Commit 6502735b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files 

Fix from main trunk, 2000-10-04 03:16:34 steve:

Fix for bug in DirectoryString mask setting.

Fix from main trunk, 2000-10-20 01:16:49 steve:

Move expired CA certificate.

Fix from main trunk, 2000-10-20 02:36:47 steve:

Stop MASM debug warning.
parent 31a266cb

certs/rsa-ssca.pem

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority

issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority

notBefore=941109235417Z

notAfter =991231235417Z

-----BEGIN X509 CERTIFICATE-----



MIICKTCCAZYCBQJBAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw

HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl

IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDkyMzU0MTda

Fw05OTEyMzEyMzU0MTdaMF8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0

YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJlIFNlcnZlciBDZXJ0aWZp

Y2F0aW9uIEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCSznrB

roM+WqqJg1esJQF2DK2ujiw3zus1eGRUA+WEQFHJv48I4oqCCNIWhjdV6bEhAq12

aIGaBaJLyUslZiJWbIgHj/eBWW2EB2VwE3F2Ppt3TONQiVaYSLkdpykaEy5KEVmc

HhXVSVQsczppgrGXOZxtcGdI5d0t1sgeewIDAQABMA0GCSqGSIb3DQEBAgUAA34A

iNHReSHO4ovo+MF9NFM/YYPZtgs4F7boviGNjwC4i1N+RGceIr2XJ+CchcxK9oU7

suK+ktPlDemvXA4MRpX/oRxePug2WHpzpgr4IhFrwwk4fia7c+8AvQKk8xQNMD9h

cHsg/jKjn7P0Z1LctO6EjJY2IN6BCINxIYoPnqk=

-----END X509 CERTIFICATE-----

crypto/asn1/a_strnid.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in, 
	if(tbl) {

		mask = tbl->mask;

		if(!(tbl->flags & STABLE_NO_MASK)) mask &= global_mask;

		ret = ASN1_mbstring_ncopy(out, in, inlen, inform, tbl->mask,

		ret = ASN1_mbstring_ncopy(out, in, inlen, inform, mask,

					tbl->minsize, tbl->maxsize);

	} else ret = ASN1_mbstring_copy(out, in, inlen, inform, DIRSTRING_TYPE & global_mask);

	if(ret <= 0) return NULL;

crypto/sha/asm/sha1-586.pl

+7 −5
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ sub BODY_60_79 


sub sha1_block_host

	{

	local($name)=@_;

	local($name, $sclabel)=@_;



	&function_begin_B($name,"");
@@ -352,7 +352,7 @@ sub sha1_block_host 
		&mov(&swtmp($i+0),$A);

		 &mov(&swtmp($i+1),$B);

		}

	&jmp(&label("shortcut"));

	&jmp($sclabel);

	&function_end_B($name);

	}
@@ -529,10 +529,12 @@ sub sha1_block_data 
	&pop("esi");

	 &ret();



	# it has to reside within sha1_block_asm_host_order body

	# because it calls &jmp(&label("shortcut"));

	&sha1_block_host("sha1_block_asm_host_order");

	# keep a note of shortcut label so it can be used outside

	# block.

	my $sclabel = &label("shortcut");



	&function_end_B($name);

	# Putting this here avoids problems with MASM in debugging mode

	&sha1_block_host("sha1_block_asm_host_order", $sclabel);

	}