security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-17 14:07:03 +01:00
Code Activity

gpg,gpgsm: Fix compliance check for DSA and avoid an assert.

Browse Source 
* common/compliance.c (gnupg_pk_is_compliant): Swap P and Q for DSA
check.  Explicitly check for allowed ECC algos.
(gnupg_pk_is_allowed): Swap P and Q for DSA check.
* g10/mainproc.c (proc_encrypted): Simplify SYMKEYS check.  Replace
assert by debug message.

--

Note that in mainproc.c SYMKEYS is unsigned and thus a greater than 0
condition is surprising because it leads to the assumption SYMKEYS
could be negative.  Better use a boolean test.

The assert could have lead to a regression for no good reason.  Not
being compliant is better than breaking existing users.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-06-19 17:50:02 +02:00
parent 6cc4702767
commit 3621dbe525
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/compliance.c
View File

@ -154,10 +154,10 @@ gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo,
case is_dsa: case is_dsa:
if (key) if (key)
{ {
size_t L = gcry_mpi_get_nbits (key[0] /* p */); size_t P = gcry_mpi_get_nbits (key[0]);
size_t N = gcry_mpi_get_nbits (key[1] /* q */); size_t Q = gcry_mpi_get_nbits (key[1]);
result = (L == 256 result = (Q == 256
&& (N == 2048 || N == 3072)); && (P == 2048 || P == 3072));
} }
break; break;
@ -171,7 +171,8 @@ gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo,
} }
result = (curvename result = (curvename
&& algo != PUBKEY_ALGO_EDDSA && (algo == PUBKEY_ALGO_ECDH
|| algo == PUBKEY_ALGO_ECDSA)
&& (!strcmp (curvename, "brainpoolP256r1") && (!strcmp (curvename, "brainpoolP256r1")
|| !strcmp (curvename, "brainpoolP384r1") || !strcmp (curvename, "brainpoolP384r1")
|| !strcmp (curvename, "brainpoolP512r1"))); || !strcmp (curvename, "brainpoolP512r1")));
@ -238,13 +239,13 @@ gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance,
case PUBKEY_ALGO_DSA: case PUBKEY_ALGO_DSA:
if (key) if (key)
{ {
size_t L = gcry_mpi_get_nbits (key[0] /* p */); size_t P = gcry_mpi_get_nbits (key[0]);
size_t N = gcry_mpi_get_nbits (key[1] /* q */); size_t Q = gcry_mpi_get_nbits (key[1]);
return ((use == PK_USE_SIGNING return ((use == PK_USE_SIGNING
&& L == 256 && Q == 256
&& (N == 2048 || N == 3072)) && (P == 2048 || P == 3072))
|| (use == PK_USE_VERIFICATION || (use == PK_USE_VERIFICATION
&& N < 2048)); && P < 2048));
} }
else else
return 0; return 0;

12
common/compliance.h
View File

@ -57,14 +57,17 @@ int gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance,
int gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance, int gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance,
cipher_algo_t cipher, cipher_algo_t cipher,
enum gcry_cipher_modes mode); enum gcry_cipher_modes mode);
int gnupg_cipher_is_allowed (enum gnupg_compliance_mode compliance, int producer, int gnupg_cipher_is_allowed (enum gnupg_compliance_mode compliance,
int producer,
cipher_algo_t cipher, cipher_algo_t cipher,
enum gcry_cipher_modes mode); enum gcry_cipher_modes mode);
int gnupg_digest_is_compliant (enum gnupg_compliance_mode compliance, int gnupg_digest_is_compliant (enum gnupg_compliance_mode compliance,
digest_algo_t digest); digest_algo_t digest);
int gnupg_digest_is_allowed (enum gnupg_compliance_mode compliance, int producer, int gnupg_digest_is_allowed (enum gnupg_compliance_mode compliance,
int producer,
digest_algo_t digest); digest_algo_t digest);
const char *gnupg_status_compliance_flag (enum gnupg_compliance_mode compliance); const char *gnupg_status_compliance_flag (enum gnupg_compliance_mode
compliance);
struct gnupg_compliance_option struct gnupg_compliance_option
{ {
@ -76,7 +79,8 @@ int gnupg_parse_compliance_option (const char *string,
struct gnupg_compliance_option options[], struct gnupg_compliance_option options[],
size_t length, size_t length,
int quiet); int quiet);
const char *gnupg_compliance_option_string (enum gnupg_compliance_mode compliance); const char *gnupg_compliance_option_string (enum gnupg_compliance_mode
compliance);
#endif /*GNUPG_COMMON_COMPLIANCE_H*/ #endif /*GNUPG_COMMON_COMPLIANCE_H*/

13
g10/mainproc.c
View File

@ -94,7 +94,7 @@ struct mainproc_context
kbnode_t list; /* The current list of packets. */ kbnode_t list; /* The current list of packets. */
iobuf_t iobuf; /* Used to get the filename etc. */ iobuf_t iobuf; /* Used to get the filename etc. */
int trustletter; /* Temporary usage in list_node. */ int trustletter; /* Temporary usage in list_node. */
ulong symkeys; ulong symkeys; /* Number of symmetrically encrypted session keys. */
struct kidlist_item *pkenc_list; /* List of encryption packets. */ struct kidlist_item *pkenc_list; /* List of encryption packets. */
struct { struct {
unsigned int sig_seen:1; /* Set to true if a signature packet unsigned int sig_seen:1; /* Set to true if a signature packet
@ -603,18 +603,19 @@ proc_encrypted (CTX c, PACKET *pkt)
/* Compute compliance with CO_DE_VS. */ /* Compute compliance with CO_DE_VS. */
if (!result && is_status_enabled () if (!result && is_status_enabled ()
/* Symmetric encryption and asymmetric encryption voids compliance. */ /* Symmetric encryption and asymmetric encryption voids compliance. */
&& ((c->symkeys > 0) != (c->pkenc_list != NULL)) && (c->symkeys != !!c->pkenc_list )
/* Overriding session key voids compliance. */ /* Overriding session key voids compliance. */
&& opt.override_session_key == NULL && !opt.override_session_key
/* Check symmetric cipher. */ /* Check symmetric cipher. */
&& gnupg_cipher_is_compliant (CO_DE_VS, c->dek->algo, GCRY_CIPHER_MODE_CFB)) && gnupg_cipher_is_compliant (CO_DE_VS, c->dek->algo,
GCRY_CIPHER_MODE_CFB))
{ {
struct kidlist_item *i; struct kidlist_item *i;
int compliant = 1; int compliant = 1;
PKT_public_key *pk = xmalloc (sizeof *pk); PKT_public_key *pk = xmalloc (sizeof *pk);
log_assert (c->pkenc_list || c->symkeys if ( !(c->pkenc_list || c->symkeys) )
|| !"where else did the session key come from!?"); log_debug ("%s: where else did the session key come from?\n", __func__);
/* Now check that every key used to encrypt the session key is /* Now check that every key used to encrypt the session key is
* compliant. */ * compliant. */

7
sm/decrypt.c
View File

@ -493,9 +493,10 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
} }
/* Check that all certs are compliant with CO_DE_VS. */ /* Check that all certs are compliant with CO_DE_VS. */
is_de_vs = (is_de_vs is_de_vs =
&& gnupg_pk_is_compliant (CO_DE_VS, pk_algo, NULL, (is_de_vs
nbits, NULL)); && gnupg_pk_is_compliant (CO_DE_VS, pk_algo, NULL,
nbits, NULL));
} }
oops: oops: