Do not use HMAC_Init

Replace remaining use of HMAC_Init with HMAC_Init_ex to silence
deprecation warnings with OpenSSL 1.1.

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
index 74892b3ba3f80f12f315fbe92d256672859dfdb8..4b19cbbb4d11b51ef9a80f8d2263a32d2d397516 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
@@ -45,7 +45,7 @@ static void H_Init(HMAC_CTX *ctx)
        uint8_t allzero[SHA256_DIGEST_LENGTH];
 
        memset(allzero, 0, SHA256_DIGEST_LENGTH);
-       HMAC_Init(ctx, allzero, SHA256_DIGEST_LENGTH, EVP_sha256());
+       HMAC_Init_ex(ctx, allzero, SHA256_DIGEST_LENGTH, EVP_sha256(), NULL);
 }
 
 static void H_Update(HMAC_CTX *ctx, uint8_t const *data, int len)
@@ -76,7 +76,7 @@ static void eap_pwd_kdf(uint8_t *key, int keylen, char const *label, int labelle
        L = htons(resultbitlen);
        while (len < resultbytelen) {
                ctr++; i = htons(ctr);
-               HMAC_Init(&hctx, key, keylen, EVP_sha256());
+               HMAC_Init_ex(&hctx, key, keylen, EVP_sha256(), NULL);
                if (ctr > 1) {
                        HMAC_Update(&hctx, digest, mdlen);
                }

diff --git a/src/modules/rlm_otp/otp_radstate.c b/src/modules/rlm_otp/otp_radstate.c
index afde5945dfd0d60ddf7160384f4099b11aef1965..66fd8b4987c0353e5679da23efc31595aa7017db 100644 (file)
--- a/src/modules/rlm_otp/otp_radstate.c
+++ b/src/modules/rlm_otp/otp_radstate.c
@@ -121,7 +121,7 @@ size_t otp_gen_state(char state[OTP_MAX_RADSTATE_LEN],
         *      contiguous piece.
         */
        hmac_ctx = HMAC_CTX_new();
-       HMAC_Init(hmac_ctx, key, sizeof(key[0]) * 16, EVP_md5());
+       HMAC_Init_ex(hmac_ctx, key, sizeof(key[0]) * 16, EVP_md5(), NULL);
        HMAC_Update(hmac_ctx, (uint8_t const *) challenge, clen);
        HMAC_Update(hmac_ctx, (uint8_t *) &flags, 4);
        HMAC_Update(hmac_ctx, (uint8_t *) &when, 4);