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

Win32 fixes, add new directory to WIN32 build system.

parent c10f53a8

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) */

util/libeay.num

+22 −0
Original line number Diff line number Diff line
@@ -3700,3 +3700,25 @@ FIPS_rsa_free 4088 EXIST:OPENSSL_FIPS:FUNCTION:RSA 
FIPS_dsa_sig_encode                     4089	EXIST:OPENSSL_FIPS:FUNCTION:DSA

CRYPTO_dbg_remove_all_info              4090	EXIST::FUNCTION:

OPENSSL_init                            4091	EXIST::FUNCTION:

private_Camellia_set_key                4092	EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA

JPAKE_STEP3A_process                    4093	EXIST::FUNCTION:

JPAKE_STEP1_release                     4094	EXIST::FUNCTION:

JPAKE_get_shared_key                    4095	EXIST::FUNCTION:

JPAKE_STEP3B_init                       4096	EXIST::FUNCTION:

JPAKE_STEP1_generate                    4097	EXIST::FUNCTION:

JPAKE_STEP1_init                        4098	EXIST::FUNCTION:

JPAKE_STEP3B_process                    4099	EXIST::FUNCTION:

JPAKE_STEP2_generate                    4100	EXIST::FUNCTION:

JPAKE_CTX_new                           4101	EXIST::FUNCTION:

JPAKE_CTX_free                          4102	EXIST::FUNCTION:

JPAKE_STEP3B_release                    4103	EXIST::FUNCTION:

JPAKE_STEP3A_release                    4104	EXIST::FUNCTION:

JPAKE_STEP2_process                     4105	EXIST::FUNCTION:

CRYPTO_strdup                           4106	EXIST::FUNCTION:

JPAKE_STEP3B_generate                   4107	EXIST::FUNCTION:

JPAKE_STEP1_process                     4108	EXIST::FUNCTION:

JPAKE_STEP3A_generate                   4109	EXIST::FUNCTION:

JPAKE_STEP2_release                     4110	EXIST::FUNCTION:

JPAKE_STEP3A_init                       4111	EXIST::FUNCTION:

ERR_load_JPAKE_strings                  4112	EXIST::FUNCTION:

JPAKE_STEP2_init                        4113	EXIST::FUNCTION:

util/mkdef.pl

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ $crypto.=" crypto/tmdiff.h"; 
$crypto.=" crypto/store/store.h";

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

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

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

$crypto.=" fips/fips.h fips/rand/fips_rand.h";



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

util/mkfiles.pl

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

"crypto/x509v3",

"crypto/conf",

"crypto/jpake",

"crypto/txt_db",

"crypto/pkcs7",

"crypto/pkcs12",