mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#8198 use #elif instead of #else for gnutls cases

Browse Source 
Reserve #else for actual fallback cases.
This commit is contained in:
Ryan Tandy 2015-08-22 18:59:13 -07:00
parent 709a0f4a97
commit 9d2dc5dd24
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c
View File

@ -152,7 +152,7 @@ static int pbkdf2_encrypt(
int rc; int rc;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
const EVP_MD *md; const EVP_MD *md;
#else #elif HAVE_GNUTLS
struct hmac_sha1_ctx sha1_ctx; struct hmac_sha1_ctx sha1_ctx;
struct hmac_sha256_ctx sha256_ctx; struct hmac_sha256_ctx sha256_ctx;
struct hmac_sha512_ctx sha512_ctx; struct hmac_sha512_ctx sha512_ctx;
@ -181,7 +181,7 @@ static int pbkdf2_encrypt(
}else{ }else{
return LUTIL_PASSWD_ERR; return LUTIL_PASSWD_ERR;
} }
#else #elif HAVE_GNUTLS
if(!ber_bvcmp(scheme, &pbkdf2_scheme)){ if(!ber_bvcmp(scheme, &pbkdf2_scheme)){
dk.bv_len = PBKDF2_SHA1_DK_SIZE; dk.bv_len = PBKDF2_SHA1_DK_SIZE;
current_ctx = &sha1_ctx; current_ctx = &sha1_ctx;
@ -221,7 +221,7 @@ static int pbkdf2_encrypt(
iteration, md, dk.bv_len, dk_value)){ iteration, md, dk.bv_len, dk_value)){
return LUTIL_PASSWD_ERR; return LUTIL_PASSWD_ERR;
} }
#else #elif HAVE_GNUTLS
PBKDF2(current_ctx, current_hmac_update, current_hmac_digest, PBKDF2(current_ctx, current_hmac_update, current_hmac_digest,
dk.bv_len, iteration, dk.bv_len, iteration,
salt.bv_len, (const uint8_t *) salt.bv_val, salt.bv_len, (const uint8_t *) salt.bv_val,
@ -275,7 +275,7 @@ static int pbkdf2_check(
size_t dk_len; size_t dk_len;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
const EVP_MD *md; const EVP_MD *md;
#else #elif HAVE_GNUTLS
struct hmac_sha1_ctx sha1_ctx; struct hmac_sha1_ctx sha1_ctx;
struct hmac_sha256_ctx sha256_ctx; struct hmac_sha256_ctx sha256_ctx;
struct hmac_sha512_ctx sha512_ctx; struct hmac_sha512_ctx sha512_ctx;
@ -306,7 +306,7 @@ static int pbkdf2_check(
}else{ }else{
return LUTIL_PASSWD_ERR; return LUTIL_PASSWD_ERR;
} }
#else #elif HAVE_GNUTLS
if(!ber_bvcmp(scheme, &pbkdf2_scheme)){ if(!ber_bvcmp(scheme, &pbkdf2_scheme)){
dk_len = PBKDF2_SHA1_DK_SIZE; dk_len = PBKDF2_SHA1_DK_SIZE;
current_ctx = &sha1_ctx; current_ctx = &sha1_ctx;
@ -390,7 +390,7 @@ static int pbkdf2_check(
iteration, md, dk_len, input_dk_value)){ iteration, md, dk_len, input_dk_value)){
return LUTIL_PASSWD_ERR; return LUTIL_PASSWD_ERR;
} }
#else #elif HAVE_GNUTLS
PBKDF2(current_ctx, current_hmac_update, current_hmac_digest, PBKDF2(current_ctx, current_hmac_update, current_hmac_digest,
dk_len, iteration, dk_len, iteration,
PBKDF2_SALT_SIZE, salt_value, PBKDF2_SALT_SIZE, salt_value,