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

Win32 fixes... add new directory to build system. Fix warnings.

parent e9eda23a

crypto/jpake/jpake.c

+2 −1
Original line number Diff line number Diff line
@@ -151,11 +151,12 @@ static void hashstring(SHA_CTX *sha, const char *string) 
static void hashbn(SHA_CTX *sha, const BIGNUM *bn)

    {

    size_t l = BN_num_bytes(bn);

    unsigned char *bin = alloca(l);

    unsigned char *bin = OPENSSL_malloc(l);



    hashlength(sha, l);

    BN_bn2bin(bn, bin);

    SHA1_Update(sha, bin, l);

    OPENSSL_free(bin);

    }



/* h=hash(g, g^r, g^x, name) */

ssl/ssl_ciph.c

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, 
	STACK_OF(SSL_CIPHER) *cipherstack, *tmp_cipher_list;

	const char *rule_p;

	CIPHER_ORDER *co_list = NULL, *head = NULL, *tail = NULL, *curr;

	const SSL_CIPHER **ca_list = NULL;

	SSL_CIPHER **ca_list = NULL;



	/*

	 * Return with error if nothing to do.

util/mkdef.pl

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ $crypto.=" crypto/krb5/krb5_asn.h"; 
#$crypto.=" crypto/store/store.h";

$crypto.=" crypto/pqueue/pqueue.h";

$crypto.=" crypto/cms/cms.h";

$crypto.=" crypto/jpake/jpake.h";



my $symhacks="crypto/symhacks.h";

util/mkfiles.pl

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ my @dirs = ( 
"crypto/x509v3",

"crypto/cms",

"crypto/conf",

"crypto/jpake",

"crypto/txt_db",

"crypto/pkcs7",

"crypto/pkcs12",