Various Win32 related fixed. Make no-krb5 work in mkdef.pl .

Fix warning in apps/engine.c

Remove definitions of deleted functions.

Add missing definition of X509_VAL.

diff --git a/apps/engine.c b/apps/engine.c
index f11206f570833367b2b56412b8e52d998db1b709..13de0bdaadfdec3a021eb1e4195eb95e88a159b2 100644 (file)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -99,7 +99,7 @@ static int append_buf(char **buf, char *s, int *size, int step)
        if (**buf != '\0')
                l += 2;         /* ", " */
 
        if (**buf != '\0')
                l += 2;         /* ", " */
 

-       if (strlen(*buf) + strlen(s) >= *size)
+       if (strlen(*buf) + strlen(s) >= (unsigned int)*size)

                {
                *size += step;
                *buf = OPENSSL_realloc(*buf, *size);
                {
                *size += step;
                *buf = OPENSSL_realloc(*buf, *size);

diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index 48edf88e81f4da6c6be765e58242af484ea6f83a..d488dc237e071c3ca18124f6dfc1103d284b9eb4 100644 (file)
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -65,3 +65,5 @@ ASN1_SEQUENCE(X509_VAL) = {
        ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
        ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
 } ASN1_SEQUENCE_END(X509_VAL);
        ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
        ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
 } ASN1_SEQUENCE_END(X509_VAL);

+
+IMPLEMENT_ASN1_FUNCTIONS(X509_VAL)

diff --git a/crypto/rijndael/rd_fst.h b/crypto/rijndael/rd_fst.h
index f093e5b4777f0361c2c91be6d70d881d1425af2a..fcace29478130527b5395d38423a630bf9006b1c 100755 (executable)
--- a/crypto/rijndael/rd_fst.h
+++ b/crypto/rijndael/rd_fst.h
@@ -39,9 +39,4 @@ int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBit
 void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]);
 void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]);
 
 void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]);
 void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]);
 

-#ifdef INTERMEDIATE_VALUE_KAT
-void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);
-void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);
-#endif /* INTERMEDIATE_VALUE_KAT */
-

 #endif /* __RIJNDAEL_ALG_FST_H */
 #endif /* __RIJNDAEL_ALG_FST_H */

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 2de99d529a109db80bba93a29944c4e4ee308e22..9255bf3ded351d2d1fbff50acc7bb330880728dc 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -214,9 +214,6 @@ int RSA_set_method(RSA *rsa, struct engine_st *engine);
 /* This function needs the memory locking malloc callbacks to be installed */
 int RSA_memory_lock(RSA *r);
 
 /* This function needs the memory locking malloc callbacks to be installed */
 int RSA_memory_lock(RSA *r);
 

-/* If you have RSAref compiled in. */
-const RSA_METHOD *RSA_PKCS1_RSAref(void);
-

 /* these are the actual SSLeay RSA functions */
 const RSA_METHOD *RSA_PKCS1_SSLeay(void);
 
 /* these are the actual SSLeay RSA functions */
 const RSA_METHOD *RSA_PKCS1_SSLeay(void);
 


@@ -240,9 +237,6 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length, int (*cb)(), in
 
 int i2d_Netscape_RSA(const RSA *a, unsigned char **pp, int (*cb)());
 RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, int (*cb)());
 
 int i2d_Netscape_RSA(const RSA *a, unsigned char **pp, int (*cb)());
 RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, int (*cb)());

-/* Naughty internal function required elsewhere, to handle a MS structure
- * that is the same as the netscape one :-) */
-RSA *d2i_Netscape_RSA_2(RSA **a, const unsigned char **pp, long length, int (*cb)());

 
 /* The following 2 functions sign and verify a X509_SIG ASN1 object
  * inside PKCS#1 padded RSA encryption */
 
 /* The following 2 functions sign and verify a X509_SIG ASN1 object
  * inside PKCS#1 padded RSA encryption */

diff --git a/util/mkdef.pl b/util/mkdef.pl
index bcf875f546fd2256be49c394bc7ef0bca6cfb79a..a9e1a16cb7743302d7022aa1b53d14ee84d4fb88 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -99,7 +99,7 @@ close(IN);
 my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
 my $no_cast;
 my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
 my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
 my $no_cast;
 my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;

-my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes;
+my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;

 my $no_fp_api;
 
 foreach (@ARGV, split(/ /, $options))
 my $no_fp_api;
 
 foreach (@ARGV, split(/ /, $options))


@@ -150,6 +150,7 @@ foreach (@ARGV, split(/ /, $options))
        #elsif (/^no-locking$/) { $no_locking=1; }
        elsif (/^no-comp$/)     { $no_comp=1; }
        elsif (/^no-dso$/)      { $no_dso=1; }
        #elsif (/^no-locking$/) { $no_locking=1; }
        elsif (/^no-comp$/)     { $no_comp=1; }
        elsif (/^no-dso$/)      { $no_dso=1; }

+       elsif (/^no-krb5$/)     { $no_krb5=1; }

        }
 
 
        }
 
 


@@ -738,8 +739,8 @@ sub print_test_file
        foreach $sym (@symbols) {
                (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/;
                if ($s ne $prev) {
        foreach $sym (@symbols) {
                (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/;
                if ($s ne $prev) {

-                       if (!defined($nums{$sym})) {
-                               printf STDERR "Warning: $sym does not have a number assigned\n"
+                       if (!defined($nums{$s})) {
+                               printf STDERR "Warning: $s does not have a number assigned\n"

                                                if(!$do_update);
                        } else {
                                $n=$nums{$s};
                                                if(!$do_update);
                        } else {
                                $n=$nums{$s};


@@ -838,6 +839,7 @@ EOF
                            && (!@a || (!$no_dh || !grep(/^DH$/,@a)))
                            && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a)))
                            && (!@a || (!$no_aes || !grep(/^AES$/,@a)))
                            && (!@a || (!$no_dh || !grep(/^DH$/,@a)))
                            && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a)))
                            && (!@a || (!$no_aes || !grep(/^AES$/,@a)))

+                           && (!@a || (!$no_krb5 || !grep(/^KRB5$/,@a)))

                            && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))
                            ) {
                                if($v) {
                            && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))
                            ) {
                                if($v) {