libzrtpcpp (2.3.4-1) unstable; urgency=medium

  * New upstream release
    - Fixes "CVE-2013-2221 CVE-2013-2222 CVE-2013-2223" (Closes: #714650)

# imported from the archive

1 files changed, 106 insertions, 0 deletions

diff --git a/srtp/crypto/openssl/hmac.cpp b/srtp/crypto/openssl/hmac.cpp
new file mode 100644
index 0000000..88d33a1
--- /dev/null
+++ b/srtp/crypto/openssl/hmac.cpp
@@ -0,0 +1,106 @@
+/*
+  Copyright (C) 2005, 2004, 2010, Erik Eliasson, Johan Bilien, Werner Dittmann
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+/*
+ * Authors: Erik Eliasson <eliasson@it.kth.se>
+ *          Johan Bilien <jobi@via.ecp.fr>
+ *          Werner Dittmann
+ */
+
+#include <stdint.h>
+#include <openssl/hmac.h>
+#include <crypto/hmac.h>
+
+void hmac_sha1(uint8_t * key, int32_t key_length,
+               const uint8_t* data, uint32_t data_length,
+               uint8_t* mac, int32_t* mac_length )
+{
+    HMAC(EVP_sha1(), key, key_length,
+         data, data_length, mac,
+         reinterpret_cast<uint32_t*>(mac_length) );
+}
+
+void hmac_sha1( uint8_t* key, int32_t key_length,
+                const uint8_t* data_chunks[],
+                uint32_t data_chunck_length[],
+                uint8_t* mac, int32_t* mac_length ) {
+    HMAC_CTX ctx;
+    HMAC_CTX_init(&ctx);
+    HMAC_Init_ex(&ctx, key, key_length, EVP_sha1(), NULL);
+    while (*data_chunks) {
+        HMAC_Update(&ctx, *data_chunks, *data_chunck_length);
+        data_chunks ++;
+        data_chunck_length ++;
+    }
+    HMAC_Final(&ctx, mac, reinterpret_cast<uint32_t*>(mac_length));
+    HMAC_CTX_cleanup(&ctx);
+}
+
+void* createSha1HmacContext(uint8_t* key, int32_t key_length)
+{
+    HMAC_CTX* ctx = (HMAC_CTX*)malloc(sizeof(HMAC_CTX));
+    
+    HMAC_CTX_init(ctx);
+    HMAC_Init_ex(ctx, key, key_length, EVP_sha1(), NULL);
+    return ctx;
+}
+
+void hmacSha1Ctx(void* ctx, const uint8_t* data, uint32_t data_length,
+                uint8_t* mac, int32_t* mac_length)
+{
+    HMAC_CTX* pctx = (HMAC_CTX*)ctx;
+
+    HMAC_Init_ex(pctx, NULL, 0, NULL, NULL );
+    HMAC_Update(pctx, data, data_length );
+    HMAC_Final(pctx, mac, reinterpret_cast<uint32_t*>(mac_length) );
+}
+
+void hmacSha1Ctx(void* ctx, const uint8_t* data[], uint32_t data_length[],
+                uint8_t* mac, int32_t* mac_length )
+{
+    HMAC_CTX* pctx = (HMAC_CTX*)ctx;
+
+    HMAC_Init_ex(pctx, NULL, 0, NULL, NULL );
+    while (*data) {
+        HMAC_Update(pctx, *data, *data_length);
+        data++;
+        data_length++;
+    }
+    HMAC_Final(pctx, mac, reinterpret_cast<uint32_t*>(mac_length) );
+}
+
+void freeSha1HmacContext(void* ctx)
+{
+    if (ctx) {
+        HMAC_CTX_cleanup((HMAC_CTX*)ctx);
+        free(ctx);
+    }
+}
\ No newline at end of file