[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  ed5c7ea250657796517fef035e162b20eb8d3c7f (commit)
       via  1aee92bf0f3fe243192fb5440f7c9789d5a08c67 (commit)
       via  f50b5f37a328d354b6e1d5ac44a352ef8c3d90c8 (commit)
      from  180c3fc7754f098b385c9a978491a2d468092bca (commit)


- Log -----------------------------------------------------------------
commit ed5c7ea250657796517fef035e162b20eb8d3c7f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Aug 10 16:36:37 2017 +0100

    no-ec2m fixes
    
    Fix warning and don't use binary field certificate for ECDH CMS
    key only test.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4134)

commit 1aee92bf0f3fe243192fb5440f7c9789d5a08c67
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Aug 10 16:45:31 2017 +0100

    Add alternative CMS P-256 cert
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4134)

commit f50b5f37a328d354b6e1d5ac44a352ef8c3d90c8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Aug 10 16:45:18 2017 +0100

    Fix no-ec
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4134)

-----------------------------------------------------------------------

Summary of changes:
 test/bntest.c                     |  3 ++-
 test/ectest.c                     |  2 ++
 test/recipes/80-test_cms.t        |  4 ++--
 test/smime-certs/mksmime-certs.sh |  4 ++++
 test/smime-certs/smec3.pem        | 22 ++++++++++++++++++++++
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 test/smime-certs/smec3.pem

diff --git a/test/bntest.c b/test/bntest.c
index 4dae660..ca0b8e3 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -59,9 +59,10 @@ static BN_CTX *ctx;
 /*
  * Polynomial coefficients used in GFM tests.
  */
+#ifndef OPENSSL_NO_EC2M
 static int p0[] = { 163, 7, 6, 3, 0, -1 };
 static int p1[] = { 193, 15, 0, -1 };
-
+#endif
 
 /*
  * Look for |key| in the stanza and return it or NULL if not found.
diff --git a/test/ectest.c b/test/ectest.c
index fb6027b..80e1001 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1452,5 +1452,7 @@ int setup_tests(void)
 
 void cleanup_tests(void)
 {
+#ifndef OPENSSL_NO_EC
     OPENSSL_free(curves);
+#endif
 }
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index b626449..f038bea 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -353,8 +353,8 @@ my @smime_cms_param_tests = (
       [ "-encrypt", "-in", $smcont,
 	"-stream", "-out", "test.cms",
 	catfile($smdir, "smec1.pem"),
-	catfile($smdir, "smec2.pem") ],
-      [ "-decrypt", "-inkey", catfile($smdir, "smec2.pem"),
+	catfile($smdir, "smec3.pem") ],
+      [ "-decrypt", "-inkey", catfile($smdir, "smec3.pem"),
 	"-in", "test.cms", "-out", "smtst.txt" ]
     ],
 
diff --git a/test/smime-certs/mksmime-certs.sh b/test/smime-certs/mksmime-certs.sh
index 89963ec..c98e164 100644
--- a/test/smime-certs/mksmime-certs.sh
+++ b/test/smime-certs/mksmime-certs.sh
@@ -64,6 +64,10 @@ CN="Test S/MIME EE EC #2" $OPENSSL req -config ca.cnf -nodes \
 	-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 \
+	-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
 # Create X9.42 DH parameters.
 $OPENSSL genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_type:2 \
 	-out dhp.pem
diff --git a/test/smime-certs/smec3.pem b/test/smime-certs/smec3.pem
new file mode 100644
index 0000000..90eac86
--- /dev/null
+++ b/test/smime-certs/smec3.pem
@@ -0,0 +1,22 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQga03Rl+2K38wgwVyJ
+zSy+knGorGWZBGG5p//ke0WUSbqhRANCAARH8uHBHkuOfuyXgJj7V3lNqUEPiQNo
+xG8ntGjVmKRHfywdUoQJ1PgfbkCEsBk334rRFmja1r+MYyqn/A9ARiGB
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICoDCCAYigAwIBAgIJAPaEOllWs/pjMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDDBRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0xNzA4MTAxNTQyMDhaFw0yNzA2MTkxNTQyMDhaMEQx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDDBRU
+ZXN0IFMvTUlNRSBFRSBFQyAjMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEfy
+4cEeS45+7JeAmPtXeU2pQQ+JA2jEbye0aNWYpEd/LB1ShAnU+B9uQISwGTffitEW
+aNrWv4xjKqf8D0BGIYGjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXg
+MB0GA1UdDgQWBBQLR+H9CmAY/KDyXWdVUM9FP766WzAfBgNVHSMEGDAWgBT3YQTy
+KJTdSIrnOcPj3pm5oVNtazANBgkqhkiG9w0BAQsFAAOCAQEAmMRuf8Iz5fr9f0GA
+HaNiOM5S7AIfZ6W7zzdeF63EF1j9HqP1DJsUW4y5b9azWmpp62kKuNaM4CGPUVvm
+diLKJVlrDcc+6lW9oROpnBsskhjqFMTjTANPQSAKZeKiG2W3U8Q103VQpuYvE4Nj
+OU9JT+5e4RZS7wxYk/IsvnyF/DkoF1FTMHo9/3Wiw4V4KRhpJIPnqojWNcfipmhM
+UDpbw0Oyj5fE7x6wvaoOUr8GNJE5NudtV/5QDh9REkjyKUdVYsuUrWwKqn3NT8EI
+OLl8wx3RqA8htRg/W+SoESx87rvW1saPGvfypBp4cl18B1IzTlC+FMbHFJvZqQn8
+Ci1l4Q==
+-----END CERTIFICATE-----