Updates from 1.0.0-stable (06ddf8eb) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/apps.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -259,13 +259,6 @@ int str2fmt(char *s)
		return(FORMAT_ASN1);
		else if ((s == 'T') \|\| (s == 't'))
		return(FORMAT_TEXT);
		else if ((s == 'P') \|\| (s == 'p'))
		{
		if (s[1] == 'V' \|\| s[1] == 'v')
		return FORMAT_PVK;
		else
		return(FORMAT_PEM);
		}
		else if ((s == 'N') \|\| (s == 'n'))
		return(FORMAT_NETSCAPE);
		else if ((s == 'S') \|\| (s == 's'))
		@@ -278,6 +271,13 @@ int str2fmt(char *s)
		return(FORMAT_PKCS12);
		else if ((s == 'E') \|\| (s == 'e'))
		return(FORMAT_ENGINE);
		else if ((s == 'P') \|\| (s == 'p'))
		{
		if (s[1] == 'V' \|\| s[1] == 'v')
		return FORMAT_PVK;
		else
		return(FORMAT_PEM);
		}
		else
		return(FORMAT_UNDEF);
		}

apps/openssl.cnf

+3 −3

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment

		subjectKeyIdentifier=hash

		authorityKeyIdentifier=keyid:always,issuer:always
		authorityKeyIdentifier=keyid:always,issuer

		# This is what PKIX recommends but some broken software chokes on critical
		# extensions.
		@@ -264,7 +264,7 @@ basicConstraints = CA:true
		# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.

		# issuerAltName=issuer:copy
		authorityKeyIdentifier=keyid:always,issuer:always
		authorityKeyIdentifier=keyid:always

		[ proxy_cert_ext ]
		# These extensions should be added when creating a proxy certificate
		@@ -297,7 +297,7 @@ nsComment = "OpenSSL Generated Certificate"

		# PKIX recommendations harmless if included in all certificates.
		subjectKeyIdentifier=hash
		authorityKeyIdentifier=keyid,issuer:always
		authorityKeyIdentifier=keyid,issuer

		# This stuff is for subjectAltName and issuerAltname.
		# Import the email address.

crypto/bio/b_sock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -810,7 +810,7 @@ int BIO_accept(int sock, char **addr)
		#ifdef EAI_FAMILY
		# if defined(OPENSSL_SYS_VMS) \|\| defined(OPENSSL_SYS_BEOS_BONE) \|\| defined(OPENSSL_SYS_MSDOS)
		# define SOCKLEN_T size_t
		# else
		# elif !defined(SOCKLEN_T)
		# define SOCKLEN_T socklen_t
		#endif
		do {

crypto/objects/objects.h

+16 −6

Original line number	Diff line number	Diff line
		@@ -1054,24 +1054,34 @@ const void * OBJ_bsearch_ex_(const void key,const void base,int num,
		* the non-constness means a lot of complication, and in practice
		* comparison routines do always not touch their arguments.
		*/
		#define _IMPLEMENT_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm) \

		#define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm) \
		static int nm##_cmp_BSEARCH_CMP_FN(const void a_, const void b_) \
		{ \
		type1 const *a = a_; \
		type2 const *b = b_; \
		return nm##_cmp(a,b); \
		} \
		scope type2 OBJ_bsearch_##nm(type1 key, type2 const *base, int num) \
		static type2 OBJ_bsearch_##nm(type1 key, type2 const *base, int num) \
		{ \
		return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
		nm##_cmp_BSEARCH_CMP_FN); \
		} \
		extern void dummy_prototype(void)

		#define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, cmp) \
		_IMPLEMENT_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
		#define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, cmp) \
		_IMPLEMENT_OBJ_BSEARCH_CMP_FN(, type1, type2, cmp)
		#define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm) \
		static int nm##_cmp_BSEARCH_CMP_FN(const void a_, const void b_) \
		{ \
		type1 const *a = a_; \
		type2 const *b = b_; \
		return nm##_cmp(a,b); \
		} \
		type2 OBJ_bsearch_##nm(type1 key, type2 const *base, int num) \
		{ \
		return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
		nm##_cmp_BSEARCH_CMP_FN); \
		} \
		extern void dummy_prototype(void)

		#define OBJ_bsearch(type1,key,type2,base,num,cmp) \
		((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \

crypto/pkcs12/p12_kiss.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ int PKCS12_parse(PKCS12 p12, const char pass, EVP_PKEY pkey, X509 cert,
		STACK_OF(X509) **ca)
		{
		STACK_OF(X509) *ocerts = NULL;
		X509 *x;
		X509 *x = NULL;
		/* Check for NULL PKCS12 structure */

		if(!p12)