diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-11 15:41:08 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-07-28 09:17:56 +0200 |
| commit | ef8980176d53d85ff96d913a647c01d07e144c5d (patch) | |
| tree | 489ddabbd96ef452c16b004018390000e9f9fed4 /test/smime-certs/mksmime-certs.sh | |
| parent | TEST: Add RSA-PSS cases in test/serdes_test.c (diff) | |
| download | openssl-ef8980176d53d85ff96d913a647c01d07e144c5d.tar.xz openssl-ef8980176d53d85ff96d913a647c01d07e144c5d.zip | |
Deprecate -nodes in favor of -noenc in pkcs12 and req app
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12495)
Diffstat (limited to '')
| -rw-r--r-- | test/smime-certs/mksmime-certs.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/smime-certs/mksmime-certs.sh b/test/smime-certs/mksmime-certs.sh index e6803ef74f..9316831d64 100644 --- a/test/smime-certs/mksmime-certs.sh +++ b/test/smime-certs/mksmime-certs.sh @@ -14,22 +14,22 @@ OPENSSL_CONF=./ca.cnf export OPENSSL_CONF # Root CA: create certificate directly -CN="Test S/MIME RSA Root" $OPENSSL req -config ca.cnf -x509 -nodes \ +CN="Test S/MIME RSA Root" $OPENSSL req -config ca.cnf -x509 -noenc \ -keyout smroot.pem -out smroot.pem -newkey rsa:2048 -days 3650 # EE RSA certificates: create request first -CN="Test S/MIME EE RSA #1" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE RSA #1" $OPENSSL req -config ca.cnf -noenc \ -keyout smrsa1.pem -out req.pem -newkey rsa:2048 # Sign request: end entity extensions $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smrsa1.pem -CN="Test S/MIME EE RSA #2" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE RSA #2" $OPENSSL req -config ca.cnf -noenc \ -keyout smrsa2.pem -out req.pem -newkey rsa:2048 $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smrsa2.pem -CN="Test S/MIME EE RSA #3" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE RSA #3" $OPENSSL req -config ca.cnf -noenc \ -keyout smrsa3.pem -out req.pem -newkey rsa:2048 $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smrsa3.pem @@ -38,15 +38,15 @@ $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ $OPENSSL dsaparam -out dsap.pem 2048 -CN="Test S/MIME EE DSA #1" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE DSA #1" $OPENSSL req -config ca.cnf -noenc \ -keyout smdsa1.pem -out req.pem -newkey dsa:dsap.pem $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdsa1.pem -CN="Test S/MIME EE DSA #2" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE DSA #2" $OPENSSL req -config ca.cnf -noenc \ -keyout smdsa2.pem -out req.pem -newkey dsa:dsap.pem $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdsa2.pem -CN="Test S/MIME EE DSA #3" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE DSA #3" $OPENSSL req -config ca.cnf -noenc \ -keyout smdsa3.pem -out req.pem -newkey dsa:dsap.pem $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdsa3.pem @@ -56,15 +56,15 @@ $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ $OPENSSL ecparam -out ecp.pem -name P-256 $OPENSSL ecparam -out ecp2.pem -name K-283 -CN="Test S/MIME EE EC #1" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE EC #1" $OPENSSL req -config ca.cnf -noenc \ -keyout smec1.pem -out req.pem -newkey ec:ecp.pem $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smec1.pem -CN="Test S/MIME EE EC #2" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE EC #2" $OPENSSL req -config ca.cnf -noenc \ -keyout smec2.pem -out req.pem -newkey ec:ecp2.pem $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smec2.pem -CN="Test S/MIME EE EC #3" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE EC #3" $OPENSSL req -config ca.cnf -noenc \ -keyout smec3.pem -out req.pem -newkey ec:ecp.pem $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ -extfile ca.cnf -extensions usr_cert -CAcreateserial >>smec3.pem @@ -75,7 +75,7 @@ $OPENSSL genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_type:2 \ $OPENSSL genpkey -paramfile dhp.pem -out smdh.pem $OPENSSL pkey -pubout -in smdh.pem -out dhpub.pem # Generate dummy request. -CN="Test S/MIME EE DH #1" $OPENSSL req -config ca.cnf -nodes \ +CN="Test S/MIME EE DH #1" $OPENSSL req -config ca.cnf -noenc \ -keyout smtmp.pem -out req.pem -newkey rsa:2048 # Sign request but force public key to DH $OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \ |