Fixed missing padding when calculating MESSAGE-INTEGRITY in STUN

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1265 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 84 insertions, 2 deletions

diff --git a/pjlib-util/include/pjlib-util/hmac_md5.h b/pjlib-util/include/pjlib-util/hmac_md5.h
index 5fefab51..f9bdca1a 100644
--- a/pjlib-util/include/pjlib-util/hmac_md5.h
+++ b/pjlib-util/include/pjlib-util/hmac_md5.h
@@ -29,6 +29,7 @@
  */
 
 #include <pj/types.h>
+#include <pjlib-util/md5.h>
 
 PJ_BEGIN_DECL
 
@@ -41,6 +42,15 @@ PJ_BEGIN_DECL
  * for Message Authentication, as described in RFC 2104
  */
 
+/**
+ * The HMAC-MD5 context used in the incremental HMAC calculation.
+ */
+typedef struct pj_hmac_md5_context
+{
+    pj_md5_context  context;	/**< MD5 context	    */
+    pj_uint8_t	    k_opad[64];	/**< opad xor-ed with key   */
+} pj_hmac_md5_context;
+
 
 /**
  * Calculate HMAC MD5 digest for the specified input and key.
@@ -57,6 +67,36 @@ PJ_DECL(void) pj_hmac_md5(const pj_uint8_t *input, unsigned input_len,
 
 
 /**
+ * Initiate HMAC-MD5 context for incremental hashing.
+ *
+ * @param hctx		HMAC-MD5 context.
+ * @param key		Pointer to the authentication key.
+ * @param key_len	Length of the authentication key.
+ */
+PJ_DECL(void) pj_hmac_md5_init(pj_hmac_md5_context *hctx, 
+			       const pj_uint8_t *key, unsigned key_len);
+
+/**
+ * Append string to the message.
+ *
+ * @param hctx		HMAC-MD5 context.
+ * @param input		Pointer to the input stream.
+ * @param input_len	Length of input stream in bytes.
+ */
+PJ_DECL(void) pj_hmac_md5_update(pj_hmac_md5_context *hctx,
+				 const pj_uint8_t *input, 
+				 unsigned input_len);
+
+/**
+ * Finish the message and return the digest. 
+ *
+ * @param hctx		HMAC-MD5 context.
+ * @param digest	Buffer to be filled with HMAC MD5 digest.
+ */
+PJ_DECL(void) pj_hmac_md5_final(pj_hmac_md5_context *hctx,
+				pj_uint8_t digest[16]);
+
+/**
  * @}
  */
 
diff --git a/pjlib-util/include/pjlib-util/hmac_sha1.h b/pjlib-util/include/pjlib-util/hmac_sha1.h
index 6fe4b6ad..70984c53 100644
--- a/pjlib-util/include/pjlib-util/hmac_sha1.h
+++ b/pjlib-util/include/pjlib-util/hmac_sha1.h
@@ -25,6 +25,7 @@
  */
 
 #include <pj/types.h>
+#include <pjlib-util/sha1.h>
 
 PJ_BEGIN_DECL
 
@@ -34,12 +35,22 @@ PJ_BEGIN_DECL
  * @{
  *
  * This module contains the implementation of HMAC: Keyed-Hashing 
- * for Message Authentication, as described in RFC 2104
+ * for Message Authentication, as described in RFC 2104.
  */
 
+/**
+ * The HMAC-SHA1 context used in the incremental HMAC calculation.
+ */
+typedef struct pj_hmac_sha1_context
+{
+    pj_sha1_context context;	/**< SHA1 context	    */
+    pj_uint8_t	    k_opad[64];	/**< opad xor-ed with key   */
+} pj_hmac_sha1_context;
+
 
 /**
- * Calculate HMAC SHA1 digest for the specified input and key.
+ * Calculate HMAC-SHA1 digest for the specified input and key with this
+ * single function call.
  *
  * @param input		Pointer to the input stream.
  * @param input_len	Length of input stream in bytes.
@@ -53,6 +64,37 @@ PJ_DECL(void) pj_hmac_sha1(const pj_uint8_t *input, unsigned input_len,
 
 
 /**
+ * Initiate HMAC-SHA1 context for incremental hashing.
+ *
+ * @param hctx		HMAC-SHA1 context.
+ * @param key		Pointer to the authentication key.
+ * @param key_len	Length of the authentication key.
+ */
+PJ_DECL(void) pj_hmac_sha1_init(pj_hmac_sha1_context *hctx, 
+			        const pj_uint8_t *key, unsigned key_len);
+
+/**
+ * Append string to the message.
+ *
+ * @param hctx		HMAC-SHA1 context.
+ * @param input		Pointer to the input stream.
+ * @param input_len	Length of input stream in bytes.
+ */
+PJ_DECL(void) pj_hmac_sha1_update(pj_hmac_sha1_context *hctx,
+				  const pj_uint8_t *input, 
+				  unsigned input_len);
+
+/**
+ * Finish the message and return the digest. 
+ *
+ * @param hctx		HMAC-SHA1 context.
+ * @param digest	Buffer to be filled with HMAC SHA1 digest.
+ */
+PJ_DECL(void) pj_hmac_sha1_final(pj_hmac_sha1_context *hctx,
+				 pj_uint8_t digest[20]);
+
+
+/**
  * @}
  */