openssl/crypto/objects, branch OpenSSL_1_0_2k

Fix a mem leak on an error path in OBJ_NAME_add()

2016-05-23T23:12:04Z

If lh_OBJ_NAME_insert() fails then the allocated |onp| value is leaked. RT#2238 Reviewed-by: Richard Levitte (cherry picked from commit 0a618df059d93bf7fe9e3ec92e04db8bc1eeff07)

RT4044: Remove .cvsignore files.

2015-09-15T15:58:27Z

Reviewed-by: Matt Caswell

return correct NID for undefined object

2015-06-08T20:46:42Z

Reviewed-by: Tim Hudson (cherry picked from commit 0fb9990480919163cc375a2b6c0df1d8d901a77b)

RT3230: Better test for C identifier

2015-06-02T21:17:43Z

objects.pl only looked for a space to see if the name could be used as a C identifier. Improve the test to match the real C rules. Signed-off-by: Rich Salz Reviewed-by: Matt Caswell (cherry picked from commit 591b7aef05b22cba09b179e5787a9bf40dfc9508)

Fix the update target and remove duplicate file updates

2015-05-23T04:25:12Z

We had updates of certain header files in both Makefile.org and the Makefile in the directory the header file lived in. This is error prone and also sometimes generates slightly different results (usually just a comment that differs) depending on which way the update was done. This removes the file update targets from the top level Makefile, adds an update: target in all Makefiles and has it depend on the depend: or local_depend: targets, whichever is appropriate, so we don't get a double run through the whole file tree. Reviewed-by: Rich Salz (cherry picked from commit 0f539dc1a2f45580435c39dada44dd276e79cb88) Conflicts: Makefile.org apps/Makefile test/Makefile

Call of memcmp with null pointers in obj_cmp()

2015-05-13T14:28:48Z

The function obj_cmp() (file crypto/objects/obj_dat.c) can in some situations call memcmp() with a null pointer and a zero length. This is invalid behaviour. When compiling openssl with undefined behaviour sanitizer (add -fsanitize=undefined to compile flags) this can be seen. One example that triggers this behaviour is the pkcs7 command (but there are others, e.g. I've seen it with the timestamp function): apps/openssl pkcs7 -in test/testp7.pem What happens is that obj_cmp takes objects of the type ASN1_OBJECT and passes their ->data pointer to memcmp. Zero-sized ASN1_OBJECT structures can have a null pointer as data. RT#3816 Signed-off-by: Matt Caswell Reviewed-by: Rich Salz (cherry picked from commit 2b8dc08b74fc3c6d4c2fc855cc23bac691d985be)

Code style: space after 'if'

2015-04-16T17:50:01Z

Reviewed-by: Matt Caswell

Unchecked malloc fixes

2015-03-05T09:15:08Z

Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error paths as I spotted them along the way. Reviewed-by: Tim Hudson (cherry picked from commit 918bb8652969fd53f0c390c1cd909265ed502c7e) Conflicts: crypto/bio/bss_dgram.c

objects/obj_xref.h: revert reformat.

2015-02-10T07:55:30Z

obj_xref.h was erroneously restored to pre-reformat state. Reviewed-by: Matt Caswell

Bring objects.pl output even closer to new format.

2015-02-09T15:00:25Z

Reviewed-by: Matt Caswell (cherry picked from commit 849037169d98d070c27d094ac341fc6aca1ed2ca)