Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From e7a2d3a57fd51f0d4d5b3fcb6669b1876d4b18d2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 10 Nov 2015 01:23:18 -0500 |
| 4 | Subject: [PATCH 1/2] libnet-ssleay-perl: Disable test that fails with |
| 5 | openssl-1.0.2b or above |
| 6 | |
| 7 | Run testsuits: |
| 8 | t/local/33_x509_create_cert............NOK 39/123 |
| 9 | not ok 39 - PEM_get_string_PrivateKey+passwd+enc_alg |
| 10 | | Failed test 'PEM_get_string_PrivateKey+passwd+enc_alg' |
| 11 | | at t/local/33_x509_create_cert.t line 104. |
| 12 | | undef |
| 13 | | doesn't match '(?^:-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----)' |
| 14 | |
| 15 | This is due to the following change in OpenSSL: |
| 16 | (git://git.openssl.org/openssl.git) |
| 17 | ...... |
| 18 | 4d9dc0c269be87b92da188df1fbd8bfee4700eb3 is the first bad commit |
| 19 | commit 4d9dc0c269be87b92da188df1fbd8bfee4700eb3 |
| 20 | Author: Dr. Stephen Henson <steve@openssl.org> |
| 21 | Date: Thu May 28 15:44:20 2015 +0100 |
| 22 | |
| 23 | check for error when creating PKCS#8 structure |
| 24 | |
| 25 | Reviewed-by: Rich Salz <rsalz@openssl.org> |
| 26 | (cherry picked from commit 2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc) |
| 27 | ...... |
| 28 | |
| 29 | Upstream-Status: Backport from upstream latest 1.72: |
| 30 | http://www.cpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-1.72.tar.gz |
| 31 | |
| 32 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 33 | --- |
| 34 | t/local/33_x509_create_cert.t | 13 ++++++++----- |
| 35 | 1 file changed, 8 insertions(+), 5 deletions(-) |
| 36 | |
| 37 | diff --git a/t/local/33_x509_create_cert.t b/t/local/33_x509_create_cert.t |
| 38 | index 2f2c013..3e653ce 100755 |
| 39 | --- a/t/local/33_x509_create_cert.t |
| 40 | +++ b/t/local/33_x509_create_cert.t |
| 41 | @@ -2,7 +2,7 @@ |
| 42 | |
| 43 | use strict; |
| 44 | use warnings; |
| 45 | -use Test::More tests => 123; |
| 46 | +use Test::More tests => 121; |
| 47 | use Net::SSLeay qw/MBSTRING_ASC MBSTRING_UTF8 EVP_PK_RSA EVP_PKT_SIGN EVP_PKT_ENC/; |
| 48 | use File::Spec; |
| 49 | use utf8; |
| 50 | @@ -99,10 +99,13 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer, $ca_subject), 0, "X509_NAME_cmp"); |
| 51 | } |
| 52 | ok(my $alg1 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-CBC"), "EVP_get_cipherbyname"); |
| 53 | like(my $key_pem3 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg1), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg"); |
| 54 | - |
| 55 | - ok(my $alg2 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-OFB"), "EVP_get_cipherbyname"); |
| 56 | - like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg"); |
| 57 | - |
| 58 | + |
| 59 | +# DES-EDE3-OFB has no ASN1 support, detected by changes to do_pk8pkey as of openssl 1.0.1n |
| 60 | +# https://git.openssl.org/?p=openssl.git;a=commit;h=4d9dc0c269be87b92da188df1fbd8bfee4700eb3 |
| 61 | +# this test now fails |
| 62 | +# ok(my $alg2 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-OFB"), "EVP_get_cipherbyname"); |
| 63 | +# like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg"); |
| 64 | + |
| 65 | is(Net::SSLeay::X509_NAME_print_ex($name), "O=Company Name,C=UK,CN=Common name text X509", "X509_NAME_print_ex"); |
| 66 | |
| 67 | # 2014-06-06: Sigh, some versions of openssl have this patch, which afffects the results of this test: |
| 68 | -- |
| 69 | 1.9.1 |
| 70 | |