Refactor rnp_key_store_t to rnp::KeyStore. #2122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #2122 +/- ##
==========================================
- Coverage 76.87% 76.86% -0.01%
==========================================
Files 193 193
Lines 37051 37003 -48
==========================================
- Hits 28484 28444 -40
+ Misses 8567 8559 -8
☔ View full report in Codecov by Sentry. |
ni4
force-pushed
the
ni4-refactor-rnp_key_store_t
branch
2 times, most recently
from
d0a2649 to
a43e565
Compare
…y to rnp_key_store_t::get_signer()
ni4
force-pushed
the
ni4-refactor-rnp_key_store_t
branch
from
a43e565 to
31e2e52
Compare
Comment on lines
+3008
to
+3075
| switch (alg) { | ||
| case PGP_PKA_RSA: | ||
| case PGP_PKA_RSA_SIGN_ONLY: | ||
| case PGP_PKA_RSA_ENCRYPT_ONLY: | ||
| grip_hash_mpi(*hash, rsa.n, '\0'); | ||
| break; | ||
| case PGP_PKA_DSA: | ||
| grip_hash_mpi(*hash, dsa.p, 'p'); | ||
| grip_hash_mpi(*hash, dsa.q, 'q'); | ||
| grip_hash_mpi(*hash, dsa.g, 'g'); | ||
| grip_hash_mpi(*hash, dsa.y, 'y'); | ||
| break; | ||
| case PGP_PKA_ELGAMAL: | ||
| case PGP_PKA_ELGAMAL_ENCRYPT_OR_SIGN: | ||
| grip_hash_mpi(*hash, eg.p, 'p'); | ||
| grip_hash_mpi(*hash, eg.g, 'g'); | ||
| grip_hash_mpi(*hash, eg.y, 'y'); | ||
| break; | ||
| case PGP_PKA_ECDH: | ||
| case PGP_PKA_ECDSA: | ||
| case PGP_PKA_EDDSA: | ||
| case PGP_PKA_SM2: | ||
| grip_hash_ec(*hash, ec); | ||
| break; | ||
| #if defined(ENABLE_CRYPTO_REFRESH) | ||
| // TODO: if GnuPG would ever support v6, check whether this works correctly. | ||
| case PGP_PKA_ED25519: | ||
| hash->add(key->ed25519.pub); | ||
| break; | ||
| case PGP_PKA_X25519: | ||
| hash->add(key->x25519.pub); | ||
| break; | ||
| #endif | ||
| #if defined(ENABLE_PQC) | ||
| case PGP_PKA_KYBER768_X25519: | ||
| FALLTHROUGH_STATEMENT; | ||
| // TODO add case PGP_PKA_KYBER1024_X448: FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_KYBER768_P256: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_KYBER1024_P384: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_KYBER768_BP256: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_KYBER1024_BP384: | ||
| hash->add(key->kyber_ecdh.pub.get_encoded()); | ||
| break; | ||
| case PGP_PKA_DILITHIUM3_ED25519: | ||
| FALLTHROUGH_STATEMENT; | ||
| // TODO: add case PGP_PKA_DILITHIUM5_ED448: FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_DILITHIUM3_P256: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_DILITHIUM5_P384: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_DILITHIUM3_BP256: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_DILITHIUM5_BP384: | ||
| hash->add(key->dilithium_exdsa.pub.get_encoded()); | ||
| break; | ||
| case PGP_PKA_SPHINCSPLUS_SHA2: | ||
| FALLTHROUGH_STATEMENT; | ||
| case PGP_PKA_SPHINCSPLUS_SHAKE: | ||
| hash->add(key->sphincsplus.pub.get_encoded()); | ||
| break; | ||
| #endif | ||
| default: | ||
| RNP_LOG("unsupported public-key algorithm %d", (int) alg); | ||
| return false; | ||
| } |
Check notice
Code scanning / CodeQL
Long switch case Note
| break; | ||
| case PGP_PKA_DILITHIUM3_ED25519: | ||
| FALLTHROUGH_STATEMENT; | ||
| // TODO: add case PGP_PKA_DILITHIUM5_ED448: FALLTHROUGH_STATEMENT; |
Check notice
Code scanning / CodeQL
Commented-out code Note
| #if defined(ENABLE_PQC) | ||
| case PGP_PKA_KYBER768_X25519: | ||
| FALLTHROUGH_STATEMENT; | ||
| // TODO add case PGP_PKA_KYBER1024_X448: FALLTHROUGH_STATEMENT; |
Check notice
Code scanning / CodeQL
Commented-out code Note
antonsviridenko
approved these changes
Sep 26, 2023
|
@ronaldtse Ping for review :) |
|
@maxirmx @ribose-jeffreylau Could you please review this? Thanks! |
maxirmx
approved these changes
Oct 26, 2023
|
Two approvals and merging. Thank you @ni4 ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
...hopefully at some point we'll finally get rid from C leftovers.