Compile fixes for HAVE_EVP_SHA3_512

diff --git a/src/lib/server/xlat_func.c b/src/lib/server/xlat_func.c
index 5519f88e8c0975961e6ce5e459453f514991968d..c95a70b6e71468dee402d760b1dcea64f344e650 100644 (file)
--- 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 54b125336b6bd7bf7ac73c4043e7e33104ceda0b..20d562518da4576c40d4f85289432fa816605846 100644 (file)
--- 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 {