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

integration.

CHANGES

@@ -5,6 +5,10 @@
 
  Changes between 0.9.2b and 0.9.3
 
+  *) Still more PKCS#12 integration. Add pkcs12 application to openssl
+     application. Various cleanups and fixes.
+     [Steve Henson]
+
   *) More PKCS#12 integration. Add new pkcs12 directory with Makefile.ssl and
      modify error routines to work internally. Add error codes and PBE init
      to library startup routines.

STATUS

 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 1999/03/29 00:19:51 $
+  ______________                           $Date: 1999/03/29 17:50:11 $
 
   DEVELOPMENT STATE
 
@@ -29,9 +29,9 @@
   IN PROGRESS
 
     o Steve is currently working on (in no particular order):
-        PKCS#12 code integration.
         Proper (or at least usable) certificate chain verification.
         Documentation on X509 V3 extension code.
+        PKCS#12 code cleanup and enhancement.
 
     o Mark is currently working on:
         Folding in any changes that are in the C2Net code base that were

apps/Makefile.ssl

@@ -34,7 +34,7 @@ EXE= $(PROGRAM)
 E_EXE=	verify asn1pars req dgst dh enc gendh errstr ca crl \
 	rsa dsa dsaparam \
 	x509 genrsa gendsa s_server s_client speed \
-	s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq
+	s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12
 
 PROGS= $(PROGRAM).c
 
@@ -48,7 +48,7 @@ E_OBJ=	verify.o asn1pars.o req.o dgst.o dh.o enc.o gendh.o errstr.o ca.o \
 	rsa.o dsa.o dsaparam.o \
 	x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
 	s_time.o $(A_OBJ) $(S_OBJ) version.o sess_id.o \
-	ciphers.o nseq.o
+	ciphers.o nseq.o pkcs12.o
 
 #	pem_mail.o
 

apps/nseq.c

@@ -83,7 +83,6 @@ char **argv;
 	int badarg = 0;
 	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 	ERR_load_crypto_strings();
-        SSLeay_add_all_algorithms();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
 		if (!strcmp (*args, "-toseq")) toseq = 1;

apps/progs.h

@@ -25,6 +25,7 @@ extern int crl2pkcs7_main(int argc,char *argv[]);
 extern int sess_id_main(int argc,char *argv[]);
 extern int ciphers_main(int argc,char *argv[]);
 extern int nseq_main(int argc,char *argv[]);
+extern int pkcs12_main(int argc,char *argv[]);
 #else
 extern int verify_main();
 extern int asn1parse_main();
@@ -52,6 +53,7 @@ extern int crl2pkcs7_main();
 extern int sess_id_main();
 extern int ciphers_main();
 extern int nseq_main();
+extern int pkcs12_main();
 #endif
 
 #ifdef SSLEAY_SRC
@@ -115,6 +117,7 @@ FUNCTION functions[] = {
 	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 #endif
 	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
+	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
 	{FUNC_TYPE_MD,"md2",dgst_main},
 	{FUNC_TYPE_MD,"md5",dgst_main},
 	{FUNC_TYPE_MD,"sha",dgst_main},

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);
+}

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();
 	}

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 */

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 */

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"
 
 /*

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 */

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,

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 */

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 */

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"
 
 

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 */

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"
 
 /*

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)

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 */

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"
 
 /*

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 */

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
 

util/mkdef.pl

@@ -73,6 +73,7 @@ $crypto.=" crypto/asn1/asn1.h";
 $crypto.=" crypto/asn1/asn1_mac.h";
 $crypto.=" crypto/err/err.h";
 $crypto.=" crypto/pkcs7/pkcs7.h";
+$crypto.=" crypto/pkcs12/pkcs12.h";
 $crypto.=" crypto/x509/x509.h";
 $crypto.=" crypto/x509/x509_vfy.h";
 $crypto.=" crypto/x509v3/x509v3.h";

util/mkfiles.pl

@@ -7,6 +7,7 @@
 # List of directories to process
 
 my @dirs = (
+".",
 "crypto",
 "crypto/md2",
 "crypto/md5",
@@ -40,6 +41,7 @@ my @dirs = (
 "crypto/conf",
 "crypto/txt_db",
 "crypto/pkcs7",
+"crypto/pkcs12",
 "crypto/comp",
 "ssl",
 "rsaref",
@@ -48,7 +50,6 @@ my @dirs = (
 "tools"
 );
 
-&files_dir (".", "Makefile.org");
 foreach (@dirs) {
 	&files_dir ($_, "Makefile.ssl");
 }