summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-06-30 18:19:41 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-06-30 18:19:41 +0000
commit630282f1c0bacb2f248e413e0f8302df6bdea218 (patch)
tree6398c5b96c71a34c4a3b8d696c1eed0cb627a49e
parenteaba7edf39c3a36783d92095d948717c28a8edb8 (diff)
downloadgnutls-630282f1c0bacb2f248e413e0f8302df6bdea218.tar.gz
Removed the salt size restriction (multiple of 8) to allow parsing IE5 generated structures.
-rw-r--r--lib/x509/pkcs12_encr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c
index 72ff6b8489..fea80fd8d3 100644
--- a/lib/x509/pkcs12_encr.c
+++ b/lib/x509/pkcs12_encr.c
@@ -68,7 +68,7 @@ _pkcs12_string_to_key (unsigned int id, const opaque *salt, unsigned int salt_si
cur_keylen = 0;
pwlen = strlen (pw);
- if (pwlen > 63/2 || (salt_size % 8) != 0) {
+ if (pwlen > 63/2) {
gnutls_assert();
return GNUTLS_E_INVALID_REQUEST;
}