WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

SRTCP 32-bit indices default plus errata 48-bit indices

pull/7455/head
kaleb-himes 2024-04-19 12:31:08 -06:00
parent 69be7a7c54
commit e835517633
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wolfcrypt/src/kdf.c
View File

@ -1099,9 +1099,9 @@ int wc_SRTP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
* @return MEMORY_E on dynamic memory allocation failure.
* @return 0 on success.
*/
int wc_SRTCP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
int wc_SRTCP_KDF_ex(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
int kdrIdx, const byte* index, byte* key1, word32 key1Sz, byte* key2,
word32 key2Sz, byte* key3, word32 key3Sz)
word32 key2Sz, byte* key3, word32 key3Sz, int idxLenIndicator)
{
int ret = 0;
byte block[AES_BLOCK_SIZE];
@ -1111,6 +1111,15 @@ int wc_SRTCP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
Aes aes[1];
#endif
int aes_inited = 0;
int idxLen;
if (idxLenIndicator == WC_SRTCP_32BIT_IDX) {
idxLen = WC_SRTCP_INDEX_LEN;
} else if (idxLenIndicator == WC_SRTCP_48BIT_IDX) {
idxLen = WC_SRTP_INDEX_LEN;
} else {
return BAD_FUNC_ARG; /* bad or invalid idxLenIndicator */
}
/* Validate parameters. */
if ((key == NULL) || (keySz > AES_256_KEY_SIZE) || (salt == NULL) ||
@ -1142,23 +1151,22 @@ int wc_SRTCP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
/* Calculate first block that can be used in each derivation. */
if (ret == 0) {
wc_srtp_kdf_first_block(salt, saltSz, kdrIdx, index, WC_SRTCP_INDEX_LEN,
block);
wc_srtp_kdf_first_block(salt, saltSz, kdrIdx, index, idxLen, block);
}
/* Calculate first key if required. */
if ((ret == 0) && (key1 != NULL)) {
ret = wc_srtp_kdf_derive_key(block, WC_SRTCP_INDEX_LEN,
ret = wc_srtp_kdf_derive_key(block, idxLen,
WC_SRTCP_LABEL_ENCRYPTION, key1, key1Sz, aes);
}
/* Calculate second key if required. */
if ((ret == 0) && (key2 != NULL)) {
ret = wc_srtp_kdf_derive_key(block, WC_SRTCP_INDEX_LEN,
ret = wc_srtp_kdf_derive_key(block, idxLen,
WC_SRTCP_LABEL_MSG_AUTH, key2, key2Sz, aes);
}
/* Calculate third key if required. */
if ((ret == 0) && (key3 != NULL)) {
ret = wc_srtp_kdf_derive_key(block, WC_SRTCP_INDEX_LEN,
ret = wc_srtp_kdf_derive_key(block, idxLen,
WC_SRTCP_LABEL_SALT, key3, key3Sz, aes);
}
@ -1170,6 +1178,15 @@ int wc_SRTCP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
return ret;
}
int wc_SRTCP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
int kdrIdx, const byte* index, byte* key1, word32 key1Sz, byte* key2,
word32 key2Sz, byte* key3, word32 key3Sz)
{
/* The default 32-bit IDX expected by many implementations */
return wc_SRTCP_KDF_ex(key, keySz, salt, saltSz, kdrIdx, index,
key1, key1Sz, key2, key2Sz, key3, key3Sz,
WC_SRTCP_32BIT_IDX);
}
/* Derive key with label using SRTP KDF algorithm.
*
* SP 800-135 (RFC 3711).

9
wolfssl/wolfcrypt/kdf.h
View File

@ -137,6 +137,12 @@ WOLFSSL_API int wc_SSH_KDF(byte hashId, byte keyId,
/* Length of index for SRTCP KDF. */
#define WC_SRTCP_INDEX_LEN 4
/* Indicators */
enum {
WC_SRTCP_32BIT_IDX = 0,
WC_SRTCP_48BIT_IDX = 1,
};
/* Maximum length of salt that can be used with SRTP/SRTCP. */
#define WC_SRTP_MAX_SALT 14
@ -146,6 +152,9 @@ WOLFSSL_API int wc_SRTP_KDF(const byte* key, word32 keySz, const byte* salt,
WOLFSSL_API int wc_SRTCP_KDF(const byte* key, word32 keySz, const byte* salt,
word32 saltSz, int kdrIdx, const byte* index, byte* key1, word32 key1Sz,
byte* key2, word32 key2Sz, byte* key3, word32 key3Sz);
WOLFSSL_API int wc_SRTCP_KDF_ex(const byte* key, word32 keySz, const byte* salt,
word32 saltSz, int kdrIdx, const byte* index, byte* key1, word32 key1Sz,
byte* key2, word32 key2Sz, byte* key3, word32 key3Sz, int idxLenIndicator);
WOLFSSL_API int wc_SRTP_KDF_label(const byte* key, word32 keySz,
const byte* salt, word32 saltSz, int kdrIdx, const byte* index, byte label,
byte* outKey, word32 outKeySz);