diff options
Diffstat (limited to 'src/lib/libcrypto/hmac')
-rw-r--r-- | src/lib/libcrypto/hmac/Makefile | 110 | ||||
-rw-r--r-- | src/lib/libcrypto/hmac/Makefile.ssl | 101 | ||||
-rw-r--r-- | src/lib/libcrypto/hmac/hmac.c | 90 | ||||
-rw-r--r-- | src/lib/libcrypto/hmac/hmac.h | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/hmac/hmactest.c | 175 |
5 files changed, 418 insertions, 67 deletions
diff --git a/src/lib/libcrypto/hmac/Makefile b/src/lib/libcrypto/hmac/Makefile new file mode 100644 index 0000000000..0e91709f64 --- /dev/null +++ b/src/lib/libcrypto/hmac/Makefile | |||
@@ -0,0 +1,110 @@ | |||
1 | # | ||
2 | # OpenSSL/crypto/md/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= hmac | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | INCLUDES= | ||
9 | CFLAG=-g | ||
10 | MAKEFILE= Makefile | ||
11 | AR= ar r | ||
12 | |||
13 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
14 | |||
15 | GENERAL=Makefile | ||
16 | TEST=hmactest.c | ||
17 | APPS= | ||
18 | |||
19 | LIB=$(TOP)/libcrypto.a | ||
20 | LIBSRC=hmac.c hm_ameth.c hm_pmeth.c | ||
21 | LIBOBJ=hmac.o hm_ameth.o hm_pmeth.o | ||
22 | |||
23 | SRC= $(LIBSRC) | ||
24 | |||
25 | EXHEADER= hmac.h | ||
26 | HEADER= $(EXHEADER) | ||
27 | |||
28 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
29 | |||
30 | top: | ||
31 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
32 | |||
33 | all: lib | ||
34 | |||
35 | lib: $(LIBOBJ) | ||
36 | $(AR) $(LIB) $(LIBOBJ) | ||
37 | $(RANLIB) $(LIB) || echo Never mind. | ||
38 | @touch lib | ||
39 | |||
40 | files: | ||
41 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
42 | |||
43 | links: | ||
44 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
45 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
46 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
47 | |||
48 | install: | ||
49 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | ||
50 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
51 | do \ | ||
52 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
53 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
54 | done; | ||
55 | |||
56 | tags: | ||
57 | ctags $(SRC) | ||
58 | |||
59 | tests: | ||
60 | |||
61 | lint: | ||
62 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
63 | |||
64 | depend: | ||
65 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
66 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
67 | |||
68 | dclean: | ||
69 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
70 | mv -f Makefile.new $(MAKEFILE) | ||
71 | |||
72 | clean: | ||
73 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
74 | |||
75 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
76 | |||
77 | hm_ameth.o: ../../e_os.h ../../include/openssl/asn1.h | ||
78 | hm_ameth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
79 | hm_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
80 | hm_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
81 | hm_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
82 | hm_ameth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
83 | hm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
84 | hm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
85 | hm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h ../cryptlib.h | ||
86 | hm_ameth.o: hm_ameth.c | ||
87 | hm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h | ||
88 | hm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
89 | hm_pmeth.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h | ||
90 | hm_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
91 | hm_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
92 | hm_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
93 | hm_pmeth.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h | ||
94 | hm_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
95 | hm_pmeth.o: ../../include/openssl/opensslconf.h | ||
96 | hm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
97 | hm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
98 | hm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
99 | hm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
100 | hm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
101 | hm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h hm_pmeth.c | ||
102 | hmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
103 | hmac.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
104 | hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
105 | hmac.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h | ||
106 | hmac.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
107 | hmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
108 | hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
109 | hmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
110 | hmac.o: ../../include/openssl/symhacks.h ../cryptlib.h hmac.c | ||
diff --git a/src/lib/libcrypto/hmac/Makefile.ssl b/src/lib/libcrypto/hmac/Makefile.ssl new file mode 100644 index 0000000000..f1c07322c4 --- /dev/null +++ b/src/lib/libcrypto/hmac/Makefile.ssl | |||
@@ -0,0 +1,101 @@ | |||
1 | # | ||
2 | # SSLeay/crypto/md/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= hmac | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | INCLUDES= | ||
9 | CFLAG=-g | ||
10 | INSTALL_PREFIX= | ||
11 | OPENSSLDIR= /usr/local/ssl | ||
12 | INSTALLTOP=/usr/local/ssl | ||
13 | MAKE= make -f Makefile.ssl | ||
14 | MAKEDEPPROG= makedepend | ||
15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
16 | MAKEFILE= Makefile.ssl | ||
17 | AR= ar r | ||
18 | |||
19 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
20 | |||
21 | GENERAL=Makefile | ||
22 | TEST=hmactest.c | ||
23 | APPS= | ||
24 | |||
25 | LIB=$(TOP)/libcrypto.a | ||
26 | LIBSRC=hmac.c | ||
27 | LIBOBJ=hmac.o | ||
28 | |||
29 | SRC= $(LIBSRC) | ||
30 | |||
31 | EXHEADER= hmac.h | ||
32 | HEADER= $(EXHEADER) | ||
33 | |||
34 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
35 | |||
36 | top: | ||
37 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
38 | |||
39 | all: lib | ||
40 | |||
41 | lib: $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) || echo Never mind. | ||
44 | @touch lib | ||
45 | |||
46 | files: | ||
47 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
48 | |||
49 | links: | ||
50 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
51 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
52 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
53 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
54 | |||
55 | install: | ||
56 | @for i in $(EXHEADER) ; \ | ||
57 | do \ | ||
58 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
59 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
60 | done; | ||
61 | |||
62 | tags: | ||
63 | ctags $(SRC) | ||
64 | |||
65 | tests: | ||
66 | |||
67 | lint: | ||
68 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
69 | |||
70 | depend: | ||
71 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
72 | |||
73 | dclean: | ||
74 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
75 | mv -f Makefile.new $(MAKEFILE) | ||
76 | |||
77 | clean: | ||
78 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
79 | |||
80 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
81 | |||
82 | hmac.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h | ||
83 | hmac.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h | ||
84 | hmac.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | ||
85 | hmac.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h | ||
86 | hmac.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | ||
87 | hmac.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | ||
88 | hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
89 | hmac.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h | ||
90 | hmac.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
91 | hmac.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
92 | hmac.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
93 | hmac.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
94 | hmac.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
95 | hmac.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h | ||
96 | hmac.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
97 | hmac.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
98 | hmac.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
99 | hmac.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
100 | hmac.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
101 | hmac.o: ../cryptlib.h hmac.c | ||
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c index 45015fe754..cbc1c76a57 100644 --- a/src/lib/libcrypto/hmac/hmac.c +++ b/src/lib/libcrypto/hmac/hmac.c | |||
@@ -61,7 +61,9 @@ | |||
61 | #include "cryptlib.h" | 61 | #include "cryptlib.h" |
62 | #include <openssl/hmac.h> | 62 | #include <openssl/hmac.h> |
63 | 63 | ||
64 | int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | 64 | #ifndef OPENSSL_FIPS |
65 | |||
66 | void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | ||
65 | const EVP_MD *md, ENGINE *impl) | 67 | const EVP_MD *md, ENGINE *impl) |
66 | { | 68 | { |
67 | int i,j,reset=0; | 69 | int i,j,reset=0; |
@@ -82,13 +84,10 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | |||
82 | OPENSSL_assert(j <= (int)sizeof(ctx->key)); | 84 | OPENSSL_assert(j <= (int)sizeof(ctx->key)); |
83 | if (j < len) | 85 | if (j < len) |
84 | { | 86 | { |
85 | if (!EVP_DigestInit_ex(&ctx->md_ctx,md, impl)) | 87 | EVP_DigestInit_ex(&ctx->md_ctx,md, impl); |
86 | goto err; | 88 | EVP_DigestUpdate(&ctx->md_ctx,key,len); |
87 | if (!EVP_DigestUpdate(&ctx->md_ctx,key,len)) | 89 | EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key, |
88 | goto err; | 90 | &ctx->key_length); |
89 | if (!EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key, | ||
90 | &ctx->key_length)) | ||
91 | goto err; | ||
92 | } | 91 | } |
93 | else | 92 | else |
94 | { | 93 | { |
@@ -105,38 +104,31 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | |||
105 | { | 104 | { |
106 | for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) | 105 | for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) |
107 | pad[i]=0x36^ctx->key[i]; | 106 | pad[i]=0x36^ctx->key[i]; |
108 | if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl)) | 107 | EVP_DigestInit_ex(&ctx->i_ctx,md, impl); |
109 | goto err; | 108 | EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md)); |
110 | if (!EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md))) | ||
111 | goto err; | ||
112 | 109 | ||
113 | for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) | 110 | for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) |
114 | pad[i]=0x5c^ctx->key[i]; | 111 | pad[i]=0x5c^ctx->key[i]; |
115 | if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl)) | 112 | EVP_DigestInit_ex(&ctx->o_ctx,md, impl); |
116 | goto err; | 113 | EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md)); |
117 | if (!EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md))) | ||
118 | goto err; | ||
119 | } | 114 | } |
120 | if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx)) | 115 | EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx); |
121 | goto err; | ||
122 | return 1; | ||
123 | err: | ||
124 | return 0; | ||
125 | } | 116 | } |
126 | 117 | ||
127 | int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md) | 118 | void HMAC_Init(HMAC_CTX *ctx, const void *key, int len, |
119 | const EVP_MD *md) | ||
128 | { | 120 | { |
129 | if(key && md) | 121 | if(key && md) |
130 | HMAC_CTX_init(ctx); | 122 | HMAC_CTX_init(ctx); |
131 | return HMAC_Init_ex(ctx,key,len,md, NULL); | 123 | HMAC_Init_ex(ctx,key,len,md, NULL); |
132 | } | 124 | } |
133 | 125 | ||
134 | int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) | 126 | void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) |
135 | { | 127 | { |
136 | return EVP_DigestUpdate(&ctx->md_ctx,data,len); | 128 | EVP_DigestUpdate(&ctx->md_ctx,data,len); |
137 | } | 129 | } |
138 | 130 | ||
139 | int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) | 131 | void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) |
140 | { | 132 | { |
141 | int j; | 133 | int j; |
142 | unsigned int i; | 134 | unsigned int i; |
@@ -144,17 +136,10 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) | |||
144 | 136 | ||
145 | j=EVP_MD_block_size(ctx->md); | 137 | j=EVP_MD_block_size(ctx->md); |
146 | 138 | ||
147 | if (!EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i)) | 139 | EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i); |
148 | goto err; | 140 | EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx); |
149 | if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx)) | 141 | EVP_DigestUpdate(&ctx->md_ctx,buf,i); |
150 | goto err; | 142 | EVP_DigestFinal_ex(&ctx->md_ctx,md,len); |
151 | if (!EVP_DigestUpdate(&ctx->md_ctx,buf,i)) | ||
152 | goto err; | ||
153 | if (!EVP_DigestFinal_ex(&ctx->md_ctx,md,len)) | ||
154 | goto err; | ||
155 | return 1; | ||
156 | err: | ||
157 | return 0; | ||
158 | } | 143 | } |
159 | 144 | ||
160 | void HMAC_CTX_init(HMAC_CTX *ctx) | 145 | void HMAC_CTX_init(HMAC_CTX *ctx) |
@@ -164,22 +149,6 @@ void HMAC_CTX_init(HMAC_CTX *ctx) | |||
164 | EVP_MD_CTX_init(&ctx->md_ctx); | 149 | EVP_MD_CTX_init(&ctx->md_ctx); |
165 | } | 150 | } |
166 | 151 | ||
167 | int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx) | ||
168 | { | ||
169 | if (!EVP_MD_CTX_copy(&dctx->i_ctx, &sctx->i_ctx)) | ||
170 | goto err; | ||
171 | if (!EVP_MD_CTX_copy(&dctx->o_ctx, &sctx->o_ctx)) | ||
172 | goto err; | ||
173 | if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx)) | ||
174 | goto err; | ||
175 | memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK); | ||
176 | dctx->key_length = sctx->key_length; | ||
177 | dctx->md = sctx->md; | ||
178 | return 1; | ||
179 | err: | ||
180 | return 0; | ||
181 | } | ||
182 | |||
183 | void HMAC_CTX_cleanup(HMAC_CTX *ctx) | 152 | void HMAC_CTX_cleanup(HMAC_CTX *ctx) |
184 | { | 153 | { |
185 | EVP_MD_CTX_cleanup(&ctx->i_ctx); | 154 | EVP_MD_CTX_cleanup(&ctx->i_ctx); |
@@ -197,16 +166,11 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, | |||
197 | 166 | ||
198 | if (md == NULL) md=m; | 167 | if (md == NULL) md=m; |
199 | HMAC_CTX_init(&c); | 168 | HMAC_CTX_init(&c); |
200 | if (!HMAC_Init(&c,key,key_len,evp_md)) | 169 | HMAC_Init(&c,key,key_len,evp_md); |
201 | goto err; | 170 | HMAC_Update(&c,d,n); |
202 | if (!HMAC_Update(&c,d,n)) | 171 | HMAC_Final(&c,md,md_len); |
203 | goto err; | ||
204 | if (!HMAC_Final(&c,md,md_len)) | ||
205 | goto err; | ||
206 | HMAC_CTX_cleanup(&c); | 172 | HMAC_CTX_cleanup(&c); |
207 | return md; | 173 | return(md); |
208 | err: | ||
209 | return NULL; | ||
210 | } | 174 | } |
211 | 175 | ||
212 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) | 176 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) |
@@ -215,3 +179,5 @@ void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) | |||
215 | EVP_MD_CTX_set_flags(&ctx->o_ctx, flags); | 179 | EVP_MD_CTX_set_flags(&ctx->o_ctx, flags); |
216 | EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); | 180 | EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); |
217 | } | 181 | } |
182 | |||
183 | #endif | ||
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h index 1be0022190..fc38ffb52b 100644 --- a/src/lib/libcrypto/hmac/hmac.h +++ b/src/lib/libcrypto/hmac/hmac.h | |||
@@ -90,16 +90,15 @@ void HMAC_CTX_cleanup(HMAC_CTX *ctx); | |||
90 | 90 | ||
91 | #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */ | 91 | #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */ |
92 | 92 | ||
93 | int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, | 93 | void HMAC_Init(HMAC_CTX *ctx, const void *key, int len, |
94 | const EVP_MD *md); /* deprecated */ | 94 | const EVP_MD *md); /* deprecated */ |
95 | int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | 95 | void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, |
96 | const EVP_MD *md, ENGINE *impl); | 96 | const EVP_MD *md, ENGINE *impl); |
97 | int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len); | 97 | void 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); | 98 | void 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, | 99 | 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, | 100 | const unsigned char *d, size_t n, unsigned char *md, |
101 | unsigned int *md_len); | 101 | unsigned int *md_len); |
102 | int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx); | ||
103 | 102 | ||
104 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags); | 103 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags); |
105 | 104 | ||
diff --git a/src/lib/libcrypto/hmac/hmactest.c b/src/lib/libcrypto/hmac/hmactest.c new file mode 100644 index 0000000000..1b906b81af --- /dev/null +++ b/src/lib/libcrypto/hmac/hmactest.c | |||
@@ -0,0 +1,175 @@ | |||
1 | /* crypto/hmac/hmactest.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
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 | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
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. | ||
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. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
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: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
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 | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
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 | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <string.h> | ||
61 | #include <stdlib.h> | ||
62 | |||
63 | #include "../e_os.h" | ||
64 | |||
65 | #ifdef OPENSSL_NO_HMAC | ||
66 | int main(int argc, char *argv[]) | ||
67 | { | ||
68 | printf("No HMAC support\n"); | ||
69 | return(0); | ||
70 | } | ||
71 | #else | ||
72 | #include <openssl/hmac.h> | ||
73 | #ifndef OPENSSL_NO_MD5 | ||
74 | #include <openssl/md5.h> | ||
75 | #endif | ||
76 | |||
77 | #ifdef CHARSET_EBCDIC | ||
78 | #include <openssl/ebcdic.h> | ||
79 | #endif | ||
80 | |||
81 | #ifndef OPENSSL_NO_MD5 | ||
82 | static struct test_st | ||
83 | { | ||
84 | unsigned char key[16]; | ||
85 | int key_len; | ||
86 | unsigned char data[64]; | ||
87 | int data_len; | ||
88 | unsigned char *digest; | ||
89 | } test[4]={ | ||
90 | { "", | ||
91 | 0, | ||
92 | "More text test vectors to stuff up EBCDIC machines :-)", | ||
93 | 54, | ||
94 | (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86", | ||
95 | },{ {0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b, | ||
96 | 0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,}, | ||
97 | 16, | ||
98 | "Hi There", | ||
99 | 8, | ||
100 | (unsigned char *)"9294727a3638bb1c13f48ef8158bfc9d", | ||
101 | },{ "Jefe", | ||
102 | 4, | ||
103 | "what do ya want for nothing?", | ||
104 | 28, | ||
105 | (unsigned char *)"750c783e6ab0b503eaa86e310a5db738", | ||
106 | },{ | ||
107 | {0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa, | ||
108 | 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,}, | ||
109 | 16, | ||
110 | {0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd, | ||
111 | 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd, | ||
112 | 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd, | ||
113 | 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd, | ||
114 | 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd, | ||
115 | 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd, | ||
116 | 0xdd,0xdd}, | ||
117 | 50, | ||
118 | (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6", | ||
119 | }, | ||
120 | }; | ||
121 | #endif | ||
122 | |||
123 | static char *pt(unsigned char *md); | ||
124 | int main(int argc, char *argv[]) | ||
125 | { | ||
126 | #ifndef OPENSSL_NO_MD5 | ||
127 | int i; | ||
128 | char *p; | ||
129 | #endif | ||
130 | int err=0; | ||
131 | |||
132 | #ifdef OPENSSL_NO_MD5 | ||
133 | printf("test skipped: MD5 disabled\n"); | ||
134 | #else | ||
135 | |||
136 | #ifdef CHARSET_EBCDIC | ||
137 | ebcdic2ascii(test[0].data, test[0].data, test[0].data_len); | ||
138 | ebcdic2ascii(test[1].data, test[1].data, test[1].data_len); | ||
139 | ebcdic2ascii(test[2].key, test[2].key, test[2].key_len); | ||
140 | ebcdic2ascii(test[2].data, test[2].data, test[2].data_len); | ||
141 | #endif | ||
142 | |||
143 | for (i=0; i<4; i++) | ||
144 | { | ||
145 | p=pt(HMAC(EVP_md5(), | ||
146 | test[i].key, test[i].key_len, | ||
147 | test[i].data, test[i].data_len, | ||
148 | NULL,NULL)); | ||
149 | |||
150 | if (strcmp(p,(char *)test[i].digest) != 0) | ||
151 | { | ||
152 | printf("error calculating HMAC on %d entry'\n",i); | ||
153 | printf("got %s instead of %s\n",p,test[i].digest); | ||
154 | err++; | ||
155 | } | ||
156 | else | ||
157 | printf("test %d ok\n",i); | ||
158 | } | ||
159 | #endif /* OPENSSL_NO_MD5 */ | ||
160 | EXIT(err); | ||
161 | return(0); | ||
162 | } | ||
163 | |||
164 | #ifndef OPENSSL_NO_MD5 | ||
165 | static char *pt(unsigned char *md) | ||
166 | { | ||
167 | int i; | ||
168 | static char buf[80]; | ||
169 | |||
170 | for (i=0; i<MD5_DIGEST_LENGTH; i++) | ||
171 | sprintf(&(buf[i*2]),"%02x",md[i]); | ||
172 | return(buf); | ||
173 | } | ||
174 | #endif | ||
175 | #endif | ||