Commit ee0508d4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

integration.
parent 7c0f3d09
Loading
Loading
Loading
Loading
+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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.
+2 −2
Changes for STATUS: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line

  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
+2 −2
Changes for apps/Makefile.ssl: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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

+0 −1
Changes for apps/nseq.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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/pkcs12.c

0 → 100644
+715 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading