diff options
| author | jsing <> | 2015-09-30 18:41:06 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 18:41:06 +0000 |
| commit | 80275458dc3673baf5dc56ab2300719f4828295b (patch) | |
| tree | 90db6850a94839986c4ccd8ae4e62b0c6926d5f3 /src/lib/libcrypto/asn1/p5_pbev2.c | |
| parent | 70207c356ed770a6ac26f976fd810f6b67c7a111 (diff) | |
| download | openbsd-80275458dc3673baf5dc56ab2300719f4828295b.tar.gz openbsd-80275458dc3673baf5dc56ab2300719f4828295b.tar.bz2 openbsd-80275458dc3673baf5dc56ab2300719f4828295b.zip | |
Replace M_ASN1_OCTET_STRING_(free|new) with ASN1_OCTET_STRING_(free|new).
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbev2.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/p5_pbev2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 0a6d18d154..9be7e0205c 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p5_pbev2.c,v 1.22 2015/09/30 17:30:15 jsing Exp $ */ | 1 | /* $OpenBSD: p5_pbev2.c,v 1.23 2015/09/30 18:41:06 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999-2004. | 3 | * project 1999-2004. |
| 4 | */ | 4 | */ |
| @@ -303,7 +303,7 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid, | |||
| 303 | 303 | ||
| 304 | if (!(kdf = PBKDF2PARAM_new())) | 304 | if (!(kdf = PBKDF2PARAM_new())) |
| 305 | goto merr; | 305 | goto merr; |
| 306 | if (!(osalt = M_ASN1_OCTET_STRING_new())) | 306 | if (!(osalt = ASN1_OCTET_STRING_new())) |
| 307 | goto merr; | 307 | goto merr; |
| 308 | 308 | ||
| 309 | kdf->salt->value.octet_string = osalt; | 309 | kdf->salt->value.octet_string = osalt; |