Extend HMAC_MAX_MD_CBLOCK to accomodate SHA-512.

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

diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 57204985d32606cbb018518287e7234678f79d7a..719fc408ace4afb2bba3090376d2d2f07a670f64 100644 (file)
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -58,17 +58,19 @@
 #ifndef HEADER_HMAC_H
 #define HEADER_HMAC_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+#include <openssl/opensslconf.h>
 
-#ifdef NO_HMAC
+#ifdef OPENSSL_NO_HMAC
 #error HMAC is disabled.
 #endif
 
 #include <openssl/evp.h>
 
-#define HMAC_MAX_MD_CBLOCK     64
+#define HMAC_MAX_MD_CBLOCK     128     /* largest known is SHA512 */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 typedef struct hmac_ctx_st
        {
@@ -83,13 +85,20 @@ 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,
-              const EVP_MD *md);
-void HMAC_Update(HMAC_CTX *ctx,unsigned char *key, int len);
+void HMAC_CTX_init(HMAC_CTX *ctx);
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+
+#define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
+
+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, size_t len);
 void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
-void HMAC_cleanup(HMAC_CTX *ctx);
-unsigned char *HMAC(const EVP_MD *evp_md, const 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, size_t n, unsigned char *md,
+                   unsigned int *md_len);
 
 
 #ifdef  __cplusplus