Treat empty cert hash as NULL (LP: #917956)

[mech_eap.git] / mech_eap / util_moonshot.c

diff --git a/mech_eap/util_moonshot.c b/mech_eap/util_moonshot.c
index 75db452..cf64083 100644 (file)
--- a/mech_eap/util_moonshot.c
+++ b/mech_eap/util_moonshot.c
@@ -41,7 +41,7 @@ libMoonshotMapError(OM_uint32 *minor,
 {
     MoonshotError *error = *pError;
 
-    assert(error != NULL);
+    GSSEAP_ASSERT(error != NULL);
 
     switch (error->code) {
     case MOONSHOT_ERROR_UNABLE_TO_START_SERVICE:
@@ -194,7 +194,8 @@ libMoonshotResolveInitiatorCred(OM_uint32 *minor,
     gss_release_buffer(&tmpMinor, &cred->subjectNameConstraint);
     gss_release_buffer(&tmpMinor, &cred->subjectAltNameConstraint);
 
-    if (serverCertificateHash != NULL) {
+    if ((serverCertificateHash != NULL)
+       && (strlen(serverCertificateHash) > 0)) {
         size_t len = strlen(serverCertificateHash);
 
         #define HASH_PREFIX             "hash://server/sha256/"