Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation
[openssl.git] / crypto / pkcs12 / p12_init.c
index 0556291..6ec6fb4 100644 (file)
  */
 
 #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 =