From owner-svn-src-user@FreeBSD.ORG Tue Oct 21 20:51:24 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7439EC3; Tue, 21 Oct 2014 20:51:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2044757; Tue, 21 Oct 2014 20:51:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LKpOOC087592; Tue, 21 Oct 2014 20:51:24 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9LKpNvp087583; Tue, 21 Oct 2014 20:51:23 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410212051.s9LKpNvp087583@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 21 Oct 2014 20:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r273422 - in user/cperciva/freebsd-update-build/patches: 10.0-RELEASE 8.4-RELEASE 9.1-RELEASE 9.2-RELEASE 9.3-RELEASE X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 20:51:24 -0000 Author: delphij Date: Tue Oct 21 20:51:22 2014 New Revision: 273422 URL: https://svnweb.freebsd.org/changeset/base/273422 Log: Commit 1/2: add patches for security advisory. Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:20.rtsold user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:21.routed user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:22.namei user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:23.openssl user/cperciva/freebsd-update-build/patches/8.4-RELEASE/17-SA-14:21.routed user/cperciva/freebsd-update-build/patches/8.4-RELEASE/17-SA-14:23.openssl user/cperciva/freebsd-update-build/patches/9.1-RELEASE/20-SA-14:20.rtsold user/cperciva/freebsd-update-build/patches/9.1-RELEASE/20-SA-14:21.routed user/cperciva/freebsd-update-build/patches/9.1-RELEASE/20-SA-14:22.namei user/cperciva/freebsd-update-build/patches/9.1-RELEASE/20-SA-14:23.openssl user/cperciva/freebsd-update-build/patches/9.2-RELEASE/13-SA-14:20.rtsold user/cperciva/freebsd-update-build/patches/9.2-RELEASE/13-SA-14:21.routed user/cperciva/freebsd-update-build/patches/9.2-RELEASE/13-SA-14:22.namei user/cperciva/freebsd-update-build/patches/9.2-RELEASE/13-SA-14:23.openssl user/cperciva/freebsd-update-build/patches/9.3-RELEASE/3-SA-14:20.rtsold user/cperciva/freebsd-update-build/patches/9.3-RELEASE/3-SA-14:21.routed user/cperciva/freebsd-update-build/patches/9.3-RELEASE/3-SA-14:22.namei user/cperciva/freebsd-update-build/patches/9.3-RELEASE/3-SA-14:23.openssl Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:20.rtsold ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:20.rtsold Tue Oct 21 20:51:22 2014 (r273422) @@ -0,0 +1,14 @@ +Index: usr.sbin/rtsold/rtsol.c +=================================================================== +--- usr.sbin/rtsold/rtsol.c.orig ++++ usr.sbin/rtsold/rtsol.c +@@ -933,7 +933,8 @@ + dst_origin = dst; + memset(dst, '\0', dlen); + while (src && (len = (uint8_t)(*src++) & 0x3f) && +- (src + len) <= src_last) { ++ (src + len) <= src_last && ++ (dst - dst_origin < (ssize_t)dlen)) { + if (dst != dst_origin) + *dst++ = '.'; + warnmsg(LOG_DEBUG, __func__, "labellen = %zd", len); Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:21.routed ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:21.routed Tue Oct 21 20:51:22 2014 (r273422) @@ -0,0 +1,15 @@ +Index: sbin/routed/input.c +=================================================================== +--- sbin/routed/input.c.orig ++++ sbin/routed/input.c +@@ -288,6 +288,10 @@ + /* Answer a query from a utility program + * with all we know. + */ ++ if (aifp == NULL) { ++ trace_pkt("ignore remote query"); ++ return; ++ } + if (from->sin_port != htons(RIP_PORT)) { + supply(from, aifp, OUT_QUERY, 0, + rip->rip_vers, ap != 0); Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:22.namei ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:22.namei Tue Oct 21 20:51:22 2014 (r273422) @@ -0,0 +1,94 @@ +Index: sys/kern/vfs_lookup.c +=================================================================== +--- sys/kern/vfs_lookup.c (revision 273277) ++++ sys/kern/vfs_lookup.c (working copy) +@@ -121,6 +121,16 @@ + * if symbolic link, massage name in buffer and continue + * } + */ ++static void ++namei_cleanup_cnp(struct componentname *cnp) ++{ ++ uma_zfree(namei_zone, cnp->cn_pnbuf); ++#ifdef DIAGNOSTIC ++ cnp->cn_pnbuf = NULL; ++ cnp->cn_nameptr = NULL; ++#endif ++} ++ + int + namei(struct nameidata *ndp) + { +@@ -185,11 +195,7 @@ + } + #endif + if (error) { +- uma_zfree(namei_zone, cnp->cn_pnbuf); +-#ifdef DIAGNOSTIC +- cnp->cn_pnbuf = NULL; +- cnp->cn_nameptr = NULL; +-#endif ++ namei_cleanup_cnp(cnp); + ndp->ni_vp = NULL; + return (error); + } +@@ -256,11 +262,7 @@ + } + } + if (error) { +- uma_zfree(namei_zone, cnp->cn_pnbuf); +-#ifdef DIAGNOSTIC +- cnp->cn_pnbuf = NULL; +- cnp->cn_nameptr = NULL; +-#endif ++ namei_cleanup_cnp(cnp); + return (error); + } + } +@@ -286,6 +288,7 @@ + if (KTRPOINT(curthread, KTR_CAPFAIL)) + ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); + #endif ++ namei_cleanup_cnp(cnp); + return (ENOTCAPABLE); + } + while (*(cnp->cn_nameptr) == '/') { +@@ -298,11 +301,7 @@ + ndp->ni_startdir = dp; + error = lookup(ndp); + if (error) { +- uma_zfree(namei_zone, cnp->cn_pnbuf); +-#ifdef DIAGNOSTIC +- cnp->cn_pnbuf = NULL; +- cnp->cn_nameptr = NULL; +-#endif ++ namei_cleanup_cnp(cnp); + SDT_PROBE(vfs, namei, lookup, return, error, NULL, 0, + 0, 0); + return (error); +@@ -312,11 +311,7 @@ + */ + if ((cnp->cn_flags & ISSYMLINK) == 0) { + if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) { +- uma_zfree(namei_zone, cnp->cn_pnbuf); +-#ifdef DIAGNOSTIC +- cnp->cn_pnbuf = NULL; +- cnp->cn_nameptr = NULL; +-#endif ++ namei_cleanup_cnp(cnp); + } else + cnp->cn_flags |= HASBUF; + +@@ -378,11 +373,7 @@ + vput(ndp->ni_vp); + dp = ndp->ni_dvp; + } +- uma_zfree(namei_zone, cnp->cn_pnbuf); +-#ifdef DIAGNOSTIC +- cnp->cn_pnbuf = NULL; +- cnp->cn_nameptr = NULL; +-#endif ++ namei_cleanup_cnp(cnp); + vput(ndp->ni_vp); + ndp->ni_vp = NULL; + vrele(ndp->ni_dvp); Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:23.openssl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/10-SA-14:23.openssl Tue Oct 21 20:51:22 2014 (r273422) @@ -0,0 +1,717 @@ +Index: crypto/openssl/apps/s_client.c +=================================================================== +--- crypto/openssl/apps/s_client.c (revision 273303) ++++ crypto/openssl/apps/s_client.c (working copy) +@@ -335,6 +335,7 @@ static void sc_usage(void) + BIO_printf(bio_err," -tls1_1 - just use TLSv1.1\n"); + BIO_printf(bio_err," -tls1 - just use TLSv1\n"); + BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); ++ BIO_printf(bio_err," -fallback_scsv - send TLS_FALLBACK_SCSV\n"); + BIO_printf(bio_err," -mtu - set the link layer MTU\n"); + BIO_printf(bio_err," -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); + BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n"); +@@ -615,6 +616,7 @@ int MAIN(int argc, char **argv) + char *sess_out = NULL; + struct sockaddr peer; + int peerlen = sizeof(peer); ++ int fallback_scsv = 0; + int enable_timeouts = 0 ; + long socket_mtu = 0; + #ifndef OPENSSL_NO_JPAKE +@@ -821,6 +823,10 @@ int MAIN(int argc, char **argv) + meth=DTLSv1_client_method(); + socket_type=SOCK_DGRAM; + } ++ else if (strcmp(*argv,"-fallback_scsv") == 0) ++ { ++ fallback_scsv = 1; ++ } + else if (strcmp(*argv,"-timeout") == 0) + enable_timeouts=1; + else if (strcmp(*argv,"-mtu") == 0) +@@ -1233,6 +1239,10 @@ bad: + SSL_set_session(con, sess); + SSL_SESSION_free(sess); + } ++ ++ if (fallback_scsv) ++ SSL_set_mode(con, SSL_MODE_SEND_FALLBACK_SCSV); ++ + #ifndef OPENSSL_NO_TLSEXT + if (servername != NULL) + { +Index: crypto/openssl/ssl/d1_lib.c +=================================================================== +--- crypto/openssl/ssl/d1_lib.c (revision 273303) ++++ crypto/openssl/ssl/d1_lib.c (working copy) +@@ -262,6 +262,16 @@ long dtls1_ctrl(SSL *s, int cmd, long larg, void * + case DTLS_CTRL_LISTEN: + ret = dtls1_listen(s, parg); + break; ++ case SSL_CTRL_CHECK_PROTO_VERSION: ++ /* For library-internal use; checks that the current protocol ++ * is the highest enabled version (according to s->ctx->method, ++ * as version negotiation may have changed s->method). */ ++#if DTLS_MAX_VERSION != DTLS1_VERSION ++# error Code needs update for DTLS_method() support beyond DTLS1_VERSION. ++#endif ++ /* Just one protocol version is supported so far; ++ * fail closed if the version is not as expected. */ ++ return s->version == DTLS_MAX_VERSION; + + default: + ret = ssl3_ctrl(s, cmd, larg, parg); +Index: crypto/openssl/ssl/d1_srtp.c +=================================================================== +--- crypto/openssl/ssl/d1_srtp.c (revision 273303) ++++ crypto/openssl/ssl/d1_srtp.c (working copy) +@@ -168,25 +168,6 @@ static int find_profile_by_name(char *profile_name + return 1; + } + +-static int find_profile_by_num(unsigned profile_num, +- SRTP_PROTECTION_PROFILE **pptr) +- { +- SRTP_PROTECTION_PROFILE *p; +- +- p=srtp_known_profiles; +- while(p->name) +- { +- if(p->id == profile_num) +- { +- *pptr=p; +- return 0; +- } +- p++; +- } +- +- return 1; +- } +- + static int ssl_ctx_make_profiles(const char *profiles_string,STACK_OF(SRTP_PROTECTION_PROFILE) **out) + { + STACK_OF(SRTP_PROTECTION_PROFILE) *profiles; +@@ -209,11 +190,19 @@ static int ssl_ctx_make_profiles(const char *profi + if(!find_profile_by_name(ptr,&p, + col ? col-ptr : (int)strlen(ptr))) + { ++ if (sk_SRTP_PROTECTION_PROFILE_find(profiles,p) >= 0) ++ { ++ SSLerr(SSL_F_SSL_CTX_MAKE_PROFILES,SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST); ++ sk_SRTP_PROTECTION_PROFILE_free(profiles); ++ return 1; ++ } ++ + sk_SRTP_PROTECTION_PROFILE_push(profiles,p); + } + else + { + SSLerr(SSL_F_SSL_CTX_MAKE_PROFILES,SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE); ++ sk_SRTP_PROTECTION_PROFILE_free(profiles); + return 1; + } + +@@ -305,13 +294,12 @@ int ssl_add_clienthello_use_srtp_ext(SSL *s, unsig + + int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,int *al) + { +- SRTP_PROTECTION_PROFILE *cprof,*sprof; +- STACK_OF(SRTP_PROTECTION_PROFILE) *clnt=0,*srvr; ++ SRTP_PROTECTION_PROFILE *sprof; ++ STACK_OF(SRTP_PROTECTION_PROFILE) *srvr; + int ct; + int mki_len; +- int i,j; +- int id; +- int ret; ++ int i, srtp_pref; ++ unsigned int id; + + /* Length value + the MKI length */ + if(len < 3) +@@ -341,9 +329,11 @@ int ssl_parse_clienthello_use_srtp_ext(SSL *s, uns + return 1; + } + ++ srvr=SSL_get_srtp_profiles(s); ++ s->srtp_profile = NULL; ++ /* Search all profiles for a match initially */ ++ srtp_pref = sk_SRTP_PROTECTION_PROFILE_num(srvr); + +- clnt=sk_SRTP_PROTECTION_PROFILE_new_null(); +- + while(ct) + { + n2s(d,id); +@@ -350,14 +340,22 @@ int ssl_parse_clienthello_use_srtp_ext(SSL *s, uns + ct-=2; + len-=2; + +- if(!find_profile_by_num(id,&cprof)) ++ /* ++ * Only look for match in profiles of higher preference than ++ * current match. ++ * If no profiles have been have been configured then this ++ * does nothing. ++ */ ++ for (i = 0; i < srtp_pref; i++) + { +- sk_SRTP_PROTECTION_PROFILE_push(clnt,cprof); ++ sprof = sk_SRTP_PROTECTION_PROFILE_value(srvr, i); ++ if (sprof->id == id) ++ { ++ s->srtp_profile = sprof; ++ srtp_pref = i; ++ break; ++ } + } +- else +- { +- ; /* Ignore */ +- } + } + + /* Now extract the MKI value as a sanity check, but discard it for now */ +@@ -371,36 +369,7 @@ int ssl_parse_clienthello_use_srtp_ext(SSL *s, uns + return 1; + } + +- srvr=SSL_get_srtp_profiles(s); +- +- /* Pick our most preferred profile. If no profiles have been +- configured then the outer loop doesn't run +- (sk_SRTP_PROTECTION_PROFILE_num() = -1) +- and so we just return without doing anything */ +- for(i=0;iid==sprof->id) +- { +- s->srtp_profile=sprof; +- *al=0; +- ret=0; +- goto done; +- } +- } +- } +- +- ret=0; +- +-done: +- if(clnt) sk_SRTP_PROTECTION_PROFILE_free(clnt); +- +- return ret; ++ return 0; + } + + int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len, int maxlen) +Index: crypto/openssl/ssl/dtls1.h +=================================================================== +--- crypto/openssl/ssl/dtls1.h (revision 273303) ++++ crypto/openssl/ssl/dtls1.h (working copy) +@@ -84,6 +84,8 @@ extern "C" { + #endif + + #define DTLS1_VERSION 0xFEFF ++#define DTLS_MAX_VERSION DTLS1_VERSION ++ + #define DTLS1_BAD_VER 0x0100 + + #if 0 +@@ -284,4 +286,3 @@ typedef struct dtls1_record_data_st + } + #endif + #endif +- +Index: crypto/openssl/ssl/s23_clnt.c +=================================================================== +--- crypto/openssl/ssl/s23_clnt.c (revision 273303) ++++ crypto/openssl/ssl/s23_clnt.c (working copy) +@@ -125,9 +125,11 @@ static const SSL_METHOD *ssl23_get_client_method(i + if (ver == SSL2_VERSION) + return(SSLv2_client_method()); + #endif ++#ifndef OPENSSL_NO_SSL3 + if (ver == SSL3_VERSION) + return(SSLv3_client_method()); +- else if (ver == TLS1_VERSION) ++#endif ++ if (ver == TLS1_VERSION) + return(TLSv1_client_method()); + else if (ver == TLS1_1_VERSION) + return(TLSv1_1_client_method()); +@@ -677,6 +679,7 @@ static int ssl23_get_server_hello(SSL *s) + { + /* we have sslv3 or tls1 (server hello or alert) */ + ++#ifndef OPENSSL_NO_SSL3 + if ((p[2] == SSL3_VERSION_MINOR) && + !(s->options & SSL_OP_NO_SSLv3)) + { +@@ -691,7 +694,9 @@ static int ssl23_get_server_hello(SSL *s) + s->version=SSL3_VERSION; + s->method=SSLv3_client_method(); + } +- else if ((p[2] == TLS1_VERSION_MINOR) && ++ else ++#endif ++ if ((p[2] == TLS1_VERSION_MINOR) && + !(s->options & SSL_OP_NO_TLSv1)) + { + s->version=TLS1_VERSION; +@@ -715,6 +720,9 @@ static int ssl23_get_server_hello(SSL *s) + goto err; + } + ++ /* ensure that TLS_MAX_VERSION is up-to-date */ ++ OPENSSL_assert(s->version <= TLS_MAX_VERSION); ++ + if (p[0] == SSL3_RT_ALERT && p[5] != SSL3_AL_WARNING) + { + /* fatal alert */ +Index: crypto/openssl/ssl/s23_srvr.c +=================================================================== +--- crypto/openssl/ssl/s23_srvr.c (revision 273303) ++++ crypto/openssl/ssl/s23_srvr.c (working copy) +@@ -127,9 +127,11 @@ static const SSL_METHOD *ssl23_get_server_method(i + if (ver == SSL2_VERSION) + return(SSLv2_server_method()); + #endif ++#ifndef OPENSSL_NO_SSL3 + if (ver == SSL3_VERSION) + return(SSLv3_server_method()); +- else if (ver == TLS1_VERSION) ++#endif ++ if (ver == TLS1_VERSION) + return(TLSv1_server_method()); + else if (ver == TLS1_1_VERSION) + return(TLSv1_1_server_method()); +@@ -421,6 +423,9 @@ int ssl23_get_client_hello(SSL *s) + } + } + ++ /* ensure that TLS_MAX_VERSION is up-to-date */ ++ OPENSSL_assert(s->version <= TLS_MAX_VERSION); ++ + #ifdef OPENSSL_FIPS + if (FIPS_mode() && (s->version < TLS1_VERSION)) + { +@@ -597,6 +602,12 @@ int ssl23_get_client_hello(SSL *s) + if ((type == 2) || (type == 3)) + { + /* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */ ++ s->method = ssl23_get_server_method(s->version); ++ if (s->method == NULL) ++ { ++ SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL); ++ goto err; ++ } + + if (!ssl_init_wbio_buffer(s,1)) goto err; + +@@ -624,14 +635,6 @@ int ssl23_get_client_hello(SSL *s) + s->s3->rbuf.left=0; + s->s3->rbuf.offset=0; + } +- if (s->version == TLS1_2_VERSION) +- s->method = TLSv1_2_server_method(); +- else if (s->version == TLS1_1_VERSION) +- s->method = TLSv1_1_server_method(); +- else if (s->version == TLS1_VERSION) +- s->method = TLSv1_server_method(); +- else +- s->method = SSLv3_server_method(); + #if 0 /* ssl3_get_client_hello does this */ + s->client_version=(v[0]<<8)|v[1]; + #endif +Index: crypto/openssl/ssl/s2_lib.c +=================================================================== +--- crypto/openssl/ssl/s2_lib.c (revision 273303) ++++ crypto/openssl/ssl/s2_lib.c (working copy) +@@ -391,6 +391,8 @@ long ssl2_ctrl(SSL *s, int cmd, long larg, void *p + case SSL_CTRL_GET_SESSION_REUSED: + ret=s->hit; + break; ++ case SSL_CTRL_CHECK_PROTO_VERSION: ++ return ssl3_ctrl(s, SSL_CTRL_CHECK_PROTO_VERSION, larg, parg); + default: + break; + } +@@ -437,7 +439,7 @@ int ssl2_put_cipher_by_char(const SSL_CIPHER *c, u + if (p != NULL) + { + l=c->id; +- if ((l & 0xff000000) != 0x02000000) return(0); ++ if ((l & 0xff000000) != 0x02000000 && l != SSL3_CK_FALLBACK_SCSV) return(0); + p[0]=((unsigned char)(l>>16L))&0xFF; + p[1]=((unsigned char)(l>> 8L))&0xFF; + p[2]=((unsigned char)(l ))&0xFF; +Index: crypto/openssl/ssl/s3_enc.c +=================================================================== +--- crypto/openssl/ssl/s3_enc.c (revision 273303) ++++ crypto/openssl/ssl/s3_enc.c (working copy) +@@ -892,7 +892,7 @@ int ssl3_alert_code(int code) + case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY); ++ case SSL_AD_INAPPROPRIATE_FALLBACK:return(TLS1_AD_INAPPROPRIATE_FALLBACK); + default: return(-1); + } + } +- +Index: crypto/openssl/ssl/s3_lib.c +=================================================================== +--- crypto/openssl/ssl/s3_lib.c (revision 273303) ++++ crypto/openssl/ssl/s3_lib.c (working copy) +@@ -3350,6 +3350,33 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *p + #endif + + #endif /* !OPENSSL_NO_TLSEXT */ ++ ++ case SSL_CTRL_CHECK_PROTO_VERSION: ++ /* For library-internal use; checks that the current protocol ++ * is the highest enabled version (according to s->ctx->method, ++ * as version negotiation may have changed s->method). */ ++ if (s->version == s->ctx->method->version) ++ return 1; ++ /* Apparently we're using a version-flexible SSL_METHOD ++ * (not at its highest protocol version). */ ++ if (s->ctx->method->version == SSLv23_method()->version) ++ { ++#if TLS_MAX_VERSION != TLS1_2_VERSION ++# error Code needs update for SSLv23_method() support beyond TLS1_2_VERSION. ++#endif ++ if (!(s->options & SSL_OP_NO_TLSv1_2)) ++ return s->version == TLS1_2_VERSION; ++ if (!(s->options & SSL_OP_NO_TLSv1_1)) ++ return s->version == TLS1_1_VERSION; ++ if (!(s->options & SSL_OP_NO_TLSv1)) ++ return s->version == TLS1_VERSION; ++ if (!(s->options & SSL_OP_NO_SSLv3)) ++ return s->version == SSL3_VERSION; ++ if (!(s->options & SSL_OP_NO_SSLv2)) ++ return s->version == SSL2_VERSION; ++ } ++ return 0; /* Unexpected state; fail closed. */ ++ + default: + break; + } +@@ -3709,6 +3736,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, + break; + #endif + #endif ++ + default: + return(0); + } +@@ -4279,4 +4307,3 @@ long ssl_get_algorithm2(SSL *s) + return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256; + return alg2; + } +- +Index: crypto/openssl/ssl/ssl.h +=================================================================== +--- crypto/openssl/ssl/ssl.h (revision 273303) ++++ crypto/openssl/ssl/ssl.h (working copy) +@@ -642,6 +642,10 @@ struct ssl_session_st + * TLS only.) "Released" buffers are put onto a free-list in the context + * or just freed (depending on the context's setting for freelist_max_len). */ + #define SSL_MODE_RELEASE_BUFFERS 0x00000010L ++/* Send TLS_FALLBACK_SCSV in the ClientHello. ++ * To be set by applications that reconnect with a downgraded protocol ++ * version; see draft-ietf-tls-downgrade-scsv-00 for details. */ ++#define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080L + + /* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, + * they cannot be used to clear bits. */ +@@ -1500,6 +1504,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) + #define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE + #define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE + #define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */ ++#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */ + + #define SSL_ERROR_NONE 0 + #define SSL_ERROR_SSL 1 +@@ -1610,6 +1615,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) + #define SSL_CTRL_GET_EXTRA_CHAIN_CERTS 82 + #define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS 83 + ++#define SSL_CTRL_CHECK_PROTO_VERSION 119 ++ + #define DTLSv1_get_timeout(ssl, arg) \ + SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) + #define DTLSv1_handle_timeout(ssl) \ +@@ -2364,6 +2371,7 @@ void ERR_load_SSL_strings(void); + #define SSL_R_HTTPS_PROXY_REQUEST 155 + #define SSL_R_HTTP_REQUEST 156 + #define SSL_R_ILLEGAL_PADDING 283 ++#define SSL_R_INAPPROPRIATE_FALLBACK 373 + #define SSL_R_INCONSISTENT_COMPRESSION 340 + #define SSL_R_INVALID_CHALLENGE_LENGTH 158 + #define SSL_R_INVALID_COMMAND 280 +@@ -2510,6 +2518,7 @@ void ERR_load_SSL_strings(void); + #define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021 + #define SSL_R_TLSV1_ALERT_DECRYPT_ERROR 1051 + #define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 ++#define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086 + #define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 + #define SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 + #define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 +Index: crypto/openssl/ssl/ssl3.h +=================================================================== +--- crypto/openssl/ssl/ssl3.h (revision 273303) ++++ crypto/openssl/ssl/ssl3.h (working copy) +@@ -128,9 +128,14 @@ + extern "C" { + #endif + +-/* Signalling cipher suite value: from draft-ietf-tls-renegotiation-03.txt */ ++/* Signalling cipher suite value from RFC 5746 ++ * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV) */ + #define SSL3_CK_SCSV 0x030000FF + ++/* Signalling cipher suite value from draft-ietf-tls-downgrade-scsv-00 ++ * (TLS_FALLBACK_SCSV) */ ++#define SSL3_CK_FALLBACK_SCSV 0x03005600 ++ + #define SSL3_CK_RSA_NULL_MD5 0x03000001 + #define SSL3_CK_RSA_NULL_SHA 0x03000002 + #define SSL3_CK_RSA_RC4_40_MD5 0x03000003 +Index: crypto/openssl/ssl/ssl_err.c +=================================================================== +--- crypto/openssl/ssl/ssl_err.c (revision 273303) ++++ crypto/openssl/ssl/ssl_err.c (working copy) +@@ -383,6 +383,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= + {ERR_REASON(SSL_R_HTTPS_PROXY_REQUEST) ,"https proxy request"}, + {ERR_REASON(SSL_R_HTTP_REQUEST) ,"http request"}, + {ERR_REASON(SSL_R_ILLEGAL_PADDING) ,"illegal padding"}, ++{ERR_REASON(SSL_R_INAPPROPRIATE_FALLBACK),"inappropriate fallback"}, + {ERR_REASON(SSL_R_INCONSISTENT_COMPRESSION),"inconsistent compression"}, + {ERR_REASON(SSL_R_INVALID_CHALLENGE_LENGTH),"invalid challenge length"}, + {ERR_REASON(SSL_R_INVALID_COMMAND) ,"invalid command"}, +@@ -529,6 +530,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= + {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),"tlsv1 alert decryption failed"}, + {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPT_ERROR),"tlsv1 alert decrypt error"}, + {ERR_REASON(SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),"tlsv1 alert export restriction"}, ++{ERR_REASON(SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),"tlsv1 alert inappropriate fallback"}, + {ERR_REASON(SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),"tlsv1 alert insufficient security"}, + {ERR_REASON(SSL_R_TLSV1_ALERT_INTERNAL_ERROR),"tlsv1 alert internal error"}, + {ERR_REASON(SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),"tlsv1 alert no renegotiation"}, +Index: crypto/openssl/ssl/ssl_lib.c +=================================================================== +--- crypto/openssl/ssl/ssl_lib.c (revision 273303) ++++ crypto/openssl/ssl/ssl_lib.c (working copy) +@@ -1383,6 +1383,8 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_C + + if (sk == NULL) return(0); + q=p; ++ if (put_cb == NULL) ++ put_cb = s->method->put_cipher_by_char; + + for (i=0; isrp_ctx.srp_Mask & SSL_kSRP)) + continue; + #endif /* OPENSSL_NO_SRP */ +- j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p); ++ j = put_cb(c,p); + p+=j; + } +- /* If p == q, no ciphers and caller indicates an error. Otherwise +- * add SCSV if not renegotiating. +- */ +- if (p != q && !s->renegotiate) ++ /* If p == q, no ciphers; caller indicates an error. ++ * Otherwise, add applicable SCSVs. */ ++ if (p != q) + { +- static SSL_CIPHER scsv = ++ if (!s->renegotiate) + { +- 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 +- }; +- j = put_cb ? put_cb(&scsv,p) : ssl_put_cipher_by_char(s,&scsv,p); +- p+=j; ++ static SSL_CIPHER scsv = ++ { ++ 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 ++ }; ++ j = put_cb(&scsv,p); ++ p+=j; + #ifdef OPENSSL_RI_DEBUG +- fprintf(stderr, "SCSV sent by client\n"); ++ fprintf(stderr, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV sent by client\n"); + #endif +- } ++ } + ++ if (s->mode & SSL_MODE_SEND_FALLBACK_SCSV) ++ { ++ static SSL_CIPHER scsv = ++ { ++ 0, NULL, SSL3_CK_FALLBACK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 ++ }; ++ j = put_cb(&scsv,p); ++ p+=j; ++ } ++ } ++ + return(p-q); + } + +@@ -1435,11 +1449,12 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL + const SSL_CIPHER *c; + STACK_OF(SSL_CIPHER) *sk; + int i,n; ++ + if (s->s3) + s->s3->send_connection_binding = 0; + + n=ssl_put_cipher_by_char(s,NULL,NULL); +- if ((num%n) != 0) ++ if (n == 0 || (num%n) != 0) + { + SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST); + return(NULL); +@@ -1454,7 +1469,7 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL + + for (i=0; is3 && (n != 3 || !p[0]) && + (p[n-2] == ((SSL3_CK_SCSV >> 8) & 0xff)) && + (p[n-1] == (SSL3_CK_SCSV & 0xff))) +@@ -1474,6 +1489,23 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL + continue; + } + ++ /* Check for TLS_FALLBACK_SCSV */ ++ if ((n != 3 || !p[0]) && ++ (p[n-2] == ((SSL3_CK_FALLBACK_SCSV >> 8) & 0xff)) && ++ (p[n-1] == (SSL3_CK_FALLBACK_SCSV & 0xff))) ++ { ++ /* The SCSV indicates that the client previously tried a higher version. ++ * Fail if the current version is an unexpected downgrade. */ ++ if (!SSL_ctrl(s, SSL_CTRL_CHECK_PROTO_VERSION, 0, NULL)) ++ { ++ SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,SSL_R_INAPPROPRIATE_FALLBACK); ++ if (s->s3) ++ ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INAPPROPRIATE_FALLBACK); ++ goto err; ++ } ++ continue; ++ } ++ + c=ssl_get_cipher_by_char(s,p); + p+=n; + if (c != NULL) +Index: crypto/openssl/ssl/t1_enc.c +=================================================================== +--- crypto/openssl/ssl/t1_enc.c (revision 273303) ++++ crypto/openssl/ssl/t1_enc.c (working copy) +@@ -1243,6 +1243,7 @@ int tls1_alert_code(int code) + case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE); + case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(TLS1_AD_BAD_CERTIFICATE_HASH_VALUE); + case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY); ++ case SSL_AD_INAPPROPRIATE_FALLBACK:return(TLS1_AD_INAPPROPRIATE_FALLBACK); + #if 0 /* not appropriate for TLS, not used for DTLS */ + case DTLS1_AD_MISSING_HANDSHAKE_MESSAGE: return + (DTLS1_AD_MISSING_HANDSHAKE_MESSAGE); +Index: crypto/openssl/ssl/t1_lib.c +=================================================================== +--- crypto/openssl/ssl/t1_lib.c (revision 273303) ++++ crypto/openssl/ssl/t1_lib.c (working copy) +@@ -650,7 +650,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, + #endif + + #ifndef OPENSSL_NO_SRTP +- if(SSL_get_srtp_profiles(s)) ++ if(SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) + { + int el; + +@@ -784,7 +784,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, + #endif + + #ifndef OPENSSL_NO_SRTP +- if(s->srtp_profile) ++ if(SSL_IS_DTLS(s) && s->srtp_profile) + { + int el; + +@@ -1334,7 +1334,8 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned + + /* session ticket processed earlier */ + #ifndef OPENSSL_NO_SRTP +- else if (type == TLSEXT_TYPE_use_srtp) ++ else if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s) ++ && type == TLSEXT_TYPE_use_srtp) + { + if(ssl_parse_clienthello_use_srtp_ext(s, data, size, + al)) +@@ -1589,7 +1590,7 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned + } + #endif + #ifndef OPENSSL_NO_SRTP +- else if (type == TLSEXT_TYPE_use_srtp) ++ else if (SSL_IS_DTLS(s) && type == TLSEXT_TYPE_use_srtp) + { + if(ssl_parse_serverhello_use_srtp_ext(s, data, size, + al)) +@@ -2238,7 +2239,10 @@ static int tls_decrypt_ticket(SSL *s, const unsign + HMAC_Final(&hctx, tick_hmac, NULL); + HMAC_CTX_cleanup(&hctx); + if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen)) ++ { ++ EVP_CIPHER_CTX_cleanup(&ctx); + return 2; ++ } + /* Attempt to decrypt session data */ + /* Move p after IV to start of encrypted ticket, update length */ + p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx); +Index: crypto/openssl/ssl/tls1.h +=================================================================== +--- crypto/openssl/ssl/tls1.h (revision 273303) ++++ crypto/openssl/ssl/tls1.h (working copy) +@@ -159,17 +159,19 @@ extern "C" { + + #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 + ++#define TLS1_VERSION 0x0301 ++#define TLS1_1_VERSION 0x0302 + #define TLS1_2_VERSION 0x0303 +-#define TLS1_2_VERSION_MAJOR 0x03 +-#define TLS1_2_VERSION_MINOR 0x03 ++#define TLS_MAX_VERSION TLS1_2_VERSION + +-#define TLS1_1_VERSION 0x0302 ++#define TLS1_VERSION_MAJOR 0x03 ++#define TLS1_VERSION_MINOR 0x01 ++ + #define TLS1_1_VERSION_MAJOR 0x03 + #define TLS1_1_VERSION_MINOR 0x02 + +-#define TLS1_VERSION 0x0301 +-#define TLS1_VERSION_MAJOR 0x03 +-#define TLS1_VERSION_MINOR 0x01 ++#define TLS1_2_VERSION_MAJOR 0x03 ++#define TLS1_2_VERSION_MINOR 0x03 + + #define TLS1_get_version(s) \ + ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0) +@@ -187,6 +189,7 @@ extern "C" { + #define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */ + #define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */ + #define TLS1_AD_INTERNAL_ERROR 80 /* fatal */ ++#define TLS1_AD_INAPPROPRIATE_FALLBACK 86 /* fatal */ + #define TLS1_AD_USER_CANCELLED 90 + #define TLS1_AD_NO_RENEGOTIATION 100 + /* codes 110-114 are from RFC3546 */ Added: user/cperciva/freebsd-update-build/patches/8.4-RELEASE/17-SA-14:21.routed ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/8.4-RELEASE/17-SA-14:21.routed Tue Oct 21 20:51:22 2014 (r273422) @@ -0,0 +1,15 @@ +Index: sbin/routed/input.c +=================================================================== +--- sbin/routed/input.c.orig ++++ sbin/routed/input.c +@@ -288,6 +288,10 @@ + /* Answer a query from a utility program + * with all we know. + */ ++ if (aifp == NULL) { ++ trace_pkt("ignore remote query"); ++ return; ++ } + if (from->sin_port != htons(RIP_PORT)) { + supply(from, aifp, OUT_QUERY, 0, + rip->rip_vers, ap != 0); Added: user/cperciva/freebsd-update-build/patches/8.4-RELEASE/17-SA-14:23.openssl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/8.4-RELEASE/17-SA-14:23.openssl Tue Oct 21 20:51:22 2014 (r273422) @@ -0,0 +1,804 @@ +Index: crypto/openssl/apps/s_cb.c +=================================================================== +--- crypto/openssl/apps/s_cb.c (revision 273303) ++++ crypto/openssl/apps/s_cb.c (working copy) +@@ -518,6 +518,24 @@ void MS_CALLBACK msg_cb(int write_p, int version, + case 100: + str_details2 = " no_renegotiation"; + break; ++ case 110: ++ str_details2 = " unsupported_extension"; ++ break; ++ case 111: ++ str_details2 = " certificate_unobtainable"; ++ break; ++ case 112: ++ str_details2 = " unrecognized_name"; ++ break; ++ case 113: ++ str_details2 = " bad_certificate_status_response"; ++ break; ++ case 114: ++ str_details2 = " bad_certificate_hash_value"; ++ break; ++ case 115: ++ str_details2 = " unknown_psk_identity"; ++ break; + } + } + } +Index: crypto/openssl/apps/s_client.c +=================================================================== +--- crypto/openssl/apps/s_client.c (revision 273303) ++++ crypto/openssl/apps/s_client.c (working copy) +@@ -226,6 +226,7 @@ static void sc_usage(void) + BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); + BIO_printf(bio_err," -tls1 - just use TLSv1\n"); + BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); ++ BIO_printf(bio_err," -fallback_scsv - send TLS_FALLBACK_SCSV\n"); + BIO_printf(bio_err," -mtu - set the link layer MTU\n"); + BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); + BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n"); +@@ -339,6 +340,7 @@ int MAIN(int argc, char **argv) + char *sess_out = NULL; + struct sockaddr peer; + int peerlen = sizeof(peer); ++ int fallback_scsv = 0; + int enable_timeouts = 0 ; + long socket_mtu = 0; + #ifndef OPENSSL_NO_JPAKE +@@ -488,6 +490,10 @@ int MAIN(int argc, char **argv) + socket_mtu = atol(*(++argv)); + } + #endif ++ else if (strcmp(*argv,"-fallback_scsv") == 0) ++ { ++ fallback_scsv = 1; ++ } + else if (strcmp(*argv,"-bugs") == 0) + bugs=1; + else if (strcmp(*argv,"-keyform") == 0) +@@ -778,6 +784,10 @@ bad: + SSL_set_session(con, sess); + SSL_SESSION_free(sess); + } ++ ++ if (fallback_scsv) ++ SSL_set_mode(con, SSL_MODE_SEND_FALLBACK_SCSV); ++ + #ifndef OPENSSL_NO_TLSEXT + if (servername != NULL) + { +Index: crypto/openssl/crypto/err/openssl.ec +=================================================================== +--- crypto/openssl/crypto/err/openssl.ec (revision 273303) ++++ crypto/openssl/crypto/err/openssl.ec (working copy) +@@ -69,8 +69,14 @@ R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 + R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION 1070 + R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 + R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 ++R SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086 + R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090 + R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 ++R SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110 ++R SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE 1111 ++R SSL_R_TLSV1_UNRECOGNIZED_NAME 1112 ++R SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE 1113 ++R SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE 1114 + + R RSAREF_R_CONTENT_ENCODING 0x0400 + R RSAREF_R_DATA 0x0401 +Index: crypto/openssl/doc/apps/s_client.pod +=================================================================== +--- crypto/openssl/doc/apps/s_client.pod (revision 273303) ++++ crypto/openssl/doc/apps/s_client.pod (working copy) +@@ -34,6 +34,7 @@ B B + [B<-no_ssl2>] + [B<-no_ssl3>] + [B<-no_tls1>] ++[B<-fallback_scsv>] + [B<-bugs>] + [B<-cipher cipherlist>] + [B<-starttls protocol>] +@@ -167,11 +168,14 @@ these options disable the use of certain SSL or TL + the initial handshake uses a method which should be compatible with all + servers and permit them to use SSL v3, SSL v2 or TLS as appropriate. + +-Unfortunately there are a lot of ancient and broken servers in use which ++Unfortunately there are still ancient and broken servers in use which + cannot handle this technique and will fail to connect. Some servers only +-work if TLS is turned off with the B<-no_tls> option others will only +-support SSL v2 and may need the B<-ssl2> option. ++work if TLS is turned off. + ++=item B<-fallback_scsv> ++ ++Send TLS_FALLBACK_SCSV in the ClientHello. ++ + =item B<-bugs> + + there are several known bug in SSL and TLS implementations. Adding this +Index: crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod +=================================================================== +--- crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod (revision 273303) ++++ crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod (working copy) +@@ -61,6 +61,12 @@ deal with read/write operations returning without + flag SSL_MODE_AUTO_RETRY will cause read/write operations to only + return after the handshake and successful completion. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Oct 21 23:57:32 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CDF9B59; Tue, 21 Oct 2014 23:57:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55F4915D; Tue, 21 Oct 2014 23:57:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LNvW7A075385; Tue, 21 Oct 2014 23:57:32 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9LNvWBQ075383; Tue, 21 Oct 2014 23:57:32 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410212357.s9LNvWBQ075383@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 21 Oct 2014 23:57:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r273440 - in user/cperciva/freebsd-update-build/patches: 10.0-RELEASE 8.4-RELEASE 9.1-RELEASE 9.2-RELEASE 9.3-RELEASE X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 23:57:32 -0000 Author: delphij Date: Tue Oct 21 23:57:31 2014 New Revision: 273440 URL: https://svnweb.freebsd.org/changeset/base/273440 Log: Patch batch for 2014-10-22. Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/11-EN-14:10.tzdata user/cperciva/freebsd-update-build/patches/8.4-RELEASE/18-EN-14:10.tzdata user/cperciva/freebsd-update-build/patches/9.1-RELEASE/21-EN-14:10.tzdata user/cperciva/freebsd-update-build/patches/9.2-RELEASE/14-EN-14:10.tzdata user/cperciva/freebsd-update-build/patches/9.3-RELEASE/4-EN-14:10.tzdata user/cperciva/freebsd-update-build/patches/9.3-RELEASE/4-EN-14:11.crypt Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/11-EN-14:10.tzdata ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/11-EN-14:10.tzdata Tue Oct 21 23:57:31 2014 (r273440) @@ -0,0 +1,9166 @@ +Index: contrib/tzdata/africa +=================================================================== +--- contrib/tzdata/africa (revision 273102) ++++ contrib/tzdata/africa (working copy) +@@ -1,4 +1,3 @@ +-# 
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+@@ -35,13 +34,13 @@
+ # Previous editions of this database used WAT, CAT, SAT, and EAT
+ # for +0:00 through +3:00, respectively,
+ # but Mark R V Murray reports that
+-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
+-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
+-# `WAT' is probably the best name for +1:00, as the common phrase for
+-# the area that includes Nigeria is ``West Africa''.
+-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
++# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
++# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
++# 'WAT' is probably the best name for +1:00, as the common phrase for
++# the area that includes Nigeria is "West Africa".
++# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
+ #
+-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
++# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
+ # I'd guess that this was because people needed _some_ name for -1:00,
+ # and at the time, far west Africa was the only major land area in -1:00.
+ # This usage is now obsolete, as the last use of -1:00 on the African
+@@ -54,7 +53,7 @@
+ #	 2:00	SAST	South Africa Standard Time
+ # and Murray suggests the following abbreviation:
+ #	 1:00	WAT	West Africa Time
+-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
++# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
+ # for times before 1976, but this is the best I can think of
+ # until we get more information.
+ #
+@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
+ 			2:00	-	CAT
+ 
+ # Burkina Faso
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
+-			 0:00	-	GMT
++# See Africa/Abidjan.
+ 
+ # Burundi
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
+ 
+ # Chad
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
++Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
+ 			1:00	-	WAT	1979 Oct 14
+ 			1:00	1:00	WAST	1980 Mar  8
+ 			1:00	-	WAT
+@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
+ Zone Africa/Brazzaville	1:01:08 -	LMT	1912
+ 			1:00	-	WAT
+ 
+-# Cote D'Ivoire
++# Côte D'Ivoire / Ivory Coast
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
+ 			 0:00	-	GMT
++Link Africa/Abidjan Africa/Bamako	# Mali
++Link Africa/Abidjan Africa/Banjul	# Gambia
++Link Africa/Abidjan Africa/Conakry	# Guinea
++Link Africa/Abidjan Africa/Dakar	# Senegal
++Link Africa/Abidjan Africa/Freetown	# Sierra Leone
++Link Africa/Abidjan Africa/Lome		# Togo
++Link Africa/Abidjan Africa/Nouakchott	# Mauritania
++Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
++Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
++Link Africa/Abidjan Atlantic/St_Helena	# St Helena
+ 
+ # Djibouti
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -231,30 +238,26 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	S
+ # Egyptians would approve the cancellation."
+ #
+ # Egypt to cancel daylight saving time
+-# 
+ # http://www.almasryalyoum.com/en/node/407168
+-# 
+ # or
+-# 
+ # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
+-# 
+ Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
+-Rule	Egypt	1995	2005	-	Sep	lastThu	23:00s	0	-
++Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
+ # From Steffen Thorsen (2006-09-19):
+ # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
+ # Egypt will turn back clocks by one hour at the midnight of Thursday
+ # after observing the daylight saving time since May.
+ # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
+-Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
++Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
+ # From Dirk Losch (2007-08-14):
+ # I received a mail from an airline which says that the daylight
+ # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
+-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
++# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
+ # http://www.nentjes.info/Bill/bill5.htm
+ # http://www.timeanddate.com/worldclock/city.html?n=53
+ # From Steffen Thorsen (2007-09-04): The official information...:
+ # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
+-Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
++Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
+ # From Abdelrahman Hassan (2007-09-06):
+ # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
+ # than the year of the Gregorian calendar, Ramadan shifts earlier each
+@@ -288,15 +291,9 @@ Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
+ #
+ # timeanddate[2] and another site I've found[3] also support that.
+ #
+-# [1] 
+-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
+-# 
+-# [2] 
+-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
+-# 
+-# [3] 
+-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+-# 
++# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
++# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
++# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+ 
+ # From Arthur David Olson (2009-04-20):
+ # In 2009 (and for the next several years), Ramadan ends before the fourth
+@@ -306,14 +303,10 @@ Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
+ # From Steffen Thorsen (2009-08-11):
+ # We have been able to confirm the August change with the Egyptian Cabinet
+ # Information and Decision Support Center:
+-# 
+ # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+-# 
+ #
+ # The Middle East News Agency
+-# 
+ # http://www.mena.org.eg/index.aspx
+-# 
+ # also reports "Egypt starts winter time on August 21"
+ # today in article numbered "71, 11/08/2009 12:25 GMT."
+ # Only the title above is available without a subscription to their service,
+@@ -321,26 +314,95 @@ Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
+ # (at least today).
+ 
+ # From Alexander Krivenyshev (2010-07-20):
+-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
++# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
+ # decided that Daylight Saving Time will not be used in Egypt during
+ # Ramadan.
+ #
+ # Arabic translation:
+-# "Clocks to go back during Ramadan--and then forward again"
+-# 
++# "Clocks to go back during Ramadan - and then forward again"
+ # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
+-# 
+-# or
+-# 
+ # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
+-# 
+ 
+-Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
+-Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
+-Rule	Egypt	2010	only	-	Aug	11	0:00	0	-
+-Rule	Egypt	2010	only	-	Sep	10	0:00	1:00	S
+-Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
++# From Ahmad El-Dardiry (2014-05-07):
++# Egypt is to change back to Daylight system on May 15
++# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
+ 
++# From Gunther Vermier (2015-05-13):
++# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
++
++# From Imed Chihi (2014-06-04):
++# We have finally "located" a precise official reference about the DST changes
++# in Egypt.  The Ministers Cabinet decision is explained at
++# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
++# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
++# translates into: "With regard to daylight saving time, it is scheduled to
++# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
++# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
++# and re-established again at the end of the month of Ramadan, at twelve
++# o'clock on the evening of Thursday, 31 JUL 2014."  This statement has been
++# reproduced by other (more accessible) sites[, e.g.,]...
++# http://elgornal.net/news/news.aspx?id=4699258
++
++# From Paul Eggert (2014-06-04):
++# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
++# the change is because of blackouts in Cairo, even though Ahram Online (cited
++# above) says DST had no affect on electricity consumption.  There is
++# no information about when DST will end this fall.  See:
++# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
++#
++# For now, guess that later spring and fall transitions will use
++# 2010's rules, and guess that Egypt will switch to standard time at
++# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
++# first Friday after Ramadan.  To implement this,
++# transition dates for 2015 through 2037 were determined by running
++# the following program under GNU Emacs 24.3, with the results integrated
++# by hand into the table below.  Ramadan again intrudes on the guessed
++# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
++# (let ((islamic-year 1436))
++#   (while (< islamic-year 1460)
++#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
++#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
++#           (friday 5))
++#       (while (/= friday (mod a 7))
++#         (setq a (1- a)))
++#       (while (/= friday (mod b 7))
++#         (setq b (1+ b)))
++#       (setq a (1- a))
++#       (setq b (1- b))
++#       (setq a (calendar-gregorian-from-absolute a))
++#       (setq b (calendar-gregorian-from-absolute b))
++#       (insert
++#        (format
++#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
++#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
++#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
++#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
++#     (setq islamic-year (+ 1 islamic-year))))
++Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
++Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
++Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
++Rule	Egypt	2010	only	-	Sep	 9	24:00	1:00	S
++Rule	Egypt	2010	only	-	Sep	lastThu	24:00	0	-
++Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
++Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
++Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
++Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
++Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
++Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
++Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
++Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
++Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
++Rule	Egypt	2017	only	-	May	25	24:00	0	-
++Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
++Rule	Egypt	2018	only	-	May	10	24:00	0	-
++Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
++Rule	Egypt	2019	only	-	May	 2	24:00	0	-
++Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
++Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
++Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
++Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
++Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
+ 			2:00	Egypt	EE%sT
+@@ -359,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
+ 			3:00	-	EAT
+ 
+ # Ethiopia
+-# From Paul Eggert (2006-03-22):
+-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
+-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
+-# We'll guess that 38E50 is for Adis Dera.
++# From Paul Eggert (2014-07-31):
++# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
++# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
++# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
++#
++# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
++# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
++# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
++# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
+ 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+@@ -374,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	1912
+ 			1:00	-	WAT
+ 
+ # Gambia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
+-			-1:06:36 -	BMT	1935	# Banjul Mean Time
+-			-1:00	-	WAT	1964
+-			 0:00	-	GMT
++# See Africa/Abidjan.
+ 
+ # Ghana
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-# Whitman says DST was observed from 1931 to ``the present'';
+-# go with Shanks & Pottenger.
+-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
+-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
++# Whitman says DST was observed from 1931 to "the present";
++# Shanks & Pottenger say 1936 to 1942;
++# and September 1 to January 1 is given by:
++# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
++# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
++# For lack of better info, assume DST was observed from 1920 to 1942.
++Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
++Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Accra	-0:00:52 -	LMT	1918
+ 			 0:00	Ghana	%s
+ 
+ # Guinea
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
+-			 0:00	-	GMT	1934 Feb 26
+-			-1:00	-	WAT	1960
+-			 0:00	-	GMT
++# See Africa/Abidjan.
+ 
+ # Guinea-Bissau
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -503,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+ 			2:00	-	CAT
+ 
+ # Mali
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
+-			 0:00	-	GMT	1934 Feb 26
+-			-1:00	-	WAT	1960 Jun 20
+-			 0:00	-	GMT
+-
+ # Mauritania
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
+-			 0:00	-	GMT	1934 Feb 26
+-			-1:00	-	WAT	1960 Nov 28
+-			 0:00	-	GMT
++# See Africa/Abidjan.
+ 
+ # Mauritius
+ 
+@@ -538,9 +591,7 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+ 
+ # From Steffen Thorsen (2008-07-10):
+ # According to
+-# 
+ # http://www.lexpress.mu/display_article.php?news_id=111216
+-# 
+ # (in French), Mauritius will start and end their DST a few days earlier
+ # than previously announced (2008-11-01 to 2009-03-31).  The new start
+ # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
+@@ -559,18 +610,13 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+ # published on Monday, June 30, 2008...
+ #
+ # I guess that article in French "Le gouvernement avance l'introduction
+-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
+-# and ending on March 27, 2009 is the most recent one.
+-# ...
+-# 
++# de l'heure d'été" stating that DST in Mauritius starting on October 26
++# and ending on March 27, 2009 is the most recent one....
+ # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
+-# 
+ 
+ # From Riad M. Hossen Ally (2008-08-03):
+ # The Government of Mauritius weblink
+-# 
+ # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
+-# 
+ # Cabinet Decision of July 18th, 2008 states as follows:
+ #
+ # 4. ...Cabinet has agreed to the introduction into the National Assembly
+@@ -580,7 +626,7 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+ # States of America. It will start at two o'clock in the morning on the
+ # last Sunday of October and will end at two o'clock in the morning on
+ # the last Sunday of March the following year. The summer time for the
+-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
++# year 2008-2009 will, therefore, be effective as from 26 October 2008
+ # and end on 29 March 2009.
+ 
+ # From Ed Maste (2008-10-07):
+@@ -587,9 +633,7 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+ # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+ # beginning / ending of summer time is 2 o'clock standard time in the
+ # morning of the last Sunday of October / last Sunday of March.
+-# 
+ # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+-# 
+ 
+ # From Steffen Thorsen (2009-06-05):
+ # According to several sources, Mauritius will not continue to observe
+@@ -596,17 +640,11 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+ # DST the coming summer...
+ #
+ # Some sources, in French:
+-# 
+ # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
+-# 
+-# 
+ # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
+-# 
+ #
+ # Our wrap-up:
+-# 
+ # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+-# 
+ 
+ # From Arthur David Olson (2009-07-11):
+ # The "mauritius-dst-will-not-repeat" wrapup includes this:
+@@ -630,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ 			3:00	-	EAT
+ 
+ # Morocco
+-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
++# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
+ 
+ # From Alex Krivenyshev (2008-05-09):
+ # Here is an article that Morocco plan to introduce Daylight Saving Time between
+@@ -638,21 +676,14 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ #
+ # "... Morocco is to save energy by adjusting its clock during summer so it will
+ # be one hour ahead of GMT between 1 June and 27 September, according to
+-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
++# Communication Minister and Government Spokesman, Khalid Naciri...."
+ #
+-# 
+ # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+-# 
+-# OR
+-# 
+ # http://en.afrik.com/news11892.html
+-# 
+ 
+ # From Alex Krivenyshev (2008-05-09):
+ # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
+-# 
+ # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+-# 
+ #
+ # Morocco shifts to daylight time on June 1st through September 27, Govt.
+ # spokesman.
+@@ -659,39 +690,29 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ 
+ # From Patrice Scattolin (2008-05-09):
+ # According to this article:
+-# 
+ # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+-# 
+-# (and republished here:
+-# 
+-# http://www.actu.ma/heure-dete-comment_i127896_0.html
+-# 
+-# )
+-# the changes occurs at midnight:
++# (and republished here: )
++# the changes occur at midnight:
+ #
+-# saturday night may 31st at midnight (which in french is to be
+-# intrepreted as the night between saturday and sunday)
+-# sunday night the 28th  at midnight
++# Saturday night May 31st at midnight (which in French is to be
++# interpreted as the night between Saturday and Sunday)
++# Sunday night the 28th at midnight
+ #
+-# Seeing that the 28th is monday, I am guessing that she intends to say
+-# the midnight of the 28th which is the midnight between sunday and
+-# monday, which jives with other sources that say that it's inclusive
+-# june1st to sept 27th.
++# Seeing that the 28th is Monday, I am guessing that she intends to say
++# the midnight of the 28th which is the midnight between Sunday and
++# Monday, which jives with other sources that say that it's inclusive
++# June 1st to Sept 27th.
+ #
+ # The decision was taken by decree *2-08-224 *but I can't find the decree
+ # published on the web.
+ #
+ # It's also confirmed here:
+-# 
+ # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
+-# 
+-# on a government portal as being  between june 1st and sept 27th (not yet
+-# posted in english).
++# on a government portal as being between June 1st and Sept 27th (not yet
++# posted in English).
+ #
+-# The following google query will generate many relevant hits:
+-# 
++# The following Google query will generate many relevant hits:
+ # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+-# 
+ 
+ # From Steffen Thorsen (2008-08-27):
+ # Morocco will change the clocks back on the midnight between August 31
+@@ -699,34 +720,24 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ # of September:
+ #
+ # One article about it (in French):
+-# 
+ # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
+-# 
+ #
+ # We have some further details posted here:
+-# 
+ # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
+-# 
+ 
+ # From Steffen Thorsen (2009-03-17):
+ # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
+ # to many sources, such as
+-# 
+ # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
+-# 
+-# 
+ # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
+-# 
+ # (French)
+ #
+ # Our summary:
+-# 
+ # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
+-# 
+ 
+ # From Alexander Krivenyshev (2009-03-17):
+ # Here is a link to official document from Royaume du Maroc Premier Ministre,
+-# Ministere de la Modernisation des Secteurs Publics
++# Ministère de la Modernisation des Secteurs Publics
+ #
+ # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+ # concerning the amendment of the legal time, the Ministry of Modernization of
+@@ -733,13 +744,8 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ # Public Sectors announced that the official time in the Kingdom will be
+ # advanced 60 minutes from Sunday 31 May 2009 at midnight.
+ #
+-# 
+ # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
+-# 
+-#
+-# 
+ # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
+-# 
+ 
+ # From Steffen Thorsen (2010-04-13):
+ # Several news media in Morocco report that the Ministry of Modernization
+@@ -747,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ # 2010-05-02 to 2010-08-08.
+ #
+ # Example:
+-# 
+ # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
+-# 
+ # (French)
+ # Our page:
+-# 
+ # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+-# 
+ 
+ # From Dan Abitol (2011-03-30):
+ # ...Rules for Africa/Casablanca are the following (24h format)
+@@ -764,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ # The change was broadcast on the FM Radio
+ # I ve called ANRT (telecom regulations in Morocco) at
+ # +212.537.71.84.00
+-# 
+ # http://www.anrt.net.ma/fr/
+-# 
+ # They said that
+-# 
+ # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
+-# 
+ # is the official publication to look at.
+ # They said that the decision was already taken.
+ #
+ # More articles in the press
+-# 
+-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
+-# 
+-# e.html
+-# 
++# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
+ # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
+-# 
+-# 
+ # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
+-# anche-prochain-5538.html
+-# 
+ 
+ # From Petr Machata (2011-03-30):
+ # They have it written in English here:
+-# 
+ # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
+-# 
+ #
+ # It says there that "Morocco will resume its standard time on July 31,
+ # 2011 at midnight." Now they don't say whether they mean midnight of
+@@ -799,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ # also been like that in the past.
+ 
+ # From Alexander Krivenyshev (2012-03-09):
+-# According to Infomédiaire web site from Morocco (infomediaire.ma),
+-# on March 9, 2012, (in French) Heure légale:
+-# Le Maroc adopte officiellement l'heure d'été
+-# 
++# According to Infomédiaire web site from Morocco (infomediaire.ma),
++# on March 9, 2012, (in French) Heure légale:
++# Le Maroc adopte officiellement l'heure d'été
+ # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
+-# 
+ # Governing Council adopted draft decree, that Morocco DST starts on
+ # the last Sunday of March (March 25, 2012) and ends on
+ # last Sunday of September (September 30, 2012)
+ # except the month of Ramadan.
+ # or (brief)
+-# 
+ # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
+-# 
+ 
+ # From Arthur David Olson (2012-03-10):
+ # The infomediaire.ma source indicates that the system is to be in
+@@ -823,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ 
+ # From Christophe Tropamer (2012-03-16):
+ # Seen Morocco change again:
+-# 
+ # http://www.le2uminutes.com/actualite.php
+-# 
+-# "...à partir du dernier dimance d'avril et non fins mars,
+-# comme annoncé précédemment."
++# "...à partir du dernier dimanche d'avril et non fins mars,
++# comme annoncé précédemment."
+ 
+ # From Milamber Space Network (2012-07-17):
+ # The official return to GMT is announced by the Moroccan government:
+-# 
+ # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+-# 
+ #
+ # Google translation, lightly edited:
+ # Back to the standard time of the Kingdom (GMT)
+@@ -868,39 +848,39 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamou
+ # Another source (specifying the time for start and end in the decree):
+ # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+ 
+-# From Paul Eggert (2013-10-03):
+-# To estimate what the Moroccan government will do in future years,
+-# transition dates for 2014 through 2038 were determined by running
+-# the following program under GNU Emacs 24.3:
+-#
+-# (let ((islamic-year 1435))
+-#   (while (< islamic-year 1461)
+-#     (let ((a
+-#	     (calendar-gregorian-from-absolute
+-#	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+-#	    (b
+-#	     (calendar-gregorian-from-absolute
+-#	      (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+-#	(insert
+-#	 (format
+-#	  (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+-#		  "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+-#	  (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+-#	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
++# From Sebastien Willemijns (2014-03-18):
++# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
++
++# From Milamber Space Network (2014-06-05):
++# The Moroccan government has recently announced that the country will return
++# to standard time at 03:00 on Saturday, June 28, 2014 local time....  DST
++# will resume again at 02:00 on Saturday, August 2, 2014....
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
++
++# From Paul Eggert (2014-06-05):
++# For now, guess that later spring and fall transitions will use 2014's rules,
++# and guess that Morocco will switch to standard time at 03:00 the last
++# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
++# Ramadan.  To implement this, transition dates for 2015 through 2037 were
++# determined by running the following program under GNU Emacs 24.3, with the
++# results integrated by hand into the table below.
++# (let ((islamic-year 1436))
++#   (while (< islamic-year 1460)
++#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
++#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
++#           (saturday 6))
++#       (while (/= saturday (mod (setq a (1- a)) 7)))
++#       (while (/= saturday (mod b 7))
++#         (setq b (1+ b)))
++#       (setq a (calendar-gregorian-from-absolute a))
++#       (setq b (calendar-gregorian-from-absolute b))
++#       (insert
++#        (format
++#         (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
++#                 "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
++#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
++#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+ #     (setq islamic-year (+ 1 islamic-year))))
+-#
+-# with spring-forward transitions removed for 2023-2025, when the
+-# normal spring-forward date falls during the estimated Ramadan; with
+-# all transitions removed for 2026-2035, where the estimated Ramadan
+-# falls entirely outside daylight-saving time; and with fall-back
+-# transitions removed for 2036-2037, where the normal fall-back
+-# date falls during the estimated Ramadan.  Normally, the table would
+-# stop after 2037 because 32-bit time_t values roll around early in 2038,
+-# but that would imply a prediction of perpetual DST after March 2038
+-# due to the year-2037 glitches.  So, this table instead stops after
+-# 2038, the first non-glitchy year after the 32-bit rollover.
+-# An advantage of stopping after 2038 is that it lets zic guess
+-# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
+ 
+ # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ 
+@@ -922,46 +902,44 @@ Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
+ Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
+ Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
+ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
+-Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
++Rule	Morocco	2009	only	-	Aug	21	 0:00	0	-
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+-Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
+-Rule	Morocco	2012	2013	-	Apr	 lastSun 2:00	1:00	S
+-Rule	Morocco	2012	only	-	Sep	 30	 3:00	0	-
+-Rule	Morocco	2012	only	-	Jul	 20	 3:00	0	-
+-Rule	Morocco	2012	only	-	Aug	 20	 2:00	1:00	S
+-Rule	Morocco	2013	only	-	Jul	  7	 3:00	0	-
+-Rule	Morocco	2013	only	-	Aug	 10	 2:00	1:00	S
+-Rule	Morocco	2013	2035	-	Oct	 lastSun 3:00	0	-
+-Rule	Morocco	2014	2022	-	Mar	 lastSun 2:00	1:00	S
+-Rule	Morocco	2014	only	-	Jun	 29	 3:00	0	-
+-Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
+-Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
+-Rule	Morocco	2015	only	-	Jul	 18	 2:00	1:00	S
+-Rule	Morocco	2016	only	-	Jun	  7	 3:00	0	-
+-Rule	Morocco	2016	only	-	Jul	  7	 2:00	1:00	S
+-Rule	Morocco	2017	only	-	May	 27	 3:00	0	-
+-Rule	Morocco	2017	only	-	Jun	 26	 2:00	1:00	S
+-Rule	Morocco	2018	only	-	May	 16	 3:00	0	-
+-Rule	Morocco	2018	only	-	Jun	 15	 2:00	1:00	S
+-Rule	Morocco	2019	only	-	May	  6	 3:00	0	-
+-Rule	Morocco	2019	only	-	Jun	  5	 2:00	1:00	S
+-Rule	Morocco	2020	only	-	Apr	 24	 3:00	0	-
+-Rule	Morocco	2020	only	-	May	 24	 2:00	1:00	S
+-Rule	Morocco	2021	only	-	Apr	 13	 3:00	0	-
+-Rule	Morocco	2021	only	-	May	 13	 2:00	1:00	S
+-Rule	Morocco	2022	only	-	Apr	  3	 3:00	0	-
+-Rule	Morocco	2022	only	-	May	  3	 2:00	1:00	S
+-Rule	Morocco	2023	only	-	Apr	 22	 2:00	1:00	S
+-Rule	Morocco	2024	only	-	Apr	 10	 2:00	1:00	S
+-Rule	Morocco	2025	only	-	Mar	 31	 2:00	1:00	S
+-Rule	Morocco	2026	max	-	Mar	 lastSun 2:00	1:00	S
+-Rule	Morocco	2036	only	-	Oct	 21	 3:00	0	-
+-Rule	Morocco	2037	only	-	Oct	 11	 3:00	0	-
+-Rule	Morocco	2038	only	-	Sep	 30	 3:00	0	-
+-Rule	Morocco	2038	only	-	Oct	 30	 2:00	1:00	S
+-Rule	Morocco	2038	max	-	Oct	 lastSun 3:00	0	-
++Rule	Morocco	2011	only	-	Jul	31	 0	0	-
++Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
++Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
++Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
++Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
++Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
++Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
++Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
++Rule	Morocco	2014	2022	-	Mar	lastSun	 2:00	1:00	S
++Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
++Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
++Rule	Morocco	2015	only	-	Jun	13	 3:00	0	-
++Rule	Morocco	2015	only	-	Jul	18	 2:00	1:00	S
++Rule	Morocco	2016	only	-	Jun	 4	 3:00	0	-
++Rule	Morocco	2016	only	-	Jul	 9	 2:00	1:00	S
++Rule	Morocco	2017	only	-	May	20	 3:00	0	-
++Rule	Morocco	2017	only	-	Jul	 1	 2:00	1:00	S
++Rule	Morocco	2018	only	-	May	12	 3:00	0	-
++Rule	Morocco	2018	only	-	Jun	16	 2:00	1:00	S
++Rule	Morocco	2019	only	-	May	 4	 3:00	0	-
++Rule	Morocco	2019	only	-	Jun	 8	 2:00	1:00	S
++Rule	Morocco	2020	only	-	Apr	18	 3:00	0	-
++Rule	Morocco	2020	only	-	May	30	 2:00	1:00	S
++Rule	Morocco	2021	only	-	Apr	10	 3:00	0	-
++Rule	Morocco	2021	only	-	May	15	 2:00	1:00	S
++Rule	Morocco	2022	only	-	Apr	 2	 3:00	0	-
++Rule	Morocco	2022	only	-	May	 7	 2:00	1:00	S
++Rule	Morocco	2023	only	-	Apr	22	 2:00	1:00	S
++Rule	Morocco	2024	only	-	Apr	13	 2:00	1:00	S
++Rule	Morocco	2025	only	-	Apr	 5	 2:00	1:00	S
++Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
++Rule	Morocco	2035	only	-	Oct	27	 3:00	0	-
++Rule	Morocco	2036	only	-	Oct	18	 3:00	0	-
++Rule	Morocco	2037	only	-	Oct	10	 3:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+@@ -980,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+ # Assume that this has been true since Western Sahara switched to GMT,
+ # since most of it was then controlled by Morocco.
+ 
+-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
++Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
+ 			-1:00	-	WAT	1976 Apr 14
+ 			 0:00	Morocco	WE%sT
+ 
+@@ -1030,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
+ Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
+ 			1:00	-	WAT
+ 
+-# Reunion
++# Réunion
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
+-			4:00	-	RET	# Reunion Time
++			4:00	-	RET	# Réunion Time
+ #
+-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
++# Crozet Islands also observes Réunion time; see the 'antarctica' file.
++#
++# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
+ # The following information about them is taken from
+-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
+-# no longer available as of 1999-08-17).
++# Îles Éparses (, 1997-07-22,
++# in French; no longer available as of 1999-08-17).
+ # We have no info about their time zone histories.
+ #
+ # Bassas da India - uninhabited
+@@ -1053,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
+ 			2:00	-	CAT
+ 
+ # St Helena
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
+-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
+-			 0:00	-	GMT
++# See Africa/Abidjan.
+ # The other parts of the St Helena territory are similar:
+ #	Tristan da Cunha: on GMT, say Whitman and the CIA
+-#	Ascension: on GMT, says usno1995 and the CIA
++#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
+ #	Gough (scientific station since 1955; sealers wintered previously):
+ #		on GMT, says the CIA
+-#	Inaccessible, Nightingale: no information, but probably GMT
++#	Inaccessible, Nightingale: uninhabited
+ 
+-# Sao Tome and Principe
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
+-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
+-			 0:00	-	GMT
+-
++# São Tomé and Príncipe
+ # Senegal
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
+-			-1:00	-	WAT	1941 Jun
+-			 0:00	-	GMT
++# See Africa/Abidjan.
+ 
+ # Seychelles
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1088,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	# Victoria
+ # Possibly the islands were uninhabited.
+ 
+ # Sierra Leone
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
+-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
+-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
+-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
+-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
+-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
+-			-1:00	SL	%s	1957
+-			 0:00	SL	%s
++# See Africa/Abidjan.
+ 
+ # Somalia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1121,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
+ 
+ # Sudan
+ #
+-# From 
+-# Sudan News Agency (2000-01-13)
+-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
++# From 
++# Sudan News Agency (2000-01-13),
++# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
+ # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
+ # Saturday....  This was announced Thursday by Caretaker State Minister for
+ # Manpower Abdul-Rahman Nur-Eddin.
+@@ -1154,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+ 			3:00	-	EAT
+ 
+ # Togo
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Lome	0:04:52 -	LMT	1893
+-			0:00	-	GMT
++# See Africa/Abidjan.
+ 
+ # Tunisia
+ 
+ # From Gwillim Law (2005-04-30):
+-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
++# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
+ # this time in Tunisia.  According to Yahoo France News
+ # , in a story attributed to AP
+ # and dated 2005-04-26, "Tunisia has decided to advance its official time by
+@@ -1170,7 +1127,7 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+ # Saturday."  (My translation)
+ #
+ # From Oscar van Vlijmen (2005-05-02):
+-# LaPresse, the first national daily newspaper ...
++# La Presse, the first national daily newspaper ...
+ # 
+ # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
+ # 1h standard time.
+@@ -1184,18 +1141,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+ # From Steffen Thorsen (2009-03-16):
+ # According to several news sources, Tunisia will not observe DST this year.
+ # (Arabic)
+-# 
+ # http://www.elbashayer.com/?page=viewn&nid=42546
+-# 
+-# 
+ # http://www.babnet.net/kiwidetail-15295.asp
+-# 
+ #
+ # We have also confirmed this with the US embassy in Tunisia.
+ # We have a wrap-up about this on the following page:
+-# 
+ # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
+-# 
+ 
+ # From Alexander Krivenyshev (2009-03-17):
+ # Here is a link to Tunis Afrique Presse News Agency
+@@ -1203,20 +1154,17 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+ # Standard time to be kept the whole year long (tap.info.tn):
+ #
+ # (in English)
+-# 
+ # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
+-# 
+ #
+ # (in Arabic)
+-# 
+ # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
+-# 
+ 
+-# From Arthur David Olson (2009--3-18):
+-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
+-# that the fasting month of ramadan coincides with the period concerned by summer time.
+-# Therefore, the standard time will be kept unchanged the whole year long."
+-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
++# From Arthur David Olson (2009-03-18):
++# The Tunis Afrique Presse News Agency notice contains this: "This measure is
++# due to the fact that the fasting month of Ramadan coincides with the period
++# concerned by summer time.  Therefore, the standard time will be kept
++# unchanged the whole year long."  So foregoing DST seems to be an exception
++# (albeit one that may be repeated in the future).
+ 
+ # From Alexander Krivenyshev (2010-03-27):
+ # According to some news reports Tunis confirmed not to use DST in 2010
+@@ -1228,12 +1176,8 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+ # coincided with the month of Ramadan..."
+ #
+ # (in Arabic)
+-# 
+ # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
+-# 
+ # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
+-# or
+-# 
+ # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Index: contrib/tzdata/antarctica
+===================================================================
+--- contrib/tzdata/antarctica	(revision 273102)
++++ contrib/tzdata/antarctica	(working copy)
+@@ -1,16 +1,13 @@
+-# 
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+ # From Paul Eggert (1999-11-15):
+ # To keep things manageable, we list only locations occupied year-round; see
+-# 
+ # COMNAP - Stations and Bases
+-# 
++# 
+ # and
+-# 
+ # Summary of the Peri-Antarctic Islands (1998-07-23)
+-# 
++# 
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+ #
+@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
+ 
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***