Andy Polyakov
ddc899bada
hpux-parisc2-*: engage assembler [from HEAD] and make it link.
2012-02-02 07:42:31 +00:00
Andy Polyakov
bd479e25c7
ghash-x86.pl: engage original MMX version in no-sse2 builds [from HEAD].
2012-01-25 17:56:25 +00:00
Andy Polyakov
eaf5bd168e
x86_64-xlate.pl: 1.0.1-specific typo.
2012-01-25 17:50:23 +00:00
Dr. Stephen Henson
11ea212e8c
only include evp.h once
2012-01-24 22:59:46 +00:00
Dr. Stephen Henson
cb29d8c11f
only include string.h once
2012-01-24 22:58:46 +00:00
Andy Polyakov
f02f7c2c4a
cryptlib.c: make even non-Windows builds "strtoull-agnostic" [from HEAD].
2012-01-21 12:18:29 +00:00
Andy Polyakov
a1e44cc14f
x86_64-xlate.pl: proper solution for RT#2620 [from HEAD].
2012-01-21 11:35:20 +00:00
Dr. Stephen Henson
d2d09bf68c
change version to beta3-dev
2012-01-19 17:14:17 +00:00
Dr. Stephen Henson
463e76b63c
prepare for beta2
2012-01-19 15:37:57 +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
Andy Polyakov
4fb7e2b445
Fix OPNESSL vs. OPENSSL typos [from HEAD].
...
PR: 2613
Submitted by: Leena Heino
2012-01-15 13:40:21 +00:00
Dr. Stephen Henson
9138e3c061
fix warning
2012-01-15 13:30:52 +00:00
Andy Polyakov
9b2a29660b
Sanitize usage of <ctype.h> functions. It's important that characters
...
are passed zero-extended, not sign-extended [from HEAD].
PR: 2682
2012-01-12 16:28:03 +00:00
Andy Polyakov
b7b4a9fa57
sparcv9cap.c: omit unused variable.
2012-01-12 14:19:52 +00:00
Andy Polyakov
958e6a75a1
asn1/t_x509.c: fix serial number print, harmonize with a_int.c [from HEAD].
...
PR: 2675
Submitted by: Annie Yousar
2012-01-11 21:12:47 +00:00
Andy Polyakov
397977726c
aes-sparcv9.pl: clean up regexp [from HEAD].
...
PR: 2685
2012-01-11 15:32:08 +00:00
Dr. Stephen Henson
285d9189c7
PR: 2652
...
Submitted by: Arpadffy Zoltan <Zoltan.Arpadffy@scientificgames.se>
OpenVMS fixes.
2012-01-05 14:30:08 +00:00
Dr. Stephen Henson
2f97765bc3
Prevent malformed RFC3779 data triggering an assertion failure (CVE-2011-4577)
2012-01-04 23:01:19 +00:00
Dr. Stephen Henson
3205ca8deb
fix warnings
2012-01-04 14:46:04 +00:00
Dr. Stephen Henson
ab585551c0
prepare for 1.0.1-beta1
2012-01-03 13:30:28 +00:00
Dr. Stephen Henson
6cf0d7b999
OpenSSL 1.0.1 is now in beta.
2012-01-02 18:28:28 +00:00
Dr. Stephen Henson
9d972207f0
incomplete provisional OAEP CMS decrypt support
2012-01-02 18:16:40 +00:00
Dr. Stephen Henson
5c05f69450
make update
2011-12-27 14:38:27 +00:00
Dr. Stephen Henson
f529dca488
fix error code
2011-12-27 14:37:43 +00:00
Dr. Stephen Henson
e065e6cda2
PR: 2535
...
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Reviewed by: steve
Add SCTP support for DTLS (RFC 6083).
2011-12-25 14:45:40 +00:00
Dr. Stephen Henson
62308f3f4a
PR: 2563
...
Submitted by: Paul Green <Paul.Green@stratus.com>
Reviewed by: steve
Improved PRNG seeding for VOS.
2011-12-19 17:02:35 +00:00
Andy Polyakov
700384be8e
vpaes-x86.pl: revert previous commit and solve the problem through x86masm.pl [from HEAD].
...
PR: 2657
2011-12-15 22:20:26 +00:00
Dr. Stephen Henson
b8a22c40e0
PR: 1794
...
Submitted by: Peter Sylvester <peter.sylvester@edelweb.fr>
Reviewed by: steve
Remove unnecessary code for srp and to add some comments to
s_client.
- the callback to provide a user during client connect is
no longer necessary since rfc 5054 a connection attempt
with an srp cipher and no user is terminated when the
cipher is acceptable
- comments to indicate in s_client the (non-)usefulness of
th primalaty tests for non known group parameters.
2011-12-14 22:18:03 +00:00
Andy Polyakov
3918de9ad1
vpaes-x86.pl: portability fix.
...
PR: 2657
2011-12-14 21:30:25 +00:00
Andy Polyakov
7b467c6b81
modexp512-x86_64.pl: Solaris portability fix [from HEAD].
...
PR: 2656
2011-12-12 15:12:09 +00:00
Dr. Stephen Henson
e559febaf1
typo
2011-12-10 01:37:55 +00:00
Ben Laurie
6a4b87eb9d
Fix warning.
2011-12-09 20:15:48 +00:00
Andy Polyakov
edcba19c23
perlasm/x86gas.pl: give a hand old assemblers assembling loop instruction
...
[from HEAD].
2011-12-09 19:16:35 +00:00
Andy Polyakov
b140ae9137
cryptlib.c: allow for OPENSSL_ia32cap=~0x????? syntax for environment value
...
in question.
2011-12-09 15:46:41 +00:00
Andy Polyakov
8ee0591f28
x86-mont.pl: fix bug in integer-only squaring path.
...
PR: 2648
2011-12-09 14:26:28 +00:00
Ben Laurie
825e1a7c56
Fix warnings.
2011-12-02 14:39:41 +00:00
Bodo Möller
a0dce9be76
Fix ecdsatest.c.
...
Submitted by: Emilia Kasper
2011-12-02 12:40:42 +00:00
Bodo Möller
cf2b938529
Fix BIO_f_buffer().
...
Submitted by: Adam Langley
Reviewed by: Bodo Moeller
2011-12-02 12:24:48 +00:00
Andy Polyakov
62f685a9cd
bn/asm/mips.pl: fix typos [from HEAD].
2011-12-01 12:17:20 +00:00
Dr. Stephen Henson
a310428527
Workaround so "make depend" works for fips builds.
2011-11-22 12:50:59 +00:00
Andy Polyakov
0a8f00af34
bsaes-x86_64.pl: fix buffer overrun in tail processing [from HEAD].
2011-11-16 23:36:40 +00:00
Ben Laurie
060a38a2c0
Add DTLS-SRTP.
2011-11-15 23:02:16 +00:00
Andy Polyakov
58402976b4
aes-armv4.pl: make it link.
2011-11-15 13:55:52 +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
aecc0756e8
aes-s390x.pl: make it link.
2011-11-15 12:20:55 +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
17674bfdf7
ec_cvt.c: performance update from HEAD.
2011-11-14 21:14:53 +00:00
Andy Polyakov
d807d4c21f
c_allc.c: add XTS ciphers [from HEAD].
2011-11-14 21:13:35 +00:00
Andy Polyakov
2357ae17e7
x86 assembler pack update from HEAD.
2011-11-14 21:06:50 +00:00
Andy Polyakov
9f1c5491d2
BN update from HEAD.
2011-11-14 21:05:42 +00:00
Andy Polyakov
70b52222f5
x86_64 assembler pack update from HEAD.
2011-11-14 21:01:21 +00:00
Andy Polyakov
88cb59727c
ARM assembler pack update from HEAD.
2011-11-14 20:58:01 +00:00
Andy Polyakov
781bfdc314
Alpha assembler pack update from HEAD.
2011-11-14 20:56:15 +00:00
Andy Polyakov
b66723b23e
MIPS assembler pack update from HEAD.
2011-11-14 20:55:24 +00:00
Andy Polyakov
cf96d71c22
PPC assembler pack update from HEAD.
2011-11-14 20:54:17 +00:00
Andy Polyakov
1a111921da
PA-RISC assembler pack update from HEAD.
2011-11-14 20:50:15 +00:00
Andy Polyakov
5d9bb428bb
SPARCv9 assembler pack update from HEAD.
2011-11-14 20:48:35 +00:00
Andy Polyakov
9833757b5d
s390x assembler pack update from HEAD.
2011-11-14 20:47:22 +00:00
Andy Polyakov
4195343c0d
IA64 assembler pack update from HEAD.
2011-11-14 20:45:57 +00:00
Andy Polyakov
042bee4e5c
perlasm update from HEAD.
2011-11-14 20:44:20 +00:00
Andy Polyakov
4afba1f3d9
Mafiles updates to accomodate assembler update from HEAD.
2011-11-14 20:42:22 +00:00
Dr. Stephen Henson
5999d45a5d
DH keys have an (until now) unused 'q' parameter. When creating from DSA copy
...
q across and if q present generate DH key in the correct range. (from HEAD)
2011-11-14 14:16:09 +00:00
Dr. Stephen Henson
f69e5d6a19
Call OPENSSL_init after we've checked to see if customisation is permissible.
2011-11-14 14:15:29 +00:00
Ben Laurie
3517637702
Ignorance.
2011-11-14 02:42:26 +00:00
Ben Laurie
4c02cf8ecc
make depend.
2011-11-13 20:23:34 +00:00
Andy Polyakov
6471ec71aa
x86cpuid.pl: compensate for imaginary virtual machines [from HEAD].
...
PR: 2633
2011-11-08 21:28:14 +00:00
Andy Polyakov
cb45708061
x86cpuid.pl: don't punish "last-year" OSes on "this-year" CPUs.
...
PR: 2633
2011-11-05 10:44:25 +00:00
Andy Polyakov
02597f2885
ppc.pl: fix bug in bn_mul_comba4 [from HEAD].
...
PR: 2636
Submitted by: Charles Bryant
2011-11-05 10:16:30 +00:00
Richard Levitte
8c6a514edf
Add missing algorithms to disable, and in particular, disable
...
EC_NISTP_64_GCC_128 by default, as GCC isn't currently supported on
VMS. Add CMAC to the modules to build, and synchronise with Unix.
2011-10-30 11:45:30 +00:00
Dr. Stephen Henson
a8d72c79db
PR: 2632
...
Submitted by: emmanuel.azencot@bull.net
Reviewed by: steve
Return -1 immediately if not affine coordinates as BN_CTX has not been
set up.
2011-10-26 16:43:23 +00:00
Dr. Stephen Henson
03f84c8260
Update error codes for FIPS.
...
Add support for authentication in FIPS_mode_set().
2011-10-21 13:04:27 +00:00
Bodo Möller
67f8de9ab8
"make update"
2011-10-19 15:24:44 +00:00
Bodo Möller
2d95ceedc5
BN_BLINDING multi-threading fix.
...
Submitted by: Emilia Kasper (Google)
2011-10-19 14:58:59 +00:00
Bodo Möller
3d520f7c2d
Fix warnings.
...
Also, use the common Configure mechanism for enabling/disabling the 64-bit ECC code.
2011-10-19 08:58:35 +00:00
Bodo Möller
9c37519b55
Improve optional 64-bit NIST-P224 implementation, and add NIST-P256 and
...
NIST-P521. (Now -DEC_NISTP_64_GCC_128 enables all three of these;
-DEC_NISTP224_64_GCC_128 no longer works.)
Submitted by: Google Inc.
2011-10-18 19:43:54 +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
Andy Polyakov
42660b3cf1
aesni-x86[_64].pl: pull from HEAD.
2011-10-14 09:21:03 +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
cb70355d87
Backport ossl_ssize_t type from HEAD.
2011-10-10 22:33:50 +00:00
Dr. Stephen Henson
b17442bb04
def_rsa_finish not used anymore.
2011-10-10 20:34:17 +00:00
Dr. Stephen Henson
4874e235fb
fix leak properly this time...
2011-10-10 14:09:05 +00:00
Dr. Stephen Henson
9309ea6617
Backport PSS signature support from HEAD.
2011-10-09 23:13:50 +00:00
Dr. Stephen Henson
88bac3e664
fix memory leaks
2011-10-09 23:09:22 +00:00
Dr. Stephen Henson
5473b6bc2f
Fix memory leak. From HEAD.
2011-10-09 16:04:17 +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
6f6b31dadc
PR: 2482
...
Submitted by: Rob Austein <sra@hactrn.net>
Reviewed by: steve
Don't allow inverted ranges in RFC3779 code, discovered by Frank Ellermann.
2011-10-09 00:56:43 +00:00
Dr. Stephen Henson
177f27d71e
? crypto/aes/aes-armv4.S
...
? crypto/aes/aesni-sha1-x86_64.s
? crypto/aes/aesni-x86_64.s
? crypto/aes/foo.pl
? crypto/aes/vpaes-x86_64.s
? crypto/bn/.bn_lib.c.swp
? crypto/bn/armv4-gf2m.S
? crypto/bn/diffs
? crypto/bn/modexp512-x86_64.s
? crypto/bn/x86_64-gf2m.s
? crypto/bn/x86_64-mont5.s
? crypto/ec/bc.txt
? crypto/ec/diffs
? crypto/modes/a.out
? crypto/modes/diffs
? crypto/modes/ghash-armv4.S
? crypto/modes/ghash-x86_64.s
? crypto/modes/op.h
? crypto/modes/tst.c
? crypto/modes/x.h
? crypto/objects/.obj_xref.txt.swp
? crypto/rand/diffs
? crypto/sha/sha-512
? crypto/sha/sha1-armv4-large.S
? crypto/sha/sha256-armv4.S
? crypto/sha/sha512-armv4.S
Index: crypto/objects/obj_xref.c
===================================================================
RCS file: /v/openssl/cvs/openssl/crypto/objects/obj_xref.c,v
retrieving revision 1.9
diff -u -r1.9 obj_xref.c
--- crypto/objects/obj_xref.c 5 Nov 2008 18:38:58 -0000 1.9
+++ crypto/objects/obj_xref.c 6 Oct 2011 20:30:21 -0000
@@ -110,8 +110,10 @@
#endif
if (rv == NULL)
return 0;
- *pdig_nid = rv->hash_id;
- *ppkey_nid = rv->pkey_id;
+ if (pdig_nid)
+ *pdig_nid = rv->hash_id;
+ if (ppkey_nid)
+ *ppkey_nid = rv->pkey_id;
return 1;
}
@@ -144,7 +146,8 @@
#endif
if (rv == NULL)
return 0;
- *psignid = (*rv)->sign_id;
+ if (psignid)
+ *psignid = (*rv)->sign_id;
return 1;
}
Index: crypto/x509/x509type.c
===================================================================
RCS file: /v/openssl/cvs/openssl/crypto/x509/x509type.c,v
retrieving revision 1.10
diff -u -r1.10 x509type.c
--- crypto/x509/x509type.c 26 Oct 2007 12:06:33 -0000 1.10
+++ crypto/x509/x509type.c 6 Oct 2011 20:36:04 -0000
@@ -100,20 +100,26 @@
break;
}
- i=X509_get_signature_type(x);
- switch (i)
+ i=OBJ_obj2nid(x->sig_alg->algorithm);
+ if (i && OBJ_find_sigid_algs(i, NULL, &i))
{
- case EVP_PKEY_RSA:
- ret|=EVP_PKS_RSA;
- break;
- case EVP_PKEY_DSA:
- ret|=EVP_PKS_DSA;
- break;
- case EVP_PKEY_EC:
- ret|=EVP_PKS_EC;
- break;
- default:
- break;
+
+ switch (i)
+ {
+ case NID_rsaEncryption:
+ case NID_rsa:
+ ret|=EVP_PKS_RSA;
+ break;
+ case NID_dsa:
+ case NID_dsa_2:
+ ret|=EVP_PKS_DSA;
+ break;
+ case NID_X9_62_id_ecPublicKey:
+ ret|=EVP_PKS_EC;
+ break;
+ default:
+ break;
+ }
}
if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
2011-10-06 20:45:08 +00:00
Dr. Stephen Henson
e8f31f80d1
PR: 2606
...
Submitted by: Christoph Viethen <cv@kawo2.rwth-aachen.de>
Reviewed by: steve
Handle timezones correctly in UTCTime.
2011-09-23 13:39:35 +00:00
Dr. Stephen Henson
e34a303ce1
make depend
2011-09-16 23:15:22 +00:00
Dr. Stephen Henson
36f120cd20
Improved error checking for DRBG calls.
...
New functionality to allow default DRBG type to be set during compilation or during runtime.
2011-09-16 23:12:34 +00:00
Dr. Stephen Henson
0ae7c43fa5
Improved error checking for DRBG calls.
...
New functionality to allow default DRBG type to be set during compilation
or during runtime.
2011-09-16 23:08:57 +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
Dr. Stephen Henson
cd447875e6
Initialise X509_STORE_CTX properly so CRLs with nextUpdate date in the past
...
produce an error (CVE-2011-3207)
2011-09-06 15:14:41 +00:00
Bodo Möller
7f1022a8b1
Fix memory leak on bad inputs.
2011-09-05 09:57:15 +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
91e97cbe4c
Don't use *from++ in tolower as this is implemented as a macro on some
...
platforms. Thanks to Shayne Murray <Shayne.Murray@Polycom.com> for
reporting this issue.
2011-09-02 11:28:18 +00:00