diff options
| author | simon <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
| commit | 0d816bbd980d8201a2ad23ccd05f7bde16565282 (patch) | |
| tree | 909a7c21b7df72ae8c08b80b468a4dd75b3820be /secure | |
| parent | 7fd3bd147ec574621124307eca10ead5353e34ba (diff) | |
| parent | cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385 (diff) | |
| download | FreeBSD-src-0d816bbd980d8201a2ad23ccd05f7bde16565282.zip FreeBSD-src-0d816bbd980d8201a2ad23ccd05f7bde16565282.tar.gz | |
Merge OpenSSL 0.9.8m into head.
This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.
MFC after: 3 weeks
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 5dad969..c8cc554 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -17,7 +17,7 @@ SRCS= bio_ssl.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \ s3_both.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \ s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c \ ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \ - ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.c \ + ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c INCS= dtls1.h kssl.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h INCSDIR=${INCLUDEDIR}/openssl |
