From 3627fedbea173f2155a5cd72053d6f29af4e0dfc Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 16 Mar 2007 22:20:55 +0000 Subject: [PATCH] Win32 fixes. Add GOST algorithm to mkdef, update ordinals. Signed/unsigned fixes. --- crypto/dsa/dsa_gen.c | 4 ++-- util/libeay.num | 6 ++++++ util/mkdef.pl | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c index 6d428447ef..5deac2630c 100644 --- a/crypto/dsa/dsa_gen.c +++ b/crypto/dsa/dsa_gen.c @@ -140,9 +140,9 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, bits = (bits+63)/64*64; - if (seed_len < qsize) + if (seed_len < (size_t)qsize) seed_in = NULL; /* seed buffer too small -- ignore */ - if (seed_len > qsize) + if (seed_len > (size_t)qsize) seed_len = qsize; /* App. 2.2 of FIPS PUB 186 allows larger SEED, * but our internal buffers are restricted to 160 bits*/ if (seed_in != NULL) diff --git a/util/libeay.num b/util/libeay.num index 5ae838194b..4040ab5904 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -3903,3 +3903,9 @@ TS_TST_INFO_get_ext_by_critical 4283 EXIST::FUNCTION: EVP_PKEY_CTX_new_id 4284 EXIST::FUNCTION: TS_REQ_get_ext_by_OBJ 4285 EXIST::FUNCTION: TS_CONF_set_signer_cert 4286 EXIST::FUNCTION: +BIO_asn1_get_prefix 4287 EXIST::FUNCTION: +BIO_asn1_set_prefix 4288 EXIST::FUNCTION: +BIO_f_asn1 4289 EXIST::FUNCTION: +BIO_asn1_set_suffix 4290 EXIST::FUNCTION: +BIO_asn1_get_suffix 4291 EXIST::FUNCTION: +PKCS7_stream 4292 EXIST::FUNCTION: diff --git a/util/mkdef.pl b/util/mkdef.pl index 972292e61c..8bb9c49794 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -85,7 +85,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", "SHA256", "SHA512", "RIPEMD", "MDC2", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", - "HMAC", "AES", "WHIRLPOOL", "CAMELLIA", + "HMAC", "AES", "WHIRLPOOL", "CAMELLIA", "GOST", # Envelope "algorithms" "EVP", "X509", "ASN1_TYPEDEFS", # Helper "algorithms"