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

Win32 fixes from stable branch.

parent 7806f3dd

Configure

+2 −9
Original line number Diff line number Diff line
@@ -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 $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;
@@ -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:

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;
@@ -903,8 +903,6 @@ foreach (sort (keys %disabled)) 
		{ $symlink = 0; }

	elsif (/^sse2$/)

		{ $no_sse2 = 1; }

	elsif (/^rfc3779$/)

		{ $rfc3779 = 0; }

	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 "")

crypto/x509v3/v3_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
#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.

crypto/x509v3/x509v3.h

+1 −1
Original line number Diff line number Diff line
@@ -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);



#ifdef OPENSSL_RFC3779

#ifndef OPENSSL_NO_RFC3779



typedef struct ASRange_st {

  ASN1_INTEGER *min, *max;

ssl/ssl_sess.c

+7 −7
Original line number Diff line number Diff line
@@ -914,18 +914,18 @@ void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, 
	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,

	void (*cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess))

	void (*cb)(SSL_CTX *ctx,SSL_SESSION *sess))

	{

	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;

	}
@@ -937,8 +937,8 @@ void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, 
	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;

	}
@@ -949,7 +949,7 @@ void SSL_CTX_set_info_callback(SSL_CTX *ctx, 
	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;

	}
@@ -960,7 +960,7 @@ void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, 
	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;

	}

util/mk1mf.pl

+1 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,7 @@ sub read_options 
		"dll" => \$shlib,

		"shared" => 0,

		"no-gmp" => 0,

		"no-rfc3779" => 0,

		"no-shared" => 0,

		"no-zlib" => 0,

		"no-zlib-dynamic" => 0,