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:
13-Aug-2007 01:59:05
Branch: HEAD Handle:
2007081300590302
Modified files:
openssl/ssl t1_lib.c
openssl/util mk1mf.pl mkdef.pl ssleay.num
openssl/util/pl VC-32.pl
Log:
OPENSSL_NO_TLS1 WIN32 build support. Fix so normal build
works again.
Summary:
Revision Changes Path
1.44 +97 -97 openssl/ssl/t1_lib.c
1.82 +2 -0 openssl/util/mk1mf.pl
1.107 +1 -0 openssl/util/mkdef.pl
1.45 +2 -2 openssl/util/pl/VC-32.pl
1.50 +13 -13 openssl/util/ssleay.num
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/ssl/t1_lib.c
============================================================
================
$ cvs diff -u -r1.43 -r1.44 t1_lib.c
--- openssl/ssl/t1_lib.c 12 Aug 2007 18:56:14 -0000 1.43
+++ openssl/ssl/t1_lib.c 12 Aug 2007 23:59:03 -0000 1.44
-162,6 +162,103
s->version=TLS1_VERSION;
}
+#ifndef OPENSSL_NO_EC
+static int nid_list[] =
+ {
+ NID_sect163k1, /* sect163k1 (1) */
+ NID_sect163r1, /* sect163r1 (2) */
+ NID_sect163r2, /* sect163r2 (3) */
+ NID_sect193r1, /* sect193r1 (4) */
+ NID_sect193r2, /* sect193r2 (5) */
+ NID_sect233k1, /* sect233k1 (6) */
+ NID_sect233r1, /* sect233r1 (7) */
+ NID_sect239k1, /* sect239k1 (8) */
+ NID_sect283k1, /* sect283k1 (9) */
+ NID_sect283r1, /* sect283r1 (10) */
+ NID_sect409k1, /* sect409k1 (11) */
+ NID_sect409r1, /* sect409r1 (12) */
+ NID_sect571k1, /* sect571k1 (13) */
+ NID_sect571r1, /* sect571r1 (14) */
+ NID_secp160k1, /* secp160k1 (15) */
+ NID_secp160r1, /* secp160r1 (16) */
+ NID_secp160r2, /* secp160r2 (17) */
+ NID_secp192k1, /* secp192k1 (18) */
+ NID_X9_62_prime192v1, /* secp192r1 (19) */
+ NID_secp224k1, /* secp224k1 (20) */
+ NID_secp224r1, /* secp224r1 (21) */
+ NID_secp256k1, /* secp256k1 (22) */
+ NID_X9_62_prime256v1, /* secp256r1 (23) */
+ NID_secp384r1, /* secp384r1 (24) */
+ NID_secp521r1 /* secp521r1 (25) */
+ };
+
+int tls1_ec_curve_id2nid(int curve_id)
+ {
+ /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17,
2005) */
+ if ((curve_id < 1) || (curve_id >
sizeof(nid_list)/sizeof(nid_list[0]))) return 0;
+ return nid_list[curve_id-1];
+ }
+
+int tls1_ec_nid2curve_id(int nid)
+ {
+ /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17,
2005) */
+ switch (nid)
+ {
+ case NID_sect163k1: /* sect163k1 (1) */
+ return 1;
+ case NID_sect163r1: /* sect163r1 (2) */
+ return 2;
+ case NID_sect163r2: /* sect163r2 (3) */
+ return 3;
+ case NID_sect193r1: /* sect193r1 (4) */
+ return 4;
+ case NID_sect193r2: /* sect193r2 (5) */
+ return 5;
+ case NID_sect233k1: /* sect233k1 (6) */
+ return 6;
+ case NID_sect233r1: /* sect233r1 (7) */
+ return 7;
+ case NID_sect239k1: /* sect239k1 (8) */
+ return 8;
+ case NID_sect283k1: /* sect283k1 (9) */
+ return 9;
+ case NID_sect283r1: /* sect283r1 (10) */
+ return 10;
+ case NID_sect409k1: /* sect409k1 (11) */
+ return 11;
+ case NID_sect409r1: /* sect409r1 (12) */
+ return 12;
+ case NID_sect571k1: /* sect571k1 (13) */
+ return 13;
+ case NID_sect571r1: /* sect571r1 (14) */
+ return 14;
+ case NID_secp160k1: /* secp160k1 (15) */
+ return 15;
+ case NID_secp160r1: /* secp160r1 (16) */
+ return 16;
+ case NID_secp160r2: /* secp160r2 (17) */
+ return 17;
+ case NID_secp192k1: /* secp192k1 (18) */
+ return 18;
+ case NID_X9_62_prime192v1: /* secp192r1 (19) */
+ return 19;
+ case NID_secp224k1: /* secp224k1 (20) */
+ return 20;
+ case NID_secp224r1: /* secp224r1 (21) */
+ return 21;
+ case NID_secp256k1: /* secp256k1 (22) */
+ return 22;
+ case NID_X9_62_prime256v1: /* secp256r1 (23) */
+ return 23;
+ case NID_secp384r1: /* secp384r1 (24) */
+ return 24;
+ case NID_secp521r1: /* secp521r1 (25) */
+ return 25;
+ default:
+ return 0;
+ }
+ }
+#endif /* OPENSSL_NO_EC */
#ifndef OPENSSL_NO_TLSEXT
unsigned char *ssl_add_clienthello_tlsext(SSL *s,
unsigned char *p, unsigned char *limit)
-951,100 +1048,3
}
#endif
-#ifndef OPENSSL_NO_EC
-static int nid_list[] =
- {
- NID_sect163k1, /* sect163k1 (1) */
- NID_sect163r1, /* sect163r1 (2) */
- NID_sect163r2, /* sect163r2 (3) */
- NID_sect193r1, /* sect193r1 (4) */
- NID_sect193r2, /* sect193r2 (5) */
- NID_sect233k1, /* sect233k1 (6) */
- NID_sect233r1, /* sect233r1 (7) */
- NID_sect239k1, /* sect239k1 (8) */
- NID_sect283k1, /* sect283k1 (9) */
- NID_sect283r1, /* sect283r1 (10) */
- NID_sect409k1, /* sect409k1 (11) */
- NID_sect409r1, /* sect409r1 (12) */
- NID_sect571k1, /* sect571k1 (13) */
- NID_sect571r1, /* sect571r1 (14) */
- NID_secp160k1, /* secp160k1 (15) */
- NID_secp160r1, /* secp160r1 (16) */
- NID_secp160r2, /* secp160r2 (17) */
- NID_secp192k1, /* secp192k1 (18) */
- NID_X9_62_prime192v1, /* secp192r1 (19) */
- NID_secp224k1, /* secp224k1 (20) */
- NID_secp224r1, /* secp224r1 (21) */
- NID_secp256k1, /* secp256k1 (22) */
- NID_X9_62_prime256v1, /* secp256r1 (23) */
- NID_secp384r1, /* secp384r1 (24) */
- NID_secp521r1 /* secp521r1 (25) */
- };
-
-int tls1_ec_curve_id2nid(int curve_id)
- {
- /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17,
2005) */
- if ((curve_id < 1) || (curve_id >
sizeof(nid_list)/sizeof(nid_list[0]))) return 0;
- return nid_list[curve_id-1];
- }
-
-int tls1_ec_nid2curve_id(int nid)
- {
- /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17,
2005) */
- switch (nid)
- {
- case NID_sect163k1: /* sect163k1 (1) */
- return 1;
- case NID_sect163r1: /* sect163r1 (2) */
- return 2;
- case NID_sect163r2: /* sect163r2 (3) */
- return 3;
- case NID_sect193r1: /* sect193r1 (4) */
- return 4;
- case NID_sect193r2: /* sect193r2 (5) */
- return 5;
- case NID_sect233k1: /* sect233k1 (6) */
- return 6;
- case NID_sect233r1: /* sect233r1 (7) */
- return 7;
- case NID_sect239k1: /* sect239k1 (8) */
- return 8;
- case NID_sect283k1: /* sect283k1 (9) */
- return 9;
- case NID_sect283r1: /* sect283r1 (10) */
- return 10;
- case NID_sect409k1: /* sect409k1 (11) */
- return 11;
- case NID_sect409r1: /* sect409r1 (12) */
- return 12;
- case NID_sect571k1: /* sect571k1 (13) */
- return 13;
- case NID_sect571r1: /* sect571r1 (14) */
- return 14;
- case NID_secp160k1: /* secp160k1 (15) */
- return 15;
- case NID_secp160r1: /* secp160r1 (16) */
- return 16;
- case NID_secp160r2: /* secp160r2 (17) */
- return 17;
- case NID_secp192k1: /* secp192k1 (18) */
- return 18;
- case NID_X9_62_prime192v1: /* secp192r1 (19) */
- return 19;
- case NID_secp224k1: /* secp224k1 (20) */
- return 20;
- case NID_secp224r1: /* secp224r1 (21) */
- return 21;
- case NID_secp256k1: /* secp256k1 (22) */
- return 22;
- case NID_X9_62_prime256v1: /* secp256r1 (23) */
- return 23;
- case NID_secp384r1: /* secp384r1 (24) */
- return 24;
- case NID_secp521r1: /* secp521r1 (25) */
- return 25;
- default:
- return 0;
- }
- }
-#endif /* OPENSSL_NO_EC */
.
patch -p0 <<' .'
Index: openssl/util/mk1mf.pl
============================================================
================
$ cvs diff -u -r1.81 -r1.82 mk1mf.pl
--- openssl/util/mk1mf.pl 18 Jul 2007 17:40:48 -0000 1.81
+++ openssl/util/mk1mf.pl 12 Aug 2007 23:59:04 -0000 1.82
-221,6 +221,7
$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
+$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
$cflags.=" -DOPENSSL_NO_ERR" if $no_err;
$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
$cflags.=" -DOPENSSL_NO_EC" if $no_ec;
-1020,6 +1021,7
"gaswin" => $gaswin,
"no-ssl2" => $no_ssl2,
"no-ssl3" => $no_ssl3,
+ "no-tlsext" => $no_tlsext,
"no-err" => $no_err,
"no-sock" => $no_sock,
"no-krb5" => $no_krb5,
.
patch -p0 <<' .'
Index: openssl/util/mkdef.pl
============================================================
================
$ cvs diff -u -r1.106 -r1.107 mkdef.pl
--- openssl/util/mkdef.pl 18 Jul 2007 17:40:48
-0000 1.106
+++ openssl/util/mkdef.pl 12 Aug 2007 23:59:04
-0000 1.107
-198,6 +198,7
elsif (/^no-hw$/) { $no_hw=1; }
elsif (/^no-gmp$/) { $no_gmp=1; }
elsif (/^no-rfc3779$/) { $no_rfc3779=1; }
+ elsif (/^no-tlsext$/) { $no_tlsext=1; }
}
.
patch -p0 <<' .'
Index: openssl/util/pl/VC-32.pl
============================================================
================
$ cvs diff -u -r1.44 -r1.45 VC-32.pl
--- openssl/util/pl/VC-32.pl 18 Jul 2007 17:40:49
-0000 1.44
+++ openssl/util/pl/VC-32.pl 12 Aug 2007 23:59:05
-0000 1.45
-285,7 +285,7
}
$ex.=" $zlib_lib" if $zlib_opt == 1
&& $target =~ /O_CRYPTO/;
$ret.="t$(LINK) $(MLFLAGS) $efile$target $name
<<n $(SHLIB_EX_OBJ) $objs
$exn<<n";
- $ret.="tIF EXIST $.manifest mt -manifest
$.manifest -outputresource:$;2nn";
+ $ret.="tIF EXIST $.manifest mt -nologo
-manifest $.manifest -outputresource:$;2nn";
}
$ret.="n";
return($ret);
-301,7 +301,7
$ret.="$target: $files $dep_libsn";
$ret.="t$(LINK) $(LFLAGS) $efile$target <<n";
$ret.=" $(APP_EX_OBJ) $files
$libsn<<n";
- $ret.="tIF EXIST $.manifest mt -manifest
$.manifest -outputresource:$;1nn";
+ $ret.="tIF EXIST $.manifest mt -nologo
-manifest $.manifest -outputresource:$;1nn";
return($ret);
}
.
patch -p0 <<' .'
Index: openssl/util/ssleay.num
============================================================
================
$ cvs diff -u -r1.49 -r1.50 ssleay.num
--- openssl/util/ssleay.num 18 Jul 2007 17:40:48
-0000 1.49
+++ openssl/util/ssleay.num 12 Aug 2007 23:59:04
-0000 1.50
-239,17 +239,17
SSL_CTX_get_client_cert_cb
288 EXIST::FUNCTION:
SSL_CTX_sess_get_remove_cb
289 EXIST::FUNCTION:
SSL_set_SSL_CTX
290 EXIST::FUNCTION:
-SSL_CTX_use_psk_identity_hint
291 EXIST::FUNCTION:PSK
-SSL_CTX_set_psk_client_callback
292 EXIST::FUNCTION:PSK
-SSL_get_psk_identity_hint
293 EXIST::FUNCTION:PSK
-SSL_set_psk_server_callback
294 EXIST::FUNCTION:PSK
-SSL_use_psk_identity_hint
295 EXIST::FUNCTION:PSK
-SSL_set_psk_client_callback
296 EXIST::FUNCTION:PSK
-SSL_get_servername
297 EXIST::FUNCTION:TLSEXT
-SSL_get_servername_type
298 EXIST::FUNCTION:TLSEXT
-SSL_CTX_set_psk_server_callback
299 EXIST::FUNCTION:PSK
-SSL_get_psk_identity
300 EXIST::FUNCTION:PSK
-PEM_write_bio_SSL_SESSION
301 EXIST::FUNCTION:
-PEM_read_SSL_SESSION
302 EXIST:!WIN16:FUNCTION:
-PEM_read_bio_SSL_SESSION
303 EXIST::FUNCTION:
+SSL_get_servername
291 EXIST::FUNCTION:TLSEXT
+SSL_get_servername_type
292 EXIST::FUNCTION:TLSEXT
+SSL_CTX_use_psk_identity_hint
293 EXIST::FUNCTION:PSK
+SSL_CTX_set_psk_client_callback
294 EXIST::FUNCTION:PSK
+PEM_write_bio_SSL_SESSION
295 EXIST::FUNCTION:
+SSL_get_psk_identity_hint
296 EXIST::FUNCTION:PSK
+SSL_set_psk_server_callback
297 EXIST::FUNCTION:PSK
+SSL_use_psk_identity_hint
298 EXIST::FUNCTION:PSK
+SSL_set_psk_client_callback
299 EXIST::FUNCTION:PSK
+PEM_read_SSL_SESSION
300 EXIST:!WIN16:FUNCTION:
+PEM_read_bio_SSL_SESSION
301 EXIST::FUNCTION:
+SSL_CTX_set_psk_server_callback
302 EXIST::FUNCTION:PSK
+SSL_get_psk_identity
303 EXIST::FUNCTION:PSK
PEM_write_SSL_SESSION
304 EXIST:!WIN16:FUNCTION:
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
