diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-04-04 12:11:27 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-04-04 15:23:34 +0200 |
| commit | 2ee8be983d0aff5a904035148c1b431c98f28b4f (patch) | |
| tree | 803fbdf931c6439c9ab9a211b36f0f7e4fec3ffe | |
| parent | 56d85d190f20d9b8431ba7ebefdddb93a89975c7 (diff) | |
| download | gnutls-2ee8be983d0aff5a904035148c1b431c98f28b4f.tar.gz | |
pkcs12: increased the maximum salt size
This accomodates for files which have salt sizes up to 256 bytes.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | lib/x509/x509_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h index ad097653d9..62007f48c1 100644 --- a/lib/x509/x509_int.h +++ b/lib/x509/x509_int.h @@ -32,6 +32,7 @@ #define MAX_CRQ_EXTENSIONS_SIZE 8*1024 #define MAX_OID_SIZE 128 #define MAX_KEY_ID_SIZE 128 +#define MAX_SALT_SIZE 256 #define HASH_OID_SHA1 "1.3.14.3.2.26" #define HASH_OID_MD5 "1.2.840.113549.2.5" @@ -119,7 +120,7 @@ typedef struct gnutls_pkcs7_int { } gnutls_pkcs7_int; struct pbkdf2_params { - uint8_t salt[32]; + uint8_t salt[MAX_SALT_SIZE]; int salt_size; unsigned iter_count; unsigned key_size; |