Merge pull request #461 from ellert/crl-fix

Fix hash-algorithm detection bug
xrootd · Feb 10, 2017 · c4577aa · c4577aa
2 parents c07a51d + be89136
commit c4577aa
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/XrdSecgsi/XrdSecProtocolgsi.cc b/src/XrdSecgsi/XrdSecProtocolgsi.cc
@@ -3946,12 +3946,15 @@ XrdCryptoX509Crl *XrdSecProtocolgsi::LoadCRL(XrdCryptoX509 *xca, const char *sub
       return crl;
    }
 
+   String caroot(subjhash);
+   if (caroot.endswith(".0"))
+     caroot.erase(caroot.length() - 2, 2);
+
    // Get the CA hash
-   String cahash(subjhash);
    int hashalg = 0;
-   if (strcmp(subjhash, xca->SubjectHash())) hashalg = 1;
-   // Drop the extension (".0")
-   String caroot(cahash, 0, cahash.find(".0")-1);
+   if (strcmp(caroot.c_str(), xca->SubjectHash())) hashalg = 1;
+
+   String cahash = caroot + ".0";
 
    // The dir
    String crlext = XrdSecProtocolgsi::DefCRLext;