Win32 fixes from stable branch.

diff --git a/Configure b/Configure
index 6eb7f96e6c14fe90fb446f1e68a1ed94bac654d0..b5f9de05a7a729e4a35127066ad084a1cd744fa1 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -579,7 +579,7 @@ my $threads=0;
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used

-my $rfc3779=1;  # but "no-rfc3779" is default
+my $no_rfc3779=1; # but "no-rfc3779" is default

 my $no_asm=0;
 my $no_dso=0;
 my $no_gmp=0;
 my $no_asm=0;
 my $no_dso=0;
 my $no_gmp=0;


@@ -626,7 +626,7 @@ my %disabled = ( # "what"         => "comment"
 # For symmetry, "disable-..." is a synonym for "no-...".
 
 # This is what $depflags will look like with the above default:
 # For symmetry, "disable-..." is a synonym for "no-...".
 
 # This is what $depflags will look like with the above default:

-my $default_depflags = "-DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 ";
+my $default_depflags = "-DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779";

 
 
 my $no_sse2=0;
 
 
 my $no_sse2=0;


@@ -903,8 +903,6 @@ foreach (sort (keys %disabled))
                { $symlink = 0; }
        elsif (/^sse2$/)
                { $no_sse2 = 1; }
                { $symlink = 0; }
        elsif (/^sse2$/)
                { $no_sse2 = 1; }

-       elsif (/^rfc3779$/)
-               { $rfc3779 = 0; }

        else
                {
                my ($ALGO, $algo);
        else
                {
                my ($ALGO, $algo);


@@ -1141,11 +1139,6 @@ if ($zlib)
                }
        }
 
                }
        }
 

-if ($rfc3779)
-       {
-       $openssl_other_defines.="#define OPENSSL_RFC3779\n";
-       }
-

 # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
 my $shared_mark = "";
 if ($shared_target eq "")
 # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
 my $shared_mark = "";
 if ($shared_target eq "")

diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
index 8ba22548560f9ef48416c3207dfd0c775f168718..4a794ae1117ba22da55574e8bb2a19ce09c030b4 100644 (file)
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/v3_addr.c
@@ -68,7 +68,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 

-#ifdef OPENSSL_RFC3779
+#ifndef OPENSSL_NO_RFC3779

 
 /*
  * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.
 
 /*
  * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index 763a0d523b076fc04436abfd98865067ab32ff4c..2238df24ea95b36d764ed7451d5d77dd8c7125b3 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -658,7 +658,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
 
 void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
 
 
 void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
 

-#ifdef OPENSSL_RFC3779
+#ifndef OPENSSL_NO_RFC3779

 
 typedef struct ASRange_st {
   ASN1_INTEGER *min, *max;
 
 typedef struct ASRange_st {
   ASN1_INTEGER *min, *max;

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index d83a2b03f44944f0dc41bc78fbbe7b527e342887..658d02d4021cf3ece5daa5fb51b565e0b0662420 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -914,18 +914,18 @@ void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
        ctx->new_session_cb=cb;
        }
 
        ctx->new_session_cb=cb;
        }
 

-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st */*ssl*/,SSL_SESSION */*sess*/)
+int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(SSL *ssl, SSL_SESSION *sess)

        {
        return ctx->new_session_cb;
        }
 
 void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
        {
        return ctx->new_session_cb;
        }
 
 void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,

-       void (*cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess))
+       void (*cb)(SSL_CTX *ctx,SSL_SESSION *sess))

        {
        ctx->remove_session_cb=cb;
        }
 
        {
        ctx->remove_session_cb=cb;
        }
 

-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st */*ctx*/,SSL_SESSION */*sess*/)
+void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(SSL_CTX * ctx,SSL_SESSION *sess)

        {
        return ctx->remove_session_cb;
        }
        {
        return ctx->remove_session_cb;
        }


@@ -937,8 +937,8 @@ void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
        ctx->get_session_cb=cb;
        }
 
        ctx->get_session_cb=cb;
        }
 

-SSL_SESSION * (*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st */*ssl*/,
-                unsigned char */*data*/,int /*len*/,int */*copy*/)
+SSL_SESSION * (*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(SSL *ssl,
+                unsigned char *data,int len,int *copy)

        {
        return ctx->get_session_cb;
        }
        {
        return ctx->get_session_cb;
        }


@@ -949,7 +949,7 @@ void SSL_CTX_set_info_callback(SSL_CTX *ctx,
        ctx->info_callback=cb;
        }
 
        ctx->info_callback=cb;
        }
 

-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL */*ssl*/,int /*type*/,int /*val*/)
+void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val)

        {
        return ctx->info_callback;
        }
        {
        return ctx->info_callback;
        }


@@ -960,7 +960,7 @@ void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
        ctx->client_cert_cb=cb;
        }
 
        ctx->client_cert_cb=cb;
        }
 

-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * /*ssl */, X509 **/* x509 */, EVP_PKEY **/*pkey*/)
+int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * ssl, X509 ** x509 , EVP_PKEY **pkey)

        {
        return ctx->client_cert_cb;
        }
        {
        return ctx->client_cert_cb;
        }

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 24a5f2552de2acec35b70f4123737dd26f146a06..7463bdcd5ae80f8389b04c837e07c0c55da9f225 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1038,6 +1038,7 @@ sub read_options
                "dll" => \$shlib,
                "shared" => 0,
                "no-gmp" => 0,
                "dll" => \$shlib,
                "shared" => 0,
                "no-gmp" => 0,

+               "no-rfc3779" => 0,

                "no-shared" => 0,
                "no-zlib" => 0,
                "no-zlib-dynamic" => 0,
                "no-shared" => 0,
                "no-zlib" => 0,
                "no-zlib-dynamic" => 0,

diff --git a/util/mkdef.pl b/util/mkdef.pl
index b6fc9791599917f1e1efba96bc12d7a665b0cb06..972292e61cef338a7c056bf97ddf25e014a73395 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -95,6 +95,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
                         # Engines
                         "STATIC_ENGINE", "ENGINE", "HW", "GMP",
                         "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
                         # Engines
                         "STATIC_ENGINE", "ENGINE", "HW", "GMP",

+                        # RFC3779
+                        "RFC3779",

                         # TLS
                         "TLSEXT", "PSK",
                         # Deprecated functions
                         # TLS
                         "TLSEXT", "PSK",
                         # Deprecated functions


@@ -116,7 +118,7 @@ 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_krb5;
 my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
 my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;

-my $no_psk; my $no_tlsext;
+my $no_rfc3779; my $no_psk; my $no_tlsext;

 
 
 foreach (@ARGV, split(/ /, $options))
 
 
 foreach (@ARGV, split(/ /, $options))


@@ -194,6 +196,7 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-engine$/)   { $no_engine=1; }
        elsif (/^no-hw$/)       { $no_hw=1; }
        elsif (/^no-gmp$/)      { $no_gmp=1; }
        elsif (/^no-engine$/)   { $no_engine=1; }
        elsif (/^no-hw$/)       { $no_hw=1; }
        elsif (/^no-gmp$/)      { $no_gmp=1; }

+       elsif (/^no-rfc3779$/)  { $no_rfc3779=1; }

        }
 
 
        }
 
 


@@ -1114,6 +1117,7 @@ sub is_valid
                        if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
                        if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
                        if ($keyword eq "GMP" && $no_gmp) { return 0; }
                        if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
                        if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
                        if ($keyword eq "GMP" && $no_gmp) { return 0; }

+                       if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }

                        if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
                        if ($keyword eq "PSK" && $no_psk) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
                        if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
                        if ($keyword eq "PSK" && $no_psk) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }