Include pkcs12 program as part of openssl. This completes most of the PKCS#12

integration.

17 files changed, 29 insertions, 55 deletions

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index e1ebb66..a905573 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -174,3 +174,8 @@ EVP_PBE_KEYGEN *keygen;
 	sk_push (pbe_algs, (char *)pbe_tmp);
 	return 1;
 }
+
+void EVP_PBE_cleanup()
+{
+	sk_pop_free(pbe_algs, FreeFunc);
+}
diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 4cc7156..6bf3710 100644
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include "evp.h"
 #include "objects.h"
+#include "x509.h"
 
 int EVP_add_cipher(c)
 EVP_CIPHER *c;
@@ -117,4 +118,5 @@ void EVP_cleanup()
 	{
 	OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
 	OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
+	EVP_PBE_cleanup();
 	}
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 2022b95..9e3522c 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -57,8 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* Pack an object into an OCTET STRING and turn into a safebag */
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index f528742..49b9a88 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -57,9 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* Add a local keyid to a safebag */
diff --git a/crypto/pkcs12/p12_bags.c b/crypto/pkcs12/p12_bags.c
index 60d12fb..38729b6 100644
--- a/crypto/pkcs12/p12_bags.c
+++ b/crypto/pkcs12/p12_bags.c
@@ -57,9 +57,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <asn1_mac.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "asn1_mac.h"
 #include "pkcs12.h"
 
 /*
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 96c551e..7d3a94d 100644
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -57,8 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* PKCS#12 specific PBE functions */
diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index f2e0aac..63a65e1 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -57,10 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pem.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 PKCS12 *PKCS12_create(pass, name, pkey, cert, ca, nid_key, nid_cert, iter,
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index c4af4fa..d28e886 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -57,16 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <objects.h>
-#include <pkcs7.h>
-#include <err.h>
-#include <crypto.h>
-#include <sha.h>
-#include <stack.h>
-#include <evp.h>
-#include <string.h>
-#include "hmac.h"
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* Define this to dump decrypted output to files called DERnnn */
diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 0556291..f6846a8 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 */
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index f1506ba..ec35786 100644
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -57,10 +57,7 @@
  */
 
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <err.h>
-#include <bn.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 947e476..ef42060 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -57,11 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pem.h>
-#include <err.h>
-#include <x509.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* Simplified PKCS#12 routines */
diff --git a/crypto/pkcs12/p12_lib.c b/crypto/pkcs12/p12_lib.c
index f83aae2..e5bc2da 100644
--- a/crypto/pkcs12/p12_lib.c
+++ b/crypto/pkcs12/p12_lib.c
@@ -57,9 +57,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <asn1_mac.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "asn1_mac.h"
 #include "pkcs12.h"
 
 /*
diff --git a/crypto/pkcs12/p12_mac.c b/crypto/pkcs12/p12_mac.c
index 907c371..acb0c5f 100644
--- a/crypto/pkcs12/p12_mac.c
+++ b/crypto/pkcs12/p12_mac.c
@@ -57,9 +57,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <asn1_mac.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "asn1_mac.h"
 #include "pkcs12.h"
 /*
  *ASN1err(ASN1_F_PKCS12_MAC_DATA_NEW,ASN1_R_DECODE_ERROR)
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index b788e44..d5c2f73 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -57,11 +57,9 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include <hmac.h>
-#include <rand.h>
+#include "cryptlib.h"
+#include "hmac.h"
+#include "rand.h"
 #include "pkcs12.h"
 
 /* Generate a MAC */
diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index 7888fda..d39ffe4 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -57,9 +57,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <asn1_mac.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "asn1_mac.h"
 #include "pkcs12.h"
 
 /*
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index ae689c9..1404dbc 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -57,10 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bio.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "pkcs12.h"
 
 /* Cheap and nasty Unicode stuff */
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 8cdfe0f..ee54557 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -883,6 +883,7 @@ int EVP_PBE_ALGOR_CipherInit(X509_ALGOR *algor, unsigned char *pass,
 				 int passlen, EVP_CIPHER_CTX *ctx, int en_de);
 int EVP_PBE_alg_add(int nid, EVP_CIPHER *cipher, EVP_MD *md,
 						 EVP_PBE_KEYGEN *keygen);
+void EVP_PBE_cleanup(void);
 
 #else
 
@@ -1200,6 +1201,7 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken();
 int EVP_PBE_ALGOR_CipherInit();
 int EVP_PBE_alg_add();
 X509_ALGOR *PKCS5_pbe_set();
+void EVP_PBE_cleanup();
 
 #endif