Revert incompatible OCSP_basic_verify changes.

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

diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 7ed945da98c50b0b93e6b097ae4035486de6f349..1be00221908d1211572b54950730b35947fd49dd 100644 (file)
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -58,13 +58,15 @@
 #ifndef HEADER_HMAC_H
 #define HEADER_HMAC_H
 
+#include <openssl/opensslconf.h>
+
 #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" {
@@ -83,15 +85,23 @@ typedef struct hmac_ctx_st
 #define HMAC_size(e)   (EVP_MD_size((e)->md))
 
 
-void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-              const EVP_MD *md);
-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);
+void HMAC_CTX_init(HMAC_CTX *ctx);
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+
+#define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
+
+int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
+              const EVP_MD *md); /* deprecated */
+int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
+                 const EVP_MD *md, ENGINE *impl);
+int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
+int 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,
+                   const unsigned char *d, size_t n, unsigned char *md,
                    unsigned int *md_len);
+int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
 
+void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
 
 #ifdef  __cplusplus
 }