import openssl-0.9.7-beta1

2 files changed, 62 insertions, 57 deletions

diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c
index fb09129963..da363b7950 100644
--- a/src/lib/libcrypto/hmac/hmac.c
+++ b/src/lib/libcrypto/hmac/hmac.c
@@ -58,13 +58,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "hmac.h"
+#include <openssl/hmac.h>
 
-void HMAC_Init(ctx,key,len,md)
-HMAC_CTX *ctx;
-unsigned char *key;
-int len;
-EVP_MD *md;
+void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
+                  const EVP_MD *md, ENGINE *impl)
         {
         int i,j,reset=0;
         unsigned char pad[HMAC_MAX_MD_CBLOCK];
@@ -83,47 +80,50 @@ EVP_MD *md;
                 j=EVP_MD_block_size(md);
                 if (j < len)
                         {
-                        EVP_DigestInit(&ctx->md_ctx,md);
+                        EVP_DigestInit_ex(&ctx->md_ctx,md, impl);
                         EVP_DigestUpdate(&ctx->md_ctx,key,len);
-                        EVP_DigestFinal(&(ctx->md_ctx),ctx->key,
+                        EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key,
                                 &ctx->key_length);
                         }
                 else
                         {
                         memcpy(ctx->key,key,len);
-                        memset(&(ctx->key[len]),0,sizeof(ctx->key)-len);
                         ctx->key_length=len;
                         }
+                if(ctx->key_length != HMAC_MAX_MD_CBLOCK)
+                        memset(&ctx->key[ctx->key_length], 0,
+                                HMAC_MAX_MD_CBLOCK - ctx->key_length);
                 }
 
         if (reset)      
                 {
                 for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
                         pad[i]=0x36^ctx->key[i];
-                EVP_DigestInit(&ctx->i_ctx,md);
+                EVP_DigestInit_ex(&ctx->i_ctx,md, impl);
                 EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md));
 
                 for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
                         pad[i]=0x5c^ctx->key[i];
-                EVP_DigestInit(&ctx->o_ctx,md);
+                EVP_DigestInit_ex(&ctx->o_ctx,md, impl);
                 EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md));
                 }
+        EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx);
+        }
 
-        memcpy(&ctx->md_ctx,&ctx->i_ctx,sizeof(ctx->i_ctx));
+void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
+               const EVP_MD *md)
+        {
+        if(key && md)
+            HMAC_CTX_init(ctx);
+        HMAC_Init_ex(ctx,key,len,md, NULL);
         }
 
-void HMAC_Update(ctx,data,len)
-HMAC_CTX *ctx;
-unsigned char *data;
-int len;
+void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, int len)
         {
-        EVP_DigestUpdate(&(ctx->md_ctx),data,len);
+        EVP_DigestUpdate(&ctx->md_ctx,data,len);
         }
 
-void HMAC_Final(ctx,md,len)
-HMAC_CTX *ctx;
-unsigned char *md;
-unsigned int *len;
+void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         {
         int j;
         unsigned int i;
@@ -131,35 +131,40 @@ unsigned int *len;
 
         j=EVP_MD_block_size(ctx->md);
 
-        EVP_DigestFinal(&(ctx->md_ctx),buf,&i);
-        memcpy(&(ctx->md_ctx),&(ctx->o_ctx),sizeof(ctx->o_ctx));
-        EVP_DigestUpdate(&(ctx->md_ctx),buf,i);
-        EVP_DigestFinal(&(ctx->md_ctx),md,len);
+        EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i);
+        EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx);
+        EVP_DigestUpdate(&ctx->md_ctx,buf,i);
+        EVP_DigestFinal_ex(&ctx->md_ctx,md,len);
+        }
+
+void HMAC_CTX_init(HMAC_CTX *ctx)
+        {
+        EVP_MD_CTX_init(&ctx->i_ctx);
+        EVP_MD_CTX_init(&ctx->o_ctx);
+        EVP_MD_CTX_init(&ctx->md_ctx);
         }
 
-void HMAC_cleanup(ctx)
-HMAC_CTX *ctx;
+void HMAC_CTX_cleanup(HMAC_CTX *ctx)
         {
-        memset(ctx,0,sizeof(HMAC_CTX));
+        EVP_MD_CTX_cleanup(&ctx->i_ctx);
+        EVP_MD_CTX_cleanup(&ctx->o_ctx);
+        EVP_MD_CTX_cleanup(&ctx->md_ctx);
+        memset(ctx,0,sizeof *ctx);
         }
 
-unsigned char *HMAC(evp_md,key,key_len,d,n,md,md_len)
-EVP_MD *evp_md;
-unsigned char *key;
-int key_len;
-unsigned char *d;
-int n;
-unsigned char *md;
-unsigned int *md_len;
+unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
+                    const unsigned char *d, int n, unsigned char *md,
+                    unsigned int *md_len)
         {
         HMAC_CTX c;
         static unsigned char m[EVP_MAX_MD_SIZE];
 
         if (md == NULL) md=m;
+        HMAC_CTX_init(&c);
         HMAC_Init(&c,key,key_len,evp_md);
         HMAC_Update(&c,d,n);
         HMAC_Final(&c,md,md_len);
-        HMAC_cleanup(&c);
+        HMAC_CTX_cleanup(&c);
         return(md);
         }
 
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h
index e6b43f52c4..0364a1fcbd 100644
--- a/src/lib/libcrypto/hmac/hmac.h
+++ b/src/lib/libcrypto/hmac/hmac.h
@@ -58,17 +58,21 @@
 #ifndef HEADER_HMAC_H
 #define HEADER_HMAC_H
 
-#ifdef  __cplusplus
-extern "C" {
+#ifdef OPENSSL_NO_HMAC
+#error HMAC is disabled.
 #endif
 
-#include "evp.h"
+#include <openssl/evp.h>
 
 #define HMAC_MAX_MD_CBLOCK      64
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct hmac_ctx_st
         {
-        EVP_MD *md;
+        const EVP_MD *md;
         EVP_MD_CTX md_ctx;
         EVP_MD_CTX i_ctx;
         EVP_MD_CTX o_ctx;
@@ -78,26 +82,22 @@ typedef struct hmac_ctx_st
 
 #define HMAC_size(e)    (EVP_MD_size((e)->md))
 
-#ifndef NOPROTO
-
-void HMAC_Init(HMAC_CTX *ctx, unsigned char *key, int len,
-        EVP_MD *md);
-void HMAC_Update(HMAC_CTX *ctx,unsigned char *key, int len);
-void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
-void HMAC_cleanup(HMAC_CTX *ctx);
-unsigned char *HMAC(EVP_MD *evp_md, unsigned char *key, int key_len,
-        unsigned char *d, int n, unsigned char *md, unsigned int *md_len);
 
+void HMAC_CTX_init(HMAC_CTX *ctx);
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
 
-#else
+#define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
 
-void HMAC_Init();
-void HMAC_Update();
-void HMAC_Final();
-void HMAC_cleanup();
-unsigned char *HMAC();
+void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
+               const EVP_MD *md); /* deprecated */
+void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
+                  const EVP_MD *md, ENGINE *impl);
+void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, int len);
+void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
+unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
+                    const unsigned char *d, int n, unsigned char *md,
+                    unsigned int *md_len);
 
-#endif
 
 #ifdef  __cplusplus
 }