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

Win32 fixes. 

Use OPENSSL_NO_RFC3779 instead of OPENSSL_RFC3779: this makes the Win32 scripts
work and is consistent with other options.

Fix Win32 scripts and Configure to process OPENSSL_NO_RFC3779 properly.

Update ordinals.

Change some prototypes for LSB because VC++ 6 doesn't like the */ sequence and thinks it is an invalid end of comment.
parent d4a62400

Configure

+2 −9
Original line number Diff line number Diff line
@@ -568,7 +568,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;
@@ -616,7 +616,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_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 ";

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





my $no_sse2=0;
@@ -885,8 +885,6 @@ foreach (sort (keys %disabled)) 
		{ $symlink = 0; }

	elsif (/^sse2$/)

		{ $no_sse2 = 1; }

	elsif (/^rfc3779$/)

		{ $rfc3779 = 0; }

	else

		{

		my ($ALGO, $algo);
@@ -1124,11 +1122,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
@@ -626,7 +626,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
@@ -771,18 +771,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;

	}
@@ -794,8 +794,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;

	}
@@ -806,7 +806,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;

	}
@@ -817,7 +817,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/libeay.num

+101 −0
Original line number Diff line number Diff line
@@ -3409,3 +3409,104 @@ EVP_camellia_256_cfb1 3809 EXIST::FUNCTION:CAMELLIA 
EVP_camellia_256_cfb8                   3810	EXIST::FUNCTION:CAMELLIA

EVP_camellia_256_ecb                    3811	EXIST::FUNCTION:CAMELLIA

EVP_camellia_256_ofb                    3812	EXIST::FUNCTION:CAMELLIA

a2i_ipadd                               3813	EXIST::FUNCTION:

ASIdentifiers_free                      3814	EXIST::FUNCTION:RFC3779

i2d_ASIdOrRange                         3815	EXIST::FUNCTION:RFC3779

EVP_CIPHER_block_size                   3816	EXIST::FUNCTION:

v3_asid_is_canonical                    3817	EXIST::FUNCTION:RFC3779

IPAddressChoice_free                    3818	EXIST::FUNCTION:RFC3779

EVP_CIPHER_CTX_set_app_data             3819	EXIST::FUNCTION:

BIO_set_callback_arg                    3820	EXIST::FUNCTION:

v3_addr_add_prefix                      3821	EXIST::FUNCTION:RFC3779

IPAddressOrRange_it                     3822	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

IPAddressOrRange_it                     3822	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

BIO_set_flags                           3823	EXIST::FUNCTION:

ASIdentifiers_it                        3824	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

ASIdentifiers_it                        3824	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

v3_addr_get_range                       3825	EXIST::FUNCTION:RFC3779

BIO_method_type                         3826	EXIST::FUNCTION:

v3_addr_inherits                        3827	EXIST::FUNCTION:RFC3779

IPAddressChoice_it                      3828	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

IPAddressChoice_it                      3828	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

AES_ige_encrypt                         3829	EXIST::FUNCTION:AES

v3_addr_add_range                       3830	EXIST::FUNCTION:RFC3779

EVP_CIPHER_CTX_nid                      3831	EXIST::FUNCTION:

d2i_ASRange                             3832	EXIST::FUNCTION:RFC3779

v3_addr_add_inherit                     3833	EXIST::FUNCTION:RFC3779

v3_asid_add_id_or_range                 3834	EXIST::FUNCTION:RFC3779

v3_addr_validate_resource_set           3835	EXIST::FUNCTION:RFC3779

EVP_CIPHER_iv_length                    3836	EXIST::FUNCTION:

EVP_MD_type                             3837	EXIST::FUNCTION:

v3_asid_canonize                        3838	EXIST::FUNCTION:RFC3779

IPAddressRange_free                     3839	EXIST::FUNCTION:RFC3779

v3_asid_add_inherit                     3840	EXIST::FUNCTION:RFC3779

EVP_CIPHER_CTX_key_length               3841	EXIST::FUNCTION:

IPAddressRange_new                      3842	EXIST::FUNCTION:RFC3779

ASIdOrRange_new                         3843	EXIST::FUNCTION:RFC3779

EVP_MD_size                             3844	EXIST::FUNCTION:

EVP_MD_CTX_test_flags                   3845	EXIST::FUNCTION:

BIO_clear_flags                         3846	EXIST::FUNCTION:

i2d_ASRange                             3847	EXIST::FUNCTION:RFC3779

IPAddressRange_it                       3848	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

IPAddressRange_it                       3848	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

IPAddressChoice_new                     3849	EXIST::FUNCTION:RFC3779

