@@ -14,28 +14,6 @@ STATUS md5Digest(PBYTE, UINT64, PBYTE);
14
14
#define KVS_MD5_DIGEST_LENGTH MD5_DIGEST_LENGTH
15
15
#define KVS_SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH
16
16
17
- // https://www.openssl.org/docs/man3.1/man3/MD5.html
18
- #if (OPENSSL_VERSION_NUMBER >= 0x30000000L )
19
- #define KVS_MD5_DIGEST (m , mlen , ob ) \
20
- do { \
21
- EVP_MD_CTX* mdctx; \
22
- const EVP_MD* md; \
23
- md = EVP_MD_fetch(NULL, "MD5", NULL); \
24
- if (md == NULL) { \
25
- DLOGI("Failed to fetch MD5 provider"); \
26
- } else { \
27
- mdctx = EVP_MD_CTX_new(); \
28
- EVP_DigestInit_ex(mdctx, md, NULL); \
29
- EVP_DigestUpdate(mdctx, m, mlen); \
30
- EVP_DigestFinal_ex(mdctx, ob, NULL); \
31
- EVP_MD_CTX_free(mdctx); \
32
- EVP_MD_free((EVP_MD*) md); \
33
- } \
34
- } while (0)
35
- #else
36
- #define KVS_MD5_DIGEST (m , mlen , ob ) MD5((m), (mlen), (ob));
37
- #endif
38
-
39
17
#define KVS_SHA1_HMAC (k , klen , m , mlen , ob , plen ) \
40
18
CHK(NULL != HMAC(EVP_sha1(), (k), (INT32) (klen), (m), (mlen), (ob), (plen)), STATUS_HMAC_GENERATION_ERROR);
41
19
#define KVS_CRYPTO_INIT () \
@@ -56,10 +34,9 @@ typedef enum {
56
34
KVS_SRTP_PROFILE_AES128_CM_HMAC_SHA1_32 = SRTP_AES128_CM_SHA1_32 ,
57
35
} KVS_SRTP_PROFILE ;
58
36
#elif KVS_USE_MBEDTLS
59
- #define KVS_RSA_F4 0x10001L
60
- #define KVS_MD5_DIGEST_LENGTH 16
61
- #define KVS_SHA1_DIGEST_LENGTH 20
62
- #define KVS_MD5_DIGEST (m , mlen , ob ) mbedtls_md5_ret((m), (mlen), (ob));
37
+ #define KVS_RSA_F4 0x10001L
38
+ #define KVS_MD5_DIGEST_LENGTH 16
39
+ #define KVS_SHA1_DIGEST_LENGTH 20
63
40
#define KVS_SHA1_HMAC (k , klen , m , mlen , ob , plen ) \
64
41
CHK(0 == mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA1), (k), (klen), (m), (mlen), (ob)), STATUS_HMAC_GENERATION_ERROR); \
65
42
*(plen) = mbedtls_md_get_size(mbedtls_md_info_from_type(MBEDTLS_MD_SHA1));
0 commit comments