Some of the ENGINE file names were changed for 8.3 filename uniqueness

[openssl.git] / crypto / hmac / hmac.h

diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 00f9d7203c9668d4df4434b5ad97f8d6423d69c2..e70b01b2fb6b0b2a102b316ef8d92b572ea75afc 100644 (file)
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -58,11 +58,7 @@
 #ifndef HEADER_HMAC_H
 #define HEADER_HMAC_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_HMAC
+#ifdef OPENSSL_NO_HMAC
 #error HMAC is disabled.
 #endif
 
@@ -70,6 +66,10 @@ extern "C" {
 
 #define HMAC_MAX_MD_CBLOCK     64
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct hmac_ctx_st
        {
        const EVP_MD *md;
@@ -83,13 +83,16 @@ typedef struct hmac_ctx_st
 #define HMAC_size(e)   (EVP_MD_size((e)->md))
 
 
-void HMAC_Init(HMAC_CTX *ctx, const unsigned char *key, int len,
+void HMAC_CTX_init(HMAC_CTX *ctx);
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+
+void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
               const EVP_MD *md);
-void HMAC_Update(HMAC_CTX *ctx,unsigned char *key, int len);
+void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, 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);
+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);
 
 
 #ifdef  __cplusplus