ASIdentifierChoice_new                  3850	EXIST::FUNCTION:RFC3779

ASRange_free                            3851	EXIST::FUNCTION:RFC3779

EVP_MD_pkey_type                        3852	EXIST::FUNCTION:

EVP_MD_CTX_clear_flags                  3853	EXIST::FUNCTION:

IPAddressFamily_free                    3854	EXIST::FUNCTION:RFC3779

i2d_IPAddressFamily                     3855	EXIST::FUNCTION:RFC3779

IPAddressOrRange_new                    3856	EXIST::FUNCTION:RFC3779

EVP_CIPHER_flags                        3857	EXIST::FUNCTION:

v3_asid_validate_resource_set           3858	EXIST::FUNCTION:RFC3779

d2i_IPAddressRange                      3859	EXIST::FUNCTION:RFC3779

AES_bi_ige_encrypt                      3860	EXIST::FUNCTION:AES

BIO_get_callback                        3861	EXIST::FUNCTION:

IPAddressOrRange_free                   3862	EXIST::FUNCTION:RFC3779

v3_addr_subset                          3863	EXIST::FUNCTION:RFC3779

d2i_IPAddressFamily                     3864	EXIST::FUNCTION:RFC3779

v3_asid_subset                          3865	EXIST::FUNCTION:RFC3779

BIO_test_flags                          3866	EXIST::FUNCTION:

i2d_ASIdentifierChoice                  3867	EXIST::FUNCTION:RFC3779

ASRange_it                              3868	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

ASRange_it                              3868	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

d2i_ASIdentifiers                       3869	EXIST::FUNCTION:RFC3779

ASRange_new                             3870	EXIST::FUNCTION:RFC3779

d2i_IPAddressChoice                     3871	EXIST::FUNCTION:RFC3779

v3_addr_get_afi                         3872	EXIST::FUNCTION:RFC3779

EVP_CIPHER_key_length                   3873	EXIST::FUNCTION:

EVP_Cipher                              3874	EXIST::FUNCTION:

i2d_IPAddressOrRange                    3875	EXIST::FUNCTION:RFC3779

ASIdOrRange_it                          3876	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

ASIdOrRange_it                          3876	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

EVP_CIPHER_nid                          3877	EXIST::FUNCTION:

i2d_IPAddressChoice                     3878	EXIST::FUNCTION:RFC3779

EVP_CIPHER_CTX_block_size               3879	EXIST::FUNCTION:

ASIdentifiers_new                       3880	EXIST::FUNCTION:RFC3779

v3_addr_validate_path                   3881	EXIST::FUNCTION:RFC3779

IPAddressFamily_new                     3882	EXIST::FUNCTION:RFC3779

EVP_MD_CTX_set_flags                    3883	EXIST::FUNCTION:

v3_addr_is_canonical                    3884	EXIST::FUNCTION:RFC3779

i2d_IPAddressRange                      3885	EXIST::FUNCTION:RFC3779

IPAddressFamily_it                      3886	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

IPAddressFamily_it                      3886	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

v3_asid_inherits                        3887	EXIST::FUNCTION:RFC3779

EVP_CIPHER_CTX_cipher                   3888	EXIST::FUNCTION:

EVP_CIPHER_CTX_get_app_data             3889	EXIST::FUNCTION:

EVP_MD_block_size                       3890	EXIST::FUNCTION:

EVP_CIPHER_CTX_flags                    3891	EXIST::FUNCTION:

v3_asid_validate_path                   3892	EXIST::FUNCTION:RFC3779

d2i_IPAddressOrRange                    3893	EXIST::FUNCTION:RFC3779

v3_addr_canonize                        3894	EXIST::FUNCTION:RFC3779

ASIdentifierChoice_it                   3895	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779

ASIdentifierChoice_it                   3895	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779

EVP_MD_CTX_md                           3896	EXIST::FUNCTION:

d2i_ASIdentifierChoice                  3897	EXIST::FUNCTION:RFC3779

BIO_method_name                         3898	EXIST::FUNCTION:

EVP_CIPHER_CTX_iv_length                3899	EXIST::FUNCTION:

ASIdOrRange_free                        3900	EXIST::FUNCTION:RFC3779

ASIdentifierChoice_free                 3901	EXIST::FUNCTION:RFC3779

BIO_get_callback_arg                    3902	EXIST::FUNCTION:

BIO_set_callback                        3903	EXIST::FUNCTION:

d2i_ASIdOrRange                         3904	EXIST::FUNCTION:RFC3779

i2d_ASIdentifiers                       3905	EXIST::FUNCTION:RFC3779