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

Delete nonexistant function from pkcs7.h header file. WIN32 build fix from 

stable branch. Sync and update ordinals.
parent 88db4e6b

crypto/pkcs7/pkcs7.h

+0 −1
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si, 
				const unsigned char *md, int mdlen);



int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);

ASN1_VALUE *SMIME_read_asn1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);

PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);

int SMIME_crlf_copy(BIO *in, BIO *out, int flags);

int SMIME_text(BIO *in, BIO *out);

util/libeay.num

+547 −411

File changed.

Preview size limit exceeded, changes collapsed.

util/mk1mf.pl

+1 −0
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ sub var_add 
	return("") if $no_dsa  && $dir =~ /\/dsa/;

	return("") if $no_dh   && $dir =~ /\/dh/;

	return("") if $no_ec   && $dir =~ /\/ec/;

	return("") if $no_cms  && $dir =~ /\/cms/;

	if ($no_des && $dir =~ /\/des/)

		{

		if ($val =~ /read_pwd/)