diff options
| -rw-r--r-- | crypto/jpake/jpake.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_ciph.c | 2 | ||||
| -rwxr-xr-x | util/mkdef.pl | 1 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/crypto/jpake/jpake.c b/crypto/jpake/jpake.c index d3c17c1178..577b7ef375 100644 --- 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 e60a490a52..430c1b379b 100644 --- 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 7a3337d34a..8140601910 100755 --- 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 1326c9856a..853f69c0eb 100755 --- 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", |