diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-10-20 05:50:23 +0400 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-10-20 05:50:23 +0400 |
commit | 08e9c1af6c26f74ef7f7524be4b89241ff232a8c (patch) | |
tree | 7fe3f66fdfb1f20a5bfcbbf98369032374f3a79b /crypto/pkcs12/p12_mac.c | |
parent | 023c8d0b0aec445b680ef5aea2bd2154adb59974 (diff) |
Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
tolerated in certificates.
Diffstat (limited to 'crypto/pkcs12/p12_mac.c')
-rw-r--r-- | crypto/pkcs12/p12_mac.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/pkcs12/p12_mac.c b/crypto/pkcs12/p12_mac.c index f163d4cfaa..a427df105c 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); } |