[Build-System] Update libsrtp to 2.4.0

libs/srtp/crypto/hash/auth.c

@@ -123,6 +123,12 @@ srtp_err_status_t srtp_auth_type_test(const srtp_auth_type_t *at,
             return status;
         }
 
+        status = srtp_auth_start(a);
+        if (status) {
+            srtp_auth_dealloc(a);
+            return status;
+        }
+
         /* zeroize tag then compute */
         octet_string_set_to_zero(tag, test_case->tag_length_octets);
         status = srtp_auth_compute(a, test_case->data,

libs/srtp/crypto/hash/auth_test_cases.c

@@ -0,0 +1,70 @@
+/*
+ *
+ * Copyright (c) 2013-2021, Cisco Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ *   Neither the name of the Cisco Systems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "auth_test_cases.h"
+#include <stddef.h>
+
+/* clang-format off */
+static const uint8_t srtp_hmac_test_case_0_key[20] = {
+    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+    0x0b, 0x0b, 0x0b, 0x0b
+};
+/* clang-format on */
+
+/* clang-format off */
+static const uint8_t srtp_hmac_test_case_0_data[8] = {
+    0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65 /* "Hi There" */
+};
+/* clang-format on */
+
+/* clang-format off */
+static const uint8_t srtp_hmac_test_case_0_tag[20] = {
+    0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
+    0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
+    0xf1, 0x46, 0xbe, 0x00
+};
+/* clang-format on */
+
+const srtp_auth_test_case_t srtp_hmac_test_case_0 = {
+    sizeof(srtp_hmac_test_case_0_key),  /* octets in key            */
+    srtp_hmac_test_case_0_key,          /* key                      */
+    sizeof(srtp_hmac_test_case_0_data), /* octets in data           */
+    srtp_hmac_test_case_0_data,         /* data                     */
+    sizeof(srtp_hmac_test_case_0_tag),  /* octets in tag            */
+    srtp_hmac_test_case_0_tag,          /* tag                      */
+    NULL                                /* pointer to next testcase */
+};

libs/srtp/crypto/hash/auth_test_cases.h

@@ -0,0 +1,48 @@
+/*
+ *
+ * Copyright (c) 2013-2021, Cisco Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ *   Neither the name of the Cisco Systems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef AUTH_TEST_CASES_H
+#define AUTH_TEST_CASES_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "auth.h"
+
+extern const srtp_auth_test_case_t srtp_hmac_test_case_0;
+
+#endif

libs/srtp/crypto/hash/hmac.c

@@ -49,6 +49,7 @@
 #include "hmac.h"
 #include "alloc.h"
 #include "cipher_types.h"
+#include "auth_test_cases.h"
 
 /* the debug module for authentiation */
 
@@ -228,41 +229,6 @@ static srtp_err_status_t srtp_hmac_compute(void *statev,
     return srtp_err_status_ok;
 }
 
-/* begin test case 0 */
-/* clang-format off */
-static const uint8_t srtp_hmac_test_case_0_key[20] = {
-    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    0x0b, 0x0b, 0x0b, 0x0b
-};
-/* clang-format on */
-
-/* clang-format off */
-static const uint8_t srtp_hmac_test_case_0_data[8] = {
-    0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65 /* "Hi There" */
-};
-/* clang-format on */
-
-/* clang-format off */
-static const uint8_t srtp_hmac_test_case_0_tag[20] = {
-    0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
-    0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
-    0xf1, 0x46, 0xbe, 0x00
-};
-/* clang-format on */
-
-static const srtp_auth_test_case_t srtp_hmac_test_case_0 = {
-    20,                         /* octets in key            */
-    srtp_hmac_test_case_0_key,  /* key                      */
-    8,                          /* octets in data           */
-    srtp_hmac_test_case_0_data, /* data                     */
-    20,                         /* octets in tag            */
-    srtp_hmac_test_case_0_tag,  /* tag                      */
-    NULL                        /* pointer to next testcase */
-};
-
-/* end test case 0 */
-
 static const char srtp_hmac_description[] =
     "hmac sha-1 authentication function";
 

libs/srtp/crypto/hash/hmac_mbedtls.c

@@ -0,0 +1,221 @@
+/*
+ * hmac_mbedtls.c
+ *
+ * Implementation of hmac srtp_auth_type_t that leverages Mbedtls
+ *
+ * YongCheng Yang
+ */
+/*
+ *
+ * Copyright(c) 2013-2017, Cisco Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ *   Neither the name of the Cisco Systems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "auth.h"
+#include "alloc.h"
+#include "err.h" /* for srtp_debug */
+#include "auth_test_cases.h"
+#include <mbedtls/md.h>
+
+#define SHA1_DIGEST_SIZE 20
+
+/* the debug module for authentiation */
+
+srtp_debug_module_t srtp_mod_hmac = {
+    0,                   /* debugging is off by default */
+    "hmac sha-1 mbedtls" /* printable name for module   */
+};
+
+static srtp_err_status_t srtp_hmac_mbedtls_alloc(srtp_auth_t **a,
+                                                 int key_len,
+                                                 int out_len)
+{
+    extern const srtp_auth_type_t srtp_hmac;
+
+    debug_print(srtp_mod_hmac, "allocating auth func with key length %d",
+                key_len);
+    debug_print(srtp_mod_hmac, "                          tag length %d",
+                out_len);
+
+    /* check output length - should be less than 20 bytes */
+    if (key_len > SHA1_DIGEST_SIZE) {
+        return srtp_err_status_bad_param;
+    }
+    /* check output length - should be less than 20 bytes */
+    if (out_len > SHA1_DIGEST_SIZE) {
+        return srtp_err_status_bad_param;
+    }
+
+    *a = (srtp_auth_t *)srtp_crypto_alloc(sizeof(srtp_auth_t));
+    if (*a == NULL) {
+        return srtp_err_status_alloc_fail;
+    }
+    // allocate the buffer of mbedtls context.
+    (*a)->state = srtp_crypto_alloc(sizeof(mbedtls_md_context_t));
+    if ((*a)->state == NULL) {
+        srtp_crypto_free(*a);
+        *a = NULL;
+        return srtp_err_status_alloc_fail;
+    }
+    mbedtls_md_init((mbedtls_md_context_t *)(*a)->state);
+
+    /* set pointers */
+    (*a)->type = &srtp_hmac;
+    (*a)->out_len = out_len;
+    (*a)->key_len = key_len;
+    (*a)->prefix_len = 0;
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_mbedtls_dealloc(srtp_auth_t *a)
+{
+    mbedtls_md_context_t *hmac_ctx;
+    hmac_ctx = (mbedtls_md_context_t *)a->state;
+    mbedtls_md_free(hmac_ctx);
+    srtp_crypto_free(hmac_ctx);
+    /* zeroize entire state*/
+    octet_string_set_to_zero(a, sizeof(srtp_auth_t));
+
+    /* free memory */
+    srtp_crypto_free(a);
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_mbedtls_start(void *statev)
+{
+    mbedtls_md_context_t *state = (mbedtls_md_context_t *)statev;
+    if (mbedtls_md_hmac_reset(state) != 0)
+        return srtp_err_status_auth_fail;
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_mbedtls_init(void *statev,
+                                                const uint8_t *key,
+                                                int key_len)
+{
+    mbedtls_md_context_t *state = (mbedtls_md_context_t *)statev;
+    const mbedtls_md_info_t *info = NULL;
+
+    info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
+    if (info == NULL)
+        return srtp_err_status_auth_fail;
+
+    if (mbedtls_md_setup(state, info, 1) != 0)
+        return srtp_err_status_auth_fail;
+
+    debug_print(srtp_mod_hmac, "mbedtls setup, name: %s",
+                mbedtls_md_get_name(info));
+    debug_print(srtp_mod_hmac, "mbedtls setup, size: %d",
+                mbedtls_md_get_size(info));
+
+    if (mbedtls_md_hmac_starts(state, key, key_len) != 0)
+        return srtp_err_status_auth_fail;
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_mbedtls_update(void *statev,
+                                                  const uint8_t *message,
+                                                  int msg_octets)
+{
+    mbedtls_md_context_t *state = (mbedtls_md_context_t *)statev;
+
+    debug_print(srtp_mod_hmac, "input: %s",
+                srtp_octet_string_hex_string(message, msg_octets));
+
+    if (mbedtls_md_hmac_update(state, message, msg_octets) != 0)
+        return srtp_err_status_auth_fail;
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_mbedtls_compute(void *statev,
+                                                   const uint8_t *message,
+                                                   int msg_octets,
+                                                   int tag_len,
+                                                   uint8_t *result)
+{
+    mbedtls_md_context_t *state = (mbedtls_md_context_t *)statev;
+    uint8_t hash_value[SHA1_DIGEST_SIZE];
+    int i;
+
+    /* check tag length, return error if we can't provide the value expected */
+    if (tag_len > SHA1_DIGEST_SIZE) {
+        return srtp_err_status_bad_param;
+    }
+
+    /* hash message, copy output into H */
+    if (mbedtls_md_hmac_update(statev, message, msg_octets) != 0)
+        return srtp_err_status_auth_fail;
+
+    if (mbedtls_md_hmac_finish(state, hash_value) != 0)
+        return srtp_err_status_auth_fail;
+
+    /* copy hash_value to *result */
+    for (i = 0; i < tag_len; i++) {
+        result[i] = hash_value[i];
+    }
+
+    debug_print(srtp_mod_hmac, "output: %s",
+                srtp_octet_string_hex_string(hash_value, tag_len));
+
+    return srtp_err_status_ok;
+}
+
+/* end test case 0 */
+
+static const char srtp_hmac_mbedtls_description[] =
+    "hmac sha-1 authentication function using mbedtls";
+
+/*
+ * srtp_auth_type_t hmac is the hmac metaobject
+ */
+
+const srtp_auth_type_t srtp_hmac = {
+    srtp_hmac_mbedtls_alloc,       /* */
+    srtp_hmac_mbedtls_dealloc,     /* */
+    srtp_hmac_mbedtls_init,        /* */
+    srtp_hmac_mbedtls_compute,     /* */
+    srtp_hmac_mbedtls_update,      /* */
+    srtp_hmac_mbedtls_start,       /* */
+    srtp_hmac_mbedtls_description, /* */
+    &srtp_hmac_test_case_0,        /* */
+    SRTP_HMAC_SHA1                 /* */
+};

libs/srtp/crypto/hash/hmac_nss.c

@@ -0,0 +1,290 @@
+/*
+ *
+ * Copyright(c) 2013-2017, Cisco Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ *   Neither the name of the Cisco Systems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "auth.h"
+#include "alloc.h"
+#include "err.h" /* for srtp_debug */
+#include "auth_test_cases.h"
+
+#define NSS_PKCS11_2_0_COMPAT 1
+
+#include <nss.h>
+#include <pk11pub.h>
+
+#define SHA1_DIGEST_SIZE 20
+
+/* the debug module for authentiation */
+
+srtp_debug_module_t srtp_mod_hmac = {
+    0,               /* debugging is off by default */
+    "hmac sha-1 nss" /* printable name for module   */
+};
+
+typedef struct {
+    NSSInitContext *nss;
+    PK11SymKey *key;
+    PK11Context *ctx;
+} srtp_hmac_nss_ctx_t;
+
+static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a,
+                                         int key_len,
+                                         int out_len)
+{
+    extern const srtp_auth_type_t srtp_hmac;
+    srtp_hmac_nss_ctx_t *hmac;
+    NSSInitContext *nss;
+
+    debug_print(srtp_mod_hmac, "allocating auth func with key length %d",
+                key_len);
+    debug_print(srtp_mod_hmac, "                          tag length %d",
+                out_len);
+
+    /* check output length - should be less than 20 bytes */
+    if (out_len > SHA1_DIGEST_SIZE) {
+        return srtp_err_status_bad_param;
+    }
+
+    /* Initialize NSS equiv of NSS_NoDB_Init(NULL) */
+    nss = NSS_InitContext("", "", "", "", NULL,
+                          NSS_INIT_READONLY | NSS_INIT_NOCERTDB |
+                              NSS_INIT_NOMODDB | NSS_INIT_FORCEOPEN |
+                              NSS_INIT_OPTIMIZESPACE);
+    if (!nss) {
+        return srtp_err_status_auth_fail;
+    }
+
+    *a = (srtp_auth_t *)srtp_crypto_alloc(sizeof(srtp_auth_t));
+    if (*a == NULL) {
+        NSS_ShutdownContext(nss);
+        return srtp_err_status_alloc_fail;
+    }
+
+    hmac =
+        (srtp_hmac_nss_ctx_t *)srtp_crypto_alloc(sizeof(srtp_hmac_nss_ctx_t));
+    if (hmac == NULL) {
+        NSS_ShutdownContext(nss);
+        srtp_crypto_free(*a);
+        *a = NULL;
+        return srtp_err_status_alloc_fail;
+    }
+
+    hmac->nss = nss;
+    hmac->key = NULL;
+    hmac->ctx = NULL;
+
+    /* set pointers */
+    (*a)->state = hmac;
+    (*a)->type = &srtp_hmac;
+    (*a)->out_len = out_len;
+    (*a)->key_len = key_len;
+    (*a)->prefix_len = 0;
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a)
+{
+    srtp_hmac_nss_ctx_t *hmac;
+
+    hmac = (srtp_hmac_nss_ctx_t *)a->state;
+    if (hmac) {
+        /* free any PK11 values that have been created */
+        if (hmac->key) {
+            PK11_FreeSymKey(hmac->key);
+            hmac->key = NULL;
+        }
+
+        if (hmac->ctx) {
+            PK11_DestroyContext(hmac->ctx, PR_TRUE);
+            hmac->ctx = NULL;
+        }
+
+        if (hmac->nss) {
+            NSS_ShutdownContext(hmac->nss);
+            hmac->nss = NULL;
+        }
+
+        /* zeroize everything */
+        octet_string_set_to_zero(hmac, sizeof(srtp_hmac_nss_ctx_t));
+        srtp_crypto_free(hmac);
+    }
+
+    /* free memory */
+    srtp_crypto_free(a);
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_start(void *statev)
+{
+    srtp_hmac_nss_ctx_t *hmac;
+    hmac = (srtp_hmac_nss_ctx_t *)statev;
+
+    if (PK11_DigestBegin(hmac->ctx) != SECSuccess) {
+        return srtp_err_status_auth_fail;
+    }
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_init(void *statev,
+                                        const uint8_t *key,
+                                        int key_len)
+{
+    srtp_hmac_nss_ctx_t *hmac;
+    hmac = (srtp_hmac_nss_ctx_t *)statev;
+    PK11SymKey *sym_key;
+    PK11Context *ctx;
+
+    if (hmac->ctx) {
+        PK11_DestroyContext(hmac->ctx, PR_TRUE);
+        hmac->ctx = NULL;
+    }
+
+    if (hmac->key) {
+        PK11_FreeSymKey(hmac->key);
+        hmac->key = NULL;
+    }
+
+    PK11SlotInfo *slot = PK11_GetBestSlot(CKM_SHA_1_HMAC, NULL);
+    if (!slot) {
+        return srtp_err_status_bad_param;
+    }
+
+    SECItem key_item = { siBuffer, (unsigned char *)key, key_len };
+    sym_key = PK11_ImportSymKey(slot, CKM_SHA_1_HMAC, PK11_OriginUnwrap,
+                                CKA_SIGN, &key_item, NULL);
+    PK11_FreeSlot(slot);
+
+    if (!sym_key) {
+        return srtp_err_status_auth_fail;
+    }
+
+    SECItem param_item = { siBuffer, NULL, 0 };
+    ctx = PK11_CreateContextBySymKey(CKM_SHA_1_HMAC, CKA_SIGN, sym_key,
+                                     &param_item);
+    if (!ctx) {
+        PK11_FreeSymKey(sym_key);
+        return srtp_err_status_auth_fail;
+    }
+
+    hmac->key = sym_key;
+    hmac->ctx = ctx;
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_update(void *statev,
+                                          const uint8_t *message,
+                                          int msg_octets)
+{
+    srtp_hmac_nss_ctx_t *hmac;
+    hmac = (srtp_hmac_nss_ctx_t *)statev;
+
+    debug_print(srtp_mod_hmac, "input: %s",
+                srtp_octet_string_hex_string(message, msg_octets));
+
+    if (PK11_DigestOp(hmac->ctx, message, msg_octets) != SECSuccess) {
+        return srtp_err_status_auth_fail;
+    }
+
+    return srtp_err_status_ok;
+}
+
+static srtp_err_status_t srtp_hmac_compute(void *statev,
+                                           const uint8_t *message,
+                                           int msg_octets,
+                                           int tag_len,
+                                           uint8_t *result)
+{
+    srtp_hmac_nss_ctx_t *hmac;
+    hmac = (srtp_hmac_nss_ctx_t *)statev;
+    uint8_t hash_value[SHA1_DIGEST_SIZE];
+    int i;
+    unsigned int len;
+
+    debug_print(srtp_mod_hmac, "input: %s",
+                srtp_octet_string_hex_string(message, msg_octets));
+
+    /* check tag length, return error if we can't provide the value expected */
+    if (tag_len > SHA1_DIGEST_SIZE) {
+        return srtp_err_status_bad_param;
+    }
+
+    if (PK11_DigestOp(hmac->ctx, message, msg_octets) != SECSuccess) {
+        return srtp_err_status_auth_fail;
+    }
+
+    if (PK11_DigestFinal(hmac->ctx, hash_value, &len, SHA1_DIGEST_SIZE) !=
+        SECSuccess) {
+        return srtp_err_status_auth_fail;
+    }
+
+    if (len < tag_len)
+        return srtp_err_status_auth_fail;
+
+    /* copy hash_value to *result */
+    for (i = 0; i < tag_len; i++) {
+        result[i] = hash_value[i];
+    }
+
+    debug_print(srtp_mod_hmac, "output: %s",
+                srtp_octet_string_hex_string(hash_value, tag_len));
+
+    return srtp_err_status_ok;
+}
+
+static const char srtp_hmac_description[] =
+    "hmac sha-1 authentication function";
+
+/*
+ * srtp_auth_type_t hmac is the hmac metaobject
+ */
+
+const srtp_auth_type_t srtp_hmac = {
+    srtp_hmac_alloc,        /* */
+    srtp_hmac_dealloc,      /* */
+    srtp_hmac_init,         /* */
+    srtp_hmac_compute,      /* */
+    srtp_hmac_update,       /* */
+    srtp_hmac_start,        /* */
+    srtp_hmac_description,  /* */
+    &srtp_hmac_test_case_0, /* */
+    SRTP_HMAC_SHA1          /* */
+};

libs/srtp/crypto/hash/hmac_ossl.c

@@ -49,6 +49,7 @@
 #include "auth.h"
 #include "alloc.h"
 #include "err.h" /* for srtp_debug */
+#include "auth_test_cases.h"
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 
@@ -192,6 +193,9 @@ static srtp_err_status_t srtp_hmac_compute(void *statev,
     int i;
     unsigned int len;
 
+    debug_print(srtp_mod_hmac, "input: %s",
+                srtp_octet_string_hex_string(message, msg_octets));
+
     /* check tag length, return error if we can't provide the value expected */
     if (tag_len > SHA1_DIGEST_SIZE) {
         return srtp_err_status_bad_param;
@@ -218,41 +222,6 @@ static srtp_err_status_t srtp_hmac_compute(void *statev,
     return srtp_err_status_ok;
 }
 
-/* begin test case 0 */
-/* clang-format off */
-static const uint8_t srtp_hmac_test_case_0_key[SHA1_DIGEST_SIZE] = {
-    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    0x0b, 0x0b, 0x0b, 0x0b
-};
-/* clang-format on */
-
-/* clang-format off */
-static const uint8_t srtp_hmac_test_case_0_data[8] = {
-    0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65 /* "Hi There" */
-};
-/* clang-format on */
-
-/* clang-format off */
-static const uint8_t srtp_hmac_test_case_0_tag[SHA1_DIGEST_SIZE] = {
-    0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
-    0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
-    0xf1, 0x46, 0xbe, 0x00
-};
-/* clang-format on */
-
-static const srtp_auth_test_case_t srtp_hmac_test_case_0 = {
-    sizeof(srtp_hmac_test_case_0_key),  /* octets in key            */
-    srtp_hmac_test_case_0_key,          /* key                      */
-    sizeof(srtp_hmac_test_case_0_data), /* octets in data           */
-    srtp_hmac_test_case_0_data,         /* data                     */
-    sizeof(srtp_hmac_test_case_0_tag),  /* octets in tag            */
-    srtp_hmac_test_case_0_tag,          /* tag                      */
-    NULL                                /* pointer to next testcase */
-};
-
-/* end test case 0 */
-
 static const char srtp_hmac_description[] =
     "hmac sha-1 authentication function";
 

libs/srtp/crypto/hash/sha1.c

@@ -76,15 +76,6 @@ uint32_t SHA_K1 = 0x6ED9EBA1; /* Kt for 20 <= t <= 39 */
 uint32_t SHA_K2 = 0x8F1BBCDC; /* Kt for 40 <= t <= 59 */
 uint32_t SHA_K3 = 0xCA62C1D6; /* Kt for 60 <= t <= 79 */
 
-void srtp_sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5])
-{
-    srtp_sha1_ctx_t ctx;
-
-    srtp_sha1_init(&ctx);
-    srtp_sha1_update(&ctx, msg, octets_in_msg);
-    srtp_sha1_final(&ctx, hash_value);
-}
-
 /*
  *  srtp_sha1_core(M, H) computes the core compression function, where M is
  *  the next part of the message (in network byte order) and H is the
@@ -261,14 +252,13 @@ void srtp_sha1_update(srtp_sha1_ctx_t *ctx,
 
             /* process a whole block */
 
-            debug_print(srtp_mod_sha1, "(update) running srtp_sha1_core()",
-                        NULL);
+            debug_print0(srtp_mod_sha1, "(update) running srtp_sha1_core()");
 
             srtp_sha1_core(ctx->M, ctx->H);
 
         } else {
-            debug_print(srtp_mod_sha1, "(update) not running srtp_sha1_core()",
-                        NULL);
+            debug_print0(srtp_mod_sha1,
+                         "(update) not running srtp_sha1_core()");
 
             for (i = ctx->octets_in_buffer;
                  i < (ctx->octets_in_buffer + octets_in_msg); i++) {
@@ -285,7 +275,7 @@ void srtp_sha1_update(srtp_sha1_ctx_t *ctx,
  * into the twenty octets located at *output
  */
 
-void srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t *output)
+void srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t output[5])
 {
     uint32_t A, B, C, D, E, TEMP;
     uint32_t W[80];
@@ -391,11 +381,10 @@ void srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t *output)
         ctx->H[4] += E;
     }
 
-    debug_print(srtp_mod_sha1, "(final) running srtp_sha1_core()", NULL);
+    debug_print0(srtp_mod_sha1, "(final) running srtp_sha1_core()");
 
     if (ctx->octets_in_buffer >= 56) {
-        debug_print(srtp_mod_sha1, "(final) running srtp_sha1_core() again",
-                    NULL);
+        debug_print0(srtp_mod_sha1, "(final) running srtp_sha1_core() again");
 
         /* we need to do one final run of the compression algo */