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

Various changes to stop VC++ choking under Win32.

parent f513939e

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 


 Changes between 0.9.3a and 0.9.4



  *) Various changes to make Win32 compile work: 

     1. Casts to avoid "loss of data" warnings in p5_crpt2.c

     2. Change unsigned int to int in b_dump.c to avoid "signed/unsigned

        comparison" warnings.

     3. Add sk_<TYPE>_sort to DEF file generator and do make update.



  *) Add a debugging option to PKCS#5 v2 key generation function: when

     you #define DEBUG_PKCS5V2 passwords, salts, iteration counts and

     derived keys are printed to stderr.

crypto/bio/b_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int BIO_dump(BIO *bio, const char *s, int len) 
{

  int ret=0;

  char buf[160+1],tmp[20];

  unsigned int i,j,rows,trunc;

  int i,j,rows,trunc;

  unsigned char ch;



  trunc=0;

crypto/evp/p5_crpt2.c

+4 −4
Original line number Diff line number Diff line
@@ -92,10 +92,10 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, 
		/* We are unlikely to ever use more than 256 blocks (5120 bits!)

		 * but just in case...

		 */

		itmp[0] = (i >> 24) & 0xff;

		itmp[1] = (i >> 16) & 0xff;

		itmp[2] = (i >> 8) & 0xff;

		itmp[3] = i & 0xff;

		itmp[0] = (unsigned char)((i >> 24) & 0xff);

		itmp[1] = (unsigned char)((i >> 16) & 0xff);

		itmp[2] = (unsigned char)((i >> 8) & 0xff);

		itmp[3] = (unsigned char)(i & 0xff);

		HMAC_Init(&hctx, pass, passlen, EVP_sha1());

		HMAC_Update(&hctx, salt, saltlen);

		HMAC_Update(&hctx, itmp, 4);

util/libeay.num

+20 −0
Original line number Diff line number Diff line
@@ -1821,3 +1821,23 @@ PKCS7_signatureVerify 1845 
RSA_set_method                          1846

RSA_get_method                          1847

RSA_get_default_method                  1848

sk_CONF_VALUE_sort                      1849

sk_X509_REVOKED_sort                    1850

sk_X509_ATTRIBUTE_sort                  1851

sk_X509_INFO_sort                       1852

sk_POLICYINFO_sort                      1853

sk_GENERAL_NAME_sort                    1854

sk_X509_sort                            1855

sk_X509_NAME_sort                       1856

sk_ASN1_TYPE_sort                       1857

sk_X509_ALGOR_sort                      1858

sk_PKCS7_RECIP_INFO_sort                1859

sk_X509_NAME_ENTRY_sort                 1860

sk_X509_EXTENSION_sort                  1861

sk_SXNETID_sort                         1862

sk_ASN1_OBJECT_sort                     1863

sk_PKCS7_SIGNER_INFO_sort               1864

sk_X509_LOOKUP_sort                     1865

sk_POLICYQUALINFO_sort                  1866

sk_X509_CRL_sort                        1867

sk_DIST_POINT_sort                      1868

util/mkdef.pl

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ sub do_defs 
				$funcs{"sk_${1}_pop_free"} = 1;

				$funcs{"sk_${1}_shift"} = 1;

				$funcs{"sk_${1}_pop"} = 1;

				$funcs{"sk_${1}_sort"} = 1;

			} elsif ($safe_stack_def &&

				/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) {

				$funcs{"d2i_ASN1_SET_OF_${1}"} = 1;