Ignore Makefile.save

[openssl.git] / crypto / pkcs12 / p12_add.c

diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 2022b953f5c5136be0eeffa5e5f24553396e9947..b5858d1a109f2e7cf12971e1a52f57e46f03d311 100644 (file)
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -57,18 +57,13 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <err.h>
-#include "pkcs12.h"
+#include "cryptlib.h"
+#include <openssl/pkcs12.h>
 
 /* Pack an object into an OCTET STRING and turn into a safebag */
 
-PKCS12_SAFEBAG *PKCS12_pack_safebag (obj, i2d, nid1, nid2)
-char *obj;
-int (*i2d)();
-int nid1;
-int nid2;
-
+PKCS12_SAFEBAG *PKCS12_pack_safebag (char *obj, int (*i2d)(), int nid1,
+            int nid2)
 {
        PKCS12_BAGS *bag;
        PKCS12_SAFEBAG *safebag;
@@ -76,7 +71,7 @@ int nid2;
                PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       M_ASN1_OBJECT_set(bag->type, nid1);
+       bag->type = OBJ_nid2obj(nid1);
        if (!ASN1_pack_string(obj, i2d, &bag->value.octet)) {
                PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
                return NULL;
@@ -86,35 +81,29 @@ int nid2;
                return NULL;
        }
        safebag->value.bag = bag;
-       M_ASN1_OBJECT_set(safebag->type, nid2);
+       safebag->type = OBJ_nid2obj(nid2);
        return safebag;
 }
 
 /* Turn PKCS8 object into a keybag */
 
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (p8)
-PKCS8_PRIV_KEY_INFO *p8;
+PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (PKCS8_PRIV_KEY_INFO *p8)
 {
        PKCS12_SAFEBAG *bag;
        if (!(bag = PKCS12_SAFEBAG_new())) {
-               PKCS12err(PKCS12_F_PKCS12_MAKE_SAFEBAG, ERR_R_MALLOC_FAILURE);
+               PKCS12err(PKCS12_F_PKCS12_MAKE_KEYBAG,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       M_ASN1_OBJECT_set(bag->type, NID_keyBag);
+       bag->type = OBJ_nid2obj(NID_keyBag);
        bag->value.keybag = p8;
        return bag;
 }
 
 /* Turn PKCS8 object into a shrouded keybag */
 
-PKCS12_SAFEBAG
-        *PKCS12_MAKE_SHKEYBAG (pbe_nid, pass, passlen, salt, saltlen, iter, p8)int pbe_nid;
-unsigned char *pass;
-int passlen;
-unsigned char *salt;
-int saltlen;
-int iter;
-PKCS8_PRIV_KEY_INFO *p8;
+PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (int pbe_nid, const char *pass,
+            int passlen, unsigned char *salt, int saltlen, int iter,
+            PKCS8_PRIV_KEY_INFO *p8)
 {
        PKCS12_SAFEBAG *bag;
 
@@ -124,7 +113,7 @@ PKCS8_PRIV_KEY_INFO *p8;
                return NULL;
        }
 
-       M_ASN1_OBJECT_set(bag->type, NID_pkcs8ShroudedKeyBag);
+       bag->type = OBJ_nid2obj(NID_pkcs8ShroudedKeyBag);
        if (!(bag->value.shkeybag = 
          PKCS8_encrypt(pbe_nid, pass, passlen, salt, saltlen, iter, p8))) {
                PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
@@ -135,17 +124,16 @@ PKCS8_PRIV_KEY_INFO *p8;
 }
 
 /* Turn a stack of SAFEBAGS into a PKCS#7 data Contentinfo */
-PKCS7 *PKCS12_pack_p7data (sk)
-STACK *sk;
+PKCS7 *PKCS12_pack_p7data (STACK *sk)
 {
        PKCS7 *p7;
        if (!(p7 = PKCS7_new())) {
-               PKCS12err(PKCS12_F_PKCS12_PACK_P7_DATA, ERR_R_MALLOC_FAILURE);
+               PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       M_ASN1_OBJECT_set(p7->type, NID_pkcs7_data);
+       p7->type = OBJ_nid2obj(NID_pkcs7_data);
        if (!(p7->d.data = ASN1_OCTET_STRING_new())) {
-               PKCS12err(PKCS12_F_PKCS12_PACK_P7_DATA, ERR_R_MALLOC_FAILURE);
+               PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
        
@@ -159,15 +147,8 @@ STACK *sk;
 
 /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */
 
-PKCS7 *PKCS12_pack_p7encdata (pbe_nid, pass, passlen, salt, saltlen, iter,
-                                                                        bags)
-int pbe_nid;
-unsigned char *pass;
-int passlen;
-unsigned char *salt;
-int saltlen;
-int iter;
-STACK *bags;
+PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, const char *pass, int passlen,
+            unsigned char *salt, int saltlen, int iter, STACK *bags)
 {
        PKCS7 *p7;
        X509_ALGOR *pbe;
@@ -175,15 +156,13 @@ STACK *bags;
                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       /* The next bit may end up in PKCS7_set_type eventually */
-       M_ASN1_OBJECT_set(p7->type, NID_pkcs7_encrypted);
+       p7->type = OBJ_nid2obj(NID_pkcs7_encrypted);
        if (!(p7->d.encrypted = PKCS7_ENCRYPT_new ())) {
                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
        ASN1_INTEGER_set (p7->d.encrypted->version, 0);
-       M_ASN1_OBJECT_set(p7->d.encrypted->enc_data->content_type,
-                                                               NID_pkcs7_data);
+       p7->d.encrypted->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_data);
        if (!(pbe = PKCS5_pbe_set (pbe_nid, iter, salt, saltlen))) {
                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
                return NULL;
@@ -201,14 +180,9 @@ STACK *bags;
        return p7;
 }
 
-X509_SIG *PKCS8_encrypt (pbe_nid, pass, passlen, salt, saltlen, iter, p8inf)
-int pbe_nid;
-unsigned char *pass;
-int passlen;
-unsigned char *salt;
-int saltlen;
-int iter;
-PKCS8_PRIV_KEY_INFO *p8inf;
+X509_SIG *PKCS8_encrypt (int pbe_nid, const char *pass, int passlen,
+            unsigned char *salt, int saltlen, int iter,
+            PKCS8_PRIV_KEY_INFO *p8inf)
 {
        X509_SIG *p8;
        X509_ALGOR *pbe;