summaryrefslogtreecommitdiffstats
path: root/crypto/objects
AgeCommit message (Collapse)Author
2012-01-02incomplete provisional OAEP CMS decrypt supportDr. Stephen Henson
2011-10-09Backport PSS signature support from HEAD.Dr. 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-05make updateBodo Möller
2011-08-23Add RC4-MD5 and AESNI-SHA1 "stitched" implementations [from HEAD].Andy Polyakov
2011-08-11Add XTS OIDs from HEAD.Dr. Stephen Henson
2011-03-23make update (1.0.1-stable)Richard Levitte
This meant a slight renumbering in util/libeay.num due to symbols appearing in 1.0.0-stable. However, since there's been no release on this branch yet, it should be harmless.
2010-11-17sync OIDs with HEADDr. Stephen Henson
2010-01-25PR: 2149Dr. Stephen Henson
Submitted by: Douglas Stebila <douglas@stebila.ca> Fix wap OIDs.
2009-11-10PR: 2091Dr. Stephen Henson
Submitted by: Martin Kaiser <lists@kaiser.cx>, Stephen Henson Approved by: steve@openssl.org If an OID has no short name or long name return the numerical representation.
2009-04-06Use basename of objxref.pl not whole path in generated header.Dr. Stephen Henson
2009-04-04Fix for VC++ 6 which chokes on the empty argument.Dr. Stephen Henson
2009-04-01Make update fixing duplicate ASN1 error codes.Dr. Stephen Henson
2009-03-25Update from stable branch.Dr. Stephen Henson
2009-02-10Add error checking to obj_xref.pl and add command line support for dataDr. Stephen Henson
file locations.
2008-11-12Revert the size_t modifications from HEAD that had led to moreGeoff Thorpe
knock-on work than expected - they've been extracted into a patch series that can be completed elsewhere, or in a different branch, before merging back to HEAD.
2008-11-05Update obsolete email address...Dr. Stephen Henson
2008-11-01More size_tification.Ben Laurie
2008-11-01size_tification.Ben Laurie
2008-10-22Add permanentIdentifier OID.Dr. Stephen Henson
2008-10-22Create function of the form OBJ_bsearch_xxx() in bsearch typesafe macrosDr. Stephen Henson
with the appropriate parameters which calls OBJ_bsearch(). A compiler will typically inline this. This avoids the need for cmp_xxx variables and fixes unchecked const issues with CHECKED_PTR_OF()
2008-10-20Reinstate obj_xref.h as it is not auto generated on all platforms.Dr. Stephen Henson
2008-10-20Fix a shed load or warnings:Dr. Stephen Henson
Duplicate const. Use of ; outside function.
2008-10-18Fix multiple ; warning.Dr. Stephen Henson
2008-10-18Fix warning a different way.Ben Laurie
2008-10-14Type-safe OBJ_bsearch_ex.Ben Laurie
2008-10-12Type-checked (and modern C compliant) OBJ_bsearch.Ben Laurie
2008-08-27Add support for freshest CRL extension.Dr. Stephen Henson
2008-07-04Avoid warnings with -pedantic, specifically:Dr. Stephen Henson
Conversion between void * and function pointer. Value computed not used. Signed/unsigned argument.
2008-06-26Update from stable branch.Dr. Stephen Henson
2008-06-04More type-checking.Ben Laurie
2008-05-26LHASH revamp. make depend.Ben Laurie
2008-04-02Since OID NIDs with 0.9.8.Dr. Stephen Henson
2008-03-22Update dependencies.Dr. Stephen Henson
2008-03-19Allow alternate eContentType oids to be set in cms utility.Dr. Stephen Henson
Add id-ct-asciiTextWithCRLF OID. Give more meaninful error message is attempt to use key ID from a certificate without a key ID.
2008-03-19Produce meaningful error if sanity check fails.Dr. Stephen Henson
Delete trailing whitespace from objects.txt Delete duplicate NIDs.
2008-03-19Additional sanity check.Dr. Stephen Henson
2008-03-17Partial support for KEKRecipientInfo type.Dr. Stephen Henson
2008-03-16Fix a variety of warnings generated by some elevated compiler-fascism,Geoff Thorpe
OPENSSL_NO_DEPRECATED, etc. Steve, please double-check the CMS stuff...
2008-02-29We already have an object for "zlib compression" but it was a placeDr. Stephen Henson
holder and its actual encoding never used. Just as well because it's value looks like it was made up in the mists of time... Now there is a registered value for zlib compression (used in S/MIME compressedData content type) use that instead.
2008-02-12Add OIDs for compressedData content type and zlib compression.Dr. Stephen Henson
2007-11-23Rebuild OID database: duplicates got in there somehow??Dr. Stephen Henson
2007-11-23Fix from stable branch.Dr. Stephen Henson
2007-11-23Add caRepository OID and sync object NIDs with OpenSSL 0.9.8.Dr. Stephen Henson
2007-11-20Rebuild object cross reference table.Dr. Stephen Henson
2007-11-01Add OIDs by CMP (RFC 4210) and CRMF (RFC 4211)Lutz Jänicke
Submitted by: Martin Peylo <martinmeis@googlemail.com>
2007-09-18Addenum to "Constify obj_dat.[ch]."Andy Polyakov
2007-09-18Constify obj_dat.[ch], as well as minimize linker relocations.Andy Polyakov
2007-08-31Update ssl code to support digests other than MD5+SHA1 in handshake.Dr. Stephen Henson
Submitted by: Victor B. Wagner <vitus@cryptocom.ru>
2007-04-23Add SEED encryption algorithm.Bodo Möller
PR: 1503 Submitted by: KISA Reviewed by: Bodo Moeller
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 12:08:13 +0000