OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
30-Nov-2006 14:39:35
Branch: HEAD Handle:
2006113013393301
Modified files:
openssl Configure
openssl/crypto/x509v3 v3_addr.c x509v3.h
openssl/ssl ssl_sess.c
openssl/util mk1mf.pl mkdef.pl
Log:
Win32 fixes from stable branch.
Summary:
Revision Changes Path
1.546 +2 -9 openssl/Configure
1.3 +1 -1 openssl/crypto/x509v3/v3_addr.c
1.111 +1 -1 openssl/crypto/x509v3/x509v3.h
1.64 +7 -7 openssl/ssl/ssl_sess.c
1.79 +1 -0 openssl/util/mk1mf.pl
1.103 +5 -1 openssl/util/mkdef.pl
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/Configure
============================================================
================
$ cvs diff -u -r1.545 -r1.546 Configure
--- openssl/Configure 27 Nov 2006 14:17:57 -0000 1.545
+++ openssl/Configure 30 Nov 2006 13:39:33 -0000 1.546
-579,7 +579,7
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
# 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
{ $symlink = 0; }
elsif (/^sse2$/)
{ $no_sse2 = 1; }
- elsif (/^rfc3779$/)
- { $rfc3779 = 0; }
else
{
my ($ALGO, $algo);
-1141,11 +1139,6
}
}
-if ($rfc3779)
- {
- $openssl_other_defines.="#define
OPENSSL_RFC3779n";
- }
-
# You will find shlib_mark1 and shlib_mark2 explained in
Makefile.org
my $shared_mark = "";
if ($shared_target eq "")
.
patch -p0 <<' .'
Index: openssl/crypto/x509v3/v3_addr.c
============================================================
================
$ cvs diff -u -r1.2 -r1.3 v3_addr.c
--- openssl/crypto/x509v3/v3_addr.c 27 Nov 2006 14:18:03
-0000 1.2
+++ openssl/crypto/x509v3/v3_addr.c 30 Nov 2006 13:39:33
-0000 1.3
-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.
.
patch -p0 <<' .'
Index: openssl/crypto/x509v3/x509v3.h
============================================================
================
$ cvs diff -u -r1.110 -r1.111 x509v3.h
--- openssl/crypto/x509v3/x509v3.h 27 Nov 2006 14:18:05
-0000 1.110
+++ openssl/crypto/x509v3/x509v3.h 30 Nov 2006 13:39:33
-0000 1.111
-658,7 +658,7
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;
.
patch -p0 <<' .'
Index: openssl/ssl/ssl_sess.c
============================================================
================
$ cvs diff -u -r1.63 -r1.64 ssl_sess.c
--- openssl/ssl/ssl_sess.c 29 Nov 2006 20:54:57 -0000 1.63
+++ openssl/ssl/ssl_sess.c 30 Nov 2006 13:39:34 -0000 1.64
-914,18 +914,18
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
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
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
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;
}
.
patch -p0 <<' .'
Index: openssl/util/mk1mf.pl
============================================================
================
$ cvs diff -u -r1.78 -r1.79 mk1mf.pl
--- openssl/util/mk1mf.pl 9 Jun 2006 15:44:59 -0000 1.78
+++ openssl/util/mk1mf.pl 30 Nov 2006 13:39:34 -0000 1.79
-1038,6 +1038,7
"dll" => $shlib,
"shared" => 0,
"no-gmp" => 0,
+ "no-rfc3779" => 0,
"no-shared" => 0,
"no-zlib" => 0,
"no-zlib-dynamic" => 0,
.
patch -p0 <<' .'
Index: openssl/util/mkdef.pl
============================================================
================
$ cvs diff -u -r1.102 -r1.103 mkdef.pl
--- openssl/util/mkdef.pl 9 Jun 2006 15:44:59 -0000 1.102
+++ openssl/util/mkdef.pl 30 Nov 2006 13:39:34 -0000 1.103
-95,6 +95,8
"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_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
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
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; }
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|