Skip to content

Commit

Permalink
We don't want depend on spacing around equal sign
Browse files Browse the repository at this point in the history 
...in DN output
  • Loading branch information
@beldmit
beldmit committed Sep 16, 2021
1 parent 65d9677 commit 9869058
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions tcl_tests/ca.try
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ test -createsfiles test.crl "Generating CRL" {


test -skip {![file exists test.crl]} "Displaying CRL" {
grep "(Serial|Version|Signature Alg|Issuer)" [openssl "crl -text -noout -in test.crl"]
regsub -all " = " [grep "(Serial|Version|Signature Alg|Issuer)" [openssl "crl -text -noout -in test.crl"] ] "="
} 0 " Version 2 (0x1)
Signature Algorithm: [hash_with_sign_long_name $ca_alg]
Issuer: C = RU, L = Moscow, CN = Test CA $ca_alg, O = Cryptocom, OU = OpenSSL CA, emailAddress = [email protected]
Issuer: C=RU, L=Moscow, CN=Test CA $ca_alg, O=Cryptocom, OU=OpenSSL CA, emailAddress=[email protected]
$serial_list Signature Algorithm: [hash_with_sign_long_name $ca_alg]
"

Expand Down
24 changes: 12 additions & 12 deletions tcl_tests/cms2.try
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

test -createsfiles cms_signed2_1_$length\_op.msg "Signing opaque in S/MIME format with 1st signature" {
Expand Down Expand Up @@ -79,11 +79,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

test -createsfiles cms_signed2_1_$length\_det.asn "Signing detached in DER format with 1st signature" {
Expand Down Expand Up @@ -113,11 +113,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert_asn[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert_asn$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

test -createsfiles cms_signed2_1_$length.msg "Signing in S/MIME format with 1st signature" {
Expand Down Expand Up @@ -146,11 +146,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert_cms[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert_cms$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

}
Expand Down
24 changes: 12 additions & 12 deletions tcl_tests/smime2.try
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

test -createsfiles signed2_1_$length\_op.msg "Signing opaque in S/MIME format with 1st signature" {
Expand Down Expand Up @@ -79,11 +79,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

test -createsfiles signed2_1_$length\_det.asn "Signing detached in DER format with 1st signature" {
Expand Down Expand Up @@ -113,11 +113,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert_asn[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert_asn$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

test -createsfiles signed2_1_$length.msg "Signing in S/MIME format with 1st signature" {
Expand Down Expand Up @@ -146,11 +146,11 @@ test "Extracting signer certificates" {
set certs [regexp -all -inline -- {-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----} [getFile signer.certs]]
foreach cert $certs {
makeFile cert_smime[incr i].pem $cert
lappend subjs [grep subject [openssl "x509 -in cert_smime$i.pem -subject -noout"]]
lappend subjs [regsub -all " = " [grep subject [openssl "x509 -in cert$i.pem -subject -noout"]] "=" ]
}
lsort $subjs
} 0 "{subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER1_$length, emailAddress = [email protected]
} {subject=C = RU, O = Cryptocom, OU = OpenSSL Team, CN = USER2_$length, emailAddress = [email protected]
} 0 "{subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER1_$length, emailAddress=[email protected]
} {subject=C=RU, O=Cryptocom, OU=OpenSSL Team, CN=USER2_$length, emailAddress=[email protected]
}"

}
Expand Down

0 comments on commit 9869058

Please sign in to comment.