提交 ab7e09f5 编写于 作者: D Dr. Stephen Henson

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

上级 e9eda23a
...@@ -151,11 +151,12 @@ static void hashstring(SHA_CTX *sha, const char *string) ...@@ -151,11 +151,12 @@ static void hashstring(SHA_CTX *sha, const char *string)
static void hashbn(SHA_CTX *sha, const BIGNUM *bn) static void hashbn(SHA_CTX *sha, const BIGNUM *bn)
{ {
size_t l = BN_num_bytes(bn); size_t l = BN_num_bytes(bn);
unsigned char *bin = alloca(l); unsigned char *bin = OPENSSL_malloc(l);
hashlength(sha, l); hashlength(sha, l);
BN_bn2bin(bn, bin); BN_bn2bin(bn, bin);
SHA1_Update(sha, bin, l); SHA1_Update(sha, bin, l);
OPENSSL_free(bin);
} }
/* h=hash(g, g^r, g^x, name) */ /* h=hash(g, g^r, g^x, name) */
......
...@@ -1258,7 +1258,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, ...@@ -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; STACK_OF(SSL_CIPHER) *cipherstack, *tmp_cipher_list;
const char *rule_p; const char *rule_p;
CIPHER_ORDER *co_list = NULL, *head = NULL, *tail = NULL, *curr; 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. * Return with error if nothing to do.
......
...@@ -309,6 +309,7 @@ $crypto.=" crypto/krb5/krb5_asn.h"; ...@@ -309,6 +309,7 @@ $crypto.=" crypto/krb5/krb5_asn.h";
#$crypto.=" crypto/store/store.h"; #$crypto.=" crypto/store/store.h";
$crypto.=" crypto/pqueue/pqueue.h"; $crypto.=" crypto/pqueue/pqueue.h";
$crypto.=" crypto/cms/cms.h"; $crypto.=" crypto/cms/cms.h";
$crypto.=" crypto/jpake/jpake.h";
my $symhacks="crypto/symhacks.h"; my $symhacks="crypto/symhacks.h";
......
...@@ -48,6 +48,7 @@ my @dirs = ( ...@@ -48,6 +48,7 @@ my @dirs = (
"crypto/x509v3", "crypto/x509v3",
"crypto/cms", "crypto/cms",
"crypto/conf", "crypto/conf",
"crypto/jpake",
"crypto/txt_db", "crypto/txt_db",
"crypto/pkcs7", "crypto/pkcs7",
"crypto/pkcs12", "crypto/pkcs12",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册