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

diff --git a/crypto/jpake/jpake.c b/crypto/jpake/jpake.c
index d3c17c11780d8d55d7bfc4bab6e7c2003e96b40f..577b7ef375cdb1678977ad278dad32e3196c8e3b 100644 (file)
--- a/crypto/jpake/jpake.c
+++ b/crypto/jpake/jpake.c
@@ -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) */

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index e60a490a52cc41d0b300ec508c021783c099ab30..430c1b379ba44dcbfe8660ef7aa5d85a709d240b 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -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.

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 7a3337d34a6aa0a4ffb432a04ad10d163358ca7f..81406019107dbf272928cf84a13d913a1ff06afa 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -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";
 

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 1326c9856a30be22a82b6960b2fdb169d669dbbb..853f69c0eb00819287c1006f19a4629f3e2738cc 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -48,6 +48,7 @@ my @dirs = (
 "crypto/x509v3",
 "crypto/cms",
 "crypto/conf",
+"crypto/jpake",
 "crypto/txt_db",
 "crypto/pkcs7",
 "crypto/pkcs12",