projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
[openssl.git]
/
crypto
/
pkcs12
/
p12_decr.c
diff --git
a/crypto/pkcs12/p12_decr.c
b/crypto/pkcs12/p12_decr.c
index d3d288e1874ee475d0320475a34bfa7d3f42c49a..4be44eac50601b41cfa65283acd747a961708d87 100644
(file)
--- 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;
}