diff options
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r-- | crypto/pkcs12/p12_add.c | 6 | ||||
-rw-r--r-- | crypto/pkcs12/p12_attr.c | 10 | ||||
-rw-r--r-- | crypto/pkcs12/p12_bags.c | 6 | ||||
-rw-r--r-- | crypto/pkcs12/p12_decr.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_init.c | 6 | ||||
-rw-r--r-- | crypto/pkcs12/p12_kiss.c | 30 | ||||
-rw-r--r-- | crypto/pkcs12/p12_lib.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_mac.c | 14 | ||||
-rw-r--r-- | crypto/pkcs12/p12_mutl.c | 8 |
9 files changed, 42 insertions, 42 deletions
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c index 50a7d0b..7ed1c3f 100644 --- a/crypto/pkcs12/p12_add.c +++ b/crypto/pkcs12/p12_add.c @@ -133,7 +133,7 @@ PKCS7 *PKCS12_pack_p7data (STACK *sk) return NULL; } p7->type = OBJ_nid2obj(NID_pkcs7_data); - if (!(p7->d.data = ASN1_OCTET_STRING_new())) { + if (!(p7->d.data = M_ASN1_OCTET_STRING_new())) { PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE); return NULL; } @@ -168,7 +168,7 @@ PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, const char *pass, int passlen, } X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm); p7->d.encrypted->enc_data->algorithm = pbe; - ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); + M_ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_i2d_encrypt (pbe, i2d_PKCS12_SAFEBAG, pass, passlen, (char *)bags, 1))) { @@ -200,7 +200,7 @@ X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, } X509_ALGOR_free(p8->algor); p8->algor = pbe; - ASN1_OCTET_STRING_free(p8->digest); + M_ASN1_OCTET_STRING_free(p8->digest); if (!(p8->digest = PKCS12_i2d_encrypt (pbe, i2d_PKCS8_PRIV_KEY_INFO, pass, passlen, (char *)p8inf, 0))) { diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c index 31c9782..f559351 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -73,11 +73,11 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name, return 0; } keyid->type = V_ASN1_OCTET_STRING; - if (!(oct = ASN1_OCTET_STRING_new())) { + if (!(oct = M_ASN1_OCTET_STRING_new())) { PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); return 0; } - if (!ASN1_OCTET_STRING_set(oct, name, namelen)) { + if (!M_ASN1_OCTET_STRING_set(oct, name, namelen)) { PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); return 0; } @@ -115,11 +115,11 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage) return 0; } keyid->type = V_ASN1_BIT_STRING; - if (!(bstr = ASN1_BIT_STRING_new())) { + if (!(bstr = M_ASN1_BIT_STRING_new())) { PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); return 0; } - if (!ASN1_BIT_STRING_set(bstr, &us_val, 1)) { + if (!M_ASN1_BIT_STRING_set(bstr, &us_val, 1)) { PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); return 0; } @@ -176,7 +176,7 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag, return 0; } fname->type = V_ASN1_BMPSTRING; - if (!(bmp = ASN1_BMPSTRING_new())) { + if (!(bmp = M_ASN1_BMPSTRING_new())) { PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI, ERR_R_MALLOC_FAILURE); return 0; diff --git a/crypto/pkcs12/p12_bags.c b/crypto/pkcs12/p12_bags.c index d6eab92..5a0abd6 100644 --- a/crypto/pkcs12/p12_bags.c +++ b/crypto/pkcs12/p12_bags.c @@ -171,15 +171,15 @@ void PKCS12_BAGS_free (PKCS12_BAGS *a) switch (OBJ_obj2nid(a->type)) { case NID_x509Certificate: - ASN1_OCTET_STRING_free (a->value.x509cert); + M_ASN1_OCTET_STRING_free (a->value.x509cert); break; case NID_x509Crl: - ASN1_OCTET_STRING_free (a->value.x509crl); + M_ASN1_OCTET_STRING_free (a->value.x509crl); break; case NID_sdsiCertificate: - ASN1_IA5STRING_free (a->value.sdsicert); + M_ASN1_IA5STRING_free (a->value.sdsicert); break; default: diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index d3d288e..4be44ea 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -155,7 +155,7 @@ ASN1_OCTET_STRING *PKCS12_i2d_encrypt (X509_ALGOR *algor, int (*i2d)(), ASN1_OCTET_STRING *oct; unsigned char *in, *p; int inlen; - if (!(oct = ASN1_OCTET_STRING_new ())) { + if (!(oct = M_ASN1_OCTET_STRING_new ())) { PKCS12err(PKCS12_F_PKCS12_I2D_ENCRYPT,ERR_R_MALLOC_FAILURE); return NULL; } diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c index dc6ab41..d5d4884 100644 --- a/crypto/pkcs12/p12_init.c +++ b/crypto/pkcs12/p12_init.c @@ -69,11 +69,11 @@ PKCS12 *PKCS12_init (int mode) PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); return NULL; } - if (!(pkcs12->version = ASN1_INTEGER_new ())) { + if (!(pkcs12->version = M_ASN1_INTEGER_new ())) { PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); return NULL; } - ASN1_INTEGER_set (pkcs12->version, 3); + ASN1_INTEGER_set(pkcs12->version, 3); if (!(pkcs12->authsafes = PKCS7_new())) { PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); return NULL; @@ -82,7 +82,7 @@ PKCS12 *PKCS12_init (int mode) switch (mode) { case NID_pkcs7_data: if (!(pkcs12->authsafes->d.data = - ASN1_OCTET_STRING_new())) { + M_ASN1_OCTET_STRING_new())) { PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); return NULL; } diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 767e130..08a6055 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -139,16 +139,16 @@ static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, sk_pop_free (asafes, PKCS7_free); return 0; } - if (!parse_bags (bags, pass, passlen, pkey, cert, ca, + if (!parse_bags(bags, pass, passlen, pkey, cert, ca, &keyid, &keymatch)) { - sk_pop_free (bags, PKCS12_SAFEBAG_free); - sk_pop_free (asafes, PKCS7_free); + sk_pop_free(bags, PKCS12_SAFEBAG_free); + sk_pop_free(asafes, PKCS7_free); return 0; } - sk_pop_free (bags, PKCS12_SAFEBAG_free); + sk_pop_free(bags, PKCS12_SAFEBAG_free); } - sk_pop_free (asafes, PKCS7_free); - if (keyid) ASN1_OCTET_STRING_free (keyid); + sk_pop_free(asafes, PKCS7_free); + if (keyid) M_ASN1_OCTET_STRING_free(keyid); return 1; } @@ -158,8 +158,8 @@ static int parse_bags (STACK *bags, const char *pass, int passlen, ASN1_OCTET_STRING **keyid, char *keymatch) { int i; - for (i = 0; i < sk_num (bags); i++) { - if (!parse_bag ((PKCS12_SAFEBAG *)sk_value (bags, i), + for (i = 0; i < sk_num(bags); i++) { + if (!parse_bag((PKCS12_SAFEBAG *)sk_value (bags, i), pass, passlen, pkey, cert, ca, keyid, keymatch)) return 0; } @@ -170,7 +170,7 @@ static int parse_bags (STACK *bags, const char *pass, int passlen, #define MATCH_CERT 0x2 #define MATCH_ALL 0x3 -static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen, +static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch) @@ -187,9 +187,9 @@ static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen, /* Check for any local key id matching (if needed) */ if (lkey && ((*keymatch & MATCH_ALL) != MATCH_ALL)) { if (*keyid) { - if (ASN1_OCTET_STRING_cmp (*keyid, lkey)) lkey = NULL; + if (M_ASN1_OCTET_STRING_cmp(*keyid, lkey)) lkey = NULL; } else { - if (!(*keyid = ASN1_OCTET_STRING_dup (lkey))) { + if (!(*keyid = M_ASN1_OCTET_STRING_dup(lkey))) { PKCS12err(PKCS12_F_PARSE_BAGS,ERR_R_MALLOC_FAILURE); return 0; } @@ -200,16 +200,16 @@ static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen, { case NID_keyBag: if (!lkey || !pkey) return 1; - if (!(*pkey = EVP_PKCS82PKEY (bag->value.keybag))) return 0; + if (!(*pkey = EVP_PKCS82PKEY(bag->value.keybag))) return 0; *keymatch |= MATCH_KEY; break; case NID_pkcs8ShroudedKeyBag: if (!lkey || !pkey) return 1; - if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen))) + if (!(p8 = M_PKCS12_decrypt_skey(bag, pass, passlen))) return 0; - *pkey = EVP_PKCS82PKEY (p8); - PKCS8_PRIV_KEY_INFO_free (p8); + *pkey = EVP_PKCS82PKEY(p8); + PKCS8_PRIV_KEY_INFO_free(p8); if (!(*pkey)) return 0; *keymatch |= MATCH_KEY; break; diff --git a/crypto/pkcs12/p12_lib.c b/crypto/pkcs12/p12_lib.c index 00a6695..014cb52 100644 --- a/crypto/pkcs12/p12_lib.c +++ b/crypto/pkcs12/p12_lib.c @@ -104,7 +104,7 @@ PKCS12 *PKCS12_new(void) void PKCS12_free (PKCS12 *a) { if (a == NULL) return; - ASN1_INTEGER_free (a->version); + M_ASN1_INTEGER_free(a->version); PKCS12_MAC_DATA_free (a->mac); PKCS7_free (a->authsafes); Free ((char *)a); diff --git a/crypto/pkcs12/p12_mac.c b/crypto/pkcs12/p12_mac.c index f163d4c..a427df1 100644 --- a/crypto/pkcs12/p12_mac.c +++ b/crypto/pkcs12/p12_mac.c @@ -82,9 +82,9 @@ PKCS12_MAC_DATA *PKCS12_MAC_DATA_new(void) ASN1_CTX c; M_ASN1_New_Malloc(ret, PKCS12_MAC_DATA); ret->dinfo = X509_SIG_new(); - ret->salt = ASN1_OCTET_STRING_new(); + ret->salt = M_ASN1_OCTET_STRING_new(); ret->iter = NULL; - return (ret); + return(ret); M_ASN1_New_Error(ASN1_F_PKCS12_MAC_DATA_NEW); } @@ -94,9 +94,9 @@ PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, unsigned char **pp, M_ASN1_D2I_vars(a,PKCS12_MAC_DATA *,PKCS12_MAC_DATA_new); M_ASN1_D2I_Init(); M_ASN1_D2I_start_sequence(); - M_ASN1_D2I_get (ret->dinfo, d2i_X509_SIG); - M_ASN1_D2I_get (ret->salt, d2i_ASN1_OCTET_STRING); - M_ASN1_D2I_get_opt (ret->iter, d2i_ASN1_INTEGER, V_ASN1_INTEGER); + M_ASN1_D2I_get(ret->dinfo, d2i_X509_SIG); + M_ASN1_D2I_get(ret->salt, d2i_ASN1_OCTET_STRING); + M_ASN1_D2I_get_opt(ret->iter, d2i_ASN1_INTEGER, V_ASN1_INTEGER); M_ASN1_D2I_Finish(a, PKCS12_MAC_DATA_free, ASN1_F_D2I_PKCS12_MAC_DATA); } @@ -104,7 +104,7 @@ void PKCS12_MAC_DATA_free (PKCS12_MAC_DATA *a) { if (a == NULL) return; X509_SIG_free (a->dinfo); - ASN1_OCTET_STRING_free (a->salt); - ASN1_INTEGER_free (a->iter); + M_ASN1_OCTET_STRING_free(a->salt); + M_ASN1_INTEGER_free(a->iter); Free ((char *)a); } diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index bac558d..3cb782f 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -131,7 +131,7 @@ int PKCS12_set_mac (PKCS12 *p12, const char *pass, int passlen, PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_GENERATION_ERROR); return 0; } - if (!(ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) { + if (!(M_ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) { PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_STRING_SET_ERROR); return 0; } @@ -142,13 +142,13 @@ int PKCS12_set_mac (PKCS12 *p12, const char *pass, int passlen, int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen, EVP_MD *md_type) { - if (!(p12->mac = PKCS12_MAC_DATA_new ())) return PKCS12_ERROR; + if (!(p12->mac = PKCS12_MAC_DATA_new())) return PKCS12_ERROR; if (iter > 1) { - if(!(p12->mac->iter = ASN1_INTEGER_new())) { + if(!(p12->mac->iter = M_ASN1_INTEGER_new())) { PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); return 0; } - ASN1_INTEGER_set (p12->mac->iter, iter); + ASN1_INTEGER_set(p12->mac->iter, iter); } if (!saltlen) saltlen = PKCS12_SALT_LEN; p12->mac->salt->length = saltlen; |