diff options
| author | eroman <eroman@chromium.org> | 2016-02-02 16:18:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 00:20:03 +0000 |
| commit | cf72295f7d8d641940ad7300a65f37837af3736e (patch) | |
| tree | a0fcdfd7e8443f16b62a823d270aea736f302892 | |
| parent | 7da8bd05a6def3df489ab3f237ce510f219ced6a (diff) | |
| download | chromium_src-cf72295f7d8d641940ad7300a65f37837af3736e.zip chromium_src-cf72295f7d8d641940ad7300a65f37837af3736e.tar.gz chromium_src-cf72295f7d8d641940ad7300a65f37837af3736e.tar.bz2 | |
Normalize the PEM format used in some certificate test data.
* The annotation for PEM block should precedes the block rather than follow it
* Remove extra newline at end of file
* Two newlines separate title
Review URL: https://codereview.chromium.org/1658693006
Cr-Commit-Position: refs/heads/master@{#373094}
87 files changed, 691 insertions, 1380 deletions
diff --git a/net/data/parse_certificate_unittest/basic_constraints_ca_false.pem b/net/data/parse_certificate_unittest/basic_constraints_ca_false.pem index 9acb44b..e124258 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_ca_false.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_ca_false.pem @@ -4,4 +4,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAMBAQA= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_ca_no_path.pem b/net/data/parse_certificate_unittest/basic_constraints_ca_no_path.pem index 7d25c80..f74352b 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_ca_no_path.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_ca_no_path.pem @@ -4,4 +4,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAMBAf8= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_ca_path_9.pem b/net/data/parse_certificate_unittest/basic_constraints_ca_path_9.pem index 7bb05d2..4df6f39 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_ca_path_9.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_ca_path_9.pem @@ -5,4 +5,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAYBAf8CAQk= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_negative_path.pem b/net/data/parse_certificate_unittest/basic_constraints_negative_path.pem index cc2ef3b..659a38f 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_negative_path.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_negative_path.pem @@ -5,4 +5,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAYBAf8CAf8= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_not_ca.pem b/net/data/parse_certificate_unittest/basic_constraints_not_ca.pem index 15ad416..4439140 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_not_ca.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_not_ca.pem @@ -3,4 +3,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAA= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_path_too_large.pem b/net/data/parse_certificate_unittest/basic_constraints_path_too_large.pem index dd986d1..9952047 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_path_too_large.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_path_too_large.pem @@ -5,4 +5,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MB0BAf8CGA///////////////////////////////w== -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_pathlen_255.pem b/net/data/parse_certificate_unittest/basic_constraints_pathlen_255.pem index b97e2741..01bb696 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_pathlen_255.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_pathlen_255.pem @@ -5,4 +5,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAcBAf8CAgD/ -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_pathlen_256.pem b/net/data/parse_certificate_unittest/basic_constraints_pathlen_256.pem index 23c2101..7a3322d 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_pathlen_256.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_pathlen_256.pem @@ -5,4 +5,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAcBAf8CAgEA -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_pathlen_not_ca.pem b/net/data/parse_certificate_unittest/basic_constraints_pathlen_not_ca.pem index f462f1c..2fa12fc75 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_pathlen_not_ca.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_pathlen_not_ca.pem @@ -4,4 +4,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAMCAQE= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/basic_constraints_unconsumed_data.pem b/net/data/parse_certificate_unittest/basic_constraints_unconsumed_data.pem index b31bb58..82e7f8c 100644 --- a/net/data/parse_certificate_unittest/basic_constraints_unconsumed_data.pem +++ b/net/data/parse_certificate_unittest/basic_constraints_unconsumed_data.pem @@ -4,4 +4,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAIFAA== -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/cert_algorithm_not_sequence.pem b/net/data/parse_certificate_unittest/cert_algorithm_not_sequence.pem index 1e566fc..96f05fe 100644 --- a/net/data/parse_certificate_unittest/cert_algorithm_not_sequence.pem +++ b/net/data/parse_certificate_unittest/cert_algorithm_not_sequence.pem @@ -2,14 +2,12 @@ This is a synthesized Certificate, where the signature algorithm is an INTEGER rather than a SEQUENCE. - ------BEGIN CERTIFICATE----- -MAwwAgUAAgIFAAMCAKs= ------END CERTIFICATE----- - $ openssl asn1parse -i < [CERTIFICATE] 0:d=0 hl=2 l= 12 cons: SEQUENCE 2:d=1 hl=2 l= 2 cons: SEQUENCE 4:d=2 hl=2 l= 0 prim: NULL 6:d=1 hl=2 l= 2 prim: INTEGER :0500 10:d=1 hl=2 l= 2 prim: BIT STRING +-----BEGIN CERTIFICATE----- +MAwwAgUAAgIFAAMCAKs= +-----END CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/cert_data_after_signature.pem b/net/data/parse_certificate_unittest/cert_data_after_signature.pem index 8ec6f6b..090c126 100644 --- a/net/data/parse_certificate_unittest/cert_data_after_signature.pem +++ b/net/data/parse_certificate_unittest/cert_data_after_signature.pem @@ -2,11 +2,6 @@ This is an otherwise "valid" input to ParseCertificate(), however there is a trailing NULL after the signature field. - ------BEGIN CERTIFICATE----- -MA4wAgUAMAIFAAMCAKwFAA== ------END CERTIFICATE----- - $ openssl asn1parse -i < [CERTIFICATE] 0:d=0 hl=2 l= 14 cons: SEQUENCE 2:d=1 hl=2 l= 2 cons: SEQUENCE @@ -15,3 +10,6 @@ $ openssl asn1parse -i < [CERTIFICATE] 8:d=2 hl=2 l= 0 prim: NULL 10:d=1 hl=2 l= 2 prim: BIT STRING 14:d=1 hl=2 l= 0 prim: NULL +-----BEGIN CERTIFICATE----- +MA4wAgUAMAIFAAMCAKwFAA== +-----END CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/cert_empty_sequence.pem b/net/data/parse_certificate_unittest/cert_empty_sequence.pem index 1ec818c..f6b7f9a 100644 --- a/net/data/parse_certificate_unittest/cert_empty_sequence.pem +++ b/net/data/parse_certificate_unittest/cert_empty_sequence.pem @@ -2,10 +2,8 @@ This is an empty SEQUENCE. It will fail to be parsed as a Certificate since it contains no fields. - +$ openssl asn1parse -i < [CERTIFICATE] + 0:d=0 hl=2 l= 0 cons: SEQUENCE -----BEGIN CERTIFICATE----- MAA= -----END CERTIFICATE----- - -$ openssl asn1parse -i < [CERTIFICATE] - 0:d=0 hl=2 l= 0 cons: SEQUENCE diff --git a/net/data/parse_certificate_unittest/cert_missing_signature.pem b/net/data/parse_certificate_unittest/cert_missing_signature.pem index 6b347cf..9a5960f 100644 --- a/net/data/parse_certificate_unittest/cert_missing_signature.pem +++ b/net/data/parse_certificate_unittest/cert_missing_signature.pem @@ -2,14 +2,12 @@ This is an otherwise "valid" Certificate input for ParseCertificate(), however it is missing the final field (signature). - ------BEGIN CERTIFICATE----- -MAgwAgUAMAIFAA== ------END CERTIFICATE----- - $ openssl asn1parse -i < [CERTIFICATE] 0:d=0 hl=2 l= 8 cons: SEQUENCE 2:d=1 hl=2 l= 2 cons: SEQUENCE 4:d=2 hl=2 l= 0 prim: NULL 6:d=1 hl=2 l= 2 cons: SEQUENCE 8:d=2 hl=2 l= 0 prim: NULL +-----BEGIN CERTIFICATE----- +MAgwAgUAMAIFAA== +-----END CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/cert_not_sequence.pem b/net/data/parse_certificate_unittest/cert_not_sequence.pem index e808f82..3ef1bde 100644 --- a/net/data/parse_certificate_unittest/cert_not_sequence.pem +++ b/net/data/parse_certificate_unittest/cert_not_sequence.pem @@ -2,10 +2,8 @@ This is an otherwise valid input for ParseCertificate(), however the SEQUENCE tag was changed to be an INTEGER. - +$ openssl asn1parse -i < [CERTIFICATE] + 0:d=0 hl=2 l= 16 prim: INTEGER :300605003002050030020500030200AC -----BEGIN CERTIFICATE----- AhAwBgUAMAIFADACBQADAgCs -----END CERTIFICATE----- - -$ openssl asn1parse -i < [CERTIFICATE] - 0:d=0 hl=2 l= 16 prim: INTEGER :300605003002050030020500030200AC diff --git a/net/data/parse_certificate_unittest/cert_signature_not_bit_string.pem b/net/data/parse_certificate_unittest/cert_signature_not_bit_string.pem index 9a5f876..5d335b9 100644 --- a/net/data/parse_certificate_unittest/cert_signature_not_bit_string.pem +++ b/net/data/parse_certificate_unittest/cert_signature_not_bit_string.pem @@ -2,11 +2,6 @@ This is an otherwise valid input to ParseSignature(), however the signature was changed from a BIT STRING to an OCTET STRING. - ------BEGIN CERTIFICATE----- -MAwwAgUAMAIFAAQCAQI= ------END CERTIFICATE----- - $ openssl asn1parse -i < [CERTIFICATE] 0:d=0 hl=2 l= 12 cons: SEQUENCE 2:d=1 hl=2 l= 2 cons: SEQUENCE @@ -14,3 +9,6 @@ $ openssl asn1parse -i < [CERTIFICATE] 6:d=1 hl=2 l= 2 cons: SEQUENCE 8:d=2 hl=2 l= 0 prim: NULL 10:d=1 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:0102 +-----BEGIN CERTIFICATE----- +MAwwAgUAMAIFAAQCAQI= +-----END CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/cert_skeleton.pem b/net/data/parse_certificate_unittest/cert_skeleton.pem index 49453de..a3049ad 100644 --- a/net/data/parse_certificate_unittest/cert_skeleton.pem +++ b/net/data/parse_certificate_unittest/cert_skeleton.pem @@ -1,11 +1,6 @@ This is a valid certificate from the perspective of ParseCertificate(). - ------BEGIN CERTIFICATE----- -MBAwBgUAMAIFADACBQADAgCs ------END CERTIFICATE----- - $ openssl asn1parse -i < [CERTIFICATE] 0:d=0 hl=2 l= 16 cons: SEQUENCE 2:d=1 hl=2 l= 6 cons: SEQUENCE @@ -15,30 +10,25 @@ $ openssl asn1parse -i < [CERTIFICATE] 10:d=1 hl=2 l= 2 cons: SEQUENCE 12:d=2 hl=2 l= 0 prim: NULL 14:d=1 hl=2 l= 2 prim: BIT STRING - - - ------BEGIN TBS CERTIFICATE----- -MAYFADACBQA= ------END TBS CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MBAwBgUAMAIFADACBQADAgCs +-----END CERTIFICATE----- $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 6 cons: SEQUENCE 2:d=1 hl=2 l= 0 prim: NULL 4:d=1 hl=2 l= 2 cons: SEQUENCE 6:d=2 hl=2 l= 0 prim: NULL - - - ------BEGIN SIGNATURE ALGORITHM----- -MAIFAA== ------END SIGNATURE ALGORITHM----- +-----BEGIN TBS CERTIFICATE----- +MAYFADACBQA= +-----END TBS CERTIFICATE----- $ openssl asn1parse -i < [SIGNATURE ALGORITHM] 0:d=0 hl=2 l= 2 cons: SEQUENCE 2:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN SIGNATURE ALGORITHM----- +MAIFAA== +-----END SIGNATURE ALGORITHM----- -----BEGIN SIGNATURE----- rA== diff --git a/net/data/parse_certificate_unittest/cert_version3.pem b/net/data/parse_certificate_unittest/cert_version3.pem index 4105348..dd8468e 100644 --- a/net/data/parse_certificate_unittest/cert_version3.pem +++ b/net/data/parse_certificate_unittest/cert_version3.pem @@ -1,35 +1,6 @@ This is a valid real-world certificate. - ------BEGIN CERTIFICATE----- -MIIFVzCCBD+gAwIBAgIHK2OkKnBQdjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMCVVMxEDA -OBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY2 -9tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9za -XRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTER -MA8GA1UEBRMIMDc5NjkyODcwHhcNMTIwNDE5MTM1MzI0WhcNMTMwNDE5MTM1MzI0WjBPMRQwEgY -DVQQKEwtrdGh1bGh1Lm5ldDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEg -YDVQQDEwtrdGh1bGh1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK80JLhGb -+cZDSye0QoAGJh+LxvOxRTxZuSfvTm3pzQBapvFeQuCM15tfrO66NLJ3Szsgx+SDTQLSpLqqe5K -rm5dW2z92ePkWtxDb+3KcEG0I6Gmo0SghkVC7P4xTAgAEoov/t45JLnzYpru3AXw1zkkEdmEGS+ -M4Q1u7LP88E1bKWJ8b1O6A3KjiMAphcEPxb2EwMRdbqMygbCXy/OeL9DCiOxhMsp+lvI2e3/HEn -PGob6ywGLf3rQMa5h3DFFSW1voMV4sCbB349N0tf0cqR02+IEahM96V+sJfLKrST9C+Zl7kIBEq -BAGeEqz2C8V8raq1Nci4t9sYFsB7tQO3yECAwEAAaOCAbowggG2MA8GA1UdEwEB/wQFMAMBAQAw -HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIFoDAzBgNVHR8ELDA -qMCigJqAkhiJodHRwOi8vY3JsLmdvZGFkZHkuY29tL2dkczEtNjguY3JsMFMGA1UdIARMMEowSA -YLYIZIAYb9bQEHFwEwOTA3BggrBgEFBQcCARYraHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5L -mNvbS9yZXBvc2l0b3J5LzCBgAYIKwYBBQUHAQEEdDByMCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz -cC5nb2RhZGR5LmNvbS8wSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5 -jb20vcmVwb3NpdG9yeS9nZF9pbnRlcm1lZGlhdGUuY3J0MB8GA1UdIwQYMBaAFP2sYTKTbEXW4u -6FX5q653aZaMznMCcGA1UdEQQgMB6CC2t0aHVsaHUubmV0gg93d3cua3RodWxodS5uZXQwHQYDV -R0OBBYEFKMeGrGp5PVQvD4F4XTPAdCeNeAXMA0GCSqGSIb3DQEBBQUAA4IBAQC3hBvUM0guBBJc -qsVDNehFGtd+wsbgqEHMDGSMIK5ahg4rgqUevqe98xVb9n3fMF0zCs/3LYA6mbzKQo8i2Xdbbyc -rA0Lc+k2LST1+i19rr0idYb6Dl8mzyObf0RQQHZ5wjj+GShOk4SGXuId1hJyEJZoNUjdu3yHyPf -+K6UaDtp4B3ECZZPyz19SFsYTsBX7Pm1u0tA6kDpNaNQxOlEEQQ+ogKFeqSJ7d0/3D83WFmIxtH -KV7jpWcZcSVDjacjFZIsVTgjQgkgIkkUrAvqsFPFTcUnXogk6qtGxH4C17wXoQO7Tsa+j3McYP1 -HZmCxBi7r3fZJEu5k5TpvDU4Kemf ------END CERTIFICATE----- - $ openssl asn1parse -i < [CERTIFICATE] 0:d=0 hl=4 l=1367 cons: SEQUENCE 4:d=1 hl=4 l=1087 cons: SEQUENCE @@ -124,31 +95,33 @@ $ openssl asn1parse -i < [CERTIFICATE] 1097:d=2 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 1108:d=2 hl=2 l= 0 prim: NULL 1110:d=1 hl=4 l= 257 prim: BIT STRING - - - ------BEGIN TBS CERTIFICATE----- -MIIEP6ADAgECAgcrY6QqcFB2MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJVUzEQMA4GA1U -ECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIE -luYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9ye -TEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYD -VQQFEwgwNzk2OTI4NzAeFw0xMjA0MTkxMzUzMjRaFw0xMzA0MTkxMzUzMjRaME8xFDASBgNVBAo -TC2t0aHVsaHUubmV0MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBA -MTC2t0aHVsaHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzQkuEZv5xkNL -J7RCgAYmH4vG87FFPFm5J+9ObenNAFqm8V5C4IzXm1+s7ro0sndLOyDH5INNAtKkuqp7kqubl1b -bP3Z4+Ra3ENv7cpwQbQjoaajRKCGRULs/jFMCAASii/+3jkkufNimu7cBfDXOSQR2YQZL4zhDW7 -ss/zwTVspYnxvU7oDcqOIwCmFwQ/FvYTAxF1uozKBsJfL854v0MKI7GEyyn6W8jZ7f8cSc8ahvr -LAYt/etAxrmHcMUVJbW+gxXiwJsHfj03S1/RypHTb4gRqEz3pX6wl8sqtJP0L5mXuQgESoEAZ4S -rPYLxXytqrU1yLi32xgWwHu1A7fIQIDAQABo4IBujCCAbYwDwYDVR0TAQH/BAUwAwEBADAdBgNV -HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDMGA1UdHwQsMCowKKA -moCSGImh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RzMS02OC5jcmwwUwYDVR0gBEwwSjBIBgtghk -gBhv1tAQcXATA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL -3JlcG9zaXRvcnkvMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdv -ZGFkZHkuY29tLzBKBggrBgEFBQcwAoY+aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9 -yZXBvc2l0b3J5L2dkX2ludGVybWVkaWF0ZS5jcnQwHwYDVR0jBBgwFoAU/axhMpNsRdbi7oVfmr -rndplozOcwJwYDVR0RBCAwHoILa3RodWxodS5uZXSCD3d3dy5rdGh1bGh1Lm5ldDAdBgNVHQ4EF -gQUox4asank9VC8PgXhdM8B0J414Bc= ------END TBS CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFVzCCBD+gAwIBAgIHK2OkKnBQdjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMCVVMxEDA +OBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY2 +9tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9za +XRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTER +MA8GA1UEBRMIMDc5NjkyODcwHhcNMTIwNDE5MTM1MzI0WhcNMTMwNDE5MTM1MzI0WjBPMRQwEgY +DVQQKEwtrdGh1bGh1Lm5ldDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEg +YDVQQDEwtrdGh1bGh1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK80JLhGb ++cZDSye0QoAGJh+LxvOxRTxZuSfvTm3pzQBapvFeQuCM15tfrO66NLJ3Szsgx+SDTQLSpLqqe5K +rm5dW2z92ePkWtxDb+3KcEG0I6Gmo0SghkVC7P4xTAgAEoov/t45JLnzYpru3AXw1zkkEdmEGS+ +M4Q1u7LP88E1bKWJ8b1O6A3KjiMAphcEPxb2EwMRdbqMygbCXy/OeL9DCiOxhMsp+lvI2e3/HEn +PGob6ywGLf3rQMa5h3DFFSW1voMV4sCbB349N0tf0cqR02+IEahM96V+sJfLKrST9C+Zl7kIBEq +BAGeEqz2C8V8raq1Nci4t9sYFsB7tQO3yECAwEAAaOCAbowggG2MA8GA1UdEwEB/wQFMAMBAQAw +HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIFoDAzBgNVHR8ELDA +qMCigJqAkhiJodHRwOi8vY3JsLmdvZGFkZHkuY29tL2dkczEtNjguY3JsMFMGA1UdIARMMEowSA +YLYIZIAYb9bQEHFwEwOTA3BggrBgEFBQcCARYraHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5L +mNvbS9yZXBvc2l0b3J5LzCBgAYIKwYBBQUHAQEEdDByMCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz +cC5nb2RhZGR5LmNvbS8wSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5 +jb20vcmVwb3NpdG9yeS9nZF9pbnRlcm1lZGlhdGUuY3J0MB8GA1UdIwQYMBaAFP2sYTKTbEXW4u +6FX5q653aZaMznMCcGA1UdEQQgMB6CC2t0aHVsaHUubmV0gg93d3cua3RodWxodS5uZXQwHQYDV +R0OBBYEFKMeGrGp5PVQvD4F4XTPAdCeNeAXMA0GCSqGSIb3DQEBBQUAA4IBAQC3hBvUM0guBBJc +qsVDNehFGtd+wsbgqEHMDGSMIK5ahg4rgqUevqe98xVb9n3fMF0zCs/3LYA6mbzKQo8i2Xdbbyc +rA0Lc+k2LST1+i19rr0idYb6Dl8mzyObf0RQQHZ5wjj+GShOk4SGXuId1hJyEJZoNUjdu3yHyPf ++K6UaDtp4B3ECZZPyz19SFsYTsBX7Pm1u0tA6kDpNaNQxOlEEQQ+ogKFeqSJ7d0/3D83WFmIxtH +KV7jpWcZcSVDjacjFZIsVTgjQgkgIkkUrAvqsFPFTcUnXogk6qtGxH4C17wXoQO7Tsa+j3McYP1 +HZmCxBi7r3fZJEu5k5TpvDU4Kemf +-----END CERTIFICATE----- $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=4 l=1087 cons: SEQUENCE @@ -239,19 +212,36 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 1060:d=3 hl=2 l= 29 cons: SEQUENCE 1062:d=4 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier 1067:d=4 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A31E1AB1A9E4F550BC3E05E174CF01D09E35E017 - - - ------BEGIN SIGNATURE ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END SIGNATURE ALGORITHM----- +-----BEGIN TBS CERTIFICATE----- +MIIEP6ADAgECAgcrY6QqcFB2MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJVUzEQMA4GA1U +ECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIE +luYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9ye +TEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYD +VQQFEwgwNzk2OTI4NzAeFw0xMjA0MTkxMzUzMjRaFw0xMzA0MTkxMzUzMjRaME8xFDASBgNVBAo +TC2t0aHVsaHUubmV0MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBA +MTC2t0aHVsaHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzQkuEZv5xkNL +J7RCgAYmH4vG87FFPFm5J+9ObenNAFqm8V5C4IzXm1+s7ro0sndLOyDH5INNAtKkuqp7kqubl1b +bP3Z4+Ra3ENv7cpwQbQjoaajRKCGRULs/jFMCAASii/+3jkkufNimu7cBfDXOSQR2YQZL4zhDW7 +ss/zwTVspYnxvU7oDcqOIwCmFwQ/FvYTAxF1uozKBsJfL854v0MKI7GEyyn6W8jZ7f8cSc8ahvr +LAYt/etAxrmHcMUVJbW+gxXiwJsHfj03S1/RypHTb4gRqEz3pX6wl8sqtJP0L5mXuQgESoEAZ4S +rPYLxXytqrU1yLi32xgWwHu1A7fIQIDAQABo4IBujCCAbYwDwYDVR0TAQH/BAUwAwEBADAdBgNV +HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDMGA1UdHwQsMCowKKA +moCSGImh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RzMS02OC5jcmwwUwYDVR0gBEwwSjBIBgtghk +gBhv1tAQcXATA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL +3JlcG9zaXRvcnkvMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdv +ZGFkZHkuY29tLzBKBggrBgEFBQcwAoY+aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9 +yZXBvc2l0b3J5L2dkX2ludGVybWVkaWF0ZS5jcnQwHwYDVR0jBBgwFoAU/axhMpNsRdbi7oVfmr +rndplozOcwJwYDVR0RBCAwHoILa3RodWxodS5uZXSCD3d3dy5rdGh1bGh1Lm5ldDAdBgNVHQ4EF +gQUox4asank9VC8PgXhdM8B0J414Bc= +-----END TBS CERTIFICATE----- $ openssl asn1parse -i < [SIGNATURE ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN SIGNATURE ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END SIGNATURE ALGORITHM----- -----BEGIN SIGNATURE----- t4Qb1DNILgQSXKrFQzXoRRrXfsLG4KhBzAxkjCCuWoYOK4KlHr6nvfMVW/Z93zBdMwrP9y2AOpm diff --git a/net/data/parse_certificate_unittest/extension_critical.pem b/net/data/parse_certificate_unittest/extension_critical.pem index fb105bc..1f79e69 100644 --- a/net/data/parse_certificate_unittest/extension_critical.pem +++ b/net/data/parse_certificate_unittest/extension_critical.pem @@ -6,7 +6,6 @@ $ openssl asn1parse -i < [EXTENSION] 2:d=1 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints 7:d=1 hl=2 l= 1 prim: BOOLEAN :255 10:d=1 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:3000 - -----BEGIN EXTENSION----- MAwGA1UdEwEB/wQCMAA= -----END EXTENSION----- diff --git a/net/data/parse_certificate_unittest/extension_critical_0.pem b/net/data/parse_certificate_unittest/extension_critical_0.pem index a057ac5..915cbbc 100644 --- a/net/data/parse_certificate_unittest/extension_critical_0.pem +++ b/net/data/parse_certificate_unittest/extension_critical_0.pem @@ -9,7 +9,6 @@ $ openssl asn1parse -i < [EXTENSION] 2:d=1 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints 7:d=1 hl=2 l= 1 prim: BOOLEAN :0 10:d=1 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:3000 - -----BEGIN EXTENSION----- MAwGA1UdEwEBAAQCMAA= -----END EXTENSION----- diff --git a/net/data/parse_certificate_unittest/extension_critical_3.pem b/net/data/parse_certificate_unittest/extension_critical_3.pem index 435c843..97b8f08 100644 --- a/net/data/parse_certificate_unittest/extension_critical_3.pem +++ b/net/data/parse_certificate_unittest/extension_critical_3.pem @@ -9,7 +9,6 @@ $ openssl asn1parse -i < [EXTENSION] 2:d=1 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints 7:d=1 hl=2 l= 1 prim: BOOLEAN :3 10:d=1 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:3000 - -----BEGIN EXTENSION----- MAwGA1UdEwEBAwQCMAA= -----END EXTENSION----- diff --git a/net/data/parse_certificate_unittest/extension_not_critical.pem b/net/data/parse_certificate_unittest/extension_not_critical.pem index 0c84535..7e90c7a 100644 --- a/net/data/parse_certificate_unittest/extension_not_critical.pem +++ b/net/data/parse_certificate_unittest/extension_not_critical.pem @@ -6,7 +6,6 @@ $ openssl asn1parse -i < [EXTENSION] 0:d=0 hl=2 l= 9 cons: SEQUENCE 2:d=1 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints 7:d=1 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:3000 - -----BEGIN EXTENSION----- MAkGA1UdEwQCMAA= -----END EXTENSION----- diff --git a/net/data/parse_certificate_unittest/extensions_basic_constraints.pem b/net/data/parse_certificate_unittest/extensions_basic_constraints.pem index 211cef0..771cb40 100644 --- a/net/data/parse_certificate_unittest/extensions_basic_constraints.pem +++ b/net/data/parse_certificate_unittest/extensions_basic_constraints.pem @@ -13,4 +13,3 @@ $ openssl asn1parse -i < [BASIC CONSTRAINTS] -----BEGIN BASIC CONSTRAINTS----- MAA= -----END BASIC CONSTRAINTS----- - diff --git a/net/data/parse_certificate_unittest/extensions_data_after_sequence.pem b/net/data/parse_certificate_unittest/extensions_data_after_sequence.pem index 5bf26ac..0c56b1d 100644 --- a/net/data/parse_certificate_unittest/extensions_data_after_sequence.pem +++ b/net/data/parse_certificate_unittest/extensions_data_after_sequence.pem @@ -8,4 +8,3 @@ $ openssl asn1parse -i < [EXTENSIONS] -----BEGIN EXTENSIONS----- MBIwDgYDVR0PAQH/BAQDAgO4BQA= -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/extensions_duplicate_key_usage.pem b/net/data/parse_certificate_unittest/extensions_duplicate_key_usage.pem index c263384..85624e9 100644 --- a/net/data/parse_certificate_unittest/extensions_duplicate_key_usage.pem +++ b/net/data/parse_certificate_unittest/extensions_duplicate_key_usage.pem @@ -11,4 +11,3 @@ $ openssl asn1parse -i < [EXTENSIONS] -----BEGIN EXTENSIONS----- MCAwDgYDVR0PAQH/BAQDAgO4MA4GA1UdDwEB/wQEAwIDuA== -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/extensions_empty_sequence.pem b/net/data/parse_certificate_unittest/extensions_empty_sequence.pem index d3f1a73..fe02108 100644 --- a/net/data/parse_certificate_unittest/extensions_empty_sequence.pem +++ b/net/data/parse_certificate_unittest/extensions_empty_sequence.pem @@ -3,4 +3,3 @@ $ openssl asn1parse -i < [EXTENSIONS] -----BEGIN EXTENSIONS----- MAA= -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/extensions_extended_key_usage.pem b/net/data/parse_certificate_unittest/extensions_extended_key_usage.pem index 9cda6e2..6b253cd 100644 --- a/net/data/parse_certificate_unittest/extensions_extended_key_usage.pem +++ b/net/data/parse_certificate_unittest/extensions_extended_key_usage.pem @@ -17,4 +17,3 @@ $ openssl asn1parse -i < [EXTENDED KEY USAGE] -----BEGIN EXTENDED KEY USAGE----- MCsGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQB -----END EXTENDED KEY USAGE----- - diff --git a/net/data/parse_certificate_unittest/extensions_key_usage.pem b/net/data/parse_certificate_unittest/extensions_key_usage.pem index 1b56edd..7762c53 100644 --- a/net/data/parse_certificate_unittest/extensions_key_usage.pem +++ b/net/data/parse_certificate_unittest/extensions_key_usage.pem @@ -13,4 +13,3 @@ $ openssl asn1parse -i < [KEY USAGE] -----BEGIN KEY USAGE----- AwIFoA== -----END KEY USAGE----- - diff --git a/net/data/parse_certificate_unittest/extensions_not_sequence.pem b/net/data/parse_certificate_unittest/extensions_not_sequence.pem index f8cb11b..4b1b625 100644 --- a/net/data/parse_certificate_unittest/extensions_not_sequence.pem +++ b/net/data/parse_certificate_unittest/extensions_not_sequence.pem @@ -3,4 +3,3 @@ $ openssl asn1parse -i < [EXTENSIONS] -----BEGIN EXTENSIONS----- BQA= -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/extensions_policies.pem b/net/data/parse_certificate_unittest/extensions_policies.pem index 79a1c90..13457bc 100644 --- a/net/data/parse_certificate_unittest/extensions_policies.pem +++ b/net/data/parse_certificate_unittest/extensions_policies.pem @@ -22,4 +22,3 @@ $ openssl asn1parse -i < [POLICIES] MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNlY29tdHJ1c3Q ubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQE= -----END POLICIES----- - diff --git a/net/data/parse_certificate_unittest/extensions_real.pem b/net/data/parse_certificate_unittest/extensions_real.pem index 5ece71c..5a475de 100644 --- a/net/data/parse_certificate_unittest/extensions_real.pem +++ b/net/data/parse_certificate_unittest/extensions_real.pem @@ -1,5 +1,6 @@ A real world extensions sequence (taken from Google's GAI2). + $ openssl asn1parse -i < [EXTENSIONS] 0:d=0 hl=3 l= 228 cons: SEQUENCE 3:d=1 hl=2 l= 31 cons: SEQUENCE @@ -32,4 +33,3 @@ JodHRwOi8vZy5zeW1jZC5jb20wEgYDVR0TAQH/BAgwBgEB/wIBADA1BgNVHR8ELjAsMCqgKKAmh iRodHRwOi8vZy5zeW1jYi5jb20vY3Jscy9ndGdsb2JhbC5jcmwwFwYDVR0gBBAwDjAMBgorBgEE AdZ5AgUB -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/extensions_subject_alt_name.pem b/net/data/parse_certificate_unittest/extensions_subject_alt_name.pem index 3ce5fda..98a59bd 100644 --- a/net/data/parse_certificate_unittest/extensions_subject_alt_name.pem +++ b/net/data/parse_certificate_unittest/extensions_subject_alt_name.pem @@ -13,4 +13,3 @@ $ openssl asn1parse -i < [SUBJECT ALT NAME] -----BEGIN SUBJECT ALT NAME----- MBWCE2VtZXJnZW5jeXN1cHBvcnQudXM= -----END SUBJECT ALT NAME----- - diff --git a/net/data/parse_certificate_unittest/extensions_unknown_critical.pem b/net/data/parse_certificate_unittest/extensions_unknown_critical.pem index 3913615..aa4503f 100644 --- a/net/data/parse_certificate_unittest/extensions_unknown_critical.pem +++ b/net/data/parse_certificate_unittest/extensions_unknown_critical.pem @@ -7,4 +7,3 @@ $ openssl asn1parse -i < [EXTENSIONS] -----BEGIN EXTENSIONS----- MBkwFwYMKoZIhvcSBAGEtwkAAQH/BAQDAgO4 -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/extensions_unknown_non_critical.pem b/net/data/parse_certificate_unittest/extensions_unknown_non_critical.pem index 532cb2ab..0814267 100644 --- a/net/data/parse_certificate_unittest/extensions_unknown_non_critical.pem +++ b/net/data/parse_certificate_unittest/extensions_unknown_non_critical.pem @@ -6,4 +6,3 @@ $ openssl asn1parse -i < [EXTENSIONS] -----BEGIN EXTENSIONS----- MBYwFAYMKoZIhvcSBAGEtwkABAQDAgO4 -----END EXTENSIONS----- - diff --git a/net/data/parse_certificate_unittest/tbs_explicit_v1.pem b/net/data/parse_certificate_unittest/tbs_explicit_v1.pem index 67edbb3..03599ea 100644 --- a/net/data/parse_certificate_unittest/tbs_explicit_v1.pem +++ b/net/data/parse_certificate_unittest/tbs_explicit_v1.pem @@ -2,12 +2,6 @@ This is an otherwise valid v1 certificate, except the version has been encoded explicitly as 0. Instead it should have been omitted. - ------BEGIN TBS CERTIFICATE----- -MDygAwIBAAIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfM= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 60 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -24,3 +18,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 54:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 57:d=1 hl=2 l= 3 cons: SEQUENCE 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 +-----BEGIN TBS CERTIFICATE----- +MDygAwIBAAIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfM= +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_negative_serial_number.pem b/net/data/parse_certificate_unittest/tbs_negative_serial_number.pem index f7da286..fb9a712 100644 --- a/net/data/parse_certificate_unittest/tbs_negative_serial_number.pem +++ b/net/data/parse_certificate_unittest/tbs_negative_serial_number.pem @@ -2,12 +2,6 @@ This is a valid TBSCertificate. However the Serial Number is negative (which strictly speaking is not correct). - ------BEGIN TBS CERTIFICATE----- -MEOgAwIBAgIIiR6QqQAANUAwAwQBATADBAEFMB4XDTEyMTAxODAzMTIwMFoXDTEzMTAxODE0NTk -1OVowAwQBgzADBAHz ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 67 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -24,67 +18,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 61:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 64:d=1 hl=2 l= 3 cons: SEQUENCE 66:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MEOgAwIBAgIIiR6QqQAANUAwAwQBATADBAEFMB4XDTEyMTAxODAzMTIwMFoXDTEzMTAxODE0NTk +1OVowAwQBgzADBAHz +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- iR6QqQAANUA= -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_serial_number_21_octets_leading_0.pem b/net/data/parse_certificate_unittest/tbs_serial_number_21_octets_leading_0.pem index e09125f..efbf053 100644 --- a/net/data/parse_certificate_unittest/tbs_serial_number_21_octets_leading_0.pem +++ b/net/data/parse_certificate_unittest/tbs_serial_number_21_octets_leading_0.pem @@ -2,12 +2,6 @@ This is a TBSCertificate where the serial number is more than 20 octets (21 octets, where first octet is a 0). This violates the rules in RFC 5280. - ------BEGIN TBS CERTIFICATE----- -MFCgAwIBAAIVANjDfk2H+cjIK68m71NQHfH886UgMAMEAQEwAwQBBTAeFw0xMjEwMTgwMzEyMDB -aFw0xMzEwMTgxNDU5NTlaMAMEAYMwAwQB8w== ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 80 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -24,3 +18,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 74:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 77:d=1 hl=2 l= 3 cons: SEQUENCE 79:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 +-----BEGIN TBS CERTIFICATE----- +MFCgAwIBAAIVANjDfk2H+cjIK68m71NQHfH886UgMAMEAQEwAwQBBTAeFw0xMjEwMTgwMzEyMDB +aFw0xMzEwMTgxNDU5NTlaMAMEAYMwAwQB8w== +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_serial_number_26_octets.pem b/net/data/parse_certificate_unittest/tbs_serial_number_26_octets.pem index 0ea885b..fe24034 100644 --- a/net/data/parse_certificate_unittest/tbs_serial_number_26_octets.pem +++ b/net/data/parse_certificate_unittest/tbs_serial_number_26_octets.pem @@ -2,12 +2,6 @@ This is a TBSCertificate which has a serial number that is 26 octets long. This violates RFC 5280. - ------BEGIN TBS CERTIFICATE----- -MFWgAwIBAAIaQsg8eFVS5Dkn5IvhKA+iD5+wj0f5RMMmaPkwAwQBATADBAEFMB4XDTEyMTAxODA -zMTIwMFoXDTEzMTAxODE0NTk1OVowAwQBgzADBAHz ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 85 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -24,3 +18,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 79:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 82:d=1 hl=2 l= 3 cons: SEQUENCE 84:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 +-----BEGIN TBS CERTIFICATE----- +MFWgAwIBAAIaQsg8eFVS5Dkn5IvhKA+iD5+wj0f5RMMmaPkwAwQBATADBAEFMB4XDTEyMTAxODA +zMTIwMFoXDTEzMTAxODE0NTk1OVowAwQBgzADBAHz +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_v1.pem b/net/data/parse_certificate_unittest/tbs_v1.pem index ae0ebbd..198cd2a 100644 --- a/net/data/parse_certificate_unittest/tbs_v1.pem +++ b/net/data/parse_certificate_unittest/tbs_v1.pem @@ -1,12 +1,6 @@ This is a TBSCertificate which omits the version field (meaning it is v1). - ------BEGIN TBS CERTIFICATE----- -MDcCAQEwAwQBATADBAEFMB4XDTEyMTAxODAzMTIwMFoXDTEzMTAxODE0NTk1OVowAwQBgzADBAH -z ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 55 cons: SEQUENCE 2:d=1 hl=2 l= 1 prim: INTEGER :01 @@ -21,67 +15,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 49:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 52:d=1 hl=2 l= 3 cons: SEQUENCE 54:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MDcCAQEwAwQBATADBAEFMB4XDTEyMTAxODAzMTIwMFoXDTEzMTAxODE0NTk1OVowAwQBgzADBAH +z +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_v1_extensions.pem b/net/data/parse_certificate_unittest/tbs_v1_extensions.pem index 82b13a9..d551256 100644 --- a/net/data/parse_certificate_unittest/tbs_v1_extensions.pem +++ b/net/data/parse_certificate_unittest/tbs_v1_extensions.pem @@ -2,12 +2,6 @@ This is an otherwise valid TBSCertificate, however it lacks a version (making it v1). As such extensions are not allowed. - ------BEGIN TBS CERTIFICATE----- -MD4CAQEwAwQBATADBAEFMB4XDTEyMTAxODAzMTIwMFoXDTEzMTAxODE0NTk1OVowAwQBgzADBAH -zowUwAwQB3Q== ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 62 cons: SEQUENCE 2:d=1 hl=2 l= 1 prim: INTEGER :01 @@ -25,3 +19,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 57:d=1 hl=2 l= 5 cons: cont [ 3 ] 59:d=2 hl=2 l= 3 cons: SEQUENCE 61:d=3 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD +-----BEGIN TBS CERTIFICATE----- +MD4CAQEwAwQBATADBAEFMB4XDTEyMTAxODAzMTIwMFoXDTEzMTAxODE0NTk1OVowAwQBgzADBAH +zowUwAwQB3Q== +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_v2_extensions.pem b/net/data/parse_certificate_unittest/tbs_v2_extensions.pem index ef84533..33ca59d 100644 --- a/net/data/parse_certificate_unittest/tbs_v2_extensions.pem +++ b/net/data/parse_certificate_unittest/tbs_v2_extensions.pem @@ -2,12 +2,6 @@ This is a v2 certificate which contains extensions. This is invalid since v2 does not have extensions defined. - ------BEGIN TBS CERTIFICATE----- -MEOgAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOjBTADBAHd ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 67 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -27,3 +21,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 62:d=1 hl=2 l= 5 cons: cont [ 3 ] 64:d=2 hl=2 l= 3 cons: SEQUENCE 66:d=3 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD +-----BEGIN TBS CERTIFICATE----- +MEOgAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOjBTADBAHd +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_v2_issuer_and_subject_unique_id.pem b/net/data/parse_certificate_unittest/tbs_v2_issuer_and_subject_unique_id.pem index cbecd8d..eff7abc 100644 --- a/net/data/parse_certificate_unittest/tbs_v2_issuer_and_subject_unique_id.pem +++ b/net/data/parse_certificate_unittest/tbs_v2_issuer_and_subject_unique_id.pem @@ -2,12 +2,6 @@ This is a version 2 certificate containing both the issuer unique ID and subject unique ID fields. - ------BEGIN TBS CERTIFICATE----- -MESgAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOBAgC5ggIAyg== ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 68 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -26,79 +20,59 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 62:d=1 hl=2 l= 2 prim: cont [ 1 ] 66:d=1 hl=2 l= 2 prim: cont [ 2 ] - - +-----BEGIN TBS CERTIFICATE----- +MESgAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOBAgC5ggIAyg== +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - - -----BEGIN ISSUER UNIQUE ID----- uQ== -----END ISSUER UNIQUE ID----- - - -----BEGIN SUBJECT UNIQUE ID----- yg== -----END SUBJECT UNIQUE ID----- diff --git a/net/data/parse_certificate_unittest/tbs_v2_issuer_unique_id.pem b/net/data/parse_certificate_unittest/tbs_v2_issuer_unique_id.pem index c608bb4..1ba13b17 100644 --- a/net/data/parse_certificate_unittest/tbs_v2_issuer_unique_id.pem +++ b/net/data/parse_certificate_unittest/tbs_v2_issuer_unique_id.pem @@ -1,12 +1,6 @@ This is a version 2 certificate containing the issuer unique ID field. - ------BEGIN TBS CERTIFICATE----- -MECgAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOBAgC5 ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 64 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -24,73 +18,55 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 57:d=1 hl=2 l= 3 cons: SEQUENCE 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 62:d=1 hl=2 l= 2 prim: cont [ 1 ] - - +-----BEGIN TBS CERTIFICATE----- +MECgAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOBAgC5 +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - - -----BEGIN ISSUER UNIQUE ID----- uQ== -----END ISSUER UNIQUE ID----- diff --git a/net/data/parse_certificate_unittest/tbs_v2_no_optionals.pem b/net/data/parse_certificate_unittest/tbs_v2_no_optionals.pem index cdfe301..9ea675c 100644 --- a/net/data/parse_certificate_unittest/tbs_v2_no_optionals.pem +++ b/net/data/parse_certificate_unittest/tbs_v2_no_optionals.pem @@ -1,12 +1,6 @@ This is a version 2 certificate with none of the optional fields. - ------BEGIN TBS CERTIFICATE----- -MDygAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfM= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 60 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -23,67 +17,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 54:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 57:d=1 hl=2 l= 3 cons: SEQUENCE 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MDygAwIBAQIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfM= +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_v3_all_optionals.pem b/net/data/parse_certificate_unittest/tbs_v3_all_optionals.pem index 4212e1a..5b989c8 100644 --- a/net/data/parse_certificate_unittest/tbs_v3_all_optionals.pem +++ b/net/data/parse_certificate_unittest/tbs_v3_all_optionals.pem @@ -1,12 +1,6 @@ This is a version 3 TBSCertificate containing all the possible optional fields. - ------BEGIN TBS CERTIFICATE----- -MEugAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOBAgC5ggIAyqMFMAMEAd0= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 75 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -28,89 +22,66 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 70:d=1 hl=2 l= 5 cons: cont [ 3 ] 72:d=2 hl=2 l= 3 cons: SEQUENCE 74:d=3 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD - - +-----BEGIN TBS CERTIFICATE----- +MEugAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOBAgC5ggIAyqMFMAMEAd0= +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - - -----BEGIN ISSUER UNIQUE ID----- uQ== -----END ISSUER UNIQUE ID----- - - -----BEGIN SUBJECT UNIQUE ID----- yg== -----END SUBJECT UNIQUE ID----- - - ------BEGIN EXTENSIONS----- -MAMEAd0= ------END EXTENSIONS----- - $ openssl asn1parse -i < [EXTENSIONS] 0:d=0 hl=2 l= 3 cons: SEQUENCE 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD +-----BEGIN EXTENSIONS----- +MAMEAd0= +-----END EXTENSIONS----- diff --git a/net/data/parse_certificate_unittest/tbs_v3_data_after_extensions.pem b/net/data/parse_certificate_unittest/tbs_v3_data_after_extensions.pem index 6aaadb1..7dc8327 100644 --- a/net/data/parse_certificate_unittest/tbs_v3_data_after_extensions.pem +++ b/net/data/parse_certificate_unittest/tbs_v3_data_after_extensions.pem @@ -2,12 +2,6 @@ This is an otherwise valid TBSCertificate, except there is a NULL after the extensions. - ------BEGIN TBS CERTIFICATE----- -MEWgAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOjBTADBAHdBQA= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 69 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -28,3 +22,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 64:d=2 hl=2 l= 3 cons: SEQUENCE 66:d=3 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD 69:d=1 hl=2 l= 0 prim: NULL +-----BEGIN TBS CERTIFICATE----- +MEWgAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOjBTADBAHdBQA= +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_v3_extensions.pem b/net/data/parse_certificate_unittest/tbs_v3_extensions.pem index c8a59aa..927a783 100644 --- a/net/data/parse_certificate_unittest/tbs_v3_extensions.pem +++ b/net/data/parse_certificate_unittest/tbs_v3_extensions.pem @@ -3,11 +3,6 @@ ParseTbsCertificate(), however its sub-fields are mainly bogus. This TBSCertificate contains extensions. ------BEGIN TBS CERTIFICATE----- -MEOgAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOjBTADBAHd ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 67 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -27,77 +22,58 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 62:d=1 hl=2 l= 5 cons: cont [ 3 ] 64:d=2 hl=2 l= 3 cons: SEQUENCE 66:d=3 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD - - +-----BEGIN TBS CERTIFICATE----- +MEOgAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOjBTADBAHd +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- -$ openssl asn1parse -i < [SPKI] +$ openssl asn1parse -i < [EXTENSIONS] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD -----BEGIN EXTENSIONS----- MAMEAd0= -----END EXTENSIONS----- - -$ openssl asn1parse -i < [EXTENSIONS] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:DD diff --git a/net/data/parse_certificate_unittest/tbs_v3_extensions_not_sequence.pem b/net/data/parse_certificate_unittest/tbs_v3_extensions_not_sequence.pem index ef2ca97..7122fbd 100644 --- a/net/data/parse_certificate_unittest/tbs_v3_extensions_not_sequence.pem +++ b/net/data/parse_certificate_unittest/tbs_v3_extensions_not_sequence.pem @@ -2,12 +2,6 @@ This is an otherwise valid TBSCertificate, except the extensions is an OCTET STRING rather than a SEQUENCE. - ------BEGIN TBS CERTIFICATE----- -MEOgAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfOjBQQDBAHd ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 67 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -26,3 +20,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 62:d=1 hl=2 l= 5 cons: cont [ 3 ] 64:d=2 hl=2 l= 3 prim: OCTET STRING [HEX DUMP]:0401DD +-----BEGIN TBS CERTIFICATE----- +MEOgAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfOjBQQDBAHd +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_v3_no_optionals.pem b/net/data/parse_certificate_unittest/tbs_v3_no_optionals.pem index 7b4c7cd..119ca26 100644 --- a/net/data/parse_certificate_unittest/tbs_v3_no_optionals.pem +++ b/net/data/parse_certificate_unittest/tbs_v3_no_optionals.pem @@ -4,12 +4,6 @@ TBSCertificate contains no optional fields (no issuerUniqueID, subjectUniqueID, extensions) - ------BEGIN TBS CERTIFICATE----- -MDygAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfM= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 60 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -26,67 +20,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 54:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 57:d=1 hl=2 l= 3 cons: SEQUENCE 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MDygAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfM= +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_v3_real.pem b/net/data/parse_certificate_unittest/tbs_v3_real.pem index 337cccd..f4080d4 100644 --- a/net/data/parse_certificate_unittest/tbs_v3_real.pem +++ b/net/data/parse_certificate_unittest/tbs_v3_real.pem @@ -1,30 +1,6 @@ This is a real-world certificate (in fact the same as cert_version3.pem) - ------BEGIN TBS CERTIFICATE----- -MIIEP6ADAgECAgcrY6QqcFB2MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJVUzEQMA4GA1U -ECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIE -luYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9ye -TEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYD -VQQFEwgwNzk2OTI4NzAeFw0xMjA0MTkxMzUzMjRaFw0xMzA0MTkxMzUzMjRaME8xFDASBgNVBAo -TC2t0aHVsaHUubmV0MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBA -MTC2t0aHVsaHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzQkuEZv5xkNL -J7RCgAYmH4vG87FFPFm5J+9ObenNAFqm8V5C4IzXm1+s7ro0sndLOyDH5INNAtKkuqp7kqubl1b -bP3Z4+Ra3ENv7cpwQbQjoaajRKCGRULs/jFMCAASii/+3jkkufNimu7cBfDXOSQR2YQZL4zhDW7 -ss/zwTVspYnxvU7oDcqOIwCmFwQ/FvYTAxF1uozKBsJfL854v0MKI7GEyyn6W8jZ7f8cSc8ahvr -LAYt/etAxrmHcMUVJbW+gxXiwJsHfj03S1/RypHTb4gRqEz3pX6wl8sqtJP0L5mXuQgESoEAZ4S -rPYLxXytqrU1yLi32xgWwHu1A7fIQIDAQABo4IBujCCAbYwDwYDVR0TAQH/BAUwAwEBADAdBgNV -HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDMGA1UdHwQsMCowKKA -moCSGImh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RzMS02OC5jcmwwUwYDVR0gBEwwSjBIBgtghk -gBhv1tAQcXATA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL -3JlcG9zaXRvcnkvMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdv -ZGFkZHkuY29tLzBKBggrBgEFBQcwAoY+aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9 -yZXBvc2l0b3J5L2dkX2ludGVybWVkaWF0ZS5jcnQwHwYDVR0jBBgwFoAU/axhMpNsRdbi7oVfmr -rndplozOcwJwYDVR0RBCAwHoILa3RodWxodS5uZXSCD3d3dy5rdGh1bGh1Lm5ldDAdBgNVHQ4EF -gQUox4asank9VC8PgXhdM8B0J414Bc= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=4 l=1087 cons: SEQUENCE 4:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -114,32 +90,40 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 1060:d=3 hl=2 l= 29 cons: SEQUENCE 1062:d=4 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier 1067:d=4 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A31E1AB1A9E4F550BC3E05E174CF01D09E35E017 - - +-----BEGIN TBS CERTIFICATE----- +MIIEP6ADAgECAgcrY6QqcFB2MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJVUzEQMA4GA1U +ECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIE +luYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9ye +TEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYD +VQQFEwgwNzk2OTI4NzAeFw0xMjA0MTkxMzUzMjRaFw0xMzA0MTkxMzUzMjRaME8xFDASBgNVBAo +TC2t0aHVsaHUubmV0MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBA +MTC2t0aHVsaHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzQkuEZv5xkNL +J7RCgAYmH4vG87FFPFm5J+9ObenNAFqm8V5C4IzXm1+s7ro0sndLOyDH5INNAtKkuqp7kqubl1b +bP3Z4+Ra3ENv7cpwQbQjoaajRKCGRULs/jFMCAASii/+3jkkufNimu7cBfDXOSQR2YQZL4zhDW7 +ss/zwTVspYnxvU7oDcqOIwCmFwQ/FvYTAxF1uozKBsJfL854v0MKI7GEyyn6W8jZ7f8cSc8ahvr +LAYt/etAxrmHcMUVJbW+gxXiwJsHfj03S1/RypHTb4gRqEz3pX6wl8sqtJP0L5mXuQgESoEAZ4S +rPYLxXytqrU1yLi32xgWwHu1A7fIQIDAQABo4IBujCCAbYwDwYDVR0TAQH/BAUwAwEBADAdBgNV +HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDMGA1UdHwQsMCowKKA +moCSGImh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RzMS02OC5jcmwwUwYDVR0gBEwwSjBIBgtghk +gBhv1tAQcXATA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL +3JlcG9zaXRvcnkvMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdv +ZGFkZHkuY29tLzBKBggrBgEFBQcwAoY+aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9 +yZXBvc2l0b3J5L2dkX2ludGVybWVkaWF0ZS5jcnQwHwYDVR0jBBgwFoAU/axhMpNsRdbi7oVfmr +rndplozOcwJwYDVR0RBCAwHoILa3RodWxodS5uZXSCD3d3dy5rdGh1bGh1Lm5ldDAdBgNVHQ4EF +gQUox4asank9VC8PgXhdM8B0J414Bc= +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- K2OkKnBQdg== -----END SERIAL NUMBER----- - - ------BEGIN SIGNATURE ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END SIGNATURE ALGORITHM----- - $ openssl asn1parse -i < [SIGNATURE ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - - ------BEGIN ISSUER----- -MIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTE -aMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZX -MuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZ -mljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4Nw== ------END ISSUER----- +-----BEGIN SIGNATURE ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END SIGNATURE ALGORITHM----- $ openssl asn1parse -i < [ISSUER] 0:d=0 hl=3 l= 202 cons: SEQUENCE @@ -171,32 +155,25 @@ $ openssl asn1parse -i < [ISSUER] 188:d=2 hl=2 l= 15 cons: SEQUENCE 190:d=3 hl=2 l= 3 prim: OBJECT :serialNumber 195:d=3 hl=2 l= 8 prim: PRINTABLESTRING :07969287 +-----BEGIN ISSUER----- +MIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTE +aMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZX +MuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZ +mljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4Nw== +-----END ISSUER----- - - +VALIDITY NOTBEFORE: year=2012, month=4, day=19, hours=13, minutes=53, seconds=24 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD00LCBkYXk9MTksIGhvdXJzPTEzLCBtaW51dGVzPTUzLCBzZWNvbmR zPTI0 -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=4, day=19, hours=13, minutes=53, seconds=24 - - - +VALIDITY NOTAFTER: year=2013, month=4, day=19, hours=13, minutes=53, seconds=24 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD00LCBkYXk9MTksIGhvdXJzPTEzLCBtaW51dGVzPTUzLCBzZWNvbmR zPTI0 -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=4, day=19, hours=13, minutes=53, seconds=24 - - - ------BEGIN SUBJECT----- -ME8xFDASBgNVBAoTC2t0aHVsaHUubmV0MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF -0ZWQxFDASBgNVBAMTC2t0aHVsaHUubmV0 ------END SUBJECT----- - $ openssl asn1parse -i < [SUBJECT] 0:d=0 hl=2 l= 79 cons: SEQUENCE 2:d=1 hl=2 l= 20 cons: SET @@ -211,9 +188,17 @@ $ openssl asn1parse -i < [SUBJECT] 61:d=2 hl=2 l= 18 cons: SEQUENCE 63:d=3 hl=2 l= 3 prim: OBJECT :commonName 68:d=3 hl=2 l= 11 prim: PRINTABLESTRING :kthulhu.net +-----BEGIN SUBJECT----- +ME8xFDASBgNVBAoTC2t0aHVsaHUubmV0MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF +0ZWQxFDASBgNVBAMTC2t0aHVsaHUubmV0 +-----END SUBJECT----- - - +$ openssl asn1parse -i < [SPKI] + 0:d=0 hl=4 l= 290 cons: SEQUENCE + 4:d=1 hl=2 l= 13 cons: SEQUENCE + 6:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption + 17:d=2 hl=2 l= 0 prim: NULL + 19:d=1 hl=4 l= 271 prim: BIT STRING -----BEGIN SPKI----- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzQkuEZv5xkNLJ7RCgAYmH4vG87FFPF m5J+9ObenNAFqm8V5C4IzXm1+s7ro0sndLOyDH5INNAtKkuqp7kqubl1bbP3Z4+Ra3ENv7cpwQb @@ -223,26 +208,6 @@ W+gxXiwJsHfj03S1/RypHTb4gRqEz3pX6wl8sqtJP0L5mXuQgESoEAZ4SrPYLxXytqrU1yLi32x gWwHu1A7fIQIDAQAB -----END SPKI----- -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=4 l= 290 cons: SEQUENCE - 4:d=1 hl=2 l= 13 cons: SEQUENCE - 6:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption - 17:d=2 hl=2 l= 0 prim: NULL - 19:d=1 hl=4 l= 271 prim: BIT STRING - - - ------BEGIN EXTENSIONS----- -MIIBtjAPBgNVHRMBAf8EBTADAQEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgN -VHQ8BAf8EBAMCBaAwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZH -MxLTY4LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkwNwYIKwYBBQUHAgEWK2h0dHA6L -y9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAk -BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8 -vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNydD -AfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zAnBgNVHREEIDAeggtrdGh1bGh1Lm5ld -IIPd3d3Lmt0aHVsaHUubmV0MB0GA1UdDgQWBBSjHhqxqeT1ULw+BeF0zwHQnjXgFw== ------END EXTENSIONS----- - $ openssl asn1parse -i < [EXTENSIONS] 0:d=0 hl=4 l= 438 cons: SEQUENCE 4:d=1 hl=2 l= 15 cons: SEQUENCE @@ -274,3 +239,13 @@ $ openssl asn1parse -i < [EXTENSIONS] 411:d=1 hl=2 l= 29 cons: SEQUENCE 413:d=2 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier 418:d=2 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A31E1AB1A9E4F550BC3E05E174CF01D09E35E017 +-----BEGIN EXTENSIONS----- +MIIBtjAPBgNVHRMBAf8EBTADAQEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgN +VHQ8BAf8EBAMCBaAwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZH +MxLTY4LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkwNwYIKwYBBQUHAgEWK2h0dHA6L +y9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAk +BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8 +vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNydD +AfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zAnBgNVHREEIDAeggtrdGh1bGh1Lm5ld +IIPd3d3Lmt0aHVsaHUubmV0MB0GA1UdDgQWBBSjHhqxqeT1ULw+BeF0zwHQnjXgFw== +-----END EXTENSIONS----- diff --git a/net/data/parse_certificate_unittest/tbs_v4.pem b/net/data/parse_certificate_unittest/tbs_v4.pem index 3b53866..7c94e7d 100644 --- a/net/data/parse_certificate_unittest/tbs_v4.pem +++ b/net/data/parse_certificate_unittest/tbs_v4.pem @@ -2,12 +2,6 @@ This is a very basic TBSCertificate which would be valid except the version number is v4 (3). - ------BEGIN TBS CERTIFICATE----- -MDygAwIBAwIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfM= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 60 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -24,3 +18,7 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 54:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 57:d=1 hl=2 l= 3 cons: SEQUENCE 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 +-----BEGIN TBS CERTIFICATE----- +MDygAwIBAwIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfM= +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_validity_both_generalized_time.pem b/net/data/parse_certificate_unittest/tbs_validity_both_generalized_time.pem index 2b15076..2b7022a 100644 --- a/net/data/parse_certificate_unittest/tbs_validity_both_generalized_time.pem +++ b/net/data/parse_certificate_unittest/tbs_validity_both_generalized_time.pem @@ -3,12 +3,6 @@ SEQUENCE (2 elem) GeneralizedTime 2016-02-29 00:00:00 UTC - ------BEGIN TBS CERTIFICATE----- -MECgAwIBAgIBATADBAEBMAMEAQUwIhgPMjAxNDAxMzEwMDAwMDBaGA8yMDE2MDIyOTAwMDAwMFo -wAwQBgzADBAHz ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 64 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -25,67 +19,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 58:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 61:d=1 hl=2 l= 3 cons: SEQUENCE 63:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MECgAwIBAgIBATADBAEBMAMEAQUwIhgPMjAxNDAxMzEwMDAwMDBaGA8yMDE2MDIyOTAwMDAwMFo +wAwQBgzADBAHz +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2014, month=1, day=31, hours=0, minutes=0, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDE0LCBtb250aD0xLCBkYXk9MzEsIGhvdXJzPTAsIG1pbnV0ZXM9MCwgc2Vjb25kcz0 w -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2014, month=1, day=31, hours=0, minutes=0, seconds=0 - - - +VALIDITY NOTAFTER: year=2016, month=2, day=29, hours=0, minutes=0, seconds=0 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDE2LCBtb250aD0yLCBkYXk9MjksIGhvdXJzPTAsIG1pbnV0ZXM9MCwgc2Vjb25kcz0 w -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2016, month=2, day=29, hours=0, minutes=0, seconds=0 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_validity_both_utc_time.pem b/net/data/parse_certificate_unittest/tbs_validity_both_utc_time.pem index 67f82aa..71bddb3 100644 --- a/net/data/parse_certificate_unittest/tbs_validity_both_utc_time.pem +++ b/net/data/parse_certificate_unittest/tbs_validity_both_utc_time.pem @@ -3,12 +3,6 @@ SEQUENCE (2 elem) UTCTime 2013-10-18 14:59:59 UTC - ------BEGIN TBS CERTIFICATE----- -MDygAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG -DMAMEAfM= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 60 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -25,67 +19,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 54:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 57:d=1 hl=2 l= 3 cons: SEQUENCE 59:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MDygAwIBAgIBATADBAEBMAMEAQUwHhcNMTIxMDE4MDMxMjAwWhcNMTMxMDE4MTQ1OTU5WjADBAG +DMAMEAfM= +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_validity_generalized_time_and_utc_time.pem b/net/data/parse_certificate_unittest/tbs_validity_generalized_time_and_utc_time.pem index 874bb99..25fc37b 100644 --- a/net/data/parse_certificate_unittest/tbs_validity_generalized_time_and_utc_time.pem +++ b/net/data/parse_certificate_unittest/tbs_validity_generalized_time_and_utc_time.pem @@ -3,12 +3,6 @@ SEQUENCE (2 elem) UTCTime 2013-10-18 14:59:59 UTC - ------BEGIN TBS CERTIFICATE----- -MD6gAwIBAgIBATADBAEBMAMEAQUwIBgPMjAxNDAxMzEwMDAwMDBaFw0xMzEwMTgxNDU5NTlaMAM -EAYMwAwQB8w== ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 62 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -25,67 +19,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 56:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 59:d=1 hl=2 l= 3 cons: SEQUENCE 61:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MD6gAwIBAgIBATADBAEBMAMEAQUwIBgPMjAxNDAxMzEwMDAwMDBaFw0xMzEwMTgxNDU5NTlaMAM +EAYMwAwQB8w== +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2014, month=1, day=31, hours=0, minutes=0, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDE0LCBtb250aD0xLCBkYXk9MzEsIGhvdXJzPTAsIG1pbnV0ZXM9MCwgc2Vjb25kcz0 w -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2014, month=1, day=31, hours=0, minutes=0, seconds=0 - - - +VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDEzLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0xNCwgbWludXRlcz01OSwgc2Vjb25 kcz01OQ== -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2013, month=10, day=18, hours=14, minutes=59, seconds=59 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/parse_certificate_unittest/tbs_validity_relaxed.pem b/net/data/parse_certificate_unittest/tbs_validity_relaxed.pem index 6143de9..c3f2ba6 100644 --- a/net/data/parse_certificate_unittest/tbs_validity_relaxed.pem +++ b/net/data/parse_certificate_unittest/tbs_validity_relaxed.pem @@ -1,33 +1,6 @@ This certificate comes from the CT database. The encoding of validity fails to be parsed using the strict rules. - ------BEGIN TBS CERTIFICATE----- -MIIE/KADAgECAgMoIdUwDQYJKoZIhvcNAQEFBQAwgdwxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwd -Bcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG -9naWVzLCBJbmMuMTkwNwYDVQQLEzBodHRwOi8vY2VydGlmaWNhdGVzLnN0YXJmaWVsZHRlY2guY -29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKFN0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGlvbiBB -dXRob3JpdHkxETAPBgNVBAUTCDEwNjg4NDM1MBwXCzE0MDEwNzAwMDBaFw0xNjA0MDEwNzAwMDB -aMIHrMRMwEQYLKwYBBAGCNzwCAQMTAlVTMRgwFgYLKwYBBAGCNzwCAQITB0FyaXpvbmExHTAbBg -NVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRQwEgYDVQQFEwtSLTE3MjQ3NDEtNjELMAkGA1UEB -hMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJDAiBgNVBAoTG1N0 -YXJmaWVsZCBUZWNobm9sb2dpZXMsIExMQzErMCkGA1UEAxMidmFsaWQuc2ZpLmNhdGVzdC5zdGF -yZmllbGR0ZWNoLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3UsdA7Nr22Qr -HAYv7/IqL8V7kczSyO9wziJzVdWu+l7Brg//TgjMZKMgY7cJdpICvFAxLOxO3Z1w721InVmTxz0 -1lczx5WrH3aJMwR/05By5tanNaas9zdMAWFtWd8SYKm2xcSC3FsAhue2s14OT+EE92XgNgVhF2b -dlOTgkwh/+q4Nl7k62LncnRSzFZdJKiorI811vrvVD45NB9IOPuRUXj5GLcUh4BXXp3ZSekFbVu -A2oDnIhNGyQcThtf3wcM0dRMeKgemAD59d96NaQYH/QVA3gdtlzKxgeF/UvlxYG3P3DknTRiaMz -l/Na9NzdRQX2i7ubskThqoRs05Zv0CAwEAAaOCAc4wggHKMAwGA1UdEwEB/wQCMAAwDgYDVR0PA -QH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAtBgNVHREEJjAkgiJ2YWxp -ZC5zZmkuY2F0ZXN0LnN0YXJmaWVsZHRlY2guY29tMB0GA1UdDgQWBBRw75ASplwemE9b2zPDD23 -L7UAaZDAfBgNVHSMEGDAWgBRJS1In0Ru88qEhamJ7UUJ6itfVVjA4BgNVHR8EMTAvMC2gK6Aphi -dodHRwOi8vY3JsLnN0YXJmaWVsZHRlY2guY29tL3NmczMtMC5jcmwwgY0GCCsGAQUFBwEBBIGAM -H4wKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBQBggrBgEFBQcw -AoZEaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmX2l -udGVybWVkaWF0ZS5jcnQwUgYDVR0gBEswSTBHBgtghkgBhv1uAQcXAzA4MDYGCCsGAQUFBwIBFi -podHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8= ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=4 l=1276 cons: SEQUENCE 4:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -141,3 +114,28 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 1196:d=3 hl=2 l= 82 cons: SEQUENCE 1198:d=4 hl=2 l= 3 prim: OBJECT :X509v3 Certificate Policies 1203:d=4 hl=2 l= 75 prim: OCTET STRING [HEX DUMP]:30493047060B6086480186FD6E010717033038303606082B06010505070201162A687474703A2F2F63657274732E737461726669656C64746563682E636F6D2F7265706F7369746F72792F +-----BEGIN TBS CERTIFICATE----- +MIIE/KADAgECAgMoIdUwDQYJKoZIhvcNAQEFBQAwgdwxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwd +Bcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG +9naWVzLCBJbmMuMTkwNwYDVQQLEzBodHRwOi8vY2VydGlmaWNhdGVzLnN0YXJmaWVsZHRlY2guY +29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKFN0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkxETAPBgNVBAUTCDEwNjg4NDM1MBwXCzE0MDEwNzAwMDBaFw0xNjA0MDEwNzAwMDB +aMIHrMRMwEQYLKwYBBAGCNzwCAQMTAlVTMRgwFgYLKwYBBAGCNzwCAQITB0FyaXpvbmExHTAbBg +NVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRQwEgYDVQQFEwtSLTE3MjQ3NDEtNjELMAkGA1UEB +hMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJDAiBgNVBAoTG1N0 +YXJmaWVsZCBUZWNobm9sb2dpZXMsIExMQzErMCkGA1UEAxMidmFsaWQuc2ZpLmNhdGVzdC5zdGF +yZmllbGR0ZWNoLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3UsdA7Nr22Qr +HAYv7/IqL8V7kczSyO9wziJzVdWu+l7Brg//TgjMZKMgY7cJdpICvFAxLOxO3Z1w721InVmTxz0 +1lczx5WrH3aJMwR/05By5tanNaas9zdMAWFtWd8SYKm2xcSC3FsAhue2s14OT+EE92XgNgVhF2b +dlOTgkwh/+q4Nl7k62LncnRSzFZdJKiorI811vrvVD45NB9IOPuRUXj5GLcUh4BXXp3ZSekFbVu +A2oDnIhNGyQcThtf3wcM0dRMeKgemAD59d96NaQYH/QVA3gdtlzKxgeF/UvlxYG3P3DknTRiaMz +l/Na9NzdRQX2i7ubskThqoRs05Zv0CAwEAAaOCAc4wggHKMAwGA1UdEwEB/wQCMAAwDgYDVR0PA +QH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAtBgNVHREEJjAkgiJ2YWxp +ZC5zZmkuY2F0ZXN0LnN0YXJmaWVsZHRlY2guY29tMB0GA1UdDgQWBBRw75ASplwemE9b2zPDD23 +L7UAaZDAfBgNVHSMEGDAWgBRJS1In0Ru88qEhamJ7UUJ6itfVVjA4BgNVHR8EMTAvMC2gK6Aphi +dodHRwOi8vY3JsLnN0YXJmaWVsZHRlY2guY29tL3NmczMtMC5jcmwwgY0GCCsGAQUFBwEBBIGAM +H4wKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBQBggrBgEFBQcw +AoZEaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmX2l +udGVybWVkaWF0ZS5jcnQwUgYDVR0gBEswSTBHBgtghkgBhv1uAQcXAzA4MDYGCCsGAQUFBwIBFi +podHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8= +-----END TBS CERTIFICATE----- diff --git a/net/data/parse_certificate_unittest/tbs_validity_utc_time_and_generalized_time.pem b/net/data/parse_certificate_unittest/tbs_validity_utc_time_and_generalized_time.pem index 5a171a2..2f98b87 100644 --- a/net/data/parse_certificate_unittest/tbs_validity_utc_time_and_generalized_time.pem +++ b/net/data/parse_certificate_unittest/tbs_validity_utc_time_and_generalized_time.pem @@ -3,12 +3,6 @@ SEQUENCE (2 elem) GeneralizedTime 2016-02-29 00:00:00 UTC - ------BEGIN TBS CERTIFICATE----- -MD6gAwIBAgIBATADBAEBMAMEAQUwIBcNMTIxMDE4MDMxMjAwWhgPMjAxNjAyMjkwMDAwMDBaMAM -EAYMwAwQB8w== ------END TBS CERTIFICATE----- - $ openssl asn1parse -i < [TBS CERTIFICATE] 0:d=0 hl=2 l= 62 cons: SEQUENCE 2:d=1 hl=2 l= 3 cons: cont [ 0 ] @@ -25,67 +19,51 @@ $ openssl asn1parse -i < [TBS CERTIFICATE] 56:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 59:d=1 hl=2 l= 3 cons: SEQUENCE 61:d=2 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 - - +-----BEGIN TBS CERTIFICATE----- +MD6gAwIBAgIBATADBAEBMAMEAQUwIBcNMTIxMDE4MDMxMjAwWhgPMjAxNjAyMjkwMDAwMDBaMAM +EAYMwAwQB8w== +-----END TBS CERTIFICATE----- -----BEGIN SERIAL NUMBER----- AQ== -----END SERIAL NUMBER----- - - +$ openssl asn1parse -i < [SIGNATURE ALGORITHM] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 -----BEGIN SIGNATURE ALGORITHM----- MAMEAQE= -----END SIGNATURE ALGORITHM----- -$ openssl asn1parse -i < [SIGNATURE ALGORITHM] +$ openssl asn1parse -i < [ISSUER] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:01 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 -----BEGIN ISSUER----- MAMEAQU= -----END ISSUER----- -$ openssl asn1parse -i < [ISSUER] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:05 - - - +VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 -----BEGIN VALIDITY NOTBEFORE----- eWVhcj0yMDEyLCBtb250aD0xMCwgZGF5PTE4LCBob3Vycz0zLCBtaW51dGVzPTEyLCBzZWNvbmR zPTA= -----END VALIDITY NOTBEFORE----- -VALIDITY NOTBEFORE: year=2012, month=10, day=18, hours=3, minutes=12, seconds=0 - - - +VALIDITY NOTAFTER: year=2016, month=2, day=29, hours=0, minutes=0, seconds=0 -----BEGIN VALIDITY NOTAFTER----- eWVhcj0yMDE2LCBtb250aD0yLCBkYXk9MjksIGhvdXJzPTAsIG1pbnV0ZXM9MCwgc2Vjb25kcz0 w -----END VALIDITY NOTAFTER----- -VALIDITY NOTAFTER: year=2016, month=2, day=29, hours=0, minutes=0, seconds=0 - - - +$ openssl asn1parse -i < [SUBJECT] + 0:d=0 hl=2 l= 3 cons: SEQUENCE + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 -----BEGIN SUBJECT----- MAMEAYM= -----END SUBJECT----- -$ openssl asn1parse -i < [SUBJECT] +$ openssl asn1parse -i < [SPKI] 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:83 - - - + 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 -----BEGIN SPKI----- MAMEAfM= -----END SPKI----- - -$ openssl asn1parse -i < [SPKI] - 0:d=0 hl=2 l= 3 cons: SEQUENCE - 2:d=1 hl=2 l= 1 prim: OCTET STRING [HEX DUMP]:F3 diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-spki-params-null.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-spki-params-null.pem index 6f65be1..cf5cb2f 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-spki-params-null.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-spki-params-null.pem @@ -3,30 +3,23 @@ algorithm has been tampered with. The parameters for ecPublicKey should be a namedCurve, but here they have been replaced by NULL. - ------BEGIN PUBLIC KEY----- -MFEwCwYHKoZIzj0CAQUAA0IABJywz2kwPa/HYdTkaHtOzwOebTSrlkr4CBDY1VikqNb3LVEjOhe -IkgqG7gihlix576MX+3h54pfa0hRtuZX6HHg= ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 81 cons: SEQUENCE 2:d=1 hl=2 l= 11 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 0 prim: NULL 15:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAME ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFEwCwYHKoZIzj0CAQUAA0IABJywz2kwPa/HYdTkaHtOzwOebTSrlkr4CBDY1VikqNb3LVEjOhe +IkgqG7gihlix576MX+3h54pfa0hRtuZX6HHg= +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA512 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAME +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -34,12 +27,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 71 prim: BIT STRING -----BEGIN SIGNATURE----- A0cAMEQCIEufkeQoUocmGh0ckjz2Gc1SwXXP5/G+YKUljGEDSLo9AiAoxF+QHXHEGymGOOwNaoX X/LDDO7/sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 71 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-unused-bits-signature.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-unused-bits-signature.pem index 24efda0..a7c4960 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-unused-bits-signature.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-unused-bits-signature.pem @@ -11,30 +11,23 @@ To: 03 47 02 30 ... 84 - ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS -o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 89 cons: SEQUENCE 2:d=1 hl=2 l= 19 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 23:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAME ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS +o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA512 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAME +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -42,12 +35,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 71 prim: BIT STRING -----BEGIN SIGNATURE----- A0cCMEQCIEufkeQoUocmGh0ckjz2Gc1SwXXP5/G+YKUljGEDSLo9AiAoxF+QHXHEGymGOOwNaoX X/LDDO7/sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 71 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecdh-key.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecdh-key.pem index 4f3e26c..b017432 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecdh-key.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecdh-key.pem @@ -6,30 +6,23 @@ This test should fail because the public key's algorithm does not match that of the signature algorithm. - ------BEGIN PUBLIC KEY----- -MFcwEQYFK4EEAQwGCCqGSM49AwEHA0IABJywz2kwPa/HYdTkaHtOzwOebTSrlkr4CBDY1VikqNb -3LVEjOheIkgqG7gihlix576MX+3h54pfa0hRtuZX6HHg= ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 87 cons: SEQUENCE 2:d=1 hl=2 l= 17 cons: SEQUENCE 4:d=2 hl=2 l= 5 prim: OBJECT :1.3.132.1.12 11:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 21:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAME ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFcwEQYFK4EEAQwGCCqGSM49AwEHA0IABJywz2kwPa/HYdTkaHtOzwOebTSrlkr4CBDY1VikqNb +3LVEjOheIkgqG7gihlix576MX+3h54pfa0hRtuZX6HHg= +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA512 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAME +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -37,12 +30,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 71 prim: BIT STRING -----BEGIN SIGNATURE----- A0cAMEQCIEufkeQoUocmGh0ckjz2Gc1SwXXP5/G+YKUljGEDSLo9AiAoxF+QHXHEGymGOOwNaoX X/LDDO7/sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 71 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecmqv-key.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecmqv-key.pem index d0b906f..23f4605 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecmqv-key.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecmqv-key.pem @@ -6,30 +6,23 @@ This test should fail because the public key's algorithm does not match that of the signature algorithm. - ------BEGIN PUBLIC KEY----- -MFcwEQYFK4EEAQ0GCCqGSM49AwEHA0IABJywz2kwPa/HYdTkaHtOzwOebTSrlkr4CBDY1VikqNb -3LVEjOheIkgqG7gihlix576MX+3h54pfa0hRtuZX6HHg= ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 87 cons: SEQUENCE 2:d=1 hl=2 l= 17 cons: SEQUENCE 4:d=2 hl=2 l= 5 prim: OBJECT :1.3.132.1.13 11:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 21:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAME ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFcwEQYFK4EEAQ0GCCqGSM49AwEHA0IABJywz2kwPa/HYdTkaHtOzwOebTSrlkr4CBDY1VikqNb +3LVEjOheIkgqG7gihlix576MX+3h54pfa0hRtuZX6HHg= +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA512 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAME +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -37,12 +30,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 71 prim: BIT STRING -----BEGIN SIGNATURE----- A0cAMEQCIEufkeQoUocmGh0ckjz2Gc1SwXXP5/G+YKUljGEDSLo9AiAoxF+QHXHEGymGOOwNaoX X/LDDO7/sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 71 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-rsa-algorithm.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-rsa-algorithm.pem index 8085486..f2b2168 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-rsa-algorithm.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-rsa-algorithm.pem @@ -5,31 +5,24 @@ The problem however is the signature algorithm is indicated as being RSA PKCS#1 Signature verification consequently should fail. - ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS -o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 89 cons: SEQUENCE 2:d=1 hl=2 l= 19 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 23:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBDQUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS +o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha512WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBDQUA +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -37,12 +30,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 71 prim: BIT STRING -----BEGIN SIGNATURE----- A0cAMEQCIEufkeQoUocmGh0ckjz2Gc1SwXXP5/G+YKUljGEDSLo9AiAoxF+QHXHEGymGOOwNaoX X/LDDO7/sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 71 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-wrong-signature-format.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-wrong-signature-format.pem index d51317c..58c2e2c 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-wrong-signature-format.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512-wrong-signature-format.pem @@ -5,30 +5,23 @@ concatenation of the r and s values. This is the format that WebCrypto uses for ECDSA signature, but not what is used for digital signatures. - ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS -o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 89 cons: SEQUENCE 2:d=1 hl=2 l= 19 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 23:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAME ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS +o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA512 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAME +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -36,12 +29,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 65 prim: BIT STRING -----BEGIN SIGNATURE----- A0EAS5+R5ChShyYaHRySPPYZzVLBdc/n8b5gpSWMYQNIuj0oxF+QHXHEGymGOOwNaoXX/LDDO7/ sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 65 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512.pem b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512.pem index 54f490c..6e104e8 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-prime256v1-sha512.pem @@ -7,30 +7,23 @@ and s tuple) was encoded into a Ecdsa-Sig-Value and then a BIT STRING. It uses ECDSA verification, using curve prime256v1 and SHA-512 - ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS -o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 89 cons: SEQUENCE 2:d=1 hl=2 l= 19 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 23:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAME ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS +o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA512 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAME +-----END ALGORITHM----- -----BEGIN DATA----- bikyFTMBpO72gOZCiSmtrpiMEI1mijH/VdBImUfXX/gaRr+J6E1kAfAjvm6HaI+814TXhcqEZzV @@ -38,12 +31,9 @@ SSstS0ARSyEBApHnnzDMJNkQdk7vnIqlDKm4dsRK1yUA7ECcssTR/1hnUY/ep0iOtdv3gbYpog1 APuEMjWr/5jiQb37VTjD4= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 71 prim: BIT STRING -----BEGIN SIGNATURE----- A0cAMEQCIEufkeQoUocmGh0ckjz2Gc1SwXXP5/G+YKUljGEDSLo9AiAoxF+QHXHEGymGOOwNaoX X/LDDO7/sWpyBCEa2OSiahA== -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 71 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256-corrupted-data.pem b/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256-corrupted-data.pem index 5f5380b..5cb5358 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256-corrupted-data.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256-corrupted-data.pem @@ -4,31 +4,24 @@ has been corrupted. The third byte has been set to 0. This signature should NOT verify successfully. - ------BEGIN PUBLIC KEY----- -MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEXFhBi+WKXuxeK9yCbC9jqEchwjCNsQ4RXAsJ07oHZ+Q -qz55cNIY5BAhcQ0QYY5jv9BimGL9SuhUuOSuS3Pn9rrsIFGcFsihy4kDr8rq5+7RbN8bV057gW5 -emYjLtvDsQ ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 118 cons: SEQUENCE 2:d=1 hl=2 l= 16 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 5 prim: OBJECT :secp384r1 20:d=1 hl=2 l= 98 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAMC ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEXFhBi+WKXuxeK9yCbC9jqEchwjCNsQ4RXAsJ07oHZ+Q +qz55cNIY5BAhcQ0QYY5jv9BimGL9SuhUuOSuS3Pn9rrsIFGcFsihy4kDr8rq5+7RbN8bV057gW5 +emYjLtvDsQ +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA256 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAMC +-----END ALGORITHM----- -----BEGIN DATA----- MIIA6KADAgECAgkAtUVxft6/Vc0wCgYIKoZIzj0EAwIwbzELMAkGA1UEBhMCQVUxEzARBgNVBAg @@ -42,12 +35,9 @@ Fs3xtXTnuBbl6ZiMu28OxCjUDBOMB0GA1UdDgQWBBR6nDgtPalG2JvSlWzdGRCi/Cu7NjAfBgNV HSMEGDAWgBR6nDgtPalG2JvSlWzdGRCi/Cu7NjAMBgNVHRMEBTADAQH/ -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 105 prim: BIT STRING -----BEGIN SIGNATURE----- A2kAMGYCMQCDwMSZVJZ8qThiNTV7VX57m8fdNnNS6cXIjRYoh4SozlYWmWGh87nhmJJCeD16jVM CMQDkroAY8oNi8RxLUor+LozhhVgu24tu6lcp4MP8H3Zy8bBea5HerAd1AqJp3Ox7KDU= -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 105 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256.pem b/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256.pem index d5c3798..b417714 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-secp384r1-sha256.pem @@ -35,31 +35,24 @@ It uses ECDSA with curve secp384r1 an SHA-256. base64 sig - ------BEGIN PUBLIC KEY----- -MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEXFhBi+WKXuxeK9yCbC9jqEchwjCNsQ4RXAsJ07oHZ+Q -qz55cNIY5BAhcQ0QYY5jv9BimGL9SuhUuOSuS3Pn9rrsIFGcFsihy4kDr8rq5+7RbN8bV057gW5 -emYjLtvDsQ ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 118 cons: SEQUENCE 2:d=1 hl=2 l= 16 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 5 prim: OBJECT :secp384r1 20:d=1 hl=2 l= 98 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAMC ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEXFhBi+WKXuxeK9yCbC9jqEchwjCNsQ4RXAsJ07oHZ+Q +qz55cNIY5BAhcQ0QYY5jv9BimGL9SuhUuOSuS3Pn9rrsIFGcFsihy4kDr8rq5+7RbN8bV057gW5 +emYjLtvDsQ +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA256 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAMC +-----END ALGORITHM----- -----BEGIN DATA----- MIIB6KADAgECAgkAtUVxft6/Vc0wCgYIKoZIzj0EAwIwbzELMAkGA1UEBhMCQVUxEzARBgNVBAg @@ -73,12 +66,9 @@ Fs3xtXTnuBbl6ZiMu28OxCjUDBOMB0GA1UdDgQWBBR6nDgtPalG2JvSlWzdGRCi/Cu7NjAfBgNV HSMEGDAWgBR6nDgtPalG2JvSlWzdGRCi/Cu7NjAMBgNVHRMEBTADAQH/ -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 105 prim: BIT STRING -----BEGIN SIGNATURE----- A2kAMGYCMQCDwMSZVJZ8qThiNTV7VX57m8fdNnNS6cXIjRYoh4SozlYWmWGh87nhmJJCeD16jVM CMQDkroAY8oNi8RxLUor+LozhhVgu24tu6lcp4MP8H3Zy8bBea5HerAd1AqJp3Ox7KDU= -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 105 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/ecdsa-using-rsa-key.pem b/net/data/verify_signed_data_unittest/ecdsa-using-rsa-key.pem index 653bcd7..06d18ef 100644 --- a/net/data/verify_signed_data_unittest/ecdsa-using-rsa-key.pem +++ b/net/data/verify_signed_data_unittest/ecdsa-using-rsa-key.pem @@ -2,31 +2,24 @@ This test specifies an ECDSA signature algorithm (and a valid ecdsa signature), HOWEVER it provides an RSA key. Verification should fail. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAMC ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA256 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAMC +-----END ALGORITHM----- -----BEGIN DATA----- MIIB6KADAgECAgkAtUVxft6/Vc0wCgYIKoZIzj0EAwIwbzELMAkGA1UEBhMCQVUxEzARBgNVBAg @@ -40,12 +33,9 @@ Fs3xtXTnuBbl6ZiMu28OxCjUDBOMB0GA1UdDgQWBBR6nDgtPalG2JvSlWzdGRCi/Cu7NjAfBgNV HSMEGDAWgBR6nDgtPalG2JvSlWzdGRCi/Cu7NjAMBgNVHRMEBTADAQH/ -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=2 l= 105 prim: BIT STRING -----BEGIN SIGNATURE----- A2kAMGYCMQCDwMSZVJZ8qThiNTV7VX57m8fdNnNS6cXIjRYoh4SozlYWmWGh87nhmJJCeD16jVM CMQDkroAY8oNi8RxLUor+LozhhVgu24tu6lcp4MP8H3Zy8bBea5HerAd1AqJp3Ox7KDU= -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=2 l= 105 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-length.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-length.pem index ef7967d..c2ee870 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-length.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-length.pem @@ -2,28 +2,21 @@ Same test as rsa-pkcs1-sha1.pem except the length of the first SEQUENCE has been increased by 2 (which makes it invalid). - +$ openssl asn1parse -i < [PUBLIC KEY] +Error in encoding -----BEGIN PUBLIC KEY----- MIOfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB -----END PUBLIC KEY----- -$ openssl asn1parse -i < [PUBLIC KEY] -Error in encoding - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END ALGORITHM----- - $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -32,13 +25,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAGvDoGZWhCkwokfjDVhktNgZI2unxollhirX28TiSvKOhrtTHwM1i+X7dHd8YIb4UMrviT8 Nb8wtDJHsATaTtOoAuAzUmqxOy1+JEa/lOa2kqPOCPR0T5HLRSQVHxlnHYX89JAh9228rcglhZ/ wJfKsY6aRY/LY0zc6O41iUxITX -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-null.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-null.pem index 59559f4..a88a806 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-null.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-bad-key-der-null.pem @@ -5,13 +5,6 @@ The DER can still be parsed, however it should fail due to the unconsumed data at the end. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQABBQA= ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE @@ -19,19 +12,19 @@ $ openssl asn1parse -i < [PUBLIC KEY] 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING 162:d=0 hl=2 l= 0 prim: NULL - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQABBQA= +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -40,13 +33,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAGvDoGZWhCkwokfjDVhktNgZI2unxollhirX28TiSvKOhrtTHwM1i+X7dHd8YIb4UMrviT8 Nb8wtDJHsATaTtOoAuAzUmqxOy1+JEa/lOa2kqPOCPR0T5HLRSQVHxlnHYX89JAh9228rcglhZ/ wJfKsY6aRY/LY0zc6O41iUxITX -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-key-params-absent.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-key-params-absent.pem index 10cc3d0..58d18cc5 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-key-params-absent.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-key-params-absent.pem @@ -4,31 +4,24 @@ algorithm parameters are absent rather than NULL. This should fail because RFC 3279 says the parameters MUST be NULL. - ------BEGIN PUBLIC KEY----- -MIGdMAsGCSqGSIb3DQEBAQOBjQAwgYkCgYEApW5KDnAQF1iaUYfcfqhB0Vby7A42rVKkTf6x5h9 -62ZHYxRBW/+2xYrTA8oOhKoijlN/1JqtykcuzB86r/OCx39XNlQgJbVsri2311nHvY3fAkhyyPC -cKcOJZjm/4nRnxBazC0/DLNfKSgOE4a29kxO8i4eHyDQzoz/siSb2aITcCAwEAAQ== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 157 cons: SEQUENCE 3:d=1 hl=2 l= 11 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGdMAsGCSqGSIb3DQEBAQOBjQAwgYkCgYEApW5KDnAQF1iaUYfcfqhB0Vby7A42rVKkTf6x5h9 +62ZHYxRBW/+2xYrTA8oOhKoijlN/1JqtykcuzB86r/OCx39XNlQgJbVsri2311nHvY3fAkhyyPC +cKcOJZjm/4nRnxBazC0/DLNfKSgOE4a29kxO8i4eHyDQzoz/siSb2aITcCAwEAAQ== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -37,13 +30,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAGvDoGZWhCkwokfjDVhktNgZI2unxollhirX28TiSvKOhrtTHwM1i+X7dHd8YIb4UMrviT8 Nb8wtDJHsATaTtOoAuAzUmqxOy1+JEa/lOa2kqPOCPR0T5HLRSQVHxlnHYX89JAh9228rcglhZ/ wJfKsY6aRY/LY0zc6O41iUxITX -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-using-pss-key-no-params.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-using-pss-key-no-params.pem index 0dfff97..ae6e9cf 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-using-pss-key-no-params.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-using-pss-key-no-params.pem @@ -6,31 +6,24 @@ Subsequently this should fail, as a PSS key should not be used with a signature algorithm for PKCS#1 v1.5. - ------BEGIN PUBLIC KEY----- -MIGdMAsGCSqGSIb3DQEBCgOBjQAwgYkCgYEApW5KDnAQF1iaUYfcfqhB0Vby7A42rVKkTf6x5h9 -62ZHYxRBW/+2xYrTA8oOhKoijlN/1JqtykcuzB86r/OCx39XNlQgJbVsri2311nHvY3fAkhyyPC -cKcOJZjm/4nRnxBazC0/DLNfKSgOE4a29kxO8i4eHyDQzoz/siSb2aITcCAwEAAQ== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 157 cons: SEQUENCE 3:d=1 hl=2 l= 11 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsassaPss 16:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGdMAsGCSqGSIb3DQEBCgOBjQAwgYkCgYEApW5KDnAQF1iaUYfcfqhB0Vby7A42rVKkTf6x5h9 +62ZHYxRBW/+2xYrTA8oOhKoijlN/1JqtykcuzB86r/OCx39XNlQgJbVsri2311nHvY3fAkhyyPC +cKcOJZjm/4nRnxBazC0/DLNfKSgOE4a29kxO8i4eHyDQzoz/siSb2aITcCAwEAAQ== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -39,13 +32,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAGvDoGZWhCkwokfjDVhktNgZI2unxollhirX28TiSvKOhrtTHwM1i+X7dHd8YIb4UMrviT8 Nb8wtDJHsATaTtOoAuAzUmqxOy1+JEa/lOa2kqPOCPR0T5HLRSQVHxlnHYX89JAh9228rcglhZ/ wJfKsY6aRY/LY0zc6O41iUxITX -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-wrong-algorithm.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-wrong-algorithm.pem index 9aaedba..5d848cf 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-wrong-algorithm.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1-wrong-algorithm.pem @@ -2,32 +2,25 @@ This is the same as rsa-pkcs1-sha1.pem, however the ALGORITHM has been change to have SHA256 instead of SHA1. Using this algorithm verification should fail. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCwUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCwUA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -36,13 +29,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAGvDoGZWhCkwokfjDVhktNgZI2unxollhirX28TiSvKOhrtTHwM1i+X7dHd8YIb4UMrviT8 Nb8wtDJHsATaTtOoAuAzUmqxOy1+JEa/lOa2kqPOCPR0T5HLRSQVHxlnHYX89JAh9228rcglhZ/ wJfKsY6aRY/LY0zc6O41iUxITX -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1.pem index 0972aca..c696af78 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha1.pem @@ -7,32 +7,25 @@ It uses an RSA key with modulus length of 1024 bits, PKCS#1 v1.5 padding, and SHA-1 as the digest. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBBQUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha1WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBBQUA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -41,13 +34,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAGvDoGZWhCkwokfjDVhktNgZI2unxollhirX28TiSvKOhrtTHwM1i+X7dHd8YIb4UMrviT8 Nb8wtDJHsATaTtOoAuAzUmqxOy1+JEa/lOa2kqPOCPR0T5HLRSQVHxlnHYX89JAh9228rcglhZ/ wJfKsY6aRY/LY0zc6O41iUxITX -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-key-encoded-ber.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-key-encoded-ber.pem index 2a8db4a..afc14a3 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-key-encoded-ber.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-key-encoded-ber.pem @@ -11,32 +11,25 @@ To: (the length of 0x9F is being expressed using 2 bytes instead of 1) - ------BEGIN PUBLIC KEY----- -MIIAnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqkfgdjI9YqzadSZ2Ns0CEEUD8+8m7OplIx0 -94X+QD8mooNrunwT04asbLIINGL4qiI/+9IVSvyV3Kj9c4EeQIbANGoJ8AI3wf6MOBB/txxGFed -qqcTffKVMQvtZdoYFbZ/MQkvyRsoyvunb/pWcN4sSaF9kY1bXSeP3J99fBIYUCAwEAAQ== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=4 l= 159 cons: SEQUENCE 4:d=1 hl=2 l= 13 cons: SEQUENCE 6:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 17:d=2 hl=2 l= 0 prim: NULL 19:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCwUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIIAnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqkfgdjI9YqzadSZ2Ns0CEEUD8+8m7OplIx0 +94X+QD8mooNrunwT04asbLIINGL4qiI/+9IVSvyV3Kj9c4EeQIbANGoJ8AI3wf6MOBB/txxGFed +qqcTffKVMQvtZdoYFbZ/MQkvyRsoyvunb/pWcN4sSaF9kY1bXSeP3J99fBIYUCAwEAAQ== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCwUA +-----END ALGORITHM----- -----BEGIN DATA----- MIIB46ADAgECAgkA3l4tFOVii0UwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCQVUxEzARBgN @@ -50,13 +43,10 @@ cn318EhhQIDAQABo1AwTjAdBgNVHQ4EFgQUzQBVKTEknyLndWd2HTsBdTKvyikwHwYDVR0jBBgw FoAUzQBVKTEknyLndWd2HTsBdTKvyikwDAYDVR0TBAUwAwEB/w== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBADrHSmFSJw/Gv7hs5PNzpaJwAri/sitarIZfzN/SjR+n8L8yeTEoiDb1+BkxlFvXvPHTaOK oO3WlslNNOxh1W5/JkYYGOUkCcyIjnln6qS560imcr3VNjomT/M8M2Iss+rJiKau1TRuaP7H8i6 +Gqf3saGdr8/LnvFAdNQvkalQt -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-spki-non-null-params.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-spki-non-null-params.pem index 4e7fc96..daecea6 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-spki-non-null-params.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-spki-non-null-params.pem @@ -8,32 +8,25 @@ To: 02 00 (INTEGER) - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQIAA4GNADCBiQKBgQCqR+B2Mj1irNp1JnY2zQIQRQPz7ybs6mUjHT3 -hf5APyaig2u6fBPThqxssgg0YviqIj/70hVK/JXcqP1zgR5AhsA0agnwAjfB/ow4EH+3HEYV52q -pxN98pUxC+1l2hgVtn8xCS/JGyjK+6dv+lZw3ixJoX2RjVtdJ4/cn318EhhQIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: INTEGER :00 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCwUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQIAA4GNADCBiQKBgQCqR+B2Mj1irNp1JnY2zQIQRQPz7ybs6mUjHT3 +hf5APyaig2u6fBPThqxssgg0YviqIj/70hVK/JXcqP1zgR5AhsA0agnwAjfB/ow4EH+3HEYV52q +pxN98pUxC+1l2hgVtn8xCS/JGyjK+6dv+lZw3ixJoX2RjVtdJ4/cn318EhhQIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCwUA +-----END ALGORITHM----- -----BEGIN DATA----- MIIB46ADAgECAgkA3l4tFOVii0UwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCQVUxEzARBgN @@ -47,13 +40,10 @@ cn318EhhQIDAQABo1AwTjAdBgNVHQ4EFgQUzQBVKTEknyLndWd2HTsBdTKvyikwHwYDVR0jBBgw FoAUzQBVKTEknyLndWd2HTsBdTKvyikwDAYDVR0TBAUwAwEB/w== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBADrHSmFSJw/Gv7hs5PNzpaJwAri/sitarIZfzN/SjR+n8L8yeTEoiDb1+BkxlFvXvPHTaOK oO3WlslNNOxh1W5/JkYYGOUkCcyIjnln6qS560imcr3VNjomT/M8M2Iss+rJiKau1TRuaP7H8i6 +Gqf3saGdr8/LnvFAdNQvkalQt -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-ecdsa-algorithm.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-ecdsa-algorithm.pem index a9b9eb9..e565099 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-ecdsa-algorithm.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-ecdsa-algorithm.pem @@ -5,31 +5,24 @@ The problem however is the signature algorithm is indicated as being ECDSA. Signature verification consequently should fail. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqR+B2Mj1irNp1JnY2zQIQRQPz7ybs6mUjHT3 -hf5APyaig2u6fBPThqxssgg0YviqIj/70hVK/JXcqP1zgR5AhsA0agnwAjfB/ow4EH+3HEYV52q -pxN98pUxC+1l2hgVtn8xCS/JGyjK+6dv+lZw3ixJoX2RjVtdJ4/cn318EhhQIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MAoGCCqGSM49BAMC ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqR+B2Mj1irNp1JnY2zQIQRQPz7ybs6mUjHT3 +hf5APyaig2u6fBPThqxssgg0YviqIj/70hVK/JXcqP1zgR5AhsA0agnwAjfB/ow4EH+3HEYV52q +pxN98pUxC+1l2hgVtn8xCS/JGyjK+6dv+lZw3ixJoX2RjVtdJ4/cn318EhhQIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 10 cons: SEQUENCE 2:d=1 hl=2 l= 8 prim: OBJECT :ecdsa-with-SHA256 - - +-----BEGIN ALGORITHM----- +MAoGCCqGSM49BAMC +-----END ALGORITHM----- -----BEGIN DATA----- MIIB46ADAgECAgkA3l4tFOVii0UwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCQVUxEzARBgN @@ -43,13 +36,10 @@ cn318EhhQIDAQABo1AwTjAdBgNVHQ4EFgQUzQBVKTEknyLndWd2HTsBdTKvyikwHwYDVR0jBBgw FoAUzQBVKTEknyLndWd2HTsBdTKvyikwDAYDVR0TBAUwAwEB/w== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBADrHSmFSJw/Gv7hs5PNzpaJwAri/sitarIZfzN/SjR+n8L8yeTEoiDb1+BkxlFvXvPHTaOK oO3WlslNNOxh1W5/JkYYGOUkCcyIjnln6qS560imcr3VNjomT/M8M2Iss+rJiKau1TRuaP7H8i6 +Gqf3saGdr8/LnvFAdNQvkalQt -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-id-ea-rsa.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-id-ea-rsa.pem index dd5d39c..f5b2239 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-id-ea-rsa.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256-using-id-ea-rsa.pem @@ -3,32 +3,25 @@ with. Rather than using an rsaEncryption OID for the key's algorithm, it uses id-ea-rsa (2.5.8.1.1). - ------BEGIN PUBLIC KEY----- -MIGaMAgGBFUIAQEFAAOBjQAwgYkCgYEAqkfgdjI9YqzadSZ2Ns0CEEUD8+8m7OplIx094X+QD8m -ooNrunwT04asbLIINGL4qiI/+9IVSvyV3Kj9c4EeQIbANGoJ8AI3wf6MOBB/txxGFedqqcTffKV -MQvtZdoYFbZ/MQkvyRsoyvunb/pWcN4sSaF9kY1bXSeP3J99fBIYUCAwEAAQ== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 154 cons: SEQUENCE 3:d=1 hl=2 l= 8 cons: SEQUENCE 5:d=2 hl=2 l= 4 prim: OBJECT :rsa 11:d=2 hl=2 l= 0 prim: NULL 13:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCwUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGaMAgGBFUIAQEFAAOBjQAwgYkCgYEAqkfgdjI9YqzadSZ2Ns0CEEUD8+8m7OplIx094X+QD8m +ooNrunwT04asbLIINGL4qiI/+9IVSvyV3Kj9c4EeQIbANGoJ8AI3wf6MOBB/txxGFedqqcTffKV +MQvtZdoYFbZ/MQkvyRsoyvunb/pWcN4sSaF9kY1bXSeP3J99fBIYUCAwEAAQ== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCwUA +-----END ALGORITHM----- -----BEGIN DATA----- MIIB46ADAgECAgkA3l4tFOVii0UwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCQVUxEzARBgN @@ -42,13 +35,10 @@ cn318EhhQIDAQABo1AwTjAdBgNVHQ4EFgQUzQBVKTEknyLndWd2HTsBdTKvyikwHwYDVR0jBBgw FoAUzQBVKTEknyLndWd2HTsBdTKvyikwDAYDVR0TBAUwAwEB/w== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBADrHSmFSJw/Gv7hs5PNzpaJwAri/sitarIZfzN/SjR+n8L8yeTEoiDb1+BkxlFvXvPHTaOK oO3WlslNNOxh1W5/JkYYGOUkCcyIjnln6qS560imcr3VNjomT/M8M2Iss+rJiKau1TRuaP7H8i6 +Gqf3saGdr8/LnvFAdNQvkalQt -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256.pem b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256.pem index 8509111..0fda8c2 100644 --- a/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256.pem +++ b/net/data/verify_signed_data_unittest/rsa-pkcs1-sha256.pem @@ -35,32 +35,25 @@ It uses RSA PKCS#1 v1.5 with SHA-256 and a 1024-bit key. base64 sig - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqR+B2Mj1irNp1JnY2zQIQRQPz7ybs6mUjHT3 -hf5APyaig2u6fBPThqxssgg0YviqIj/70hVK/JXcqP1zgR5AhsA0agnwAjfB/ow4EH+3HEYV52q -pxN98pUxC+1l2hgVtn8xCS/JGyjK+6dv+lZw3ixJoX2RjVtdJ4/cn318EhhQIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCwUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqR+B2Mj1irNp1JnY2zQIQRQPz7ybs6mUjHT3 +hf5APyaig2u6fBPThqxssgg0YviqIj/70hVK/JXcqP1zgR5AhsA0agnwAjfB/ow4EH+3HEYV52q +pxN98pUxC+1l2hgVtn8xCS/JGyjK+6dv+lZw3ixJoX2RjVtdJ4/cn318EhhQIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCwUA +-----END ALGORITHM----- -----BEGIN DATA----- MIIB46ADAgECAgkA3l4tFOVii0UwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCQVUxEzARBgN @@ -74,13 +67,10 @@ cn318EhhQIDAQABo1AwTjAdBgNVHQ4EFgQUzQBVKTEknyLndWd2HTsBdTKvyikwHwYDVR0jBBgw FoAUzQBVKTEknyLndWd2HTsBdTKvyikwDAYDVR0TBAUwAwEB/w== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBADrHSmFSJw/Gv7hs5PNzpaJwAri/sitarIZfzN/SjR+n8L8yeTEoiDb1+BkxlFvXvPHTaOK oO3WlslNNOxh1W5/JkYYGOUkCcyIjnln6qS560imcr3VNjomT/M8M2Iss+rJiKau1TRuaP7H8i6 +Gqf3saGdr8/LnvFAdNQvkalQt -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-no-params.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-no-params.pem index 503cc2e..74adc3e 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-no-params.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-no-params.pem @@ -3,31 +3,24 @@ algorithm identifier has been changed from rsaEncryption (1.2.840.113549.1.1.1) to rsaPss (1.2.840.113549.1.1.10). - ------BEGIN PUBLIC KEY----- -MIGdMAsGCSqGSIb3DQEBCgOBjQAwgYkCgYEApW5KDnAQF1iaUYfcfqhB0Vby7A42rVKkTf6x5h9 -62ZHYxRBW/+2xYrTA8oOhKoijlN/1JqtykcuzB86r/OCx39XNlQgJbVsri2311nHvY3fAkhyyPC -cKcOJZjm/4nRnxBazC0/DLNfKSgOE4a29kxO8i4eHyDQzoz/siSb2aITcCAwEAAQ== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 157 cons: SEQUENCE 3:d=1 hl=2 l= 11 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsassaPss 16:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCjAA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGdMAsGCSqGSIb3DQEBCgOBjQAwgYkCgYEApW5KDnAQF1iaUYfcfqhB0Vby7A42rVKkTf6x5h9 +62ZHYxRBW/+2xYrTA8oOhKoijlN/1JqtykcuzB86r/OCx39XNlQgJbVsri2311nHvY3fAkhyyPC +cKcOJZjm/4nRnxBazC0/DLNfKSgOE4a29kxO8i4eHyDQzoz/siSb2aITcCAwEAAQ== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :rsassaPss 13:d=1 hl=2 l= 0 cons: SEQUENCE - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCjAA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -36,13 +29,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAJB0MI+1mOlwGyKUOI5S+XH6rCtgpRRa8YXfUoe17SiH5Xzn/UTchjTkB8jg5DYLwibz7CJ /nZ5UY46NMfUFEhXfbrucL5V5qndZijj5FLW5wb2DxOL584Kg0Ko1Qv/uZZhKYBvGnrKN6yfcoS yCwtTD9mzVAPH/K5lNik4wy7M8 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-with-null-params.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-with-null-params.pem index 222614b..42e9546 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-with-null-params.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20-using-pss-key-with-null-params.pem @@ -4,32 +4,25 @@ to rsaPss (1.2.840.113549.1.1.10). Note that the PSS parameters have been encoded as NULL which is incorrect. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBCgUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsassaPss 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCjAA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBCgUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :rsassaPss 13:d=1 hl=2 l= 0 cons: SEQUENCE - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCjAA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -38,13 +31,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAJB0MI+1mOlwGyKUOI5S+XH6rCtgpRRa8YXfUoe17SiH5Xzn/UTchjTkB8jg5DYLwibz7CJ /nZ5UY46NMfUFEhXfbrucL5V5qndZijj5FLW5wb2DxOL584Kg0Ko1Qv/uZZhKYBvGnrKN6yfcoS yCwtTD9mzVAPH/K5lNik4wy7M8 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20.pem index e56f0fe..4f7a81c 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha1-salt20.pem @@ -7,32 +7,25 @@ It uses an RSA key with modulus length of 1024 bits, PSS padding, SHA-1 as the digest, MGF1 with SHA-1, and salt length of 20. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCjAA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :rsassaPss 13:d=1 hl=2 l= 0 cons: SEQUENCE - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCjAA +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -41,13 +34,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAJB0MI+1mOlwGyKUOI5S+XH6rCtgpRRa8YXfUoe17SiH5Xzn/UTchjTkB8jg5DYLwibz7CJ /nZ5UY46NMfUFEhXfbrucL5V5qndZijj5FLW5wb2DxOL584Kg0Ko1Qv/uZZhKYBvGnrKN6yfcoS yCwtTD9mzVAPH/K5lNik4wy7M8 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha1-wrong-salt.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha1-wrong-salt.pem index 57ec775..ffa9d52 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha1-wrong-salt.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha1-wrong-salt.pem @@ -3,25 +3,17 @@ have a salt of 23. When verified using this algorithm it will fail, however if the default salt of 20 were used it would succeed. - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MBIGCSqGSIb3DQEBCjAFogMCARc= ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 18 cons: SEQUENCE @@ -29,8 +21,9 @@ $ openssl asn1parse -i < [ALGORITHM] 13:d=1 hl=2 l= 5 cons: SEQUENCE 15:d=2 hl=2 l= 3 cons: cont [ 2 ] 17:d=3 hl=2 l= 1 prim: INTEGER :17 - - +-----BEGIN ALGORITHM----- +MBIGCSqGSIb3DQEBCjAFogMCARc= +-----END ALGORITHM----- -----BEGIN DATA----- zch9oiPXht87ReC7vHITJtHuKvgGzDFUdcxvDZxm4bYjcdRc4jkuGskoRMMQEC8Vag2NUsH0xAu @@ -39,13 +32,10 @@ vr538Gznjgj0CY+6QfnWGTwDF+i2DUtghKy0LSnjgIo7w3LYXjMRcPy/fMctC3HClmSLOk0Q9BY pXQgHqmJcqydE/Z6o/SI8QlNwKYKL0WvgJUbxMP0uM7k20mduCK7RtzMYt1CgFn0A== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAJB0MI+1mOlwGyKUOI5S+XH6rCtgpRRa8YXfUoe17SiH5Xzn/UTchjTkB8jg5DYLwibz7CJ /nZ5UY46NMfUFEhXfbrucL5V5qndZijj5FLW5wb2DxOL584Kg0Ko1Qv/uZZhKYBvGnrKN6yfcoS yCwtTD9mzVAPH/K5lNik4wy7M8 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha256-mgf1-sha512-salt33.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha256-mgf1-sha512-salt33.pem index f3b9dcb..b322226 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha256-mgf1-sha512-salt33.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha256-mgf1-sha512-salt33.pem @@ -11,26 +11,17 @@ It constructs an RSASSA-PSS signature using: * Mask gen function of MGF1 with SHA-512 - ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH -mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL -I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 159 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 141 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU -DBAIDBQCiAwIBIQ== ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClbkoOcBAXWJpRh9x+qEHRVvLsDjatUqRN/rH +mH3rZkdjFEFb/7bFitMDyg6EqiKOU3/Umq3KRy7MHzqv84LHf1c2VCAltWyuLbfXWce9jd8CSHL +I8Jwpw4lmOb/idGfEFrMLT8Ms18pKA4Thrb2TE7yLh4fINDOjP+yJJvZohNwIDAQAB +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 65 cons: SEQUENCE @@ -48,20 +39,19 @@ $ openssl asn1parse -i < [ALGORITHM] 60:d=5 hl=2 l= 0 prim: NULL 62:d=2 hl=2 l= 3 cons: cont [ 2 ] 64:d=3 hl=2 l= 1 prim: INTEGER :21 - - +-----BEGIN ALGORITHM----- +MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU +DBAIDBQCiAwIBIQ== +-----END ALGORITHM----- -----BEGIN DATA----- VGVzdCBtZXNzYWdlIHRvIGJlIHNpZ25lZC4uLg== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBAFob0HSC5uuTqKu4J/lj+5bDa+Hhij4H3klWnvt6Yc+wwPza7/UC4lgGGyvZqD32RUEdt7v Z14qqYNk53b5aj4C2gBMvLzV7Pay4mmQM4DSWa5JHMxTILqE3DDqihrbMcBw2q3XAsLcjeqLWQ9 yp8tfnV21h98qsCLtErrxZWHRr -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-params.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-params.pem index e0140b3..62da07a 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-params.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-params.pem @@ -3,14 +3,6 @@ the SPKI using rsaEncryption it is specified using rsaPss along with parameters that match those of the signature algorithm. - ------BEGIN PUBLIC KEY----- -MIHRMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZ -IAWUDBAIBBQCiAwIBCgOBiwAwgYcCgYEAvkmbXn8GyD+gKT4xRlyOtrWK+SC65Sp7W5v+t6py2x -JkES6z/UMdMaKn5QlBVmkpSUoOiR7VYTkYtLUbDR+5d4Oyas99DzhM+zX00oJPXdOAYjomvxgLY -5YcYZ3NsgyuQG8i9uJ2yAo3JZSQz+tywacahPGEbTMId7o+MQHsnHsCARE= ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 209 cons: SEQUENCE 3:d=1 hl=2 l= 65 cons: SEQUENCE @@ -29,13 +21,12 @@ $ openssl asn1parse -i < [PUBLIC KEY] 65:d=3 hl=2 l= 3 cons: cont [ 2 ] 67:d=4 hl=2 l= 1 prim: INTEGER :0A 70:d=1 hl=3 l= 139 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU -DBAIBBQCiAwIBCg== ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIHRMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZ +IAWUDBAIBBQCiAwIBCgOBiwAwgYcCgYEAvkmbXn8GyD+gKT4xRlyOtrWK+SC65Sp7W5v+t6py2x +JkES6z/UMdMaKn5QlBVmkpSUoOiR7VYTkYtLUbDR+5d4Oyas99DzhM+zX00oJPXdOAYjomvxgLY +5YcYZ3NsgyuQG8i9uJ2yAo3JZSQz+tywacahPGEbTMId7o+MQHsnHsCARE= +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 65 cons: SEQUENCE @@ -53,8 +44,10 @@ $ openssl asn1parse -i < [ALGORITHM] 60:d=5 hl=2 l= 0 prim: NULL 62:d=2 hl=2 l= 3 cons: cont [ 2 ] 64:d=3 hl=2 l= 1 prim: INTEGER :0A - - +-----BEGIN ALGORITHM----- +MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU +DBAIBBQCiAwIBCg== +-----END ALGORITHM----- -----BEGIN DATA----- x/UnD8pyX5vRn1GajXzKPMXAeQJAKfO65RD5sCFA/iOJCOT2wY8HqJxofIaEZpsfHbK6+SUaPIK @@ -62,13 +55,10 @@ frMtJMIThbsnijViGgHSl1iIWZ91uUo0W/iyfPbTPr2xNzoyEOa84zqqqnOLsrnvI9KWlXjv5bf nNV1xPnLMnlRuM3+QIcWg= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBABHhafL9QLB2Qbl2iiqxmWX7bCfxD88DI/zG0S608cBrMw3aoepQRAevop3p6+A3T+nR59D /vV/Bzzo0RuQUVBXSqyT3ibNGTFxDola7wdaSz38EgB2sW7QBpKA6t9VyioYMGeGk3Hl8pULIID zsLmAesMUfVn8u2gIrC5693u76 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-wrong-params.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-wrong-params.pem index 646ac1f..9b2b679 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-wrong-params.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10-using-pss-key-with-wrong-params.pem @@ -3,14 +3,6 @@ except the hash in the PSS key's parameters has been changed from SHA-256 to SHA-384. - ------BEGIN PUBLIC KEY----- -MIHRMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAICBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZ -IAWUDBAIBBQCiAwIBCgOBiwAwgYcCgYEAvkmbXn8GyD+gKT4xRlyOtrWK+SC65Sp7W5v+t6py2x -JkES6z/UMdMaKn5QlBVmkpSUoOiR7VYTkYtLUbDR+5d4Oyas99DzhM+zX00oJPXdOAYjomvxgLY -5YcYZ3NsgyuQG8i9uJ2yAo3JZSQz+tywacahPGEbTMId7o+MQHsnHsCARE= ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 209 cons: SEQUENCE 3:d=1 hl=2 l= 65 cons: SEQUENCE @@ -29,13 +21,12 @@ $ openssl asn1parse -i < [PUBLIC KEY] 65:d=3 hl=2 l= 3 cons: cont [ 2 ] 67:d=4 hl=2 l= 1 prim: INTEGER :0A 70:d=1 hl=3 l= 139 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU -DBAIBBQCiAwIBCg== ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIHRMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAICBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZ +IAWUDBAIBBQCiAwIBCgOBiwAwgYcCgYEAvkmbXn8GyD+gKT4xRlyOtrWK+SC65Sp7W5v+t6py2x +JkES6z/UMdMaKn5QlBVmkpSUoOiR7VYTkYtLUbDR+5d4Oyas99DzhM+zX00oJPXdOAYjomvxgLY +5YcYZ3NsgyuQG8i9uJ2yAo3JZSQz+tywacahPGEbTMId7o+MQHsnHsCARE= +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 65 cons: SEQUENCE @@ -53,8 +44,10 @@ $ openssl asn1parse -i < [ALGORITHM] 60:d=5 hl=2 l= 0 prim: NULL 62:d=2 hl=2 l= 3 cons: cont [ 2 ] 64:d=3 hl=2 l= 1 prim: INTEGER :0A - - +-----BEGIN ALGORITHM----- +MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU +DBAIBBQCiAwIBCg== +-----END ALGORITHM----- -----BEGIN DATA----- x/UnD8pyX5vRn1GajXzKPMXAeQJAKfO65RD5sCFA/iOJCOT2wY8HqJxofIaEZpsfHbK6+SUaPIK @@ -62,13 +55,10 @@ frMtJMIThbsnijViGgHSl1iIWZ91uUo0W/iyfPbTPr2xNzoyEOa84zqqqnOLsrnvI9KWlXjv5bf nNV1xPnLMnlRuM3+QIcWg= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBABHhafL9QLB2Qbl2iiqxmWX7bCfxD88DI/zG0S608cBrMw3aoepQRAevop3p6+A3T+nR59D /vV/Bzzo0RuQUVBXSqyT3ibNGTFxDola7wdaSz38EgB2sW7QBpKA6t9VyioYMGeGk3Hl8pULIID zsLmAesMUfVn8u2gIrC5693u76 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10.pem b/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10.pem index fc37f41..72d729a 100644 --- a/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10.pem +++ b/net/data/verify_signed_data_unittest/rsa-pss-sha256-salt10.pem @@ -7,26 +7,17 @@ It uses an RSA key with modulus length of 1024 bits, PSS padding, SHA-256 as the digest, MGF1 with SHA-256, and salt length of 10. - ------BEGIN PUBLIC KEY----- -MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC+SZtefwbIP6ApPjFGXI62tYr5ILrlKntbm/6 -3qnLbEmQRLrP9Qx0xoqflCUFWaSlJSg6JHtVhORi0tRsNH7l3g7Jqz30POEz7NfTSgk9d04BiOi -a/GAtjlhxhnc2yDK5AbyL24nbICjcllJDP63LBpxqE8YRtMwh3uj4xAeycewIBEQ== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=3 l= 157 cons: SEQUENCE 3:d=1 hl=2 l= 13 cons: SEQUENCE 5:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption 16:d=2 hl=2 l= 0 prim: NULL 18:d=1 hl=3 l= 139 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU -DBAIBBQCiAwIBCg== ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC+SZtefwbIP6ApPjFGXI62tYr5ILrlKntbm/6 +3qnLbEmQRLrP9Qx0xoqflCUFWaSlJSg6JHtVhORi0tRsNH7l3g7Jqz30POEz7NfTSgk9d04BiOi +a/GAtjlhxhnc2yDK5AbyL24nbICjcllJDP63LBpxqE8YRtMwh3uj4xAeycewIBEQ== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 65 cons: SEQUENCE @@ -44,8 +35,10 @@ $ openssl asn1parse -i < [ALGORITHM] 60:d=5 hl=2 l= 0 prim: NULL 62:d=2 hl=2 l= 3 cons: cont [ 2 ] 64:d=3 hl=2 l= 1 prim: INTEGER :0A - - +-----BEGIN ALGORITHM----- +MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWU +DBAIBBQCiAwIBCg== +-----END ALGORITHM----- -----BEGIN DATA----- x/UnD8pyX5vRn1GajXzKPMXAeQJAKfO65RD5sCFA/iOJCOT2wY8HqJxofIaEZpsfHbK6+SUaPIK @@ -53,13 +46,10 @@ frMtJMIThbsnijViGgHSl1iIWZ91uUo0W/iyfPbTPr2xNzoyEOa84zqqqnOLsrnvI9KWlXjv5bf nNV1xPnLMnlRuM3+QIcWg= -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBABHhafL9QLB2Qbl2iiqxmWX7bCfxD88DI/zG0S608cBrMw3aoepQRAevop3p6+A3T+nR59D /vV/Bzzo0RuQUVBXSqyT3ibNGTFxDola7wdaSz38EgB2sW7QBpKA6t9VyioYMGeGk3Hl8pULIID zsLmAesMUfVn8u2gIrC5693u76 -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa-using-ec-key.pem b/net/data/verify_signed_data_unittest/rsa-using-ec-key.pem index b9a3777..b39b0be 100644 --- a/net/data/verify_signed_data_unittest/rsa-using-ec-key.pem +++ b/net/data/verify_signed_data_unittest/rsa-using-ec-key.pem @@ -2,31 +2,24 @@ This test specifies an RSA PKCS#1 v1.5 signature algorithm (and a valid RSA signature), HOWEVER it provides an EC key. Verification should fail. - ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS -o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== ------END PUBLIC KEY----- - $ openssl asn1parse -i < [PUBLIC KEY] 0:d=0 hl=2 l= 89 cons: SEQUENCE 2:d=1 hl=2 l= 19 cons: SEQUENCE 4:d=2 hl=2 l= 7 prim: OBJECT :id-ecPublicKey 13:d=2 hl=2 l= 8 prim: OBJECT :prime256v1 23:d=1 hl=2 l= 66 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBCwUA ------END ALGORITHM----- +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnLDPaTA9r8dh1ORoe07PA55tNKuWSvgIENjVWKS +o1vctUSM6F4iSCobuCKGWLHnvoxf7eHnil9rSFG25lfoceA== +-----END PUBLIC KEY----- $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBCwUA +-----END ALGORITHM----- -----BEGIN DATA----- MIIB46ADAgECAgkA3l4tFOVii0UwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCQVUxEzARBgN @@ -40,13 +33,10 @@ cn318EhhQIDAQABo1AwTjAdBgNVHQ4EFgQUzQBVKTEknyLndWd2HTsBdTKvyikwHwYDVR0jBBgw FoAUzQBVKTEknyLndWd2HTsBdTKvyikwDAYDVR0TBAUwAwEB/w== -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=3 l= 129 prim: BIT STRING -----BEGIN SIGNATURE----- A4GBADrHSmFSJw/Gv7hs5PNzpaJwAri/sitarIZfzN/SjR+n8L8yeTEoiDb1+BkxlFvXvPHTaOK oO3WlslNNOxh1W5/JkYYGOUkCcyIjnln6qS560imcr3VNjomT/M8M2Iss+rJiKau1TRuaP7H8i6 +Gqf3saGdr8/LnvFAdNQvkalQt -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=3 l= 129 prim: BIT STRING diff --git a/net/data/verify_signed_data_unittest/rsa2048-pkcs1-sha512.pem b/net/data/verify_signed_data_unittest/rsa2048-pkcs1-sha512.pem index 342a31b..4ebb23a 100644 --- a/net/data/verify_signed_data_unittest/rsa2048-pkcs1-sha512.pem +++ b/net/data/verify_signed_data_unittest/rsa2048-pkcs1-sha512.pem @@ -35,7 +35,12 @@ It uses RSA PKCS#1 v1.5 with SHA-512 and a 2048-bit key. base64 sig - +$ openssl asn1parse -i < [PUBLIC KEY] + 0:d=0 hl=4 l= 290 cons: SEQUENCE + 4:d=1 hl=2 l= 13 cons: SEQUENCE + 6:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption + 17:d=2 hl=2 l= 0 prim: NULL + 19:d=1 hl=4 l= 271 prim: BIT STRING -----BEGIN PUBLIC KEY----- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcu2shJRrXFAwMkf30y2AY1zIg9VF/h egYcejzdR2AzUb8vU2TXld2i8pp44l+DrvtqmzS7G+yxx3uOx+zsoqBaUT0c9HfkbE+IRmcLkQF @@ -45,25 +50,13 @@ ueMVPuNncqbT4nAMKz25J1CtRlQh21uZzfY2QRP3m6rAZquQUos1febC6A7qmhQljWKKmXtfVY+ fAamstdHrWwIDAQAB -----END PUBLIC KEY----- -$ openssl asn1parse -i < [PUBLIC KEY] - 0:d=0 hl=4 l= 290 cons: SEQUENCE - 4:d=1 hl=2 l= 13 cons: SEQUENCE - 6:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption - 17:d=2 hl=2 l= 0 prim: NULL - 19:d=1 hl=4 l= 271 prim: BIT STRING - - - ------BEGIN ALGORITHM----- -MA0GCSqGSIb3DQEBDQUA ------END ALGORITHM----- - $ openssl asn1parse -i < [ALGORITHM] 0:d=0 hl=2 l= 13 cons: SEQUENCE 2:d=1 hl=2 l= 9 prim: OBJECT :sha512WithRSAEncryption 13:d=1 hl=2 l= 0 prim: NULL - - +-----BEGIN ALGORITHM----- +MA0GCSqGSIb3DQEBDQUA +-----END ALGORITHM----- -----BEGIN DATA----- MIICRaADAgECAgkA7jWRLkwHvHswDQYJKoZIhvcNAQENBQAwRTELMAkGA1UEBhMCQVUxEzARBgN @@ -79,8 +72,8 @@ OMB0GA1UdDgQWBBRsCPajkEscZM6SpLbNTa/7dY5azzAfBgNVHSMEGDAWgBRsCPajkEscZM6SpL bNTa/7dY5azzAMBgNVHRMEBTADAQH/ -----END DATA----- - - +$ openssl asn1parse -i < [SIGNATURE] + 0:d=0 hl=4 l= 257 prim: BIT STRING -----BEGIN SIGNATURE----- A4IBAQAhKSNq+X/CfzhtNsMo6MJpTBjJBV5fhHerIZr6e3ozCTBCR29vYsVnJ4/6i5lL1pNeOhM ldthnuSlMzTS1Zme1OqRWB3U8QmwCFwhDxW/i4fdT8kxDAmELNp4z0GcXbe27V895PE0R/m8P47 @@ -88,6 +81,3 @@ B6xbra+SQlEMW12K1EndUqrO6vgLbobV14mveWdgc0KIOnDKgsTHV8NTV1w3qtp1ujfvizYfBZu yyMOA1yZPDpREZtClro7lufwDQ7+LgSdtNLMDAMzapfIjAEPVNVLmJzMgzaHqMsZM8gP8vWAdfc R4mCmWXVotrM6d1rjJGdRADAONYCC4/+d1IMkVGoVfpaej6I -----END SIGNATURE----- - -$ openssl asn1parse -i < [SIGNATURE] - 0:d=0 hl=4 l= 257 prim: BIT STRING |