mirror of
https://github.com/coturn/coturn.git
synced 2025-11-04 17:01:39 +01:00
Remove OPENSSL_FIPS wrappers.
Because we're building with a FIPS enabled OpenSSL instead of the FIPS canister, the resulting build should be usable on both FIPS and non-FIPS enabled systems. Since we can't rely on building with a FIPS enabled OpenSSL, defer the check to runtime.
This commit is contained in:
parent
6b01b6f450
commit
0e03fa86df
@ -239,11 +239,9 @@ int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd
|
|||||||
unsigned int keylen = 0;
|
unsigned int keylen = 0;
|
||||||
EVP_MD_CTX ctx;
|
EVP_MD_CTX ctx;
|
||||||
EVP_MD_CTX_init(&ctx);
|
EVP_MD_CTX_init(&ctx);
|
||||||
#ifdef OPENSSL_FIPS
|
|
||||||
if (FIPS_mode()) {
|
if (FIPS_mode()) {
|
||||||
EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
|
EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
EVP_DigestInit_ex(&ctx,EVP_md5(), NULL);
|
EVP_DigestInit_ex(&ctx,EVP_md5(), NULL);
|
||||||
EVP_DigestUpdate(&ctx,str,strl);
|
EVP_DigestUpdate(&ctx,str,strl);
|
||||||
EVP_DigestFinal(&ctx,key,&keylen);
|
EVP_DigestFinal(&ctx,key,&keylen);
|
||||||
@ -251,11 +249,9 @@ int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd
|
|||||||
#else
|
#else
|
||||||
unsigned int keylen = 0;
|
unsigned int keylen = 0;
|
||||||
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
|
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
|
||||||
#ifdef OPENSSL_FIPS
|
|
||||||
if (FIPS_mode()) {
|
if (FIPS_mode()) {
|
||||||
EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
|
EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
EVP_DigestInit_ex(ctx,EVP_md5(), NULL);
|
EVP_DigestInit_ex(ctx,EVP_md5(), NULL);
|
||||||
EVP_DigestUpdate(ctx,str,strl);
|
EVP_DigestUpdate(ctx,str,strl);
|
||||||
EVP_DigestFinal(ctx,key,&keylen);
|
EVP_DigestFinal(ctx,key,&keylen);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user