Merge of main trunk, no conflicts this time (06b71aec) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+9 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,15 @@

		Changes between 0.9.5a and 0.9.6 [xx XXX 2000]

		*) Add two demo programs for PKCS12_parse() and PKCS12_create().
		Update PKCS12_parse() so it copies the friendlyName and the
		keyid to the certificates aux info.
		[Steve Henson]

		*) Fix bug in PKCS7_verify() which caused an infinite loop
		if there was more than one signature.
		[Sven Uszpelkat <su@celocom.de>]

		*) Major change in util/mkdef.pl to include extra information
		about each symbol, as well as presentig variables as well
		as functions. This change means that there's n more need

+12 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ OpenSSL - Frequently Asked Questions
		* Why does the linker complain about undefined symbols?
		* Where can I get a compiled version of OpenSSL?
		* I've compiled a program under Windows and it crashes: why?
		* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
		* I've called <some function> and it fails, why?
		* I just get a load of numbers for the error output, what do they mean?
		* Why do I get errors about unknown algorithms?
		@@ -181,6 +182,17 @@ otherwise the conflict will cause a program to crash: typically on the
		first BIO related read or write operation.


		* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?

		This usually happens when you try compiling something using the PKCS#12
		macros with a C++ compiler. There is hardly ever any need to use the
		PKCS#12 macros in a program, it is much easier to parse and create
		PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
		documented in doc/openssl.txt and with examples in demos/pkcs12. The
		'pkcs12' application has to use the macros because it prints out
		debugging information.


		* I've called <some function> and it fails, why?

		Before submitting a report or asking in one of the mailing lists, you

+2 −2

Original line number	Diff line number	Diff line
		@@ -154,13 +154,13 @@ $! Define The Application Files.
		$!
		$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
		"CA;PKCS7;CRL2P7;CRL;"+-
		"RSA;DSA;DSAPARAM;"+-
		"RSA;RSAUTL;DSA;DSAPARAM;"+-
		"X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
		"S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
		"CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND"
		$ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
		CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
		RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
		RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
		X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
		S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
		CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ

+5 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@
		static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
		static int check(X509_STORE ctx, char file, STACK_OF(X509) uchain, STACK_OF(X509) tchain, int purpose);
		static STACK_OF(X509) load_untrusted(char file);
		static int v_verbose=0;
		static int v_verbose=0, issuer_checks = 0;

		int MAIN(int, char **);

		@@ -147,6 +147,8 @@ int MAIN(int argc, char **argv)
		}
		else if (strcmp(*argv,"-help") == 0)
		goto end;
		else if (strcmp(*argv,"-issuer_checks") == 0)
		issuer_checks=1;
		else if (strcmp(*argv,"-verbose") == 0)
		v_verbose=1;
		else if (argv[0][0] == '-')
		@@ -284,6 +286,8 @@ static int check(X509_STORE ctx, char file, STACK_OF(X509) *uchain, STACK_OF(X
		X509_STORE_CTX_init(csc,ctx,x,uchain);
		if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
		if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
		if(issuer_checks)
		X509_STORE_CTX_set_flags(csc, X509_V_FLAG_CB_ISSUER_CHECK);
		i=X509_verify_cert(csc);
		X509_STORE_CTX_free(csc);

+1 −3

Original line number	Diff line number	Diff line
		@@ -67,9 +67,7 @@
		#include <openssl/stack.h>
		#include <openssl/safestack.h>

		#ifdef VMS
		#include <openssl/vms_idhacks.h>
		#endif
		#include <openssl/symhacks.h>

		#ifdef __cplusplus
		extern "C" {