From 9d2dc5dd2469f7708ba176f2888720cf3fc3a3a3 Mon Sep 17 00:00:00 2001 From: Ryan Tandy Date: Sat, 22 Aug 2015 18:59:13 -0700 Subject: [PATCH] ITS#8198 use #elif instead of #else for gnutls cases Reserve #else for actual fallback cases. --- contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c b/contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c index 83559086a7..4d4813ee7d 100644 --- a/contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c +++ b/contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c @@ -152,7 +152,7 @@ static int pbkdf2_encrypt( int rc; #ifdef HAVE_OPENSSL const EVP_MD *md; -#else +#elif HAVE_GNUTLS struct hmac_sha1_ctx sha1_ctx; struct hmac_sha256_ctx sha256_ctx; struct hmac_sha512_ctx sha512_ctx; @@ -181,7 +181,7 @@ static int pbkdf2_encrypt( }else{ return LUTIL_PASSWD_ERR; } -#else +#elif HAVE_GNUTLS if(!ber_bvcmp(scheme, &pbkdf2_scheme)){ dk.bv_len = PBKDF2_SHA1_DK_SIZE; current_ctx = &sha1_ctx; @@ -221,7 +221,7 @@ static int pbkdf2_encrypt( iteration, md, dk.bv_len, dk_value)){ return LUTIL_PASSWD_ERR; } -#else +#elif HAVE_GNUTLS PBKDF2(current_ctx, current_hmac_update, current_hmac_digest, dk.bv_len, iteration, salt.bv_len, (const uint8_t *) salt.bv_val, @@ -275,7 +275,7 @@ static int pbkdf2_check( size_t dk_len; #ifdef HAVE_OPENSSL const EVP_MD *md; -#else +#elif HAVE_GNUTLS struct hmac_sha1_ctx sha1_ctx; struct hmac_sha256_ctx sha256_ctx; struct hmac_sha512_ctx sha512_ctx; @@ -306,7 +306,7 @@ static int pbkdf2_check( }else{ return LUTIL_PASSWD_ERR; } -#else +#elif HAVE_GNUTLS if(!ber_bvcmp(scheme, &pbkdf2_scheme)){ dk_len = PBKDF2_SHA1_DK_SIZE; current_ctx = &sha1_ctx; @@ -390,7 +390,7 @@ static int pbkdf2_check( iteration, md, dk_len, input_dk_value)){ return LUTIL_PASSWD_ERR; } -#else +#elif HAVE_GNUTLS PBKDF2(current_ctx, current_hmac_update, current_hmac_digest, dk_len, iteration, PBKDF2_SALT_SIZE, salt_value, -- 2.39.5