From 1f36fe2835b35ae9c6dde5391f180150188937fb Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 28 Jan 2000 12:15:20 +0000
Subject: [PATCH] Synchronise with Unix code

---
 apps/CA.com       | 12 ++++++++++++
 apps/makeapps.com |  5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/CA.com b/apps/CA.com
index f324788eca..a33fe0b7e4 100644
--- a/apps/CA.com
+++ b/apps/CA.com
@@ -35,6 +35,7 @@ $ REQ    = openssl + " req " + SSLEAY_CONFIG
 $ CA     = openssl + " ca " + SSLEAY_CONFIG
 $ VERIFY = openssl + " verify"
 $ X509   = openssl + " x509"
+$ PKCS12 = openssl + " pkcs12"
 $ echo   = "write sys$Output"
 $!
 $ s = F$PARSE(F$ENVIRONMENT("DEFAULT"),"[]") - "].;"
@@ -121,6 +122,17 @@ $   ENDIF
 $   GOTO opt_loop_continue
 $ ENDIF
 $!
+$ IF (prog_opt .EQS. "-pkcs12")
+$ THEN
+$   i = i + 1
+$   cname = P'i'
+$   IF cname .EQS. "" THEN cname = "My certificate"
+$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CATOP''CACERT -
+	   -out newcert.p12 -export -name "''cname'"
+$   RET=$STATUS
+$   exit RET
+$ ENDIF
+$!
 $ IF (prog_opt .EQS. "-xsign")
 $ THEN
 $!
diff --git a/apps/makeapps.com b/apps/makeapps.com
index 6a2b698f14..767f274293 100644
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -152,9 +152,8 @@ $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The Application Files.
 $!
-$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;ENC;GENDH;"+-
-	      "ERRSTR;CA;"+-
-	      "PKCS7;CRL2P7;CRL;"+-
+$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;GENDH;ERRSTR;"+-
+	      "CA;PKCS7;CRL2P7;CRL;"+-
 	      "RSA;DSA;DSAPARAM;"+-
 	      "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
 	      "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
-- 
2.25.1