summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-10-21Recognise new ECC option (from HEAD).Dr. Stephen Henson
2011-10-19"make update"Bodo Möller
2011-10-19BN_BLINDING multi-threading fix.Bodo Möller
Submitted by: Emilia Kasper (Google)
2011-10-19Fix indentationBodo Möller
2011-10-19Fix warnings.Bodo Möller
Also, use the common Configure mechanism for enabling/disabling the 64-bit ECC code.
2011-10-18Improve optional 64-bit NIST-P224 implementation, and add NIST-P256 andBodo Möller
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-15Recognise no-rsax option.Dr. Stephen Henson
2011-10-14e_aes.c: fix bug in aesni_gcm_tls_cipher [in HEAD].Andy Polyakov
2011-10-14aesni-x86[_64].pl: pull from HEAD.Andy Polyakov
2011-10-13use -no_ecdhe when using -no_dheBodo Möller
2011-10-13Make CTR mode behaviour consistent with other modes:Bodo Möller
clear ctx->num in EVP_CipherInit_ex Submitted by: Emilia Kasper
2011-10-13Clarify warningBodo Möller
2011-10-13In ssl3_clear, preserve s3->init_extra along with s3->rbuf.Bodo Möller
Submitted by: Bob Buckholz <bbuckholz@google.com>
2011-10-13For now disable RSAX ENGINE for FIPS builds: it sets a non-FIPS RSADr. Stephen Henson
method which stops FIPS mode working.
2011-10-12increase test RSA key size to 1024 bitsDr. Stephen Henson
2011-10-11update pkey method initialisation and copyDr. Stephen Henson
2011-10-10Backport ossl_ssize_t type from HEAD.Dr. Stephen Henson
2011-10-10def_rsa_finish not used anymore.Dr. Stephen Henson
2011-10-10fix leak properly this time...Dr. Stephen Henson
2011-10-10add GCM ciphers in SSL_library_initDr. Stephen Henson
2011-10-10disable GCM if not availableDr. Stephen Henson
2011-10-10Add some entries for 1.0.1 in NEWS.Dr. Stephen Henson
2011-10-10sync NEWS with 1.0.0 branchDr. Stephen Henson
2011-10-09Don't disable TLS v1.2 by default any more.Dr. Stephen Henson
2011-10-09Update ordinals.Dr. Stephen Henson
2011-10-09Backport PSS signature support from HEAD.Dr. Stephen Henson
2011-10-09fix CHANGES entryDr. Stephen Henson
2011-10-09fix memory leaksDr. Stephen Henson
2011-10-09Fix memory leak. From HEAD.Dr. Stephen Henson
2011-10-09Update ordinals.Dr. Stephen Henson
2011-10-09Backport of password based CMS support from HEAD.Dr. Stephen Henson
2011-10-09PR: 2482Dr. Stephen Henson
Submitted by: Rob Austein <sra@hactrn.net> Reviewed by: steve Don't allow inverted ranges in RFC3779 code, discovered by Frank Ellermann.
2011-10-07use client version when eliminating TLS v1.2 ciphersuites in client helloDr. Stephen Henson
2011-10-06? crypto/aes/aes-armv4.SDr. Stephen Henson
? 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-09-26fix signed/unsigned warningDr. Stephen Henson
2011-09-24make sure eivlen is initialisedDr. Stephen Henson
2011-09-23use keyformat for -x509toreq, don't hard code PEMDr. Stephen Henson
2011-09-23PR: 2606Dr. Stephen Henson
Submitted by: Christoph Viethen <cv@kawo2.rwth-aachen.de> Reviewed by: steve Handle timezones correctly in UTCTime.
2011-09-23PR: 2602Dr. Stephen Henson
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de> Reviewed by: steve Fix DTLS bug which prevents manual MTU setting
2011-09-23PR: 2347Dr. Stephen Henson
Submitted by: Tomas Mraz <tmraz@redhat.com> Reviewed by: steve Fix usage message.
2011-09-16make dependDr. Stephen Henson
2011-09-16Improved error checking for DRBG calls.Dr. Stephen Henson
New functionality to allow default DRBG type to be set during compilation or during runtime.
2011-09-16Improved error checking for DRBG calls.Dr. Stephen Henson
New functionality to allow default DRBG type to be set during compilation or during runtime.
2011-09-16Typo.Dr. Stephen Henson
2011-09-10Fix warnings (from HEAD).Dr. Stephen Henson
2011-09-06Initialise X509_STORE_CTX properly so CRLs with nextUpdate date in the pastDr. Stephen Henson
produce an error (CVE-2011-3207)
2011-09-05config: don't add -Wa options with no-asm [from HEAD].Andy Polyakov
2011-09-05oopsBodo Möller
2011-09-05Fix session handling.Bodo Möller
2011-09-05Fix d2i_SSL_SESSION.Bodo Möller