fix typos and other little errors ...

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

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index 63a65e15227a18a3d2f14fc115590cb234faabfd..56d88b07596cd553568ae821f3d2d87e325c3b57 100644 (file)
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -58,20 +58,11 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "pkcs12.h"
-
-PKCS12 *PKCS12_create(pass, name, pkey, cert, ca, nid_key, nid_cert, iter,
- mac_iter, keytype)
-char *pass;
-char *name;
-EVP_PKEY *pkey;
-X509 *cert;
-STACK *ca;
-int nid_key;
-int nid_cert;
-int iter;
-int mac_iter;
-int keytype;
+#include <openssl/pkcs12.h>
+
+PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
+            STACK *ca, int nid_key, int nid_cert, int iter, int mac_iter,
+            int keytype)
 {
        PKCS12 *p12;
        STACK *bags, *safes;
@@ -81,12 +72,12 @@ int keytype;
        X509 *tcert;
        int i;
        unsigned char keyid[EVP_MAX_MD_SIZE];
-       int keyidlen;
+       unsigned int keyidlen;
 
        /* Set defaults */
        if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
        if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-       if(!iter) iter = 1000;
+       if(!iter) iter = PKCS12_DEFAULT_ITER;
        if(!mac_iter) mac_iter = 1;
 
        if(!pkey || !cert) {
@@ -124,7 +115,7 @@ int keytype;
 
        /* Turn certbags into encrypted authsafe */
        authsafe = PKCS12_pack_p7encdata (nid_cert, pass, -1, NULL, 0,
-                                                                iter, bags);
+                                         iter, bags);
        sk_pop_free(bags, PKCS12_SAFEBAG_free);
 
        if (!authsafe) return NULL;
@@ -160,7 +151,8 @@ int keytype;
 
        sk_pop_free(safes, PKCS7_free);
 
-       if(!PKCS12_set_mac (p12, pass, -1, NULL, 0, mac_iter, NULL)) return NULL;
+       if(!PKCS12_set_mac (p12, pass, -1, NULL, 0, mac_iter, NULL))
+           return NULL;
 
        return p12;