diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2006-11-30 13:39:34 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2006-11-30 13:39:34 +0000 |
commit | d137b56a5bed5557a04b54040f17dd9a41fd8274 (patch) | |
tree | 562431f6a7208a644fe98407a499e6a25314a2b6 | |
parent | 7806f3dd4b44a0de379b4b8ac3ffc0fc8f249415 (diff) |
Win32 fixes from stable branch.
-rwxr-xr-x | Configure | 11 | ||||
-rw-r--r-- | crypto/x509v3/v3_addr.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.h | 2 | ||||
-rw-r--r-- | ssl/ssl_sess.c | 14 | ||||
-rwxr-xr-x | util/mk1mf.pl | 1 | ||||
-rwxr-xr-x | util/mkdef.pl | 6 |
6 files changed, 17 insertions, 19 deletions
@@ -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 "") diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c index 8ba2254856..4a794ae111 100644 --- a/crypto/x509v3/v3_addr.c +++ b/crypto/x509v3/v3_addr.c @@ -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. diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 763a0d523b..2238df24ea 100644 --- 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); -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 typedef struct ASRange_st { ASN1_INTEGER *min, *max; diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index d83a2b03f4..658d02d402 100644 --- 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; } -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; } diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 24a5f2552d..7463bdcd5a 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -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, diff --git a/util/mkdef.pl b/util/mkdef.pl index b6fc979159..972292e61c 100755 --- 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", + # RFC3779 + "RFC3779", # 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_psk; my $no_tlsext; +my $no_rfc3779; my $no_psk; my $no_tlsext; 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-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 "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; } |