Display X509 fingerprint after hash (#2444)

Author: justsmth

tool-openssl/x509.cc

@@ -304,6 +304,14 @@ bool X509Tool(const args_list_t &args) {
       BIO_printf(output_bio.get(), "\n");
     }
 
+    if (subject_hash) {
+      BIO_printf(output_bio.get(), "%08x\n", X509_subject_name_hash(x509.get()));
+    }
+
+    if(subject_hash_old) {
+      BIO_printf(output_bio.get(), "%08x\n", X509_subject_name_hash_old(x509.get()));
+    }
+
     if (fingerprint) {
       unsigned int out_len;
       unsigned char md[EVP_MAX_MD_SIZE];
@@ -321,14 +329,6 @@ bool X509Tool(const args_list_t &args) {
       }
     }
 
-    if (subject_hash) {
-      BIO_printf(output_bio.get(), "%08x\n", X509_subject_name_hash(x509.get()));
-    }
-
-    if(subject_hash_old) {
-      BIO_printf(output_bio.get(), "%08x\n", X509_subject_name_hash_old(x509.get()));
-    }
-
     if (dates) {
       BIO_printf(output_bio.get(), "notBefore=");
       ASN1_TIME_print(output_bio.get(), X509_get_notBefore(x509.get()));

tool-openssl/x509_test.cc

@@ -474,6 +474,16 @@ TEST_F(X509ComparisonTest, X509ToolCompareFingerprintOpenSSL) {
   ASSERT_EQ(tool_output_str, openssl_output_str);
 }
 
+// Test against OpenSSL output "openssl x509 -in file -fingerprint -subject_hash -subject_hash_old"
+TEST_F(X509ComparisonTest, X509ToolCompareHashFingerprintOpenSSL) {
+  std::string tool_command = std::string(tool_executable_path)       + " x509 -subject_hash -fingerprint -noout -in " + in_path + " > " + out_path_tool;
+  std::string openssl_command = std::string(openssl_executable_path) + " x509 -subject_hash -fingerprint -noout -in " + in_path + " > " + out_path_openssl;
+
+  RunCommandsAndCompareOutput(tool_command, openssl_command, out_path_tool, out_path_openssl, tool_output_str, openssl_output_str);
+
+  ASSERT_EQ(tool_output_str, openssl_output_str);
+}
+
 // Test against OpenSSL output "openssl x509 -in file -noout -subject -fingerprint"
 TEST_F(X509ComparisonTest, X509ToolCompareSubjectFingerprintOpenSSL) {
   std::string tool_command = std::string(tool_executable_path) + " x509 -in " + in_path + " -noout -subject -fingerprint > " + out_path_tool;