|
 |
499412d |
openssl/crypto/pkcs12/p12_mutl.c 1.23.2.1 -> 1.23.2.2
|
|
|
499412d |
|
|
|
499412d |
--- openssl/crypto/pkcs12/p12_mutl.c 2005/06/30 11:34:27 1.23.2.1
|
|
|
499412d |
+++ openssl/crypto/pkcs12/p12_mutl.c 2006/05/17 18:20:27 1.23.2.2
|
|
|
499412d |
@@ -69,7 +69,7 @@
|
|
|
499412d |
{
|
|
|
499412d |
const EVP_MD *md_type;
|
|
|
499412d |
HMAC_CTX hmac;
|
|
|
499412d |
- unsigned char key[PKCS12_MAC_KEY_LENGTH], *salt;
|
|
|
499412d |
+ unsigned char key[EVP_MAX_MD_SIZE], *salt;
|
|
|
499412d |
int saltlen, iter;
|
|
|
499412d |
|
|
|
499412d |
if (!PKCS7_type_is_data(p12->authsafes))
|
|
|
499412d |
@@ -88,12 +88,12 @@
|
|
|
499412d |
return 0;
|
|
|
499412d |
}
|
|
|
499412d |
if(!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter,
|
|
|
499412d |
- PKCS12_MAC_KEY_LENGTH, key, md_type)) {
|
|
|
499412d |
+ EVP_MD_size(md_type), key, md_type)) {
|
|
|
499412d |
PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_KEY_GEN_ERROR);
|
|
|
499412d |
return 0;
|
|
|
499412d |
}
|
|
|
499412d |
HMAC_CTX_init(&hmac);
|
|
|
499412d |
- HMAC_Init_ex(&hmac, key, PKCS12_MAC_KEY_LENGTH, md_type, NULL);
|
|
|
499412d |
+ HMAC_Init_ex(&hmac, key, EVP_MD_size(md_type), md_type, NULL);
|
|
|
499412d |
HMAC_Update(&hmac, p12->authsafes->d.data->data,
|
|
|
499412d |
p12->authsafes->d.data->length);
|
|
|
499412d |
HMAC_Final(&hmac, mac, maclen);
|
|
|
499412d |
openssl/apps/pkcs12.c 1.79.2.1 -> 1.79.2.2
|
|
|
499412d |
|
|
|
499412d |
--- openssl/apps/pkcs12.c 2005/05/31 17:31:50 1.79.2.1
|
|
|
499412d |
+++ openssl/apps/pkcs12.c 2006/05/17 18:25:59 1.79.2.2
|
|
|
499412d |
@@ -825,12 +825,14 @@
|
|
|
499412d |
PBEPARAM *pbe;
|
|
|
499412d |
const unsigned char *p;
|
|
|
499412d |
p = alg->parameter->value.sequence->data;
|
|
|
499412d |
- pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
|
|
|
499412d |
+ pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
|
|
|
499412d |
+ if (!pbe)
|
|
|
499412d |
+ return 1;
|
|
|
499412d |
BIO_printf (bio_err, "%s, Iteration %ld\n",
|
|
|
499412d |
OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
|
|
|
499412d |
ASN1_INTEGER_get(pbe->iter));
|
|
|
499412d |
PBEPARAM_free (pbe);
|
|
|
499412d |
- return 0;
|
|
|
499412d |
+ return 1;
|
|
|
499412d |
}
|
|
|
499412d |
|
|
|
499412d |
/* Load all certificates from a given file */
|