From f422a51486a3ab415153eccdc3c3746c53da01f4 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 14 Mar 2015 04:16:42 +0000 Subject: Remove old ASN.1 code. Remove old M_ASN1_ macros and replace any occurences with the corresponding function. Remove d2i_ASN1_bytes, d2i_ASN1_SET, i2d_ASN1_SET: no longer used internally. Reviewed-by: Rich Salz --- crypto/asn1/p5_pbev2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/asn1/p5_pbev2.c') diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 73ba4a3d67..c56d850a74 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -210,7 +210,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, if (!(kdf = PBKDF2PARAM_new())) goto merr; - if (!(osalt = M_ASN1_OCTET_STRING_new())) + if (!(osalt = ASN1_OCTET_STRING_new())) goto merr; kdf->salt->value.octet_string = osalt; @@ -237,7 +237,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, /* If have a key len set it up */ if (keylen > 0) { - if (!(kdf->keylength = M_ASN1_INTEGER_new())) + if (!(kdf->keylength = ASN1_INTEGER_new())) goto merr; if (!ASN1_INTEGER_set(kdf->keylength, keylen)) goto merr; -- cgit v1.2.3