projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation
[openssl.git]
/
crypto
/
pkcs12
/
p12_init.c
diff --git
a/crypto/pkcs12/p12_init.c
b/crypto/pkcs12/p12_init.c
index
f6846a8
..
6ec6fb4
100644
(file)
--- a/
crypto/pkcs12/p12_init.c
+++ b/
crypto/pkcs12/p12_init.c
@@
-79,7
+79,7
@@
int mode;
PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
return NULL;
}
-
M_ASN1_OBJECT_set(pkcs12->authsafes->type,
mode);
+
pkcs12->authsafes->type = OBJ_nid2obj(
mode);
switch (mode) {
case NID_pkcs7_data:
if (!(pkcs12->authsafes->d.data =