|
 |
cd5466 |
From 9596788bdd2d061bef042485af14262e9fc4020c Mon Sep 17 00:00:00 2001
|
|
|
cd5466 |
From: Kazuki Yamaguchi <k@rhe.jp>
|
|
|
cd5466 |
Date: Thu, 13 Aug 2020 23:20:55 +0900
|
|
|
cd5466 |
Subject: [PATCH] test/openssl/test_pkcs12: fix test failures with OpenSSL 3.0
|
|
|
cd5466 |
|
|
|
cd5466 |
OpenSSL's PKCS12_create() by default uses pbewithSHAAnd40BitRC2-CBC for
|
|
|
cd5466 |
encryption of the certificates. However, in OpenSSL 3.0, the algorithm
|
|
|
cd5466 |
is part of the legacy provider and is not enabled by default.
|
|
|
cd5466 |
|
|
|
cd5466 |
Specify another algorithm that is still in the default provider for
|
|
|
cd5466 |
these test cases.
|
|
|
cd5466 |
---
|
|
|
cd5466 |
test/openssl/test_pkcs12.rb | 297 ++++++++++++++++++------------------
|
|
|
cd5466 |
1 file changed, 149 insertions(+), 148 deletions(-)
|
|
|
cd5466 |
|
|
|
cd5466 |
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
|
|
|
cd5466 |
index fdbe753b17..ec676743bc 100644
|
|
|
cd5466 |
--- a/test/openssl/test_pkcs12.rb
|
|
|
cd5466 |
+++ b/test/openssl/test_pkcs12.rb
|
|
|
cd5466 |
@@ -5,6 +5,9 @@
|
|
|
cd5466 |
|
|
|
cd5466 |
module OpenSSL
|
|
|
cd5466 |
class TestPKCS12 < OpenSSL::TestCase
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS = "PBE-SHA1-3DES"
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS = "PBE-SHA1-3DES"
|
|
|
cd5466 |
+
|
|
|
cd5466 |
def setup
|
|
|
cd5466 |
super
|
|
|
cd5466 |
ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
|
|
|
cd5466 |
@@ -14,47 +17,41 @@ def setup
|
|
|
cd5466 |
["subjectKeyIdentifier","hash",false],
|
|
|
cd5466 |
["authorityKeyIdentifier","keyid:always",false],
|
|
|
cd5466 |
]
|
|
|
cd5466 |
- @cacert = issue_cert(ca, Fixtures.pkey("rsa2048"), 1, ca_exts, nil, nil)
|
|
|
cd5466 |
+ ca_key = Fixtures.pkey("rsa-1")
|
|
|
cd5466 |
+ @cacert = issue_cert(ca, ca_key, 1, ca_exts, nil, nil)
|
|
|
cd5466 |
|
|
|
cd5466 |
inter_ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Intermediate CA")
|
|
|
cd5466 |
- inter_ca_key = OpenSSL::PKey.read <<-_EOS_
|
|
|
cd5466 |
------BEGIN RSA PRIVATE KEY-----
|
|
|
cd5466 |
-MIICXAIBAAKBgQDp7hIG0SFMG/VWv1dBUWziAPrNmkMXJgTCAoB7jffzRtyyN04K
|
|
|
cd5466 |
-oq/89HAszTMStZoMigQURfokzKsjpUp8OYCAEsBtt9d5zPndWMz/gHN73GrXk3LT
|
|
|
cd5466 |
-ZsxEn7Xv5Da+Y9F/Hx2QZUHarV5cdZixq2NbzWGwrToogOQMh2pxN3Z/0wIDAQAB
|
|
|
cd5466 |
-AoGBAJysUyx3olpsGzv3OMRJeahASbmsSKTXVLZvoIefxOINosBFpCIhZccAG6UV
|
|
|
cd5466 |
-5c/xCvS89xBw8aD15uUfziw3AuT8QPEtHCgfSjeT7aWzBfYswEgOW4XPuWr7EeI9
|
|
|
cd5466 |
-iNHGD6z+hCN/IQr7FiEBgTp6A+i/hffcSdR83fHWKyb4M7TRAkEA+y4BNd668HmC
|
|
|
cd5466 |
-G5MPRx25n6LixuBxrNp1umfjEI6UZgEFVpYOg4agNuimN6NqM253kcTR94QNTUs5
|
|
|
cd5466 |
-Kj3EhG1YWwJBAO5rUjiOyCNVX2WUQrOMYK/c1lU7fvrkdygXkvIGkhsPoNRzLPeA
|
|
|
cd5466 |
-HGJszKtrKD8bNihWpWNIyqKRHfKVD7yXT+kCQGCAhVCIGTRoypcDghwljHqLnysf
|
|
|
cd5466 |
-ci0h5ZdPcIqc7ODfxYhFsJ/Rql5ONgYsT5Ig/+lOQAkjf+TRYM4c2xKx2/8CQBvG
|
|
|
cd5466 |
-jv6dy70qDgIUgqzONtlmHeYyFzn9cdBO5sShdVYHvRHjFSMEXsosqK9zvW2UqvuK
|
|
|
cd5466 |
-FJx7d3f29gkzynCLJDkCQGQZlEZJC4vWmWJGRKJ24P6MyQn3VsPfErSKOg4lvyM3
|
|
|
cd5466 |
-Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
|
|
|
cd5466 |
------END RSA PRIVATE KEY-----
|
|
|
cd5466 |
- _EOS_
|
|
|
cd5466 |
- @inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, ca_exts, @cacert, Fixtures.pkey("rsa2048"))
|
|
|
cd5466 |
+ inter_ca_key = Fixtures.pkey("rsa-2")
|
|
|
cd5466 |
+ @inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, ca_exts, @cacert, ca_key)
|
|
|
cd5466 |
|
|
|
cd5466 |
exts = [
|
|
|
cd5466 |
["keyUsage","digitalSignature",true],
|
|
|
cd5466 |
["subjectKeyIdentifier","hash",false],
|
|
|
cd5466 |
]
|
|
|
cd5466 |
ee = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Ruby PKCS12 Test Certificate")
|
|
|
cd5466 |
- @mykey = Fixtures.pkey("rsa1024")
|
|
|
cd5466 |
+ @mykey = Fixtures.pkey("rsa-3")
|
|
|
cd5466 |
@mycert = issue_cert(ee, @mykey, 3, exts, @inter_cacert, inter_ca_key)
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
- def test_create
|
|
|
cd5466 |
+ def test_create_single_key_single_cert
|
|
|
cd5466 |
pkcs12 = OpenSSL::PKCS12.create(
|
|
|
cd5466 |
"omg",
|
|
|
cd5466 |
"hello",
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
- @mycert
|
|
|
cd5466 |
+ @mycert,
|
|
|
cd5466 |
+ nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
)
|
|
|
cd5466 |
- assert_equal @mycert.to_der, pkcs12.certificate.to_der
|
|
|
cd5466 |
+ assert_equal @mycert, pkcs12.certificate
|
|
|
cd5466 |
assert_equal @mykey.to_der, pkcs12.key.to_der
|
|
|
cd5466 |
assert_nil pkcs12.ca_certs
|
|
|
cd5466 |
+
|
|
|
cd5466 |
+ der = pkcs12.to_der
|
|
|
cd5466 |
+ decoded = OpenSSL::PKCS12.new(der, "omg")
|
|
|
cd5466 |
+ assert_equal @mykey.to_der, decoded.key.to_der
|
|
|
cd5466 |
+ assert_equal @mycert, decoded.certificate
|
|
|
cd5466 |
+ assert_equal [], Array(decoded.ca_certs)
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
def test_create_no_pass
|
|
|
cd5466 |
@@ -62,14 +59,17 @@ def test_create_no_pass
|
|
|
cd5466 |
nil,
|
|
|
cd5466 |
"hello",
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
- @mycert
|
|
|
cd5466 |
+ @mycert,
|
|
|
cd5466 |
+ nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
)
|
|
|
cd5466 |
- assert_equal @mycert.to_der, pkcs12.certificate.to_der
|
|
|
cd5466 |
+ assert_equal @mycert, pkcs12.certificate
|
|
|
cd5466 |
assert_equal @mykey.to_der, pkcs12.key.to_der
|
|
|
cd5466 |
assert_nil pkcs12.ca_certs
|
|
|
cd5466 |
|
|
|
cd5466 |
decoded = OpenSSL::PKCS12.new(pkcs12.to_der)
|
|
|
cd5466 |
- assert_cert @mycert, decoded.certificate
|
|
|
cd5466 |
+ assert_equal @mycert, decoded.certificate
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
def test_create_with_chain
|
|
|
cd5466 |
@@ -80,7 +80,9 @@ def test_create_with_chain
|
|
|
cd5466 |
"hello",
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
@mycert,
|
|
|
cd5466 |
- chain
|
|
|
cd5466 |
+ chain,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
)
|
|
|
cd5466 |
assert_equal chain, pkcs12.ca_certs
|
|
|
cd5466 |
end
|
|
|
cd5466 |
@@ -95,14 +97,16 @@ def test_create_with_chain_decode
|
|
|
cd5466 |
"hello",
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
@mycert,
|
|
|
cd5466 |
- chain
|
|
|
cd5466 |
+ chain,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
)
|
|
|
cd5466 |
|
|
|
cd5466 |
decoded = OpenSSL::PKCS12.new(pkcs12.to_der, passwd)
|
|
|
cd5466 |
assert_equal chain.size, decoded.ca_certs.size
|
|
|
cd5466 |
- assert_include_cert @cacert, decoded.ca_certs
|
|
|
cd5466 |
- assert_include_cert @inter_cacert, decoded.ca_certs
|
|
|
cd5466 |
- assert_cert @mycert, decoded.certificate
|
|
|
cd5466 |
+ assert_include decoded.ca_certs, @cacert
|
|
|
cd5466 |
+ assert_include decoded.ca_certs, @inter_cacert
|
|
|
cd5466 |
+ assert_equal @mycert, decoded.certificate
|
|
|
cd5466 |
assert_equal @mykey.to_der, decoded.key.to_der
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
@@ -126,8 +130,8 @@ def test_create_with_itr
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
@mycert,
|
|
|
cd5466 |
[],
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
2048
|
|
|
cd5466 |
)
|
|
|
cd5466 |
|
|
|
cd5466 |
@@ -138,8 +142,8 @@ def test_create_with_itr
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
@mycert,
|
|
|
cd5466 |
[],
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
"omg"
|
|
|
cd5466 |
)
|
|
|
cd5466 |
end
|
|
|
cd5466 |
@@ -152,7 +156,8 @@ def test_create_with_mac_itr
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
@mycert,
|
|
|
cd5466 |
[],
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
nil,
|
|
|
cd5466 |
nil,
|
|
|
cd5466 |
2048
|
|
|
cd5466 |
@@ -165,148 +170,144 @@ def test_create_with_mac_itr
|
|
|
cd5466 |
@mykey,
|
|
|
cd5466 |
@mycert,
|
|
|
cd5466 |
[],
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
- nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
nil,
|
|
|
cd5466 |
"omg"
|
|
|
cd5466 |
)
|
|
|
cd5466 |
end
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
- def test_new_with_one_key_and_one_cert
|
|
|
cd5466 |
- # generated with:
|
|
|
cd5466 |
- # openssl version #=> OpenSSL 1.0.2h 3 May 2016
|
|
|
cd5466 |
- # openssl pkcs12 -in <@mycert> -inkey <RSA1024> -export -out <out>
|
|
|
cd5466 |
- str = <<~EOF.unpack("m").first
|
|
|
cd5466 |
-MIIGQQIBAzCCBgcGCSqGSIb3DQEHAaCCBfgEggX0MIIF8DCCAu8GCSqGSIb3DQEH
|
|
|
cd5466 |
-BqCCAuAwggLcAgEAMIIC1QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIeZPM
|
|
|
cd5466 |
-Rh6KiXgCAggAgIICqL6O+LCZmBzdIg6mozPF3FpY0hVbWHvTNMiDHieW3CrAanhN
|
|
|
cd5466 |
-YCH2/wHqH8WpFpEWwF0qEEXAWjHsIlYB4Cfqo6b7XpuZe5eVESsjNTOTMF1JCUJj
|
|
|
cd5466 |
-A6iNefXmCFLync1JK5LUodRDhTlKLU1WPK20X9X4vuEwHn8wt5RUb8P0E+Xh6rpS
|
|
|
cd5466 |
-XC4LkZKT45zF3cJa/n5+dW65ohVGNVnF9D1bCNEKHMOllK1V9omutQ9slW88hpga
|
|
|
cd5466 |
-LGiFsJoFOb/ESGb78KO+bd6zbX1MdKdBV+WD6t1uF/cgU65y+2A4nXs1urda+MJ7
|
|
|
cd5466 |
-7iVqiB7Vnc9cANTbAkTSGNyoUDVM/NZde782/8IvddLAzUZ2EftoRDke6PvuBOVL
|
|
|
cd5466 |
-ljBhNWmdamrtBqzuzVZCRdWq44KZkF2Xoc9asepwIkdVmntzQF7f1Z+Ta5yg6HFp
|
|
|
cd5466 |
-xnr7CuM+MlHEShXkMgYtHnwAq10fDMSXIvjhi/AA5XUAusDO3D+hbtcRDcJ4uUes
|
|
|
cd5466 |
-dm5dhQE2qJ02Ysn4aH3o1F3RYNOzrxejHJwl0D2TCE8Ww2X342xib57+z9u03ufj
|
|
|
cd5466 |
-jswhiMKxy67f1LhUMq3XrT3uV6kCVXk/KUOUPcXPlPVNA5JmZeFhMp6GrtB5xJJ9
|
|
|
cd5466 |
-wwBZD8UL5A2U2Mxi2OZsdUBv8eo3jnjZ284aFpt+mCjIHrLW5O0jwY8OCwSlYUoY
|
|
|
cd5466 |
-IY00wlabX0s82kBcIQNZbC1RSV2267ro/7A0MClc8YQ/zWN0FKY6apgtUkHJI1cL
|
|
|
cd5466 |
-1dc77mhnjETjwW94iLMDFy4zQfVu7IfCBqOBzygRNnqqUG66UhTs1xFnWM0mWXl/
|
|
|
cd5466 |
-Zh9+AMpbRLIPaKCktIjl5juzzm+KEgkhD+707XRCFIGUYGP5bSHzGaz8PK9hj0u1
|
|
|
cd5466 |
-E2SpZHUvYOcawmxtA7pmpSxl5uQjMIIC+QYJKoZIhvcNAQcBoIIC6gSCAuYwggLi
|
|
|
cd5466 |
-MIIC3gYLKoZIhvcNAQwKAQKgggKmMIICojAcBgoqhkiG9w0BDAEDMA4ECKB338m8
|
|
|
cd5466 |
-qSzHAgIIAASCAoACFhJeqA3xx+s1qIH6udNQYY5hAL6oz7SXoGwFhDiceSyJjmAD
|
|
|
cd5466 |
-Dby9XWM0bPl1Gj5nqdsuI/lAM++fJeoETk+rxw8q6Ofk2zUaRRE39qgpwBwSk44o
|
|
|
cd5466 |
-0SAFJ6bzHpc5CFh6sZmDaUX5Lm9GtjnGFmmsPTSJT5an5JuJ9WczGBEd0nSBQhJq
|
|
|
cd5466 |
-xHbTGZiN8i3SXcIH531Sub+CBIFWy5lyCKgDYh/kgJFGQAaWUOjLI+7dCEESonXn
|
|
|
cd5466 |
-F3Jh2uPbnDF9MGJyAFoNgWFhgSpi1cf6AUi87GY4Oyur88ddJ1o0D0Kz2uw8/bpG
|
|
|
cd5466 |
-s3O4PYnIW5naZ8mozzbnYByEFk7PoTwM7VhoFBfYNtBoAI8+hBnPY/Y71YUojEXf
|
|
|
cd5466 |
-SeX6QbtkIANfzS1XuFNKElShC3DPQIHpKzaatEsfxHfP+8VOav6zcn4mioao7NHA
|
|
|
cd5466 |
-x7Dp6R1enFGoQOq4UNjBT8YjnkG5vW8zQHW2dAHLTJBq6x2Fzm/4Pjo/8vM1FiGl
|
|
|
cd5466 |
-BQdW5vfDeJ/l6NgQm3xR9ka2E2HaDqIcj1zWbN8jy/bHPFJYuF/HH8MBV/ngMIXE
|
|
|
cd5466 |
-vFEW/ToYv8eif0+EpUtzBsCKD4a7qYYYh87RmEVoQU96q6m+UbhpD2WztYfAPkfo
|
|
|
cd5466 |
-OSL9j2QHhVczhL7OAgqNeM95pOsjA9YMe7exTeqK31LYnTX8oH8WJD1xGbRSJYgu
|
|
|
cd5466 |
-SY6PQbumcJkc/TFPn0GeVUpiDdf83SeG50lo/i7UKQi2l1hi5Y51fQhnBnyMr68D
|
|
|
cd5466 |
-llSZEvSWqfDxBJkBpeg6PIYvkTpEwKRJpVQoM3uYvdqVSSnW6rydqIb+snfOrlhd
|
|
|
cd5466 |
-f+xCtq9xr+kHeTSqLIDRRAnMfgFRhY3IBlj6MSUwIwYJKoZIhvcNAQkVMRYEFBdb
|
|
|
cd5466 |
-8XGWehZ6oPj56Pf/uId46M9AMDEwITAJBgUrDgMCGgUABBRvSCB04/f8f13pp2PF
|
|
|
cd5466 |
-vyl2WuMdEwQIMWFFphPkIUICAggA
|
|
|
cd5466 |
- EOF
|
|
|
cd5466 |
- p12 = OpenSSL::PKCS12.new(str, "abc123")
|
|
|
cd5466 |
-
|
|
|
cd5466 |
- assert_equal @mykey.to_der, p12.key.to_der
|
|
|
cd5466 |
- assert_equal @mycert.subject.to_der, p12.certificate.subject.to_der
|
|
|
cd5466 |
- assert_equal [], Array(p12.ca_certs)
|
|
|
cd5466 |
- end
|
|
|
cd5466 |
-
|
|
|
cd5466 |
def test_new_with_no_keys
|
|
|
cd5466 |
# generated with:
|
|
|
cd5466 |
- # openssl pkcs12 -in <@mycert> -nokeys -export -out <out>
|
|
|
cd5466 |
+ # openssl pkcs12 -certpbe PBE-SHA1-3DES -in <@mycert> -nokeys -export
|
|
|
cd5466 |
str = <<~EOF.unpack("m").first
|
|
|
cd5466 |
-MIIDHAIBAzCCAuIGCSqGSIb3DQEHAaCCAtMEggLPMIICyzCCAscGCSqGSIb3DQEH
|
|
|
cd5466 |
-BqCCArgwggK0AgEAMIICrQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIX4+W
|
|
|
cd5466 |
-irqwH40CAggAgIICgOaCyo+5+6IOVoGCCL80c50bkkzAwqdXxvkKExJSdcJz2uMU
|
|
|
cd5466 |
-0gRrKnZEjL5wrUsN8RwZu8DvgQTEhNEkKsUgM7AWainmN/EnwohIdHZAHpm6WD67
|
|
|
cd5466 |
-I9kLGp0/DHrqZrV9P2dLfhXLUSQE8PI0tqZPZ8UEABhizkViw4eISTkrOUN7pGbN
|
|
|
cd5466 |
-Qtx/oqgitXDuX2polbxYYDwt9vfHZhykHoKgew26SeJyZfeMs/WZ6olEI4cQUAFr
|
|
|
cd5466 |
-mvYGuC1AxEGTo9ERmU8Pm16j9Hr9PFk50WYe+rnk9oX3wJogQ7XUWS5kYf7XRycd
|
|
|
cd5466 |
-NDkNiwV/ts94bbuaGZp1YA6I48FXpIc8b5fX7t9tY0umGaWy0bARe1L7o0Y89EPe
|
|
|
cd5466 |
-lMg25rOM7j3uPtFG8whbSfdETSy57UxzzTcJ6UwexeaK6wb2jqEmj5AOoPLWeaX0
|
|
|
cd5466 |
-LyOAszR3v7OPAcjIDYZGdrbb3MZ2f2vo2pdQfu9698BrWhXuM7Odh73RLhJVreNI
|
|
|
cd5466 |
-aezNOAtPyBlvGiBQBGTzRIYHSLL5Y5aVj2vWLAa7hjm5qTL5C5mFdDIo6TkEMr6I
|
|
|
cd5466 |
-OsexNQofEGs19kr8nARXDlcbEimk2VsPj4efQC2CEXZNzURsKca82pa62MJ8WosB
|
|
|
cd5466 |
-DTFd8X06zZZ4nED50vLopZvyW4fyW60lELwOyThAdG8UchoAaz2baqP0K4de44yM
|
|
|
cd5466 |
-Y5/yPFDu4+GoimipJfbiYviRwbzkBxYW8+958ILh0RtagLbvIGxbpaym9PqGjOzx
|
|
|
cd5466 |
-ShNXjLK2aAFZsEizQ8kd09quJHU/ogq2cUXdqqhmOqPnUWrJVi/VCoRB3Pv1/lE4
|
|
|
cd5466 |
-mrUgr2YZ11rYvBw6g5XvNvFcSc53OKyV7SLn0dwwMTAhMAkGBSsOAwIaBQAEFEWP
|
|
|
cd5466 |
-1WRQykaoD4uJCpTx/wv0SLLBBAiDKI26LJK7xgICCAA=
|
|
|
cd5466 |
+MIIGJAIBAzCCBeoGCSqGSIb3DQEHAaCCBdsEggXXMIIF0zCCBc8GCSqGSIb3
|
|
|
cd5466 |
+DQEHBqCCBcAwggW8AgEAMIIFtQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQMw
|
|
|
cd5466 |
+DgQIjv5c3OHvnBgCAggAgIIFiMJa8Z/w7errRvCQPXh9dGQz3eJaFq3S2gXD
|
|
|
cd5466 |
+rh6oiwsgIRJZvYAWgU6ll9NV7N5SgvS2DDNVuc3tsP8TPWjp+bIxzS9qmGUV
|
|
|
cd5466 |
+kYWuURWLMKhpF12ZRDab8jcIwBgKoSGiDJk8xHjx6L613/XcRM6ln3VeQK+C
|
|
|
cd5466 |
+hlW5kXniNAUAgTft25Fn61Xa8xnhmsz/fk1ycGnyGjKCnr7Mgy7KV0C1vs23
|
|
|
cd5466 |
+18n8+b1ktDWLZPYgpmXuMFVh0o+HJTV3O86mkIhJonMcnOMgKZ+i8KeXaocN
|
|
|
cd5466 |
+JQlAPBG4+HOip7FbQT/h6reXv8/J+hgjLfqAb5aV3m03rUX9mXx66nR1tQU0
|
|
|
cd5466 |
+Jq+XPfDh5+V4akIczLlMyyo/xZjI1/qupcMjr+giOGnGd8BA3cuXW+ueLQiA
|
|
|
cd5466 |
+PpTp+DQLVHRfz9XTZbyqOReNEtEXvO9gOlKSEY5lp65ItXVEs2Oqyf9PfU9y
|
|
|
cd5466 |
+DUltN6fCMilwPyyrsIBKXCu2ZLM5h65KVCXAYEX9lNqj9zrQ7vTqvCNN8RhS
|
|
|
cd5466 |
+ScYouTX2Eqa4Z+gTZWLHa8RCQFoyP6hd+97/Tg2Gv2UTH0myQxIVcnpdi1wy
|
|
|
cd5466 |
+cqb+er7tyKbcO96uSlUjpj/JvjlodtjJcX+oinEqGb/caj4UepbBwiG3vv70
|
|
|
cd5466 |
+63bS3jTsOLNjDRsR9if3LxIhLa6DW8zOJiGC+EvMD1o4dzHcGVpQ/pZWCHZC
|
|
|
cd5466 |
++YiNJpQOBApiZluE+UZ0m3XrtHFQYk7xblTrh+FJF91wBsok0rZXLAKd8m4p
|
|
|
cd5466 |
+OJsc7quCq3cuHRRTzJQ4nSe01uqbwGDAYwLvi6VWy3svU5qa05eDRmgzEFTG
|
|
|
cd5466 |
+e84Gp/1LQCtpQFr4txkjFchO2whWS80KoQKqmLPyGm1D9Lv53Q4ZsKMgNihs
|
|
|
cd5466 |
+rEepuaOZMKHl4yMAYFoOXZCAYzfbhN6b2phcFAHjMUHUw9e3F0QuDk9D0tsr
|
|
|
cd5466 |
+riYTrkocqlOKfK4QTomx27O0ON2J6f1rtEojGgfl9RNykN7iKGzjS3914QjW
|
|
|
cd5466 |
+W6gGiZejxHsDPEAa4gUp0WiSUSXtD5WJgoyAzLydR2dKWsQ4WlaUXi01CuGy
|
|
|
cd5466 |
++xvncSn2nO3bbot8VD5H6XU1CjREVtnIfbeRYO/uofyLUP3olK5RqN6ne6Xo
|
|
|
cd5466 |
+eXnJ/bjYphA8NGuuuvuW1SCITmINkZDLC9cGlER9+K65RR/DR3TigkexXMeN
|
|
|
cd5466 |
+aJ70ivZYAl0OuhZt3TGIlAzS64TIoyORe3z7Ta1Pp9PZQarYJpF9BBIZIFor
|
|
|
cd5466 |
+757PHHuQKRuugiRkp8B7v4eq1BQ+VeAxCKpyZ7XrgEtbY/AWDiaKcGPKPjc3
|
|
|
cd5466 |
+AqQraVeQm7kMBT163wFmZArCphzkDOI3bz2oEO8YArMgLq2Vto9jAZlqKyWr
|
|
|
cd5466 |
+pi2bSJxuoP1aoD58CHcWMrf8/j1LVdQhKgHQXSik2ID0H2Wc/XnglhzlVFuJ
|
|
|
cd5466 |
+JsNIW/EGJlZh/5WDez9U0bXqnBlu3uasPEOezdoKlcCmQlmTO5+uLHYLEtNA
|
|
|
cd5466 |
+EH9MtnGZebi9XS5meTuS6z5LILt8O9IHZxmT3JRPHYj287FEzotlLdcJ4Ee5
|
|
|
cd5466 |
+enW41UHjLrfv4OaITO1hVuoLRGdzjESx/fHMWmxroZ1nVClxECOdT42zvIYJ
|
|
|
cd5466 |
+J3xBZ0gppzQ5fjoYiKjJpxTflRxUuxshk3ih6VUoKtqj/W18tBQ3g5SOlkgT
|
|
|
cd5466 |
+yCW8r74yZlfYmNrPyDMUQYpLUPWj2n71GF0KyPfTU5yOatRgvheh262w5BG3
|
|
|
cd5466 |
+omFY7mb3tCv8/U2jdMIoukRKacpZiagofz3SxojOJq52cHnCri+gTHBMX0cO
|
|
|
cd5466 |
+j58ygfntHWRzst0pV7Ze2X3fdCAJ4DokH6bNJNthcgmolFJ/y3V1tJjgsdtQ
|
|
|
cd5466 |
+7Pjn/vE6xUV0HXE2x4yoVYNirbAMIvkN/X+atxrN0dA4AchN+zGp8TAxMCEw
|
|
|
cd5466 |
+CQYFKw4DAhoFAAQUQ+6XXkyhf6uYgtbibILN2IjKnOAECLiqoY45MPCrAgII
|
|
|
cd5466 |
+AA==
|
|
|
cd5466 |
EOF
|
|
|
cd5466 |
p12 = OpenSSL::PKCS12.new(str, "abc123")
|
|
|
cd5466 |
|
|
|
cd5466 |
assert_equal nil, p12.key
|
|
|
cd5466 |
assert_equal nil, p12.certificate
|
|
|
cd5466 |
assert_equal 1, p12.ca_certs.size
|
|
|
cd5466 |
- assert_equal @mycert.subject.to_der, p12.ca_certs[0].subject.to_der
|
|
|
cd5466 |
+ assert_equal @mycert.subject, p12.ca_certs[0].subject
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
def test_new_with_no_certs
|
|
|
cd5466 |
# generated with:
|
|
|
cd5466 |
- # openssl pkcs12 -inkey <RSA1024> -nocerts -export -out <out>
|
|
|
cd5466 |
+ # openssl pkcs12 -inkey fixtures/openssl/pkey/rsa-1.pem -nocerts -export
|
|
|
cd5466 |
str = <<~EOF.unpack("m").first
|
|
|
cd5466 |
-MIIDJwIBAzCCAu0GCSqGSIb3DQEHAaCCAt4EggLaMIIC1jCCAtIGCSqGSIb3DQEH
|
|
|
cd5466 |
-AaCCAsMEggK/MIICuzCCArcGCyqGSIb3DQEMCgECoIICpjCCAqIwHAYKKoZIhvcN
|
|
|
cd5466 |
-AQwBAzAOBAg6AaYnJs84SwICCAAEggKAQzZH+fWSpcQYD1J7PsGSune85A++fLCQ
|
|
|
cd5466 |
-V7tacp2iv95GJkxwYmfTP176pJdgs00mceB9UJ/u9EX5nD0djdjjQjwo6sgKjY0q
|
|
|
cd5466 |
-cpVhZw8CMxw7kBD2dhtui0zT8z5hy03LePxsjEKsGiSbeVeeGbSfw/I6AAYbv+Uh
|
|
|
cd5466 |
-O/YPBGumeHj/D2WKnfsHJLQ9GAV3H6dv5VKYNxjciK7f/JEyZCuUQGIN64QFHDhJ
|
|
|
cd5466 |
-7fzLqd/ul3FZzJZO6a+dwvcgux09SKVXDRSeFmRCEX4b486iWhJJVspCo9P2KNne
|
|
|
cd5466 |
-ORrpybr3ZSwxyoICmjyo8gj0OSnEfdx9790Ej1takPqSA1wIdSdBLekbZqB0RBQg
|
|
|
cd5466 |
-DEuPOsXNo3QFi8ji1vu0WBRJZZSNC2hr5NL6lNR+DKxG8yzDll2j4W4BBIp22mAE
|
|
|
cd5466 |
-7QRX7kVxu17QJXQhOUac4Dd1qXmzebP8t6xkAxD9L7BWEN5OdiXWwSWGjVjMBneX
|
|
|
cd5466 |
-nYObi/3UT/aVc5WHMHK2BhCI1bwH51E6yZh06d5m0TQpYGUTWDJdWGBSrp3A+8jN
|
|
|
cd5466 |
-N2PMQkWBFrXP3smHoTEN4oZC4FWiPsIEyAkQsfKRhcV9lGKl2Xgq54ROTFLnwKoj
|
|
|
cd5466 |
-Z3zJScnq9qmNzvVZSMmDLkjLyDq0pxRxGKBvgouKkWY7VFFIwwBIJM39iDJ5NbBY
|
|
|
cd5466 |
-i1AQFTRsRSsZrNVPasCXrIq7bhMoJZb/YZOGBLNyJVqKUoYXhtwsajzSq54VlWft
|
|
|
cd5466 |
-JxsPayEd4Vi6O9EU1ahnj6qFEZiKFzsicgK2J1Rb8cYagrp0XWjHW0SBn5GVUWCg
|
|
|
cd5466 |
-GUokSFG/0JTdeYTo/sQuG4qNgJkOolRjpeI48Fciq5VUWLvVdKioXzAxMCEwCQYF
|
|
|
cd5466 |
-Kw4DAhoFAAQUYAuwVtGD1TdgbFK4Yal2XBgwUR4ECEawsN3rNaa6AgIIAA==
|
|
|
cd5466 |
+MIIJ7wIBAzCCCbUGCSqGSIb3DQEHAaCCCaYEggmiMIIJnjCCCZoGCSqGSIb3
|
|
|
cd5466 |
+DQEHAaCCCYsEggmHMIIJgzCCCX8GCyqGSIb3DQEMCgECoIIJbjCCCWowHAYK
|
|
|
cd5466 |
+KoZIhvcNAQwBAzAOBAjX5nN8jyRKwQICCAAEgglIBIRLHfiY1mNHpl3FdX6+
|
|
|
cd5466 |
+72L+ZOVXnlZ1MY9HSeg0RMkCJcm0mJ2UD7INUOGXvwpK9fr6WJUZM1IqTihQ
|
|
|
cd5466 |
+1dM0crRC2m23aP7KtAlXh2DYD3otseDtwoN/NE19RsiJzeIiy5TSW1d47weU
|
|
|
cd5466 |
++D4Ig/9FYVFPTDgMzdCxXujhvO/MTbZIjqtcS+IOyF+91KkXrHkfkGjZC7KS
|
|
|
cd5466 |
+WRmYw9BBuIPQEewdTI35sAJcxT8rK7JIiL/9mewbSE+Z28Wq1WXwmjL3oZm9
|
|
|
cd5466 |
+lw6+f515b197GYEGomr6LQqJJamSYpwQbTGHonku6Tf3ylB4NLFqOnRCKE4K
|
|
|
cd5466 |
+zRSSYIqJBlKHmQ4pDm5awoupHYxMZLZKZvXNYyYN3kV8r1iiNVlY7KBR4CsX
|
|
|
cd5466 |
+rqUkXehRmcPnuqEMW8aOpuYe/HWf8PYI93oiDZjcEZMwW2IZFFrgBbqUeNCM
|
|
|
cd5466 |
+CQTkjAYxi5FyoaoTnHrj/aRtdLOg1xIJe4KKcmOXAVMmVM9QEPNfUwiXJrE7
|
|
|
cd5466 |
+n42gl4NyzcZpxqwWBT++9TnQGZ/lEpwR6dzkZwICNQLdQ+elsdT7mumywP+1
|
|
|
cd5466 |
+WaFqg9kpurimaiBu515vJNp9Iqv1Nmke6R8Lk6WVRKPg4Akw0fkuy6HS+LyN
|
|
|
cd5466 |
+ofdCfVUkPGN6zkjAxGZP9ZBwvXUbLRC5W3N5qZuAy5WcsS75z+oVeX9ePV63
|
|
|
cd5466 |
+cue23sClu8JSJcw3HFgPaAE4sfkQ4MoihPY5kezgT7F7Lw/j86S0ebrDNp4N
|
|
|
cd5466 |
+Y685ec81NRHJ80CAM55f3kGCOEhoifD4VZrvr1TdHZY9Gm3b1RYaJCit2huF
|
|
|
cd5466 |
+nlOfzeimdcv/tkjb6UsbpXx3JKkF2NFFip0yEBERRCdWRYMUpBRcl3ad6XHy
|
|
|
cd5466 |
+w0pVTgIjTxGlbbtOCi3siqMOK0GNt6UgjoEFc1xqjsgLwU0Ta2quRu7RFPGM
|
|
|
cd5466 |
+GoEwoC6VH23p9Hr4uTFOL0uHfkKWKunNN+7YPi6LT6IKmTQwrp+fTO61N6Xh
|
|
|
cd5466 |
+KlqTpwESKsIJB2iMnc8wBkjXJtmG/e2n5oTqfhICIrxYmEb7zKDyK3eqeTj3
|
|
|
cd5466 |
+FhQh2t7cUIiqcT52AckUqniPmlE6hf82yBjhaQUPfi/ExTBtTDSmFfRPUzq+
|
|
|
cd5466 |
+Rlla4OHllPRzUXJExyansgCxZbPqlw46AtygSWRGcWoYAKUKwwoYjerqIV5g
|
|
|
cd5466 |
+JoZICV9BOU9TXco1dHXZQTs/nnTwoRmYiL/Ly5XpvUAnQOhYeCPjBeFnPSBR
|
|
|
cd5466 |
+R/hRNqrDH2MOV57v5KQIH2+mvy26tRG+tVGHmLMaOJeQkjLdxx+az8RfXIrH
|
|
|
cd5466 |
+7hpAsoBb+g9jUDY1mUVavPk1T45GMpQH8u3kkzRvChfOst6533GyIZhE7FhN
|
|
|
cd5466 |
+KanC6ACabVFDUs6P9pK9RPQMp1qJfpA0XJFx5TCbVbPkvnkZd8K5Tl/tzNM1
|
|
|
cd5466 |
+n32eRao4MKr9KDwoDL93S1yJgYTlYjy1XW/ewdedtX+B4koAoz/wSXDYO+GQ
|
|
|
cd5466 |
+Zu6ZSpKSEHTRPhchsJ4oICvpriVaJkn0/Z7H3YjNMB9U5RR9+GiIg1wY1Oa1
|
|
|
cd5466 |
+S3WfuwrrI6eqfbQwj6PDNu3IKy6srEgvJwaofQALNBPSYWbauM2brc8qsD+t
|
|
|
cd5466 |
+n8jC/aD1aMcy00+9t3H/RVCjEOb3yKfUpAldIkEA2NTTnZpoDQDXeNYU2F/W
|
|
|
cd5466 |
+yhmFjJy8A0O4QOk2xnZK9kcxSRs0v8vI8HivvgWENoVPscsDC4742SSIe6SL
|
|
|
cd5466 |
+f/T08reIX11f0K70rMtLhtFMQdHdYOTNl6JzhkHPLr/f9MEZsBEQx52depnF
|
|
|
cd5466 |
+ARb3gXGbCt7BAi0OeCEBSbLr2yWuW4r55N0wRZSOBtgqgjsiHP7CDQSkbL6p
|
|
|
cd5466 |
+FPlQS1do9gBSHiNYvsmN1LN5bG+mhcVb0UjZub4mL0EqGadjDfDdRJmWqlX0
|
|
|
cd5466 |
+r5dyMcOWQVy4O2cPqYFlcP9lk8buc5otcyVI2isrAFdlvBK29oK6jc52Aq5Q
|
|
|
cd5466 |
+0b2ESDlgX8WRgiOPPxK8dySKEeuIwngCtJyNTecP9Ug06TDsu0znZGCXJ+3P
|
|
|
cd5466 |
+8JOpykgA8EQdOZOYHbo76ZfB2SkklI5KeRA5IBjGs9G3TZ4PHLy2DIwsbWzS
|
|
|
cd5466 |
+H1g01o1x264nx1cJ+eEgUN/KIiGFIib42RS8Af4D5e+Vj54Rt3axq+ag3kI+
|
|
|
cd5466 |
+53p8uotyu+SpvvXUP7Kv4xpQ/L6k41VM0rfrd9+DrlDVvSfxP2uh6I1TKF7A
|
|
|
cd5466 |
+CT5n8zguMbng4PGjxvyPBM5k62t6hN5fuw6Af0aZFexh+IjB/5wFQ6onSz23
|
|
|
cd5466 |
+fBzMW4St7RgSs8fDg3lrM+5rwXiey1jxY1ddaxOoUsWRMvvdd7rZxRZQoN5v
|
|
|
cd5466 |
+AcI5iMkK/vvpQgC/sfzhtXtrJ2XOPZ+GVgi7VcuDLKSkdFMcPbGzO8SdxUnS
|
|
|
cd5466 |
+SLV5XTKqKND+Lrfx7DAoKi5wbDFHu5496/MHK5qP4tBe6sJ5bZc+KDJIH46e
|
|
|
cd5466 |
+wTV1oWtB5tV4q46hOb5WRcn/Wjz3HSKaGZgx5QbK1MfKTzD5CTUn+ArMockX
|
|
|
cd5466 |
+2wJhPnFK85U4rgv8iBuh9bRjyw+YaKf7Z3loXRiE1eRG6RzuPF0ZecFiDumk
|
|
|
cd5466 |
+AC/VUXynJhzePBLqzrQj0exanACdullN+pSfHiRWBxR2VFUkjoFP5X45GK3z
|
|
|
cd5466 |
+OstSH6FOkMVU4afqEmjsIwozDFIyin5EyWTtdhJe3szdJSGY23Tut+9hUatx
|
|
|
cd5466 |
+9FDFLESOd8z3tyQSNiLk/Hib+e/lbjxqbXBG/p/oyvP3N999PLUPtpKqtYkV
|
|
|
cd5466 |
+H0+18sNh9CVfojiJl44fzxe8yCnuefBjut2PxEN0EFRBPv9P2wWlmOxkPKUq
|
|
|
cd5466 |
+NrCJP0rDj5aONLrNZPrR8bZNdIShkZ/rKkoTuA0WMZ+xUlDRxAupdMkWAlrz
|
|
|
cd5466 |
+8IcwNcdDjPnkGObpN5Ctm3vK7UGSBmPeNqkXOYf3QTJ9gStJEd0F6+DzTN5C
|
|
|
cd5466 |
+KGt1IyuGwZqL2Yk51FDIIkr9ykEnBMaA39LS7GFHEDNGlW+fKC7AzA0zfoOr
|
|
|
cd5466 |
+fXZlHMBuqHtXqk3zrsHRqGGoocigg4ctrhD1UREYKj+eIj1TBiRdf7c6+COf
|
|
|
cd5466 |
+NIOmej8pX3FmZ4ui+dDA8r2ctgsWHrb4A6iiH+v1DRA61GtoaA/tNRggewXW
|
|
|
cd5466 |
+VXCZCGWyyTuyHGOqq5ozrv5MlzZLWD/KV/uDsAWmy20RAed1C4AzcXlpX25O
|
|
|
cd5466 |
+M4SNl47g5VRNJRtMqokc8j6TjZrzMDEwITAJBgUrDgMCGgUABBRrkIRuS5qg
|
|
|
cd5466 |
+BC8fv38mue8LZVcbHQQIUNrWKEnskCoCAggA
|
|
|
cd5466 |
EOF
|
|
|
cd5466 |
p12 = OpenSSL::PKCS12.new(str, "abc123")
|
|
|
cd5466 |
|
|
|
cd5466 |
- assert_equal @mykey.to_der, p12.key.to_der
|
|
|
cd5466 |
+ assert_equal Fixtures.pkey("rsa-1").to_der, p12.key.to_der
|
|
|
cd5466 |
assert_equal nil, p12.certificate
|
|
|
cd5466 |
assert_equal [], Array(p12.ca_certs)
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
def test_dup
|
|
|
cd5466 |
- p12 = OpenSSL::PKCS12.create("pass", "name", @mykey, @mycert)
|
|
|
cd5466 |
+ p12 = OpenSSL::PKCS12.create(
|
|
|
cd5466 |
+ "pass",
|
|
|
cd5466 |
+ "name",
|
|
|
cd5466 |
+ @mykey,
|
|
|
cd5466 |
+ @mycert,
|
|
|
cd5466 |
+ nil,
|
|
|
cd5466 |
+ DEFAULT_PBE_PKEYS,
|
|
|
cd5466 |
+ DEFAULT_PBE_CERTS,
|
|
|
cd5466 |
+ )
|
|
|
cd5466 |
assert_equal p12.to_der, p12.dup.to_der
|
|
|
cd5466 |
end
|
|
|
cd5466 |
-
|
|
|
cd5466 |
- private
|
|
|
cd5466 |
- def assert_cert expected, actual
|
|
|
cd5466 |
- [
|
|
|
cd5466 |
- :subject,
|
|
|
cd5466 |
- :issuer,
|
|
|
cd5466 |
- :serial,
|
|
|
cd5466 |
- :not_before,
|
|
|
cd5466 |
- :not_after,
|
|
|
cd5466 |
- ].each do |attribute|
|
|
|
cd5466 |
- assert_equal expected.send(attribute), actual.send(attribute)
|
|
|
cd5466 |
- end
|
|
|
cd5466 |
- assert_equal expected.to_der, actual.to_der
|
|
|
cd5466 |
- end
|
|
|
cd5466 |
-
|
|
|
cd5466 |
- def assert_include_cert cert, ary
|
|
|
cd5466 |
- der = cert.to_der
|
|
|
cd5466 |
- ary.each do |candidate|
|
|
|
cd5466 |
- if candidate.to_der == der
|
|
|
cd5466 |
- return true
|
|
|
cd5466 |
- end
|
|
|
cd5466 |
- end
|
|
|
cd5466 |
- false
|
|
|
cd5466 |
- end
|
|
|
cd5466 |
end
|
|
|
cd5466 |
end
|
|
|
cd5466 |
|
|
|
cd5466 |
--
|
|
|
cd5466 |
2.32.0
|
|
|
cd5466 |
|