diff options
Diffstat (limited to 'src/lib/libcrypto/hmac/hmac.h')
-rw-r--r-- | src/lib/libcrypto/hmac/hmac.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h index 5631d465e9..f3418b3cb7 100644 --- a/src/lib/libcrypto/hmac/hmac.h +++ b/src/lib/libcrypto/hmac/hmac.h | |||
@@ -1,25 +1,25 @@ | |||
1 | /* $OpenBSD: hmac.h,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: hmac.h,v 1.12 2014/06/21 13:39:46 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -72,15 +72,14 @@ | |||
72 | extern "C" { | 72 | extern "C" { |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | typedef struct hmac_ctx_st | 75 | typedef struct hmac_ctx_st { |
76 | { | ||
77 | const EVP_MD *md; | 76 | const EVP_MD *md; |
78 | EVP_MD_CTX md_ctx; | 77 | EVP_MD_CTX md_ctx; |
79 | EVP_MD_CTX i_ctx; | 78 | EVP_MD_CTX i_ctx; |
80 | EVP_MD_CTX o_ctx; | 79 | EVP_MD_CTX o_ctx; |
81 | unsigned int key_length; | 80 | unsigned int key_length; |
82 | unsigned char key[HMAC_MAX_MD_CBLOCK]; | 81 | unsigned char key[HMAC_MAX_MD_CBLOCK]; |
83 | } HMAC_CTX; | 82 | } HMAC_CTX; |
84 | 83 | ||
85 | #define HMAC_size(e) (EVP_MD_size((e)->md)) | 84 | #define HMAC_size(e) (EVP_MD_size((e)->md)) |
86 | 85 | ||
@@ -91,14 +90,13 @@ void HMAC_CTX_cleanup(HMAC_CTX *ctx); | |||
91 | #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */ | 90 | #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */ |
92 | 91 | ||
93 | int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, | 92 | int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, |
94 | const EVP_MD *md); /* deprecated */ | 93 | const EVP_MD *md); /* deprecated */ |
95 | int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | 94 | int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, |
96 | const EVP_MD *md, ENGINE *impl); | 95 | ENGINE *impl); |
97 | int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len); | 96 | int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len); |
98 | int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len); | 97 | int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len); |
99 | unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, | 98 | unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, |
100 | const unsigned char *d, size_t n, unsigned char *md, | 99 | const unsigned char *d, size_t n, unsigned char *md, unsigned int *md_len); |
101 | unsigned int *md_len); | ||
102 | int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx); | 100 | int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx); |
103 | 101 | ||
104 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags); | 102 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags); |