aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/objects
Commit message (Collapse)AuthorAgeFilesLines
* free NULL cleanup 11Rich Salz2015-05-011-8/+4
| | | | | | | | | | | | | | | | | | | Don't check for NULL before calling free functions. This gets: ERR_STATE_free ENGINE_free DSO_free CMAC_CTX_free COMP_CTX_free CONF_free NCONF_free NCONF_free_data _CONF_free_data A sk_free use within OBJ_sigid_free TS_TST_INFO_free (rest of TS_ API was okay) Doc update for UI_free (all uses were fine) X509V3_conf_free X509V3_section_free X509V3_string_free Reviewed-by: Richard Levitte <levitte@openssl.org>
* free null cleanup finaleRich Salz2015-05-012-14/+7
| | | | | | Don't check for NULL before calling OPENSSL_free Reviewed-by: Richard Levitte <levitte@openssl.org>
* free NULL cleanup 7Rich Salz2015-04-301-4/+2
| | | | | | | | | | | This gets BN_.*free: BN_BLINDING_free BN_CTX_free BN_FLG_FREE BN_GENCB_free BN_MONT_CTX_free BN_RECP_CTX_free BN_clear_free BN_free BUF_MEM_free Also fix a call to DSA_SIG_free to ccgost engine and remove some #ifdef'd dead code in engines/e_ubsec. Reviewed-by: Richard Levitte <levitte@openssl.org>
* remove malloc castsRich Salz2015-04-282-9/+7
| | | | | | | Following ANSI C rules, remove the casts from calls to OPENSSL_malloc and OPENSSL_realloc. Reviewed-by: Richard Levitte <levitte@openssl.org>
* Code style: space after 'if'Viktor Dukhovni2015-04-161-1/+1
| | | | Reviewed-by: Matt Caswell <matt@openssl.org>
* Remove EXHEADER, TEST, APPS, links:, install: and uninstall: where relevantRichard Levitte2015-03-311-17/+1
| | | | | | | | | | | | With no more symlinks, there's no need for those variables, or the links target. This also goes for all install: and uninstall: targets that do nothing but copy $(EXHEADER) files, since that's now taken care of by the top Makefile. Also, removed METHTEST from test/Makefile. It looks like an old test that's forgotten... Reviewed-by: Rich Salz <rsalz@openssl.org>
* Stop symlinking, move files to intended directoryRichard Levitte2015-03-313-5422/+5
| | | | | | | | | | | | | Rather than making include/openssl/foo.h a symlink to crypto/foo/foo.h, this change moves the file to include/openssl/foo.h once and for all. Likewise, move crypto/foo/footest.c to test/footest.c, instead of symlinking it there. Originally-by: Geoff Thorpe <geoff@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
* make dependDr. Stephen Henson2015-03-251-2/+3
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* make ASN1_OBJECT opaqueDr. Stephen Henson2015-03-243-0/+19
| | | | Reviewed-by: Matt Caswell <matt@openssl.org>
* Unchecked malloc fixesMatt Caswell2015-03-051-6/+9
| | | | | | | Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error paths as I spotted them along the way. Reviewed-by: Tim Hudson <tjh@openssl.org>
* RT937: Enable pilotAttributeType uniqueIdentifierRich Salz2015-02-123-1633/+1641
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Add more Camellia OIDs.Andy Polyakov2015-02-114-5/+161
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Bring objects.pl output even closer to new format.Andy Polyakov2015-02-091-2/+1
| | | | Reviewed-by: Matt Caswell <matt@openssl.org>
* Harmonize objects.pl output with new format.Andy Polyakov2015-02-091-17/+26
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* util/mkstack.pl now generates entire safestack.hRich Salz2015-02-061-1/+0
| | | | | | | | | The mkstack.pl script now generates the entire safestack.h file. It generates output that follows the coding style. Also, removed all instances of the obsolete IMPLEMENT_STACK_OF macro. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Make objxref.pl output in correct formatDr. Stephen Henson2015-02-041-16/+21
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* OPENSSL_NO_xxx cleanup: many removalsRich Salz2015-01-271-14/+1
| | | | | | | | | | | | The following compile options (#ifdef's) are removed: OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY This diff is big because of updating the indents on preprocessor lines. Reviewed-by: Richard Levitte <levitte@openssl.org>
* ifdef cleanup part 3: OPENSSL_SYSNAMERich Salz2015-01-231-1/+1
| | | | | | | | Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx Remove MS_STATIC; it's a relic from platforms <32 bits. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org>
* Run util/openssl-format-source -v -c .Matt Caswell2015-01-228-6006/+5980
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Further comment amendments to preserve formatting prior to source reformatMatt Caswell2015-01-061-1/+2
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* mark all block comments that need format preserving so thatTim Hudson2014-12-301-2/+3
| | | | | | | indent will not alter them when reformatting comments Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
* Remove fipscanister build functionality from makefiles.Dr. Stephen Henson2014-12-081-1/+1
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Add EVP support for OCB modeMatt Caswell2014-12-084-3/+30
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Remove all .cvsignore filesRich Salz2014-11-281-4/+0
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Fix cross reference table generator.Dr. Stephen Henson2014-11-132-4/+4
| | | | | | | If the hash or public key algorithm is "undef" the signature type will receive special handling and shouldn't be included in the cross reference table. Reviewed-by: Tim Hudson <tjh@openssl.org>
* Fix OID handling:Emilia Kasper2014-08-061-7/+9
| | | | | | | | | | | - Upon parsing, reject OIDs with invalid base-128 encoding. - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function. CVE-2014-3508 Reviewed-by: Dr. Stephen Henson <steve@openssl.org> Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org>
* Please Clang's sanitizer, addendum.Andy Polyakov2014-07-081-1/+1
|
* Rebuild OID table.Dr. Stephen Henson2014-06-271-1784/+1777
|
* Fix OID encoding for one component.Dr. Stephen Henson2014-06-271-1/+1
| | | | | | OIDs with one component don't have an encoding. PR#2556 (Bug#1)
* CABForum EV OIDs for Subject Jurisdiction of Incorporation or Registration.Rob Stradling2014-02-264-5/+48
|
* Show the contents of the RFC6962 Signed Certificate Timestamp List ↵Rob Stradling2014-02-144-5/+59
| | | | | | Certificate/OCSP Extensions. Add the RFC6962 OIDs to the objects table.
* Sync OID numbers with 1.0.2 branch.Dr. Stephen Henson2013-10-153-81/+81
|
* misspellings fixes by https://github.com/vlajos/misspell_fixerVeres Lajos2013-09-051-1/+1
|
* Add new OIDs from RFC5753Dr. Stephen Henson2013-07-176-5/+194
| | | | | Add OIDs for KDF schemes from RFC5753 and add cross references for each type and the appropriate digest to use.
* Add new OID to pSpecified from PKCS#1Dr. Stephen Henson2013-06-214-5/+17
|
* Add AES-SHA256 stitch.Andy Polyakov2013-05-134-3/+33
|
* Fix some clang warnings.Ben Laurie2013-01-131-1/+1
|
* objxref.pl: improve portability.Andy Polyakov2012-04-221-1/+2
|
* PR: 2239Dr. Stephen Henson2012-04-224-5/+179
| | | | | | | | Submitted by: Dominik Oepen <oepen@informatik.hu-berlin.de> Add Brainpool curves from RFC5639. Original patch by Annie Yousar <a.yousar@informatik.hu-berlin.de>
* incomplete provisional OAEP CMS decrypt supportDr. Stephen Henson2012-01-024-12/+24
|
* Initial experimental support for X9.42 DH parameter format to handleDr. Stephen Henson2011-12-074-5/+18
| | | | RFC5114 parameters and X9.42 DH public and private keys.
* ? crypto/aes/aes-armv4.SDr. Stephen Henson2011-10-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ? 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
* Add RC4-MD5 and AESNI-SHA1 "stitched" implementations.Andy Polyakov2011-08-234-3/+44
|
* Provisional AES XTS support.Dr. Stephen Henson2011-04-124-3/+21
|
* Change AR to ARX to allow exclusion of fips object modulesDr. Stephen Henson2011-01-261-1/+1
|
* Add PSS algorithm printing. This is an initial step towards full PSS support.Dr. Stephen Henson2010-03-066-5/+36
| | | | Uses ASN1 module in Martin Kaiser's PSS patch.
* add anyExtendedKeyUsage OIDDr. Stephen Henson2010-02-244-5/+21
|
* Add assigned OIDs, as well as "anonymous" ones for AES counter mode.Andy Polyakov2010-02-234-21/+191
|
* Make CMAC API similar to HMAC API. Add methods for CMAC.Dr. Stephen Henson2010-02-084-3/+13
|
* PR: 2149Dr. Stephen Henson2010-01-253-26/+26
| | | | | | Submitted by: Douglas Stebila <douglas@stebila.ca> Fix wap OIDs.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 10:43:03 +0000