Commit 7a0c6536 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in the latest changes from 0.9.6-stable.

parent b5b000d7

README

+3 −1
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ 
 textual explanation of what your patch does.



 Note: For legal reasons, contributions from the US can be accepted only

 if a copy of the patch is sent to crypt@bxa.doc.gov

 if a TSA notification and a copy of the patch is sent to crypt@bis.doc.gov;

 see http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]

 and http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e)).



 The preferred format for changes is "diff -u" output. You might

 generate it like this:

crypto/pkcs7/verify.c

+3 −2
Original line number Diff line number Diff line
@@ -179,10 +179,11 @@ char *argv[]; 
		{

		ASN1_UTCTIME *tm;

		char *str1,*str2;

		int rc;



		si=sk_PKCS7_SIGNER_INFO_value(sk,i);

		i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);

		if (i <= 0)

		rc=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);

		if (rc <= 0)

			goto err;

		printf("signer info\n");

		if ((tm=get_signed_time(si)) != NULL)

doc/ssl/SSL_get_error.pod

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ SSL_get_error - obtain result code for TLS/SSL I/O operation 
=head1 DESCRIPTION



SSL_get_error() returns a result code (suitable for the C "switch"

statement) for a preceding call to SSL_connect(), SSL_accept(),

statement) for a preceding call to SSL_connect(), SSL_accept(), SSL_do_handshake(),

SSL_read(), SSL_peek(), or SSL_write() on B<ssl>.  The value returned by

that TLS/SSL I/O function must be passed to SSL_get_error() in parameter

B<ret>.