Win32 fixes. Add GOST algorithm to mkdef, update ordinals. Signed/unsigned fixes.

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 6d428447efe7b2997d000d7a97f5e4d1023c0e3c..5deac2630c9752aab7fb0917af355b91d292a6f5 100644 (file)
--- 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 5ae838194bad712a04b95a0fd6f263aa8ae3f34e..4040ab590423ae28448724ef79a39e814a63eaff 100755 (executable)
--- 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 972292e61cef338a7c056bf97ddf25e014a73395..8bb9c497948e227c9d30648a0915ca836abcd43f 100755 (executable)
--- 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"