From: Herwin Weststrate <herwin@snt.utwente.nl>
Date: Fri, 2 Nov 2018 17:24:08 +0000 (+0100)
Subject: Compile fixes for HAVE_EVP_SHA3_512
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e6d49adb3fbd747c7d3aaf06a2bc5802727d35f;p=thirdparty%2Ffreeradius-server.git

Compile fixes for HAVE_EVP_SHA3_512
---

diff --git a/src/lib/server/xlat_func.c b/src/lib/server/xlat_func.c
index 5519f88e8c0..c95a70b6e71 100644
--- a/src/lib/server/xlat_func.c
+++ b/src/lib/server/xlat_func.c
@@ -2638,7 +2638,7 @@ int xlat_init(void)
 	xlat_register(NULL, "sha3_224", sha3_224_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);
 	xlat_register(NULL, "sha3_256", sha3_256_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);
 	xlat_register(NULL, "sha3_384", sha3_384_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);
-	xlat_register(NULL, "sha3_512", sha3_512_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);#  endif
+	xlat_register(NULL, "sha3_512", sha3_512_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);
 #  endif
 #endif
 	xlat_register(NULL, "hmacmd5", hmac_md5_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);
diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index 54b125336b6..20d562518da 100644
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -552,7 +552,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, UNUSED void *t
 		else if (vp->da == attr_sha3_password) {
 			if (inst->normify) normify(request, vp, 28); /* ensure it's in the right format */
 			found_pw = true;
-		} else if (vp->da == attr_ssha3_224_password) {}
+		} else if (vp->da == attr_ssha3_224_password) {
 			if (inst->normify) normify(request, vp, 28); /* ensure it's in the right format */
 			found_pw = true;
 		} else if (vp->da == attr_ssha3_256_password) {
@@ -860,7 +860,6 @@ static rlm_rcode_t CC_HINT(nonnull) pap_auth_sha_evp(rlm_pap_t const *inst, REQU
 				vp->vp_length);
 			return RLM_MODULE_INVALID;
 		}
-		break;
 	}
 #  endif
 	else {