[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  995197ab84901df1cdf83509c4ce3511ea7f5ec0 (commit)
      from  8ffdf7ffd7b649068521c635baa2d0a9fd89914a (commit)


- Log -----------------------------------------------------------------
commit 995197ab84901df1cdf83509c4ce3511ea7f5ec0
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 1 03:59:48 2016 +0000

    Use PKCS#8 format EC key so test is skipped with no-ec
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/evptests.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/evptests.txt b/test/evptests.txt
index a7d29b8..c276b6e 100644
--- a/test/evptests.txt
+++ b/test/evptests.txt
@@ -2257,11 +2257,11 @@ x/iUJAcsJxl9eLM7kg6VzbZk6ZDc8M/qDZTiqOavnQ5YBW5lMQSSW5/myQ==
 
 # Additional EC key for ECDH
 PrivateKey=P-256-Peer
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP1Ec7tUwzcFBVmd4nSyEgGaRGNL3ydqSwe3/l548pdjoAoGCCqGSM49
-AwEHoUQDQgAEIAbl4UoHiqc/uKYl5WElS78tDU/sCrmVlCNy6lFAldO8IPkSyzGP
-MjSvZI6nIGQ7P3Afm3reuJ0KvnTZ77acRg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/URzu1TDNwUFWZ3i
+dLISAZpEY0vfJ2pLB7f+Xnjyl2OhRANCAAQgBuXhSgeKpz+4piXlYSVLvy0NT+wK
+uZWUI3LqUUCV07wg+RLLMY8yNK9kjqcgZDs/cB+bet64nQq+dNnvtpxG
+-----END PRIVATE KEY-----
 
 PublicKey=P-256-Peer-PUBLIC
 -----BEGIN PUBLIC KEY-----