diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 04:58:08 +0100 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 04:58:08 +0100 |
| commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
| tree | 9823103bf5828e47081ac906203516bdc332f577 /crypto/hmac | |
| parent | Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some (diff) | |
| download | openssl-6343829a391df59e46e513c84b6264ee71ad9518.tar.xz openssl-6343829a391df59e46e513c84b6264ee71ad9518.zip | |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'crypto/hmac')
| -rw-r--r-- | crypto/hmac/hm_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/hmac/hmac.c | 6 | ||||
| -rw-r--r-- | crypto/hmac/hmac.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c index 9f6b65abb5..6d8a89149e 100644 --- a/crypto/hmac/hm_ameth.c +++ b/crypto/hmac/hm_ameth.c @@ -104,7 +104,7 @@ static int hmac_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) */ static int old_hmac_decode(EVP_PKEY *pkey, - const unsigned char **pder, size_t derlen) + const unsigned char **pder, int derlen) { ASN1_OCTET_STRING *os; os = ASN1_OCTET_STRING_new(); diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index be5184f8dd..8c2e36ee7c 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -61,7 +61,7 @@ #include "cryptlib.h" #include <openssl/hmac.h> -int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t len, +int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, ENGINE *impl) { int i,j,reset=0; @@ -124,7 +124,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t len, return 0; } -int HMAC_Init(HMAC_CTX *ctx, const void *key, size_t len, const EVP_MD *md) +int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md) { if(key && md) HMAC_CTX_init(ctx); @@ -188,7 +188,7 @@ void HMAC_CTX_cleanup(HMAC_CTX *ctx) memset(ctx,0,sizeof *ctx); } -unsigned char *HMAC(const EVP_MD *evp_md, const void *key, size_t key_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) { diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h index f4a8230324..bf51476421 100644 --- a/crypto/hmac/hmac.h +++ b/crypto/hmac/hmac.h @@ -90,13 +90,13 @@ 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, size_t len, +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, size_t len, +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, size_t key_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); int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx); |