diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-06-10 16:09:35 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-06-10 16:16:18 +0200 |
| commit | 1afda19c3b36ee3d52f56e454f243463a94fde22 (patch) | |
| tree | 353361891fe13587aedd29fac3774bbe77cd310a | |
| parent | 79f7117e4154e758e8b36c4e7b7369f5e2ab7bf7 (diff) | |
| download | gnutls-1afda19c3b36ee3d52f56e454f243463a94fde22.tar.gz | |
Fix PKCS#12 string to key function for 1/128 inputs.
Reported by "Kukosa, Tomas" <tomas.kukosa@siemens-enterprise.com> in
<http://permalink.gmane.org/gmane.network.gnutls.general/1663>.
| -rw-r--r-- | lib/x509/pkcs12_encr.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c index 267ed42843..5569eba217 100644 --- a/lib/x509/pkcs12_encr.c +++ b/lib/x509/pkcs12_encr.c @@ -1,6 +1,6 @@ /* minip12.c - A mini pkcs-12 implementation (modified for gnutls) * - * Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 2002, 2004, 2005, 2009 Free Software Foundation, Inc. * * This file is part of GNUTLS. * @@ -66,7 +66,7 @@ _gnutls_pkcs12_string_to_key (unsigned int id, const opaque * salt, unsigned int pwlen; opaque hash[20], buf_b[64], buf_i[128], *p; size_t cur_keylen; - size_t n; + size_t n, m; const opaque buf_512[] = /* 2^64 */ { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -175,7 +175,13 @@ _gnutls_pkcs12_string_to_key (unsigned int id, const opaque * salt, } _gnutls_mpi_addm (num_ij, num_ij, num_b1, mpi512); n = 64; - rc = _gnutls_mpi_print (num_ij, buf_i + i, &n); +#ifndef PKCS12_BROKEN_KEYGEN + m = (_gnutls_mpi_get_nbits (num_ij) + 7) / 8; +#else + m = n; +#endif + memset (buf_i + i, 0, n - m); + rc = _gnutls_mpi_print (num_ij, buf_i + i + n - m, &n); if (rc < 0) { gnutls_assert (); |