From matt at openssl.org Thu Jun 1 12:36:34 2017 From: matt at openssl.org (Matt Caswell) Date: Thu, 01 Jun 2017 12:36:34 +0000 Subject: [openssl-commits] [openssl] OpenSSL_1_0_2-stable update Message-ID: <1496320594.798223.406.nullmailer@dev.openssl.org> The branch OpenSSL_1_0_2-stable has been updated via 44191de234b061145a6ed14221927ec0c9c7b7bf (commit) from fde111ba045f7c00e2fe673bf5bf161a64c2cb60 (commit) - Log ----------------------------------------------------------------- commit 44191de234b061145a6ed14221927ec0c9c7b7bf Author: Matt Caswell Date: Thu Jun 1 10:31:56 2017 +0100 Send a protocol version alert If we fail to negotiate a version then we should send a protocol version alert. Fixes #3595 Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/3598) ----------------------------------------------------------------------- Summary of changes: ssl/s23_clnt.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index b80d1fd..92f41dd 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -735,7 +735,35 @@ static int ssl23_get_server_hello(SSL *s) s->version = TLS1_2_VERSION; s->method = TLSv1_2_client_method(); } else { + /* + * Unrecognised version, we'll send a protocol version alert using + * our preferred version. + */ + switch(s->client_version) { + default: + /* + * Shouldn't happen + * Fall through + */ + case TLS1_2_VERSION: + s->version = TLS1_2_VERSION; + s->method = TLSv1_2_client_method(); + break; + case TLS1_1_VERSION: + s->version = TLS1_1_VERSION; + s->method = TLSv1_1_client_method(); + break; + case TLS1_VERSION: + s->version = TLS1_VERSION; + s->method = TLSv1_client_method(); + break; + case SSL3_VERSION: + s->version = SSL3_VERSION; + s->method = SSLv3_client_method(); + break; + } SSLerr(SSL_F_SSL23_GET_SERVER_HELLO, SSL_R_UNSUPPORTED_PROTOCOL); + ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_PROTOCOL_VERSION); goto err; } From rsalz at openssl.org Thu Jun 1 13:39:32 2017 From: rsalz at openssl.org (Rich Salz) Date: Thu, 01 Jun 2017 13:39:32 +0000 Subject: [openssl-commits] [web] master update Message-ID: <1496324372.721516.20127.nullmailer@dev.openssl.org> The branch master has been updated via ec5ce815ce0a8c707ac4381c825f652e72f4335c (commit) from 2b82c36c59e0188cf28eac8fa2984c80bb9f7aec (commit) - Log ----------------------------------------------------------------- commit ec5ce815ce0a8c707ac4381c825f652e72f4335c Author: Rich Salz Date: Thu Jun 1 09:39:13 2017 -0400 Editorial updates; add committers info ----------------------------------------------------------------------- Summary of changes: Makefile | 43 ++++++++++++++----------- bin/mk-committers | 24 ++++++++++++++ template-file.html => community/committers.html | 17 ++++++---- community/contacts.html | 15 --------- community/index.html | 15 ++++++--- community/omc.html | 6 ++-- community/sidebar.shtml | 3 ++ 7 files changed, 75 insertions(+), 48 deletions(-) create mode 100755 bin/mk-committers copy template-file.html => community/committers.html (64%) diff --git a/Makefile b/Makefile index fdc4c0f..6c71bec 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ RELEASEDIR = /var/www/openssl/source # All simple generated files. SIMPLE = newsflash.inc sitemap.txt \ + community/committers.inc \ docs/faq.inc docs/fips.inc \ news/changelog.inc news/changelog.txt \ news/cl102.txt news/cl110.txt \ @@ -36,6 +37,15 @@ suball: $(SIMPLE) $(SRCLISTS) manmaster relupd: suball manpages sitemap +clean: + rm -f $(SIMPLE) $(SRCLISTS) + +# Legacy targets +hack-source_htaccess: all +simple: all +generated: all +rebuild: all + define makemanpages ./bin/mk-manpages $(1) $(2) docs ./bin/mk-filelist -a docs/man$(2)/apps '' '*.html' >docs/man$(2)/apps/index.inc @@ -53,22 +63,25 @@ manmaster: ./bin/mk-filelist -a docs/manmaster/man5 '' '*.html' >docs/manmaster/man5/index.inc ./bin/mk-filelist -a docs/manmaster/man7 '' '*.html' >docs/manmaster/man7/index.inc +## $(SIMPLE) -- SIMPLE GENERATED FILES +newsflash.inc: news/newsflash.inc + @rm -f $@ + head -7 $? >$@ sitemap: @rm -f sitemap.txt ./bin/mk-sitemap > sitemap.txt -# Legacy targets -hack-source_htaccess: all -simple: all -generated: all -rebuild: all - -clean: - rm -f $(SIMPLE) $(SRCLISTS) +community/committers.inc: + @rm -f $@ + wget -q https://api.openssl.org/0/Group/commit/Members | + ./bin/mk-committers >$@ -newsflash.inc: news/newsflash.inc +docs/faq.inc: docs/faq.txt bin/mk-faq @rm -f $@ - head -7 $? >$@ + ./bin/mk-faq <$? >$@ +docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist + @rm -f $@ + ./bin/mk-filelist docs/fips fips/ '*' >$@ news/changelog.inc: news/changelog.txt bin/mk-changelog @rm -f $@ @@ -82,7 +95,6 @@ news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES news/cl110.txt: $(CHECKOUTS)/openssl-1.1.0-stable/CHANGES @rm -f $@ cp $? $@ - news/openssl-1.0.2-notes.html: news/openssl-notes.html.in @rm -f $@ sed -e 's|@VERSION@|1.0.2|g' < $< > $@ @@ -95,7 +107,6 @@ news/openssl-1.0.2-notes.inc: $(CHECKOUTS)/openssl-1.0.2-stable/NEWS news/openss news/openssl-1.1.0-notes.inc: $(CHECKOUTS)/openssl-1.1.0-stable/NEWS news/openssl-1.1.0-notes.html bin/mk-notes @rm -f $@ ./bin/mk-notes 1.1.0 < $(CHECKOUTS)/openssl-1.1.0-stable/NEWS > $@ - news/newsflash.inc: news/newsflash.txt sed <$? >$@ \ -e '/^#/d' \ @@ -106,13 +117,6 @@ news/vulnerabilities.inc: bin/vulnerabilities.xsl news/vulnerabilities.xml @rm -f $@ xsltproc bin/vulnerabilities.xsl news/vulnerabilities.xml >$@ -docs/faq.inc: docs/faq.txt bin/mk-faq - @rm -f $@ - ./bin/mk-faq <$? >$@ -docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist - @rm -f $@ - ./bin/mk-filelist docs/fips fips/ '*' >$@ - source/.htaccess: $(wildcard source/openssl-*.tar.gz) bin/mk-latest @rm -f @? ./bin/mk-latest source >$@ @@ -123,6 +127,7 @@ source/index.inc: $(wildcard $(RELEASEDIR)/openssl-*.tar.gz) bin/mk-filelist @rm -f $@ ./bin/mk-filelist $(RELEASEDIR) '' 'openssl-*.tar.gz' >$@ +## $(SRCLISTS) -- LISTS OF SOURCES source/old/0.9.x/index.inc: $(wildcard source/old/0.9.x/*.gz) bin/mk-filelist @rm -f $@ ./bin/mk-filelist source/old/0.9.x '' '*.gz' >$@ diff --git a/bin/mk-committers b/bin/mk-committers new file mode 100755 index 0000000..5e6e748 --- /dev/null +++ b/bin/mk-committers @@ -0,0 +1,24 @@ +#! /usr/bin/python + +import json, sys + +json = json.load(sys.stdin) + +members = [] +for member in json: + name = None + github = '--' + for names in member: + if type(names) == type({}): + if names.has_key(u'github'): + github = names[u'github'] + elif names.find(' ') != -1: + name = names + if name and github: + name = name.encode('ascii', 'xmlcharrefreplace') + github = github.encode('ascii', 'xmlcharrefreplace') + members.append("%s%s" % (name, github)) + +members.sort() +for m in members: + print m diff --git a/template-file.html b/community/committers.html similarity index 64% copy from template-file.html copy to community/committers.html index a7483d5..750bb93 100644 --- a/template-file.html +++ b/community/committers.html @@ -7,18 +7,22 @@
@@ -29,3 +33,4 @@ + diff --git a/community/contacts.html b/community/contacts.html index 88e01f7..32c88ab 100644 --- a/community/contacts.html +++ b/community/contacts.html @@ -72,21 +72,6 @@

-

Some OpenSSL team members are available for selected consulting - engagements.

- -

In Sweden:

- -
- OpenSSL SE
- c/o Richard Levitte
- Nordingr?gatan 20
- S-162 53 V?llingby
- Sweden
- openssl-contact.SE at openssl.org -
-

-