Dr. Stephen Henson
58fdd30664
revert more "version skew" changes that break FIPS builds
2012-06-10 23:01:28 +00:00
Ben Laurie
af454b5bb0
Reduce version skew.
2012-06-08 09:18:47 +00:00
Dr. Stephen Henson
88be4ebfbc
make update
2012-04-26 10:42:20 +00:00
Andy Polyakov
0d829f6681
e_rc4_hmac_md5.c: reapply commit#21726, which was erroneously omitted.
...
PR: 2797, 2792
2012-04-20 21:45:17 +00:00
Dr. Stephen Henson
ecf963b80d
make ciphers work again for FIPS builds
2012-04-20 00:07:48 +00:00
Andy Polyakov
7fc6d35be0
e_rc4_hmac_md5.c: last commit was inappropriate for non-x86[_64] platforms
...
[from HEAD].
PR: 2792
2012-04-19 20:43:02 +00:00
Dr. Stephen Henson
143619ccf6
only call FIPS_cipherinit in FIPS mode
2012-04-18 22:41:50 +00:00
Andy Polyakov
9f339d75b5
e_rc4_hmac_md5.c: update from HEAD, fixes crash on legacy Intel CPUs.
...
PR: 2792
2012-04-18 17:51:33 +00:00
Andy Polyakov
371056f2b9
e_aes_cbc_hmac_sha1.c: handle zero-length payload and engage empty frag
...
countermeasure [from HEAD].
PR: 2778
2012-04-15 14:23:03 +00:00
Dr. Stephen Henson
c34137bef9
fix leak
2012-03-22 16:28:51 +00:00
Dr. Stephen Henson
8705846710
only cleanup ctx if we need to, save ctx flags when we do
2012-02-10 16:54:56 +00:00
Dr. Stephen Henson
7b23c126e6
undef some symbols that cause problems with make depend for fips builds
2012-01-18 01:40:36 +00:00
Dr. Stephen Henson
5c05f69450
make update
2011-12-27 14:38:27 +00:00
Ben Laurie
825e1a7c56
Fix warnings.
2011-12-02 14:39:41 +00:00
Dr. Stephen Henson
a310428527
Workaround so "make depend" works for fips builds.
2011-11-22 12:50:59 +00:00
Andy Polyakov
cd7b854bbb
e_rc4_hmac_md5.c: make it work on darwin64, which is configured with RC4_CHAR.
2011-11-15 12:39:48 +00:00
Andy Polyakov
e6ccc6ed70
Configure, e_aes.c: allow for XTS assembler implementation [from HEAD].
2011-11-15 12:19:56 +00:00
Andy Polyakov
e959a01fac
e_aes.c: jumbo update from HEAD.
2011-11-14 21:17:08 +00:00
Andy Polyakov
d807d4c21f
c_allc.c: add XTS ciphers [from HEAD].
2011-11-14 21:13:35 +00:00
Ben Laurie
4c02cf8ecc
make depend.
2011-11-13 20:23:34 +00:00
Bodo Möller
67f8de9ab8
"make update"
2011-10-19 15:24:44 +00:00
Andy Polyakov
a99ce1f5b1
e_aes.c: fix bug in aesni_gcm_tls_cipher [in HEAD].
2011-10-14 09:34:14 +00:00
Bodo Möller
93ff4c69f7
Make CTR mode behaviour consistent with other modes:
...
clear ctx->num in EVP_CipherInit_ex
Submitted by: Emilia Kasper
2011-10-13 13:42:29 +00:00
Dr. Stephen Henson
6841abe842
update pkey method initialisation and copy
2011-10-11 18:16:02 +00:00
Dr. Stephen Henson
dc100d87b5
Backport of password based CMS support from HEAD.
2011-10-09 15:28:02 +00:00
Dr. Stephen Henson
c0d2943952
Typo.
2011-09-16 23:04:07 +00:00
Dr. Stephen Henson
7d453a3b49
Fix warnings (from HEAD).
2011-09-10 21:18:37 +00:00
Bodo Möller
edf6b025b1
make update
2011-09-05 09:44:54 +00:00
Bodo Möller
9e96812934
Fix error codes.
2011-09-05 09:42:55 +00:00
Dr. Stephen Henson
fea15b553d
PR: 2588
...
Submitted by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Reviewed by: steve
Close file pointer.
2011-09-01 13:49:08 +00:00
Andy Polyakov
84e7485bfb
Add RC4-MD5 and AESNI-SHA1 "stitched" implementations [from HEAD].
2011-08-23 20:53:34 +00:00
Dr. Stephen Henson
c5d38fc262
aesni TLS GCM support
2011-08-11 23:06:37 +00:00
Dr. Stephen Henson
6b71970520
Sync EVP AES modes from HEAD.
2011-08-11 22:52:06 +00:00
Dr. Stephen Henson
61cdb9f36a
Backport GCM support from HEAD. Minimal support at present: no assembly
...
language optimisation. [original by Andy]
2011-08-04 11:12:38 +00:00
Andy Polyakov
90f3e4cf05
Back-port TLS AEAD framework [from HEAD].
2011-07-21 19:22:57 +00:00
Andy Polyakov
fbe2e28911
AES-NI backport from HEAD. Note that e_aes.c doesn't implement all modes
...
from HEAD yet, more will be back-ported later.
2011-06-28 14:49:35 +00:00
Dr. Stephen Henson
bf0736eb1f
Redirect null cipher to FIPS module.
2011-06-20 20:00:10 +00:00
Dr. Stephen Henson
ed1bbe2cad
make sure custom cipher flag doesn't use any mode bits
2011-06-13 23:10:34 +00:00
Dr. Stephen Henson
e8d23f7811
Redirect HMAC and CMAC operations to module.
2011-06-12 15:07:26 +00:00
Dr. Stephen Henson
7c402e5af3
Disable GCM, CCM, XTS outside FIPS mode this will be updated
...
when backported.
2011-06-10 14:22:42 +00:00
Ben Laurie
78ef9b0205
Fix warnings.
2011-06-09 16:03:18 +00:00
Dr. Stephen Henson
c6fa97a6d6
FIPS low level blocking for AES, RC4 and Camellia. This is complicated by
...
use of assembly language routines: rename the assembly language function
to the private_* variant unconditionally and perform tests from a small
C wrapper.
2011-06-05 17:36:44 +00:00
Dr. Stephen Henson
24d7159abd
Backport libcrypto audit: check return values of EVP functions instead
...
of assuming they will always suceed.
2011-06-03 20:53:00 +00:00
Dr. Stephen Henson
260d08b814
Backport CMAC support from HEAD.
2011-06-03 15:08:42 +00:00
Dr. Stephen Henson
916bcab28e
Prohibit low level cipher APIs in FIPS mode.
...
Not complete: ciphers with assembly language key setup are not
covered yet.
2011-06-01 16:54:06 +00:00
Dr. Stephen Henson
c7373c3dee
For consistency define clone digests in evp_fips.c
2011-06-01 15:11:00 +00:00
Dr. Stephen Henson
9f2c8eb2a1
Redirect clone digests to FIPS module for FIPS builds.
2011-06-01 14:28:21 +00:00
Dr. Stephen Henson
65300dcfb0
Prohibit use of low level digest APIs in FIPS mode.
2011-06-01 13:39:45 +00:00
Dr. Stephen Henson
5792219d1d
Redirect cipher operations to FIPS module for FIPS builds.
2011-05-29 16:18:38 +00:00
Dr. Stephen Henson
293c58c1e7
Use approved API for EVP digest operations in FIPS builds.
...
Call OPENSSL_init() in a few more places to make sure it is always called
at least once.
Initial cipher API redirection (incomplete).
2011-05-29 15:55:13 +00:00