aboutsummaryrefslogtreecommitdiff
path: root/crypto/pkcs12
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-08-16 14:06:48 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-08-16 16:05:35 +0100
commit17ebf85abda18c3875b1ba6670fe7b393bc1f297 (patch)
tree224f98559daf13f77b4526df0a24a3ab1675f685 /crypto/pkcs12
parent1940aa6e6b51147df10a5bffcaaa2b9904209184 (diff)
downloadopenssl-17ebf85abda18c3875b1ba6670fe7b393bc1f297.zip
openssl-17ebf85abda18c3875b1ba6670fe7b393bc1f297.tar.gz
openssl-17ebf85abda18c3875b1ba6670fe7b393bc1f297.tar.bz2
Add ASN1_STRING_get0_data(), deprecate ASN1_STRING_data().
Deprecate the function ASN1_STRING_data() and replace with a new function ASN1_STRING_get0_data() which returns a constant pointer. Update library to use new function. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r--crypto/pkcs12/p12_mutl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index 9bd672a..9c0c4df 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -143,7 +143,7 @@ int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen)
}
X509_SIG_get0(NULL, &macoct, p12->mac->dinfo);
if ((maclen != (unsigned int)ASN1_STRING_length(macoct))
- || CRYPTO_memcmp(mac, ASN1_STRING_data(macoct), maclen))
+ || CRYPTO_memcmp(mac, ASN1_STRING_get0_data(macoct), maclen))
return 0;
return 1;
}