diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-01-06 00:11:01 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-01-06 00:17:30 +0100 |
| commit | 24c6ce144a1e071210dc33cc794690429d74456c (patch) | |
| tree | 42c8c7a0850b1e2ce5ccbeb445aebce699d3256f | |
| parent | 14ce2536fc6a7fbffe6ce5a723140cd925c77b60 (diff) | |
| download | gnutls-24c6ce144a1e071210dc33cc794690429d74456c.tar.gz | |
libgcrypt code updated with similar checks to nettle codegnutls_2_12_22
| -rw-r--r-- | lib/gcrypt/pk.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/gcrypt/pk.c b/lib/gcrypt/pk.c index e3bedafb7a..b1ce8f9409 100644 --- a/lib/gcrypt/pk.c +++ b/lib/gcrypt/pk.c @@ -121,7 +121,7 @@ _wrap_gcry_pk_encrypt (gnutls_pk_algorithm_t algo, goto cleanup; } - ret = _gnutls_mpi_dprint_size (res, ciphertext, plaintext->size); + ret = _gnutls_mpi_dprint_size (res, ciphertext, (_gnutls_mpi_get_nbits(pk_params->params[0])+7)/8); _gnutls_mpi_release (&res); if (ret < 0) { @@ -164,6 +164,12 @@ _wrap_gcry_pk_decrypt (gnutls_pk_algorithm_t algo, switch (algo) { case GNUTLS_PK_RSA: + if (ciphertext->size != (_gnutls_mpi_get_nbits(pk_params->params[0])+7)/8) + { + gnutls_assert (); + return GNUTLS_E_DECRYPTION_FAILED; + } + if (pk_params->params_nr >= 6) rc = gcry_sexp_build (&s_pkey, NULL, "(private-key(rsa((n%m)(e%m)(d%m)(p%m)(q%m)(u%m))))", @@ -363,7 +369,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_t algo, gnutls_datum_t * signature, res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG); gcry_sexp_release (list); - ret = _gnutls_mpi_dprint (res[0], signature); + ret = _gnutls_mpi_dprint_size (res[0], signature, (_gnutls_mpi_get_nbits(pk_params->params[0])+7)/8); if (ret < 0) { gnutls_assert (); @@ -424,6 +430,12 @@ _wrap_gcry_pk_verify (gnutls_pk_algorithm_t algo, pk_params->params[2], pk_params->params[3]); break; case GNUTLS_PK_RSA: + if (signature->size != (_gnutls_mpi_get_nbits(pk_params->params[0])+7)/8) + { + gnutls_assert (); + return GNUTLS_E_PK_SIG_VERIFY_FAILED; + } + if (pk_params->params_nr >= 2) rc = gcry_sexp_build (&s_pkey, NULL, "(public-key(rsa(n%m)(e%m)))", |