Merge pull request #224 from jtesta/selfsigned_fix

rbsec · web-flow · commit 2cddafc5e976 · 2020-10-31T14:32:37.000Z
Fix some self-signed certificates not being displayed in red.
diff --git a/docker_test/expected_output/test_1.txt b/docker_test/expected_output/test_1.txt
@@ -120,6 +120,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    2048
 
 Subject:  whythefuckwasibreached.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 03:01:23 2019 GMT[0m
 Not valid after:  [32mDec  3 03:01:23 2029 GMT[0m
diff --git a/docker_test/expected_output/test_11.txt b/docker_test/expected_output/test_11.txt
@@ -9,7 +9,7 @@ SSLv3     [32mdisabled[0m
 TLSv1.0   [33menabled[0m
 TLSv1.1   enabled
 TLSv1.2   enabled
-TLSv1.3   [33mdisabled[0m
+TLSv1.3   [32menabled[0m
 
   [1;34mOCSP Stapling Request:[0m
 OCSP Response Status: successful (0x0)
diff --git a/docker_test/expected_output/test_12.txt b/docker_test/expected_output/test_12.txt
@@ -57,6 +57,6 @@ Signature Algorithm: [31mmd5WithRSAEncryption[0m
 RSA Key Strength:    [31m512[0m
 
 Subject:  geocities.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec 13 03:56:22 2019 GMT[0m
 Not valid after:  [32mDec 13 03:56:22 2029 GMT[0m
diff --git a/docker_test/expected_output/test_13.txt b/docker_test/expected_output/test_13.txt
@@ -88,6 +88,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    3072
 
 Subject:  lmgtfy.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 04:07:43 2019 GMT[0m
 Not valid after:  [32mDec  3 04:07:43 2029 GMT[0m
diff --git a/docker_test/expected_output/test_14.txt b/docker_test/expected_output/test_14.txt
@@ -64,6 +64,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    3072
 
 Subject:  lmgtfy.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 04:07:43 2019 GMT[0m
 Not valid after:  [32mDec  3 04:07:43 2029 GMT[0m
diff --git a/docker_test/expected_output/test_15.txt b/docker_test/expected_output/test_15.txt
@@ -71,6 +71,6 @@ ECC Curve Name:      prime256v1
 ECC Key Strength:    128[0m
 
 Subject:  itspeanutbutterjellytime.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec 22 19:01:56 2019 GMT[0m
 Not valid after:  [32mDec 22 19:01:56 2029 GMT[0m
diff --git a/docker_test/expected_output/test_16.txt b/docker_test/expected_output/test_16.txt
@@ -72,6 +72,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    [31m1024[0m
 
 Subject:  howfuckedismydatabase.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 03:56:52 2019 GMT[0m
 Not valid after:  [32mDec  3 03:56:52 2029 GMT[0m
diff --git a/docker_test/expected_output/test_17.txt b/docker_test/expected_output/test_17.txt
@@ -55,6 +55,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    [31m1024[0m
 
 Subject:  howfuckedismydatabase.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 03:56:52 2019 GMT[0m
 Not valid after:  [32mDec  3 03:56:52 2029 GMT[0m
diff --git a/docker_test/expected_output/test_18.txt b/docker_test/expected_output/test_18.txt
@@ -43,6 +43,6 @@ ECC Curve Name:      prime256v1
 ECC Key Strength:    128[0m
 
 Subject:  itspeanutbutterjellytime.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec 22 19:01:56 2019 GMT[0m
 Not valid after:  [32mDec 22 19:01:56 2029 GMT[0m
diff --git a/docker_test/expected_output/test_4.txt b/docker_test/expected_output/test_4.txt
@@ -93,6 +93,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    3072
 
 Subject:  lmgtfy.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 04:07:43 2019 GMT[0m
 Not valid after:  [32mDec  3 04:07:43 2029 GMT[0m
diff --git a/docker_test/expected_output/test_5.txt b/docker_test/expected_output/test_5.txt
@@ -175,6 +175,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    [31m1024[0m
 
 Subject:  howfuckedismydatabase.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 03:56:52 2019 GMT[0m
 Not valid after:  [32mDec  3 03:56:52 2029 GMT[0m
diff --git a/docker_test/expected_output/test_6.txt b/docker_test/expected_output/test_6.txt
@@ -47,6 +47,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    3072
 
 Subject:  lmgtfy.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 04:07:43 2019 GMT[0m
 Not valid after:  [32mDec  3 04:07:43 2029 GMT[0m
diff --git a/docker_test/expected_output/test_7.txt b/docker_test/expected_output/test_7.txt
@@ -57,6 +57,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    3072
 
 Subject:  lmgtfy.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 04:07:43 2019 GMT[0m
 Not valid after:  [32mDec  3 04:07:43 2029 GMT[0m
diff --git a/docker_test/expected_output/test_8.txt b/docker_test/expected_output/test_8.txt
@@ -79,6 +79,6 @@ Signature Algorithm: [32msha256WithRSAEncryption[0m
 RSA Key Strength:    3072
 
 Subject:  lmgtfy.com
-Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
+Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 04:07:43 2019 GMT[0m
 Not valid after:  [32mDec  3 04:07:43 2029 GMT[0m
diff --git a/sslscan.c b/sslscan.c
@@ -2083,9 +2083,12 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
                                     if (cnindex == -1)
                                     {
                                         char *issuer = X509_NAME_oneline(X509_get_issuer_name(x509Cert), NULL, 0);
-                                        printf("Issuer:   %s", issuer);
-                                    printf_xml("   <issuer><![CDATA[%s]]></issuer>\n", issuer);
+                                        char *color = "";
 
+                                        if ((subject != NULL) && (strcmp(subject, issuer) == 0))
+                                            color = COL_RED;
+                                        printf("%sIssuer:   %s%s", color, issuer, RESET);
+                                        printf_xml("   <issuer><![CDATA[%s]]></issuer>\n", issuer);
                                     }
                                     else
                                     {

-Original file line number
+Diff line change
 RSA Key Strength:    2048
 Subject:  whythefuckwasibreached.com
 -Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere
 +Issuer:   /C=XX/ST=Nowhere in particular/L=Nowhere[0m
 Not valid before: [32mDec  3 03:01:23 2019 GMT[0m
 Not valid after:  [32mDec  3 03:01:23 2029 GMT[0m