aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenĂ© Korthaus <[email protected]>2019-10-23 20:39:36 +0200
committerRenĂ© Korthaus <[email protected]>2019-10-23 20:39:36 +0200
commiteb469a4ab2d121caadf0a8aef5fd3ff22511c659 (patch)
tree51a89c77346f9d173687a2edca3e64e3f889b4d4
parent84b8d3eeee5aaf29046091c0e675cfeb8c6434b8 (diff)
Add missing certificates
-rw-r--r--src/lib/pubkey/xmss/xmss_privatekey.cpp1
-rw-r--r--src/lib/pubkey/xmss/xmss_publickey.cpp1
-rw-r--r--src/tests/data/x509/xmss/xmss_bouncycastle_sha256_10_root.pem64
-rw-r--r--src/tests/data/x509/xmss/xmss_isara_root.pem71
4 files changed, 137 insertions, 0 deletions
diff --git a/src/lib/pubkey/xmss/xmss_privatekey.cpp b/src/lib/pubkey/xmss/xmss_privatekey.cpp
index 7f6cc5f6f..6a728ac72 100644
--- a/src/lib/pubkey/xmss/xmss_privatekey.cpp
+++ b/src/lib/pubkey/xmss/xmss_privatekey.cpp
@@ -27,6 +27,7 @@ namespace Botan {
namespace {
+// fall back to raw decoding for previous versions, which did not encode an OCTET STRING
secure_vector<uint8_t> extract_raw_key(const secure_vector<uint8_t>& key_bits)
{
secure_vector<uint8_t> raw_key;
diff --git a/src/lib/pubkey/xmss/xmss_publickey.cpp b/src/lib/pubkey/xmss/xmss_publickey.cpp
index 4db7a2232..43f7417cf 100644
--- a/src/lib/pubkey/xmss/xmss_publickey.cpp
+++ b/src/lib/pubkey/xmss/xmss_publickey.cpp
@@ -23,6 +23,7 @@ namespace Botan {
namespace {
+// fall back to raw decoding for previous versions, which did not encode an OCTET STRING
std::vector<uint8_t> extract_raw_key(const std::vector<uint8_t>& key_bits)
{
std::vector<uint8_t> raw_key;
diff --git a/src/tests/data/x509/xmss/xmss_bouncycastle_sha256_10_root.pem b/src/tests/data/x509/xmss/xmss_bouncycastle_sha256_10_root.pem
new file mode 100644
index 000000000..24db08b86
--- /dev/null
+++ b/src/tests/data/x509/xmss/xmss_bouncycastle_sha256_10_root.pem
@@ -0,0 +1,64 @@
+-----BEGIN CERTIFICATE-----
+MIILizCCAbGgAwIBAgIBATALBgkEAH8ADwEBDQAwgY8xCzAJBgNVBAYTAkFVMSgw
+JgYDVQQKDB9UaGUgTGVnaW9uIG9mIHRoZSBCb3VuY3kgQ2FzdGxlMRIwEAYDVQQH
+DAlNZWxib3VybmUxETAPBgNVBAgMCFZpY3RvcmlhMS8wLQYJKoZIhvcNAQkBFiBm
+ZWVkYmFjay1jcnlwdG9AYm91bmN5Y2FzdGxlLm9yZzAeFw0xOTEwMDgwNDQ0MjRa
+Fw0xOTEwMDgwNDQ2MDRaMIGPMQswCQYDVQQGEwJBVTEoMCYGA1UECgwfVGhlIExl
+Z2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTESMBAGA1UEBwwJTWVsYm91cm5lMREw
+DwYDVQQIDAhWaWN0b3JpYTEvMC0GCSqGSIb3DQEJARYgZmVlZGJhY2stY3J5cHRv
+QGJvdW5jeWNhc3RsZS5vcmcwVjALBgkEAH8ADwEBDQADRwAERAAAAAFWJwchaHXu
+HqYEWHM/sxvzb5uMNgsNnfzBWQ6ms4iX0CerRixLDoDVhhyVbQFyR2lzigXz1blz
+SbPHlBoWLRDiMAsGCQQAfwAPAQENAAOCCcUAAAAAAGScYlJ/B/oWlOBgnIGlnYhT
+EPDzn4sHDqic8HJOMMdkBsyGrR0XkqgRDnVI4PEctP8bndw7M327VGlM8Dpprcov
+lisvu7j8cV8J6Nksef/AxeIf5z+wsx0zKi7j/n1A3LkC1m3uclesJiifwfNzQYhu
+EFE87E6E7QJimr/6tzvU0jDOUB4Fcl/F3mze/c+vtR9xEjKdK2VC3Crftw8eo7jH
+kz1pz0JHHYCK2tKh9k3lYIqZMv0RQmfUT3HTQYf5nU+3gMmLUX3gDefZRVYTLX9T
+Q3/ctpbLkQ6KmW+8/3nD9X0d49C+pU6AyZHC+Ms7GN7igZhdPh8piI+0uUv1uKDv
+u+FZ/yLrLpQ9Ju/qISHXTc8q40ZXUAi77g1kWRaalXArY4j6JudIxJissWZt6w3q
+K0ouaygQQCjIydIYjKMRlf5k01basXgT8NyrVsZRl6zKvEO7HM5xgRwcB/2S5yO0
+Rec7anG2SBqL5EXRSTQQhX2cyw6tQU2zBfL6H37Gyf8ezPhdL19zHril2mQuOwgQ
+DQ/TsrU/+gfifn78JUDbdBoyflRQnrk0QDmKxOOTUnQXITDrC3773sIv2QUh3h4m
+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
+-----END CERTIFICATE-----
diff --git a/src/tests/data/x509/xmss/xmss_isara_root.pem b/src/tests/data/x509/xmss/xmss_isara_root.pem
new file mode 100644
index 000000000..07f3a6ab5
--- /dev/null
+++ b/src/tests/data/x509/xmss/xmss_isara_root.pem
@@ -0,0 +1,71 @@
+-----BEGIN CERTIFICATE-----
+MIIMwTCCAuegAwIBAgICH1AwCwYJBAB/AA8BAQ0AMIGeMQswCQYDVQQGEwJDQTEQ
+MA4GA1UECAwHT250YXJpbzERMA8GA1UEBwwIV2F0ZXJsb28xGjAYBgNVBAoMEUlT
+QVJBIENvcnBvcmF0aW9uMRcwFQYDVQQLDA5EZXZlbG9wZXIgVGVhbTENMAsGA1UE
+AwwEcm9vdDEmMCQGCSqGSIb3DQEJARYXcm9vdEBmYWtlLmlzYXJhY29ycC5jb20w
+HhcNMTkxMDA3MTg0MDAwWhcNMTkxMTA2MTg0MDAwWjCBnjELMAkGA1UEBhMCQ0Ex
+EDAOBgNVBAgMB09udGFyaW8xETAPBgNVBAcMCFdhdGVybG9vMRowGAYDVQQKDBFJ
+U0FSQSBDb3Jwb3JhdGlvbjEXMBUGA1UECwwORGV2ZWxvcGVyIFRlYW0xDTALBgNV
+BAMMBHJvb3QxJjAkBgkqhkiG9w0BCQEWF3Jvb3RAZmFrZS5pc2FyYWNvcnAuY29t
+MFYwCwYJBAB/AA8BAQ0AA0cABEQAAAABIp/dzWhnKoTmW30crhrq5TzXYp8k+7qK
+jk0x17pdgXMrvNkPrRUcK3Wgp/afgUAaGHlo9zuRckNBp7pPXGPmHaOCARMwggEP
+MB0GA1UdDgQWBBSYjbGo++onbH3AB7RVNQ9GrWGgHjCBzAYDVR0jBIHEMIHBgBSY
+jbGo++onbH3AB7RVNQ9GrWGgHqGBpKSBoTCBnjELMAkGA1UEBhMCQ0ExEDAOBgNV
+BAgMB09udGFyaW8xETAPBgNVBAcMCFdhdGVybG9vMRowGAYDVQQKDBFJU0FSQSBD
+b3Jwb3JhdGlvbjEXMBUGA1UECwwORGV2ZWxvcGVyIFRlYW0xDTALBgNVBAMMBHJv
+b3QxJjAkBgkqhkiG9w0BCQEWF3Jvb3RAZmFrZS5pc2FyYWNvcnAuY29tggIfUDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjALBgkEAH8ADwEBDQADggnF
+AAAAAABDguB8TKHavz3/+LmBcG+TZGB9GzDMQJnINHW9egH4oB56LYdw49wBDcxo
++so3RLjOgaB2TBnR40QKowmTf8U4edk5IIfQbiwhQKLZC6vTHbiYD7cuLmtIzxx7
+12ko50ltsPRn/IXBq3JmNxDS0g78R2x6+V464C5PRETQ0SnRiY3yXNxXB9Lb2+sm
+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
+DeJ/1Y0=
+-----END CERTIFICATE-----