Dr. Stephen Henson
5f2329b82a
Fix fips flag handling.
...
Don't set the fips flags in cipher and digests as the implementations
aren't suitable for FIPS mode and will be redirected to the FIPS module
versions anyway.
Return EVP_CIPH_FLAG_FIPS or EVP_MD_FLAG_FIPS if a FIPS implementation
exists when calling EVP_CIPHER_flags and EVP_MD_flags repectively.
Remove unused FIPS code from e_aes.c: the 1.0.2 branch will never be
used to build a FIPS module.
2014-02-27 19:18:58 +00:00
Dr. Stephen Henson
01fb5e133f
Remove unused file.
...
The file evp_fips.c isn't used in OpenSSL 1.0.2 as FIPS and non-FIPS
implementations of algorithms can coexist.
2014-02-27 19:08:53 +00:00
Andy Polyakov
fd2c85f6ae
evp/e_aes.c: harmonize with 1.0.1.
2014-02-27 17:47:23 +01:00
Andy Polyakov
ca88a1d439
perlasm/x86asm.pl: recognize elf-1 denoting old ELF platforms.
...
(cherry picked from commit b62a4a1c0e77233e201517e5e32d575a0f20cc05)
2014-02-27 14:30:42 +01:00
Andy Polyakov
5615196f7b
perlasm/x86gas.pl: limit special OPENSSL_ia32cap_P treatment to ELF.
...
(cherry picked from commit ce876d8316409542283b356d331f90e1a1dfb853)
2014-02-27 14:29:07 +01:00
Andy Polyakov
1f59eb5f11
rc4/asm/rc4-586.pl: allow for 386-only build.
...
(cherry picked from commit f861b1d4335d4017953938160c7e4e0df9af5a7b)
2014-02-27 14:28:54 +01:00
Andy Polyakov
4bf6d66e67
des/asm/des-586.pl: shortcut reference to DES_SPtrans.
...
(cherry picked from commit fd361a67ef5e0ed953abc881aa7061a273bad9fe)
2014-02-27 14:28:44 +01:00
Andy Polyakov
559e69f9b4
crypto/Makefile: make it OSF-make-friendly
...
PR: 3165
2014-02-26 16:42:57 +01:00
Rob Stradling
f3b7e522d8
CABForum EV OIDs for Subject Jurisdiction of Incorporation or Registration.
...
(cherry picked from commit ffcc832ba6e17859d45779eea87e38467561dd5d)
2014-02-26 15:33:10 +00:00
Andy Polyakov
d00ae7cf70
sha/asm/sha256-586.pl: don't try to compile SIMD with no-sse2.
...
(cherry picked from commit d49135e7ead795412a8357ff425dc99e328c53f6)
2014-02-26 10:23:56 +01:00
Andy Polyakov
f92926e331
sha/asm/sha512-x86_64.pl: fix compilation error on Solaris.
...
(cherry picked from commit 147cca8f530b8ddf22087e5709927082e095a062)
2014-02-26 09:31:40 +01:00
Andy Polyakov
aa1bb606f3
aes/asm/vpaes-ppc.pl: fix traceback info.
...
(cherry picked from commit e704741bf3ce02c7dbcd9b81c4df257b3d919f7e)
2014-02-25 20:13:41 +01:00
Zoltan Arpadffy
dabd4f1986
OpenVMS fixes.
2014-02-25 15:16:03 +00:00
Dr. Stephen Henson
3678161d71
Don't use BN_ULLONG in n2l8 use SCTS_TIMESTAMP.
2014-02-25 15:05:08 +00:00
Dr. Stephen Henson
6634416732
Fix for v3_scts.c
...
Not all platforms define BN_ULLONG. Define SCTS_TIMESTAMP as a type
which should work on all platforms.
2014-02-25 14:54:09 +00:00
Dr. Stephen Henson
0f9bcf3319
Avoid Windows 8 Getversion deprecated errors.
...
Windows 8 SDKs complain that GetVersion() is deprecated.
We only use GetVersion like this:
(GetVersion() < 0x80000000)
which checks if the Windows version is NT based. Use a macro check_winnt()
which uses GetVersion() on older SDK versions and true otherwise.
(cherry picked from commit a4cc3c8041104896d51ae12ef7b678c31808ce52)
2014-02-25 13:41:53 +00:00
Rob Stradling
a948732e1c
Parse non-v1 SCTs less awkwardly.
...
(cherry picked from commit 19f65ddbab30543415584ae7916e12a3c5249dba)
2014-02-25 13:04:21 +00:00
Andy Polyakov
83fe7b9c83
x509/by_dir.c: fix run-away pointer (and potential SEGV)
...
when adding duplicates in add_cert_dir.
PR: 3261
Reported by: Marian Done
(cherry picked from commit 758954e0d8232d370ed72b7f86640e40443e1778)
2014-02-24 15:21:37 +01:00
Dr. Stephen Henson
97654d7e28
Prepare for 1.0.2-beta2-dev
2014-02-24 13:52:51 +00:00
Dr. Stephen Henson
94f4166017
Prepare for 1.0.2-beta1 release
2014-02-24 13:51:34 +00:00
Dr. Stephen Henson
a74c9c9e10
OpenSSL 1.0.2 is now in beta
2014-02-24 13:50:38 +00:00
Dr. Stephen Henson
d2a3c4497f
make update
2014-02-24 13:50:38 +00:00
Andy Polyakov
2d4d9623da
aes/asm/aesni-x86[_64].pl: minor Atom-specific performance tweak.
...
(cherry picked from commit 214368ffee5736836e2dbb80a16a4fbd85f0eaf9)
2014-02-21 12:15:07 +01:00
Dr. Stephen Henson
7743be3aac
make update
2014-02-20 22:57:24 +00:00
Dr. Stephen Henson
b709f8ef54
fix WIN32 warnings
2014-02-20 22:41:06 +00:00
Rob Stradling
c74ce24cd2
Show the contents of the RFC6962 Signed Certificate Timestamp List Certificate/OCSP Extensions.
...
Add the RFC6962 OIDs to the objects table.
(backport from master branch)
2014-02-20 21:43:54 +00:00
Dr. Stephen Henson
612566e752
Don't use CRYPTO_AES_CTR if it isn't defined.
...
(cherry picked from commit 6ecbc2bb62835a401ad6efe240d469a23b21755b)
2014-02-18 22:21:41 +00:00
Dr. Stephen Henson
eb70d4407f
Remove duplicate statement.
...
(cherry picked from commit 5a7652c3e585e970e5b778074c92e617e48fde38)
2014-02-15 01:29:24 +00:00
Klaus-Peter Junghanns
b335b5440a
Add support for aes-128/192/256-ctr to the cryptodev engine.
...
This can be used to speed up SRTP with libsrtp, e.g. on TI omap/sitara based devices.
(cherry picked from commit be2c4d9bd9e81030c547a34216ae2d8e5c888190)
2014-02-15 00:06:43 +00:00
Scott Schaefer
0413ea5801
Fix various spelling errors
...
(cherry picked from commit 2b4ffc659eabec29f76821f0ac624a2b8c19e4c7)
2014-02-14 22:35:15 +00:00
Andy Polyakov
aff78bb39a
ssl/s3_pkt.c: detect RAND_bytes error in multi-block.
...
(cherry picked from commit 701134320a94908d8c0ac513741cab41e215a7b5)
2014-02-14 17:45:33 +01:00
Andy Polyakov
104c032b7b
x86[_64]cpuid.pl: add low-level RDSEED.
...
(cherry picked from commit f4d456408d9d7bca31f34765d1a05fbd9fa55826)
2014-02-14 17:25:14 +01:00
Andy Polyakov
b347341c75
aes/asm/aesni-x86_64.pl: further optimization for Atom Silvermont.
...
Improve CBC decrypt and CTR by ~13/16%, which adds up to ~25/33%
improvement over "pre-Silvermont" version. [Add performance table to
aesni-x86.pl].
(cherry picked from commit 5599c7331b90d9d29c9914c2a95c16d91485415a)
2014-02-14 17:17:39 +01:00
Dr. Stephen Henson
c00f8d697a
Include self-signed flag in certificates by checking SKID/AKID as well
...
as issuer and subject names. Although this is an incompatible change
it should have little impact in pratice because self-issued certificates
that are not self-signed are rarely encountered.
(cherry picked from commit b1efb7161f409c81178b9aa95583db3390f90b1b)
2014-02-14 15:27:30 +00:00
Dr. Stephen Henson
b07e4f2f46
Include TA in checks/callback with partial chains.
...
When a chain is complete and ends in a trusted root checks are also
performed on the TA and the callback notified with ok==1. For
consistency do the same for chains where the TA is not self signed.
(cherry picked from commit 385b3486661628f3f806205752bf968b8114b347)
2014-02-14 15:12:53 +00:00
Dr. Stephen Henson
ced6dc5cef
Add cert_self_signed function to simplify verify
...
(from master)
2014-02-14 15:12:52 +00:00
Dr. Stephen Henson
bf2d129194
Simplify X509_STORE_CTX_get1_chain (from master).
2014-02-14 15:12:52 +00:00
Andy Polyakov
fcc6f699e3
evp/e_aes_cbc_hmac_sha*.c: improve cache locality.
...
(cherry picked from commit 9587429fa07a34066107e926fbc8708220f058fa)
2014-02-13 14:41:10 +01:00
Andy Polyakov
7078d93307
ghash-x86[_64].pl: ~15% improvement on Atom Silvermont
...
(other processors unaffected).
(cherry picked from commit 98e143f118aedc2fa79fa0ae90f1b039da106309)
2014-02-13 14:38:59 +01:00
Scott Deboy
038bec784e
Add callbacks supporting generation and retrieval of supplemental data entries, facilitating RFC 5878 (TLS auth extensions)
...
Removed prior audit proof logic - audit proof support was implemented using the generic TLS extension API
Tests exercising the new supplemental data registration and callback api can be found in ssltest.c.
Implemented changes to s_server and s_client to exercise supplemental data callbacks via the -auth argument, as well as additional flags to exercise supplemental data being sent only during renegotiation.
(cherry picked from commit 36086186a9b90cdad0d2cd0a598a10f03f8f4bcc)
Conflicts:
Configure
apps/s_client.c
apps/s_server.c
ssl/ssl.h
ssl/ssl3.h
ssl/ssltest.c
2014-02-08 16:12:15 -08:00
Dr. Stephen Henson
f407eec799
make update
2014-02-06 14:31:09 +00:00
Andy Polyakov
41cf2d2518
evp/e_aes_cbc_hmac_sha[1|256].c: add multi-block implementations [from master].
2014-02-05 19:52:38 +01:00
Andy Polyakov
41c373fa3e
[aesni|sha*]-mb-x86_64.pl: add multi-block assembly modules [from master].
2014-02-05 14:33:44 +01:00
Ben Laurie
984a30423d
Add extension free function.
2014-02-02 15:22:47 +00:00
Andy Polyakov
0693dd954e
modes/asm/ghash-s390x.pl: +15% performance improvement on z10.
...
(cherry picked from commit d162584b1154153d997fed18a9df2e60771fe06c)
2014-02-02 00:10:41 +01:00
Andy Polyakov
9071b36d9a
Add AES-NI+SHA256 stitch registrations (from master).
2014-02-02 00:05:02 +01:00
Andy Polyakov
eb6af20d2e
dso/dso_win32.c: fix compiler warning.
...
(cherry picked from commit 0a2d5003df1a9ecf801ac3b4a5cb7dda85449315)
2014-02-01 23:32:19 +01:00
Andy Polyakov
8087969c5b
crypto/cryptlib.c: remove stdio dependency (update from master).
2014-02-01 23:27:49 +01:00
Andy Polyakov
cb437c66d1
camellia/asm/cmll-x86_64.pl: fix symptomless bugs (update from master).
2014-02-01 23:14:33 +01:00
Ben Laurie
40b0d0765e
Remove redundant accessor (you can do the same thing, and more, with
...
X509_ALGOR_[gs]et0()).
2014-02-01 22:03:40 +00:00