X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fpkcs12%2Fp12_init.c;h=6ec6fb478be51e3f70d490dc969bf95383880a19;hp=055629131a6cc6a4ad0c15b8b03e7147aa6e38fe;hb=bc37a6b81c9a5e295481a1dd9ee572a4bddbf5ec;hpb=8d8c7266d4de9887fb0190a0770df9dc254a16a3

diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 055629131a..6ec6fb478b 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -57,10 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include <rand.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* Initialise a PKCS12 structure to take data */
@@ -82,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 =