diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_key.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_key.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index 0357c2bfa2..0b3547a6fb 100644 --- a/src/lib/libcrypto/pkcs12/p12_key.c +++ b/src/lib/libcrypto/pkcs12/p12_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_key.c,v 1.21 2014/07/12 16:03:37 miod Exp $ */ | 1 | /* $OpenBSD: p12_key.c,v 1.22 2015/02/07 13:19:15 doug Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -107,13 +107,6 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, | |||
107 | BIGNUM *Ij, *Bpl1; /* These hold Ij and B + 1 */ | 107 | BIGNUM *Ij, *Bpl1; /* These hold Ij and B + 1 */ |
108 | EVP_MD_CTX ctx; | 108 | EVP_MD_CTX ctx; |
109 | 109 | ||
110 | #if 0 | ||
111 | if (!pass) { | ||
112 | PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI, ERR_R_PASSED_NULL_PARAMETER); | ||
113 | return 0; | ||
114 | } | ||
115 | #endif | ||
116 | |||
117 | EVP_MD_CTX_init(&ctx); | 110 | EVP_MD_CTX_init(&ctx); |
118 | v = EVP_MD_block_size(md_type); | 111 | v = EVP_MD_block_size(md_type); |
119 | u = EVP_MD_size(md_type); | 112 | u = EVP_MD_size(md_type); |