From no-reply at appveyor.com  Thu Sep  1 08:34:34 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 01 Sep 2016 08:34:34 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.21
Message-ID: <20160901083434.31412.71425.021A348A@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160901/241a4128/attachment.html>

From builds at travis-ci.org  Thu Sep  1 14:14:05 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 01 Sep 2016 14:14:05 +0000
Subject: [openssl-commits] Passed: mdilai/openssl-ubuntu-chacha20poly1305#1
	(OpenSSL_CHACHA_1_0_2h - 70d8352)
In-Reply-To: <mdilai/openssl-ubuntu-chacha20poly1305+156814023+passed@travis-ci.org>
Message-ID: <57c837af90e4_33fb5d479e5cc80094c@677b9d11-d254-437d-879c-e22c630729a8.mail>

Build Update for mdilai/openssl-ubuntu-chacha20poly1305
-------------------------------------

Build: #1
Status: Passed

Duration: 27 minutes and 54 seconds
Commit: 70d8352 (OpenSSL_CHACHA_1_0_2h)
Author: Maksym Dilai
Message: Travis enabled

View the changeset: https://github.com/mdilai/openssl-ubuntu-chacha20poly1305/compare/c55e031ec06a...70d83523057d

View the full build log and details: https://travis-ci.org/mdilai/openssl-ubuntu-chacha20poly1305/builds/156814023

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160901/a8775142/attachment.html>

From rsalz at openssl.org  Thu Sep  1 15:53:36 2016
From: rsalz at openssl.org (Rich Salz)
Date: Thu, 01 Sep 2016 15:53:36 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472745216.955939.28406.nullmailer@dev.openssl.org>

The branch master has been updated
       via  356f13f0feb84c5ece13c3aeb5bd2bed0c612deb (commit)
      from  78811ca2ae1d2600091c6c485ffd65e1950ba43d (commit)


- Log -----------------------------------------------------------------
commit 356f13f0feb84c5ece13c3aeb5bd2bed0c612deb
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Sep 1 11:53:28 2016 -0400

    Add NSA license

-----------------------------------------------------------------------

Summary of changes:
 source/NSA-PLA.pdf | Bin 0 -> 2276088 bytes
 source/sidebar.inc |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 source/NSA-PLA.pdf

diff --git a/source/NSA-PLA.pdf b/source/NSA-PLA.pdf
new file mode 100644
index 0000000..88514df
Binary files /dev/null and b/source/NSA-PLA.pdf differ
diff --git a/source/sidebar.inc b/source/sidebar.inc
index 6862589..233e092 100644
--- a/source/sidebar.inc
+++ b/source/sidebar.inc
@@ -17,6 +17,9 @@
         <a href="/source/OCB-patent-grant-OpenSSL.pdf">OCB License</a>
       </li>
       <li>
+        <a href="/source/NSA-PLA.pdf">NSA ECC License</a>
+      </li>
+      <li>
         <a href="/source/old">Old Releases</a>
       </li>
       <li>

From levitte at openssl.org  Thu Sep  1 19:01:55 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 01 Sep 2016 19:01:55 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472756515.292502.24750.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b3e718e286c7a51fb1defc4136695937f4f19d66 (commit)
       via  967e831e88bc45ea32e5b3c762945859996771ff (commit)
       via  a5e1f1230e09b249ff94cc48aeffd1b874cb937e (commit)
       via  90aeaf6bceb38746f9fa9fea9f73e4f682f37fb6 (commit)
      from  7f9ae88817ddf0aac5c6bd95d9a5af1c54ed5bbf (commit)


- Log -----------------------------------------------------------------
commit b3e718e286c7a51fb1defc4136695937f4f19d66
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 18:48:19 2016 +0200

    Document the enhanced tests specification
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 967e831e88bc45ea32e5b3c762945859996771ff
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 13:44:05 2016 +0200

    Revert "INSTALL: add information on option no-fuzz-test"
    
    This reverts commit 7f9ae88817ddf0aac5c6bd95d9a5af1c54ed5bbf.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit a5e1f1230e09b249ff94cc48aeffd1b874cb937e
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 13:43:40 2016 +0200

    Revert "Make it possible to disable fuzz testing"
    
    This reverts commit eb40eaed727500bf4a15f848c99e37edd18e142e.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 90aeaf6bceb38746f9fa9fea9f73e4f682f37fb6
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 13:34:32 2016 +0200

    Add a more versatile test chooser
    
    So far, the test runner (test/run_tests.pl) could get a list of tests
    to run, and if non were given, it assumes all available tests should
    be performed.
    
    However, that makes skipping just one or two tests a bit of a pain.
    This change makes the possibilities more versatile, run_checker.pl
    takes these arguments and will process them in the given order,
    starting with an empty set of tests to perform:
    
        alltests            The current set becomes the whole set of
                            available tests.
        test_xxx            Adds 'test_xxx' to the current set.
        -test_xxx           Removes 'test_xxx' from the current set.  If
                            nothing has been added to the set before this
                            argument, the current set is first initialised
                            to the whole set of available tests, then
                            'test_xxx' is removed from the current set.
        list                Display all available tests, then stop.
    
    If no arguments are given, 'alltests' is assumed.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure                   |  1 -
 INSTALL                     | 40 +++++++++++++++++++++----
 test/recipes/05-test_fuzz.t |  3 --
 test/run_tests.pl           | 71 ++++++++++++++++++++++++++++++---------------
 4 files changed, 83 insertions(+), 32 deletions(-)

diff --git a/Configure b/Configure
index 4fbce03..0a1b68a 100755
--- a/Configure
+++ b/Configure
@@ -342,7 +342,6 @@ my @disablables = (
     "filenames",
     "fuzz-libfuzzer",
     "fuzz-afl",
-    "fuzz-test",
     "gost",
     "heartbeats",
     "hw(-.+)?",
diff --git a/INSTALL b/INSTALL
index 6dcb4a0..c63797a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -320,11 +320,6 @@
                    platforms and should never be used in production environments.
                    See the file fuzz/README.md for further details.
 
-  no-fuzz-test
-                   Don't runt the fuzz test suite when testing. Use with
-                   caution, as those tests may be important.  However, that
-                   suite is particularly slow, and is therefore skippable.
-
   no-gost
                    Don't build support for GOST based ciphersuites. Note that
                    if this feature is enabled then GOST ciphersuites are only
@@ -672,6 +667,9 @@
 
      Please send bug reports to <rt at openssl.org>.
 
+     For more details on how the make variables TESTS can be used,
+     see section TESTS in Detail below.
+
   4. If everything tests ok, install OpenSSL with
 
        $ make install                                   # Unix
@@ -884,6 +882,38 @@
                 automatically generated files; add new error codes or add new
                 (or change the visibility of) public API functions. (Unix only).
 
+ TESTS in Detail
+ ---------------
+
+ The make variable TESTS supports a versatile set of space separated tokens
+ with which you can specify a set of tests to be performed.  With a "current
+ set of tests" in mind, initially being empty, here are the possible tokens:
+
+ alltests       The current set of tests becomes the whole set of available
+                tests (as listed when you do 'make list-tests' or similar).
+ xxx            Adds the test 'xxx' to the current set of tests.
+ -xxx           Removes 'xxx' from the current set of tests.  If this is the
+                first token in the list, the current set of tests is first
+                assigned the whole set of available tests, effectively making
+                this token equivalent to TESTS="alltests -xxx"
+
+ Also, all tokens except for "alltests" may have wildcards, such as *.
+ (on Unix and Windows, BSD style wildcards are supported, while on VMS,
+ it's VMS style wildcards)
+
+ Example: All tests except for the fuzz tests:
+
+ $ make TESTS=-test_fuzz test
+
+ or (if you want to be explicit)
+
+ $ make TESTS='alltests -test_fuzz' test
+
+ Example: All tests that have a name starting with "test_ssl" but not those
+ starting with "test_ssl_":
+
+ $ make TESTS='test_ssl* -test_ssl_*' test
+
  Note on multi-threading
  -----------------------
 
diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t
index f1ccfe3..d152925 100755
--- a/test/recipes/05-test_fuzz.t
+++ b/test/recipes/05-test_fuzz.t
@@ -15,9 +15,6 @@ use OpenSSL::Test::Utils;
 
 setup("test_fuzz");
 
-plan skip_all => "Fuzz testing is disabled by this OpenSSL build"
-    if disabled("fuzz-test");
-
 my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'server', 'x509');
 if (!disabled("cms")) {
     push @fuzzers, 'cms';
diff --git a/test/run_tests.pl b/test/run_tests.pl
index 6550e0b..66697db 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -35,31 +35,56 @@ $utillib =~ s|\\|\\\\|g if $^O eq "MSWin32";
 # switches to be used when it calls our recipes.
 $switches = "-w \"-I$testlib\" \"-I$utillib\"";
 
-my @tests = ( "alltests" );
-if (@ARGV) {
-    @tests = @ARGV;
-}
-my $list_mode = scalar(grep /^list$/, @tests) != 0;
-if (grep /^(alltests|list)$/, @tests) {
-    @tests = grep {
-	basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
-    } glob(catfile($recipesdir,"*.t"));
-} else {
-    my @t = ();
-    foreach (@tests) {
-	push @t, grep {
-	    basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
-	} glob(catfile($recipesdir,"*-$_.t"));
+my @alltests = find_matching_tests("*");
+my %tests = ();
+
+my $initial_arg = 1;
+foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
+    if ($arg eq 'list') {
+	foreach (@alltests) {
+	    (my $x = basename($_)) =~ s|^[0-9][0-9]-(.*)\.t$|$1|;
+	    print $x,"\n";
+	}
+	exit 0;
     }
-    @tests = @t;
+    if ($arg eq 'alltests') {
+	warn "'alltests' encountered, ignoring everything before that...\n"
+	    unless $initial_arg;
+	%tests = map { $_ => 1 } @alltests;
+    } elsif ($arg =~ m/^(-?)(.*)/) {
+	my $sign = $1;
+	my $test = $2;
+	my @matches = find_matching_tests($test);
+
+	# If '-foo' is the first arg, it's short for 'alltests -foo'
+	if ($sign eq '-' && $initial_arg) {
+	    %tests = map { $_ => 1 } @alltests;
+	}
+
+	if (scalar @matches == 0) {
+	    warn "Test $test found no match, skipping ",
+		($sign eq '-' ? "removal" : "addition"),
+		"...\n";
+	} else {
+	    foreach $test (@matches) {
+		if ($sign eq '-') {
+		    delete $tests{$test};
+		} else {
+		    $tests{$test} = 1;
+		}
+	    }
+	}
+    } else {
+	warn "I don't know what '$arg' is about, ignoring...\n";
+    }
+
+    $initial_arg = 0;
 }
 
-if ($list_mode) {
-    @tests = map { $_ = basename($_); $_ =~ s/^[0-9][0-9]-//; $_ =~ s/\.t$//;
-                   $_ } @tests;
-    print join("\n", @tests), "\n";
-} else {
-    @tests = map { abs2rel($_, rel2abs(curdir())); } @tests;
+runtests(map { abs2rel($_, rel2abs(curdir())); } sort keys %tests);
+
+sub find_matching_tests {
+    my ($glob) = @_;
 
-    runtests(sort @tests);
+    return glob(catfile($recipesdir,"*-$glob.t"));
 }

From levitte at openssl.org  Thu Sep  1 19:02:29 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 01 Sep 2016 19:02:29 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1472756549.585830.25789.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  b5d60c2b8d33863c9e8dd876222aa6872a3466bc (commit)
       via  eed06638c74f0dc5422e7e53cbec98d172925991 (commit)
      from  3a10218546eb4cbc83207642a6f0b191f274f7b9 (commit)


- Log -----------------------------------------------------------------
commit b5d60c2b8d33863c9e8dd876222aa6872a3466bc
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 13:44:05 2016 +0200

    Revert "INSTALL: add information on option no-fuzz-test"
    
    This reverts commit 7f9ae88817ddf0aac5c6bd95d9a5af1c54ed5bbf.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 967e831e88bc45ea32e5b3c762945859996771ff)

commit eed06638c74f0dc5422e7e53cbec98d172925991
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 13:43:40 2016 +0200

    Revert "Make it possible to disable fuzz testing"
    
    This reverts commit eb40eaed727500bf4a15f848c99e37edd18e142e.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit a5e1f1230e09b249ff94cc48aeffd1b874cb937e)

-----------------------------------------------------------------------

Summary of changes:
 Configure                   | 1 -
 INSTALL                     | 5 -----
 test/recipes/05-test_fuzz.t | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/Configure b/Configure
index 4fbce03..0a1b68a 100755
--- a/Configure
+++ b/Configure
@@ -342,7 +342,6 @@ my @disablables = (
     "filenames",
     "fuzz-libfuzzer",
     "fuzz-afl",
-    "fuzz-test",
     "gost",
     "heartbeats",
     "hw(-.+)?",
diff --git a/INSTALL b/INSTALL
index 6dcb4a0..132b2aa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -320,11 +320,6 @@
                    platforms and should never be used in production environments.
                    See the file fuzz/README.md for further details.
 
-  no-fuzz-test
-                   Don't runt the fuzz test suite when testing. Use with
-                   caution, as those tests may be important.  However, that
-                   suite is particularly slow, and is therefore skippable.
-
   no-gost
                    Don't build support for GOST based ciphersuites. Note that
                    if this feature is enabled then GOST ciphersuites are only
diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t
index f1ccfe3..d152925 100755
--- a/test/recipes/05-test_fuzz.t
+++ b/test/recipes/05-test_fuzz.t
@@ -15,9 +15,6 @@ use OpenSSL::Test::Utils;
 
 setup("test_fuzz");
 
-plan skip_all => "Fuzz testing is disabled by this OpenSSL build"
-    if disabled("fuzz-test");
-
 my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'server', 'x509');
 if (!disabled("cms")) {
     push @fuzzers, 'cms';

From builds at travis-ci.org  Thu Sep  1 19:24:07 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 01 Sep 2016 19:24:07 +0000
Subject: [openssl-commits] Passed: mdilai/openssl-ubuntu-chacha20poly1305#6
	(debian/trusty/1.0.2h-1ppa1 - f6fc2d0)
In-Reply-To: <mdilai/openssl-ubuntu-chacha20poly1305+156859454+passed@travis-ci.org>
Message-ID: <57c880567b873_33fe93cf9534825429a@1123799b-d052-443b-8b13-89bcb81b953e.mail>

Build Update for mdilai/openssl-ubuntu-chacha20poly1305
-------------------------------------

Build: #6
Status: Passed

Duration: 1 hour, 5 minutes, and 12 seconds
Commit: f6fc2d0 (debian/trusty/1.0.2h-1ppa1)
Author: Maksym Dilai
Message: Added ~trusty to package name

View the changeset: https://github.com/mdilai/openssl-ubuntu-chacha20poly1305/compare/debian/trusty/1.0.2h-1ppa1

View the full build log and details: https://travis-ci.org/mdilai/openssl-ubuntu-chacha20poly1305/builds/156859454

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160901/7a9c5553/attachment.html>

From levitte at openssl.org  Thu Sep  1 20:38:04 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 01 Sep 2016 20:38:04 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472762284.696974.28836.nullmailer@dev.openssl.org>

The branch master has been updated
       via  377ab6d183453dac5454abf62d5341a559caa264 (commit)
      from  b3e718e286c7a51fb1defc4136695937f4f19d66 (commit)


- Log -----------------------------------------------------------------
commit 377ab6d183453dac5454abf62d5341a559caa264
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 21:05:34 2016 +0200

    Move 05-test_fuzz.t to 90-test_fuzz.t
    
    This adheres much better to the documentation in test/README
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/{05-test_fuzz.t => 90-test_fuzz.t} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/recipes/{05-test_fuzz.t => 90-test_fuzz.t} (100%)

diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/90-test_fuzz.t
similarity index 100%
rename from test/recipes/05-test_fuzz.t
rename to test/recipes/90-test_fuzz.t

From levitte at openssl.org  Thu Sep  1 20:38:33 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 01 Sep 2016 20:38:33 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1472762313.224399.29801.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  3bcd1b249690f90bd1d2c2b401e65628fd9cacd8 (commit)
      from  b5d60c2b8d33863c9e8dd876222aa6872a3466bc (commit)


- Log -----------------------------------------------------------------
commit 3bcd1b249690f90bd1d2c2b401e65628fd9cacd8
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 1 21:05:34 2016 +0200

    Move 05-test_fuzz.t to 90-test_fuzz.t
    
    This adheres much better to the documentation in test/README
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 377ab6d183453dac5454abf62d5341a559caa264)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/{05-test_fuzz.t => 90-test_fuzz.t} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/recipes/{05-test_fuzz.t => 90-test_fuzz.t} (100%)

diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/90-test_fuzz.t
similarity index 100%
rename from test/recipes/05-test_fuzz.t
rename to test/recipes/90-test_fuzz.t

From appro at openssl.org  Fri Sep  2 11:20:44 2016
From: appro at openssl.org (Andy Polyakov)
Date: Fri, 02 Sep 2016 11:20:44 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1472815244.103300.32288.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  96e6c6635ec45e47cec29cab8e6dadf62eb1da00 (commit)
      from  3bcd1b249690f90bd1d2c2b401e65628fd9cacd8 (commit)


- Log -----------------------------------------------------------------
commit 96e6c6635ec45e47cec29cab8e6dadf62eb1da00
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Aug 31 16:13:10 2016 +0200

    Configurations/10-main.conf: remove solaris-x86-cc target.
    
    Since vendor assembler can't assemble our modules with -KPIC flag,
    it, assembly support, was not available as an option. But this
    means lack of side-channel resistant code, which is incompatible
    with security by todays standards.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 216a0cc4d6a35a21e613f1e7e9eee957768bf9dd)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e75d164..e4f5f1c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -200,7 +200,7 @@ sub vms_info {
                                        threads("-pthread")),
         bn_ops           => "BN_LLONG",
         shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
+        shared_ldflag    => "-shared -static-libgcc",
     },
     "solaris64-x86_64-gcc" => {
         # -shared -static-libgcc might appear controversial, but modules
@@ -225,19 +225,18 @@ sub vms_info {
     },
 
 #### Solaris x86 with Sun C setups
-    "solaris-x86-cc" => {
-        inherit_from     => [ "solaris-common" ],
-        cc               => "cc",
-        cflags           => add_before(picker(default => "-xarch=generic -xstrconst -Xa -DL_ENDIAN",
-                                              debug   => "-g",
-                                              release => "-xO5 -xregs=frameptr -xdepend -xbuiltin"),
-                                       threads("-D_REENTRANT")),
-        lflags           => add(threads("-mt")),
-        ex_libs          => add(threads("-lpthread")),
-        bn_ops           => "BN_LLONG RC4_CHAR",
-        shared_cflag     => "-KPIC",
-        shared_ldflag    => "-G -dy -z text",
-    },
+    # There used to be solaris-x86-cc target, but it was removed,
+    # primarily because vendor assembler can't assemble our modules
+    # with -KPIC flag. As result it, assembly support, was not even
+    # available as option. But its lack means lack of side-channel
+    # resistant code, which is incompatible with security by todays
+    # standards. Fortunately gcc is readily available prepackaged
+    # option, which we can firmly point at...
+    #
+    # On related note, solaris64-x86_64-cc target won't compile code
+    # paths utilizing AVX and post-Haswell instruction extensions.
+    # Consider switching to solaris64-x86_64-gcc even here...
+    #
     "solaris64-x86_64-cc" => {
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",

From appro at openssl.org  Fri Sep  2 11:20:44 2016
From: appro at openssl.org (Andy Polyakov)
Date: Fri, 02 Sep 2016 11:20:44 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472815244.184547.32310.nullmailer@dev.openssl.org>

The branch master has been updated
       via  216a0cc4d6a35a21e613f1e7e9eee957768bf9dd (commit)
      from  377ab6d183453dac5454abf62d5341a559caa264 (commit)


- Log -----------------------------------------------------------------
commit 216a0cc4d6a35a21e613f1e7e9eee957768bf9dd
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Aug 31 16:13:10 2016 +0200

    Configurations/10-main.conf: remove solaris-x86-cc target.
    
    Since vendor assembler can't assemble our modules with -KPIC flag,
    it, assembly support, was not available as an option. But this
    means lack of side-channel resistant code, which is incompatible
    with security by todays standards.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e75d164..e4f5f1c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -200,7 +200,7 @@ sub vms_info {
                                        threads("-pthread")),
         bn_ops           => "BN_LLONG",
         shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
+        shared_ldflag    => "-shared -static-libgcc",
     },
     "solaris64-x86_64-gcc" => {
         # -shared -static-libgcc might appear controversial, but modules
@@ -225,19 +225,18 @@ sub vms_info {
     },
 
 #### Solaris x86 with Sun C setups
-    "solaris-x86-cc" => {
-        inherit_from     => [ "solaris-common" ],
-        cc               => "cc",
-        cflags           => add_before(picker(default => "-xarch=generic -xstrconst -Xa -DL_ENDIAN",
-                                              debug   => "-g",
-                                              release => "-xO5 -xregs=frameptr -xdepend -xbuiltin"),
-                                       threads("-D_REENTRANT")),
-        lflags           => add(threads("-mt")),
-        ex_libs          => add(threads("-lpthread")),
-        bn_ops           => "BN_LLONG RC4_CHAR",
-        shared_cflag     => "-KPIC",
-        shared_ldflag    => "-G -dy -z text",
-    },
+    # There used to be solaris-x86-cc target, but it was removed,
+    # primarily because vendor assembler can't assemble our modules
+    # with -KPIC flag. As result it, assembly support, was not even
+    # available as option. But its lack means lack of side-channel
+    # resistant code, which is incompatible with security by todays
+    # standards. Fortunately gcc is readily available prepackaged
+    # option, which we can firmly point at...
+    #
+    # On related note, solaris64-x86_64-cc target won't compile code
+    # paths utilizing AVX and post-Haswell instruction extensions.
+    # Consider switching to solaris64-x86_64-gcc even here...
+    #
     "solaris64-x86_64-cc" => {
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",

From appro at openssl.org  Fri Sep  2 11:23:14 2016
From: appro at openssl.org (Andy Polyakov)
Date: Fri, 02 Sep 2016 11:23:14 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472815394.310242.1707.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a43249122baabb9ebaee0822d683f1fdb60f72a7 (commit)
       via  d5a39c12f0331dd0d14dbfcf2b98921be4cbb1da (commit)
      from  216a0cc4d6a35a21e613f1e7e9eee957768bf9dd (commit)


- Log -----------------------------------------------------------------
commit a43249122baabb9ebaee0822d683f1fdb60f72a7
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Aug 31 20:50:56 2016 +0200

    Configurations/10-main.conf: add android64-x86_64 target.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit d5a39c12f0331dd0d14dbfcf2b98921be4cbb1da
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Aug 31 20:50:08 2016 +0200

    Configurations/10-main.conf: fix omittions in commentary.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e4f5f1c..a1d566d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -865,7 +865,7 @@ sub vms_info {
     #
     # It takes pair of prior-set environment variables to make it work:
     #
-    # CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<
+    # CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<arch>
     # CROSS_COMPILE=<prefix>
     #
     # As well as PATH adjusted to cover ${CROSS_COMPILE}gcc and company.
@@ -874,7 +874,7 @@ sub vms_info {
     # ANDROID_NDK=/some/where/android-ndk-10d
     # CROSS_SYSROOT=$ANDROID_NDK/platforms/android-14/arch-arm
     # CROSS_COMPILE=arm-linux-adroideabi-
-    # PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/
+    # PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/bin
     #
     "android" => {
         inherit_from     => [ "linux-generic32" ],
@@ -934,6 +934,10 @@ sub vms_info {
         inherit_from     => [ "android64", asm("aarch64_asm") ],
         perlasm_scheme   => "linux64",
     },
+    "android64-x86_64" => {
+        inherit_from     => [ "android64", asm("x86_64_asm") ],
+        perlasm_scheme   => "elf",
+    },
 
 #### *BSD
     "BSD-generic32" => {

From appro at openssl.org  Fri Sep  2 11:23:46 2016
From: appro at openssl.org (Andy Polyakov)
Date: Fri, 02 Sep 2016 11:23:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1472815426.532663.2867.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  eba44ca0a697845b2cf695d984f8d46a49c866f8 (commit)
      from  96e6c6635ec45e47cec29cab8e6dadf62eb1da00 (commit)


- Log -----------------------------------------------------------------
commit eba44ca0a697845b2cf695d984f8d46a49c866f8
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Aug 31 20:50:08 2016 +0200

    Configurations/10-main.conf: fix omittions in commentary.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit d5a39c12f0331dd0d14dbfcf2b98921be4cbb1da)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e4f5f1c..843647d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -865,7 +865,7 @@ sub vms_info {
     #
     # It takes pair of prior-set environment variables to make it work:
     #
-    # CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<
+    # CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<arch>
     # CROSS_COMPILE=<prefix>
     #
     # As well as PATH adjusted to cover ${CROSS_COMPILE}gcc and company.
@@ -874,7 +874,7 @@ sub vms_info {
     # ANDROID_NDK=/some/where/android-ndk-10d
     # CROSS_SYSROOT=$ANDROID_NDK/platforms/android-14/arch-arm
     # CROSS_COMPILE=arm-linux-adroideabi-
-    # PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/
+    # PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/bin
     #
     "android" => {
         inherit_from     => [ "linux-generic32" ],

From appro at openssl.org  Fri Sep  2 11:34:28 2016
From: appro at openssl.org (Andy Polyakov)
Date: Fri, 02 Sep 2016 11:34:28 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472816068.879946.7290.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c1ec40ef1d9b487061f4f9e2843d4a1894f96660 (commit)
       via  947716c1872d210828122212d076d503ae68b928 (commit)
      from  a43249122baabb9ebaee0822d683f1fdb60f72a7 (commit)


- Log -----------------------------------------------------------------
commit c1ec40ef1d9b487061f4f9e2843d4a1894f96660
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Sep 1 10:46:08 2016 +0200

    Configurations/10-main.conf: add android64-mips64 target.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 947716c1872d210828122212d076d503ae68b928
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Sep 1 10:39:15 2016 +0200

    MIPS assembly pack: adapt it for MIPS[32|64]R6.
    
    MIPS[32|64]R6 is binary and source incompatible with previous MIPS ISA
    specifications. Fortunately it's still possible to resolve differences
    in source code with standard pre-processor and switching to trap-free
    version of addition and subtraction instructions.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/00-base-templates.conf |   2 +-
 Configurations/10-main.conf           |  13 +
 crypto/aes/asm/aes-mips.pl            |  87 +++-
 crypto/aes/build.info                 |   1 +
 crypto/bn/asm/mips-mont.pl            | 102 ++---
 crypto/bn/asm/mips.pl                 | 742 +++++++++++++++++-----------------
 crypto/bn/build.info                  |  16 +-
 crypto/mips_arch.h                    |  40 ++
 crypto/poly1305/asm/poly1305-mips.pl  |  50 ++-
 crypto/poly1305/build.info            |   1 +
 crypto/sha/asm/sha1-mips.pl           |  26 +-
 crypto/sha/asm/sha512-mips.pl         |  22 +-
 crypto/sha/build.info                 |   3 +
 13 files changed, 622 insertions(+), 483 deletions(-)
 create mode 100644 crypto/mips_arch.h

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 1c63a50..8bb4de7 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -216,7 +216,7 @@
     },
     mips32_asm => {
 	template	=> 1,
-	bn_asm_src      => "bn-mips.s mips-mont.s",
+	bn_asm_src      => "bn-mips.S mips-mont.S",
 	aes_asm_src     => "aes_cbc.c aes-mips.S",
 	sha1_asm_src    => "sha1-mips.S sha256-mips.S",
     },
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index a1d566d..f32ccbb 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -938,6 +938,19 @@ sub vms_info {
         inherit_from     => [ "android64", asm("x86_64_asm") ],
         perlasm_scheme   => "elf",
     },
+    "android64-mips64" => {
+        ############################################################
+        # You are more than likely have to specify target processor
+        # on ./Configure command line. Trouble is that toolchain's
+        # default is MIPS64r6 (at least in r10d), but there are no
+        # such processors around (or they are too rare to spot one).
+        # Actual problem is that MIPS64r6 is binary incompatible
+        # with previous MIPS ISA versions, in sense that unlike
+        # prior versions original MIPS binary code will fail.
+        #
+        inherit_from     => [ "android64", asm("mips64_asm") ],
+        perlasm_scheme   => "64",
+    },
 
 #### *BSD
     "BSD-generic32" => {
diff --git a/crypto/aes/asm/aes-mips.pl b/crypto/aes/asm/aes-mips.pl
index 439578d..0eb1474 100644
--- a/crypto/aes/asm/aes-mips.pl
+++ b/crypto/aes/asm/aes-mips.pl
@@ -65,8 +65,8 @@ $flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64
 
 if ($flavour =~ /64|n32/i) {
 	$PTR_LA="dla";
-	$PTR_ADD="dadd";	# incidentally works even on n32
-	$PTR_SUB="dsub";	# incidentally works even on n32
+	$PTR_ADD="daddu";	# incidentally works even on n32
+	$PTR_SUB="dsubu";	# incidentally works even on n32
 	$PTR_INS="dins";
 	$REG_S="sd";
 	$REG_L="ld";
@@ -74,8 +74,8 @@ if ($flavour =~ /64|n32/i) {
 	$SZREG=8;
 } else {
 	$PTR_LA="la";
-	$PTR_ADD="add";
-	$PTR_SUB="sub";
+	$PTR_ADD="addu";
+	$PTR_SUB="subu";
 	$PTR_INS="ins";
 	$REG_S="sw";
 	$REG_L="lw";
@@ -102,15 +102,13 @@ open STDOUT,">$output";
 my ($MSB,$LSB)=(0,3);	# automatically converted to little-endian
 
 $code.=<<___;
+#include "mips_arch.h"
+
 .text
 #ifdef OPENSSL_FIPSCANISTER
 # include <openssl/fipssyms.h>
 #endif
 
-#if defined(__mips_smartmips) && !defined(_MIPS_ARCH_MIPS32R2)
-#define _MIPS_ARCH_MIPS32R2
-#endif
-
 #if !defined(__mips_eabi) && (!defined(__vxworks) || defined(__pic__))
 .option	pic2
 #endif
@@ -146,7 +144,7 @@ _mips_AES_encrypt:
 	xor	$s2,$t2
 	xor	$s3,$t3
 
-	sub	$cnt,1
+	subu	$cnt,1
 #if defined(__mips_smartmips)
 	ext	$i0,$s1,16,8
 .Loop_enc:
@@ -218,7 +216,7 @@ _mips_AES_encrypt:
 	xor	$t2,$t6
 	xor	$t3,$t7
 
-	sub	$cnt,1
+	subu	$cnt,1
 	$PTR_ADD $key0,16
 	xor	$s0,$t0
 	xor	$s1,$t1
@@ -409,7 +407,7 @@ _mips_AES_encrypt:
 	xor	$t2,$t6
 	xor	$t3,$t7
 
-	sub	$cnt,1
+	subu	$cnt,1
 	$PTR_ADD $key0,16
 	xor	$s0,$t0
 	xor	$s1,$t1
@@ -657,6 +655,12 @@ $code.=<<___;
 	.set	reorder
 	$PTR_LA	$Tbl,AES_Te		# PIC-ified 'load address'
 
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	lw	$s0,0($inp)
+	lw	$s1,4($inp)
+	lw	$s2,8($inp)
+	lw	$s3,12($inp)
+#else
 	lwl	$s0,0+$MSB($inp)
 	lwl	$s1,4+$MSB($inp)
 	lwl	$s2,8+$MSB($inp)
@@ -665,9 +669,16 @@ $code.=<<___;
 	lwr	$s1,4+$LSB($inp)
 	lwr	$s2,8+$LSB($inp)
 	lwr	$s3,12+$LSB($inp)
+#endif
 
 	bal	_mips_AES_encrypt
 
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	sw	$s0,0($out)
+	sw	$s1,4($out)
+	sw	$s2,8($out)
+	sw	$s3,12($out)
+#else
 	swr	$s0,0+$LSB($out)
 	swr	$s1,4+$LSB($out)
 	swr	$s2,8+$LSB($out)
@@ -676,6 +687,7 @@ $code.=<<___;
 	swl	$s1,4+$MSB($out)
 	swl	$s2,8+$MSB($out)
 	swl	$s3,12+$MSB($out)
+#endif
 
 	.set	noreorder
 	$REG_L	$ra,$FRAMESIZE-1*$SZREG($sp)
@@ -720,7 +732,7 @@ _mips_AES_decrypt:
 	xor	$s2,$t2
 	xor	$s3,$t3
 
-	sub	$cnt,1
+	subu	$cnt,1
 #if defined(__mips_smartmips)
 	ext	$i0,$s3,16,8
 .Loop_dec:
@@ -792,7 +804,7 @@ _mips_AES_decrypt:
 	xor	$t2,$t6
 	xor	$t3,$t7
 
-	sub	$cnt,1
+	subu	$cnt,1
 	$PTR_ADD $key0,16
 	xor	$s0,$t0
 	xor	$s1,$t1
@@ -985,7 +997,7 @@ _mips_AES_decrypt:
 	xor	$t2,$t6
 	xor	$t3,$t7
 
-	sub	$cnt,1
+	subu	$cnt,1
 	$PTR_ADD $key0,16
 	xor	$s0,$t0
 	xor	$s1,$t1
@@ -1228,6 +1240,12 @@ $code.=<<___;
 	.set	reorder
 	$PTR_LA	$Tbl,AES_Td		# PIC-ified 'load address'
 
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	lw	$s0,0($inp)
+	lw	$s1,4($inp)
+	lw	$s2,8($inp)
+	lw	$s3,12($inp)
+#else
 	lwl	$s0,0+$MSB($inp)
 	lwl	$s1,4+$MSB($inp)
 	lwl	$s2,8+$MSB($inp)
@@ -1236,9 +1254,16 @@ $code.=<<___;
 	lwr	$s1,4+$LSB($inp)
 	lwr	$s2,8+$LSB($inp)
 	lwr	$s3,12+$LSB($inp)
+#endif
 
 	bal	_mips_AES_decrypt
 
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	sw	$s0,0($out)
+	sw	$s1,4($out)
+	sw	$s2,8($out)
+	sw	$s3,12($out)
+#else
 	swr	$s0,0+$LSB($out)
 	swr	$s1,4+$LSB($out)
 	swr	$s2,8+$LSB($out)
@@ -1247,6 +1272,7 @@ $code.=<<___;
 	swl	$s1,4+$MSB($out)
 	swl	$s2,8+$MSB($out)
 	swl	$s3,12+$MSB($out)
+#endif
 
 	.set	noreorder
 	$REG_L	$ra,$FRAMESIZE-1*$SZREG($sp)
@@ -1295,35 +1321,52 @@ _mips_AES_set_encrypt_key:
 	$PTR_ADD $rcon,$Tbl,256
 
 	.set	reorder
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	lw	$rk0,0($inp)		# load 128 bits
+	lw	$rk1,4($inp)
+	lw	$rk2,8($inp)
+	lw	$rk3,12($inp)
+#else
 	lwl	$rk0,0+$MSB($inp)	# load 128 bits
 	lwl	$rk1,4+$MSB($inp)
 	lwl	$rk2,8+$MSB($inp)
 	lwl	$rk3,12+$MSB($inp)
-	li	$at,128
 	lwr	$rk0,0+$LSB($inp)
 	lwr	$rk1,4+$LSB($inp)
 	lwr	$rk2,8+$LSB($inp)
 	lwr	$rk3,12+$LSB($inp)
+#endif
+	li	$at,128
 	.set	noreorder
 	beq	$bits,$at,.L128bits
 	li	$cnt,10
 
 	.set	reorder
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	lw	$rk4,16($inp)		# load 192 bits
+	lw	$rk5,20($inp)
+#else
 	lwl	$rk4,16+$MSB($inp)	# load 192 bits
 	lwl	$rk5,20+$MSB($inp)
-	li	$at,192
 	lwr	$rk4,16+$LSB($inp)
 	lwr	$rk5,20+$LSB($inp)
+#endif
+	li	$at,192
 	.set	noreorder
 	beq	$bits,$at,.L192bits
 	li	$cnt,8
 
 	.set	reorder
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	lw	$rk6,24($inp)		# load 256 bits
+	lw	$rk7,28($inp)
+#else
 	lwl	$rk6,24+$MSB($inp)	# load 256 bits
 	lwl	$rk7,28+$MSB($inp)
-	li	$at,256
 	lwr	$rk6,24+$LSB($inp)
 	lwr	$rk7,28+$LSB($inp)
+#endif
+	li	$at,256
 	.set	noreorder
 	beq	$bits,$at,.L256bits
 	li	$cnt,7
@@ -1353,7 +1396,7 @@ _mips_AES_set_encrypt_key:
 	sw	$rk1,4($key)
 	sw	$rk2,8($key)
 	sw	$rk3,12($key)
-	sub	$cnt,1
+	subu	$cnt,1
 	$PTR_ADD $key,16
 
 	_bias	$i0,24
@@ -1410,7 +1453,7 @@ _mips_AES_set_encrypt_key:
 	sw	$rk3,12($key)
 	sw	$rk4,16($key)
 	sw	$rk5,20($key)
-	sub	$cnt,1
+	subu	$cnt,1
 	$PTR_ADD $key,24
 
 	_bias	$i0,24
@@ -1471,7 +1514,7 @@ _mips_AES_set_encrypt_key:
 	sw	$rk5,20($key)
 	sw	$rk6,24($key)
 	sw	$rk7,28($key)
-	sub	$cnt,1
+	subu	$cnt,1
 
 	_bias	$i0,24
 	_bias	$i1,16
@@ -1653,7 +1696,7 @@ $code.=<<___;
 
 	lw	$tp1,16($key)		# modulo-scheduled
 	lui	$x80808080,0x8080
-	sub	$cnt,1
+	subu	$cnt,1
 	or	$x80808080,0x8080
 	sll	$cnt,2
 	$PTR_ADD $key,16
@@ -1716,7 +1759,7 @@ $code.=<<___;
 	lw	$tp1,4($key)		# modulo-scheduled
 	xor	$tpe,$tp2
 #endif
-	sub	$cnt,1
+	subu	$cnt,1
 	sw	$tpe,0($key)
 	$PTR_ADD $key,4
 	bnez	$cnt,.Lmix
diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index cf6cb5e..bcc71ab 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -35,6 +35,7 @@ GENERATE[aesp8-ppc.s]=asm/aesp8-ppc.pl $(PERLASM_SCHEME)
 GENERATE[aes-parisc.s]=asm/aes-parisc.pl $(PERLASM_SCHEME)
 
 GENERATE[aes-mips.S]=asm/aes-mips.pl $(PERLASM_SCHEME)
+INCLUDE[aes-mips.o]=..
 
 GENERATE[aesv8-armx.S]=asm/aesv8-armx.pl $(PERLASM_SCHEME)
 INCLUDE[aesv8-armx.o]=..
diff --git a/crypto/bn/asm/mips-mont.pl b/crypto/bn/asm/mips-mont.pl
index a907571..56d4202 100644
--- a/crypto/bn/asm/mips-mont.pl
+++ b/crypto/bn/asm/mips-mont.pl
@@ -56,14 +56,14 @@
 $flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64
 
 if ($flavour =~ /64|n32/i) {
-	$PTR_ADD="dadd";	# incidentally works even on n32
-	$PTR_SUB="dsub";	# incidentally works even on n32
+	$PTR_ADD="daddu";	# incidentally works even on n32
+	$PTR_SUB="dsubu";	# incidentally works even on n32
 	$REG_S="sd";
 	$REG_L="ld";
 	$SZREG=8;
 } else {
-	$PTR_ADD="add";
-	$PTR_SUB="sub";
+	$PTR_ADD="addu";
+	$PTR_SUB="subu";
 	$REG_S="sw";
 	$REG_L="lw";
 	$SZREG=4;
@@ -121,6 +121,8 @@ $m1=$s11;
 $FRAMESIZE=14;
 
 $code=<<___;
+#include "mips_arch.h"
+
 .text
 
 .set	noat
@@ -183,27 +185,27 @@ $code.=<<___;
 	$PTR_SUB $sp,$num
 	and	$sp,$at
 
-	$MULTU	$aj,$bi
-	$LD	$alo,$BNSZ($ap)
-	$LD	$nlo,$BNSZ($np)
-	mflo	$lo0
-	mfhi	$hi0
-	$MULTU	$lo0,$n0
-	mflo	$m1
-
-	$MULTU	$alo,$bi
-	mflo	$alo
-	mfhi	$ahi
-
-	$MULTU	$nj,$m1
-	mflo	$lo1
-	mfhi	$hi1
-	$MULTU	$nlo,$m1
+	$MULTU	($aj,$bi)
+	$LD	$ahi,$BNSZ($ap)
+	$LD	$nhi,$BNSZ($np)
+	mflo	($lo0,$aj,$bi)
+	mfhi	($hi0,$aj,$bi)
+	$MULTU	($lo0,$n0)
+	mflo	($m1,$lo0,$n0)
+
+	$MULTU	($ahi,$bi)
+	mflo	($alo,$ahi,$bi)
+	mfhi	($ahi,$ahi,$bi)
+
+	$MULTU	($nj,$m1)
+	mflo	($lo1,$nj,$m1)
+	mfhi	($hi1,$nj,$m1)
+	$MULTU	($nhi,$m1)
 	$ADDU	$lo1,$lo0
 	sltu	$at,$lo1,$lo0
 	$ADDU	$hi1,$at
-	mflo	$nlo
-	mfhi	$nhi
+	mflo	($nlo,$nhi,$m1)
+	mfhi	($nhi,$nhi,$m1)
 
 	move	$tp,$sp
 	li	$j,2*$BNSZ
@@ -215,25 +217,25 @@ $code.=<<___;
 	$LD	$aj,($aj)
 	$LD	$nj,($nj)
 
-	$MULTU	$aj,$bi
+	$MULTU	($aj,$bi)
 	$ADDU	$lo0,$alo,$hi0
 	$ADDU	$lo1,$nlo,$hi1
 	sltu	$at,$lo0,$hi0
 	sltu	$t0,$lo1,$hi1
 	$ADDU	$hi0,$ahi,$at
 	$ADDU	$hi1,$nhi,$t0
-	mflo	$alo
-	mfhi	$ahi
+	mflo	($alo,$aj,$bi)
+	mfhi	($ahi,$aj,$bi)
 
 	$ADDU	$lo1,$lo0
 	sltu	$at,$lo1,$lo0
-	$MULTU	$nj,$m1
+	$MULTU	($nj,$m1)
 	$ADDU	$hi1,$at
 	addu	$j,$BNSZ
 	$ST	$lo1,($tp)
 	sltu	$t0,$j,$num
-	mflo	$nlo
-	mfhi	$nhi
+	mflo	($nlo,$nj,$m1)
+	mfhi	($nhi,$nj,$m1)
 
 	bnez	$t0,.L1st
 	$PTR_ADD $tp,$BNSZ
@@ -263,34 +265,34 @@ $code.=<<___;
 	$PTR_ADD $bi,$bp,$i
 	$LD	$bi,($bi)
 	$LD	$aj,($ap)
-	$LD	$alo,$BNSZ($ap)
+	$LD	$ahi,$BNSZ($ap)
 	$LD	$tj,($sp)
 
-	$MULTU	$aj,$bi
+	$MULTU	($aj,$bi)
 	$LD	$nj,($np)
-	$LD	$nlo,$BNSZ($np)
-	mflo	$lo0
-	mfhi	$hi0
+	$LD	$nhi,$BNSZ($np)
+	mflo	($lo0,$aj,$bi)
+	mfhi	($hi0,$aj,$bi)
 	$ADDU	$lo0,$tj
-	$MULTU	$lo0,$n0
+	$MULTU	($lo0,$n0)
 	sltu	$at,$lo0,$tj
 	$ADDU	$hi0,$at
-	mflo	$m1
+	mflo	($m1,$lo0,$n0)
 
-	$MULTU	$alo,$bi
-	mflo	$alo
-	mfhi	$ahi
+	$MULTU	($ahi,$bi)
+	mflo	($alo,$ahi,$bi)
+	mfhi	($ahi,$ahi,$bi)
 
-	$MULTU	$nj,$m1
-	mflo	$lo1
-	mfhi	$hi1
+	$MULTU	($nj,$m1)
+	mflo	($lo1,$nj,$m1)
+	mfhi	($hi1,$nj,$m1)
 
-	$MULTU	$nlo,$m1
+	$MULTU	($nhi,$m1)
 	$ADDU	$lo1,$lo0
 	sltu	$at,$lo1,$lo0
 	$ADDU	$hi1,$at
-	mflo	$nlo
-	mfhi	$nhi
+	mflo	($nlo,$nhi,$m1)
+	mfhi	($nhi,$nhi,$m1)
 
 	move	$tp,$sp
 	li	$j,2*$BNSZ
@@ -303,19 +305,19 @@ $code.=<<___;
 	$LD	$aj,($aj)
 	$LD	$nj,($nj)
 
-	$MULTU	$aj,$bi
+	$MULTU	($aj,$bi)
 	$ADDU	$lo0,$alo,$hi0
 	$ADDU	$lo1,$nlo,$hi1
 	sltu	$at,$lo0,$hi0
 	sltu	$t0,$lo1,$hi1
 	$ADDU	$hi0,$ahi,$at
 	$ADDU	$hi1,$nhi,$t0
-	mflo	$alo
-	mfhi	$ahi
+	mflo	($alo,$aj,$bi)
+	mfhi	($ahi,$aj,$bi)
 
 	$ADDU	$lo0,$tj
 	addu	$j,$BNSZ
-	$MULTU	$nj,$m1
+	$MULTU	($nj,$m1)
 	sltu	$at,$lo0,$tj
 	$ADDU	$lo1,$lo0
 	$ADDU	$hi0,$at
@@ -323,8 +325,8 @@ $code.=<<___;
 	$LD	$tj,2*$BNSZ($tp)
 	$ADDU	$hi1,$t0
 	sltu	$at,$j,$num
-	mflo	$nlo
-	mfhi	$nhi
+	mflo	($nlo,$nj,$m1)
+	mfhi	($nhi,$nj,$m1)
 	$ST	$lo1,($tp)
 	bnez	$at,.Linner
 	$PTR_ADD $tp,$BNSZ
diff --git a/crypto/bn/asm/mips.pl b/crypto/bn/asm/mips.pl
index 420f01f..102b656 100644
--- a/crypto/bn/asm/mips.pl
+++ b/crypto/bn/asm/mips.pl
@@ -109,6 +109,22 @@ $gp=$v1 if ($flavour =~ /nubi/i);
 $minus4=$v1;
 
 $code.=<<___;
+#include "mips_arch.h"
+
+#if defined(_MIPS_ARCH_MIPS64R6)
+# define ddivu(rs,rt)
+# define mfqt(rd,rs,rt)	ddivu	rd,rs,rt
+# define mfrm(rd,rs,rt)	dmodu	rd,rs,rt
+#elif defined(_MIPS_ARCH_MIPS32R6)
+# define divu(rs,rt)
+# define mfqt(rd,rs,rt)	divu	rd,rs,rt
+# define mfrm(rd,rs,rt)	modu	rd,rs,rt
+#else
+# define $DIVU(rs,rt)	$DIVU	$zero,rs,rt
+# define mfqt(rd,rs,rt)	mflo	rd
+# define mfrm(rd,rs,rt)	mfhi	rd
+#endif
+
 .rdata
 .asciiz	"mips3.s, Version 1.2"
 .asciiz	"MIPS II/III/IV ISA artwork by Andy Polyakov <appro\@fy.chalmers.se>"
@@ -151,7 +167,7 @@ $code.=<<___;
 
 .L_bn_mul_add_words_loop:
 	$LD	$t0,0($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	$LD	$t1,0($a0)
 	$LD	$t2,$BNSZ($a1)
 	$LD	$t3,$BNSZ($a0)
@@ -161,11 +177,11 @@ $code.=<<___;
 	sltu	$v0,$t1,$v0	# All manuals say it "compares 32-bit
 				# values", but it seems to work fine
 				# even on 64-bit registers.
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$t1,$at
 	$ADDU	$v0,$t0
-	 $MULTU	$t2,$a3
+	 $MULTU	($t2,$a3)
 	sltu	$at,$t1,$at
 	$ST	$t1,0($a0)
 	$ADDU	$v0,$at
@@ -174,11 +190,11 @@ $code.=<<___;
 	$LD	$ta3,3*$BNSZ($a0)
 	$ADDU	$t3,$v0
 	sltu	$v0,$t3,$v0
-	mflo	$at
-	mfhi	$t2
+	mflo	($at,$t2,$a3)
+	mfhi	($t2,$t2,$a3)
 	$ADDU	$t3,$at
 	$ADDU	$v0,$t2
-	 $MULTU	$ta0,$a3
+	 $MULTU	($ta0,$a3)
 	sltu	$at,$t3,$at
 	$ST	$t3,$BNSZ($a0)
 	$ADDU	$v0,$at
@@ -188,11 +204,11 @@ $code.=<<___;
 	$PTR_ADD $a1,4*$BNSZ
 	$ADDU	$ta1,$v0
 	sltu	$v0,$ta1,$v0
-	mflo	$at
-	mfhi	$ta0
+	mflo	($at,$ta0,$a3)
+	mfhi	($ta0,$ta0,$a3)
 	$ADDU	$ta1,$at
 	$ADDU	$v0,$ta0
-	 $MULTU	$ta2,$a3
+	 $MULTU	($ta2,$a3)
 	sltu	$at,$ta1,$at
 	$ST	$ta1,-2*$BNSZ($a0)
 	$ADDU	$v0,$at
@@ -201,8 +217,8 @@ $code.=<<___;
 	and	$ta0,$a2,$minus4
 	$ADDU	$ta3,$v0
 	sltu	$v0,$ta3,$v0
-	mflo	$at
-	mfhi	$ta2
+	mflo	($at,$ta2,$a3)
+	mfhi	($ta2,$ta2,$a3)
 	$ADDU	$ta3,$at
 	$ADDU	$v0,$ta2
 	sltu	$at,$ta3,$at
@@ -217,13 +233,13 @@ $code.=<<___;
 .L_bn_mul_add_words_tail:
 	.set	reorder
 	$LD	$t0,0($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	$LD	$t1,0($a0)
 	subu	$a2,1
 	$ADDU	$t1,$v0
 	sltu	$v0,$t1,$v0
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$t1,$at
 	$ADDU	$v0,$t0
 	sltu	$at,$t1,$at
@@ -232,13 +248,13 @@ $code.=<<___;
 	beqz	$a2,.L_bn_mul_add_words_return
 
 	$LD	$t0,$BNSZ($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	$LD	$t1,$BNSZ($a0)
 	subu	$a2,1
 	$ADDU	$t1,$v0
 	sltu	$v0,$t1,$v0
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$t1,$at
 	$ADDU	$v0,$t0
 	sltu	$at,$t1,$at
@@ -247,12 +263,12 @@ $code.=<<___;
 	beqz	$a2,.L_bn_mul_add_words_return
 
 	$LD	$t0,2*$BNSZ($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	$LD	$t1,2*$BNSZ($a0)
 	$ADDU	$t1,$v0
 	sltu	$v0,$t1,$v0
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$t1,$at
 	$ADDU	$v0,$t0
 	sltu	$at,$t1,$at
@@ -310,40 +326,40 @@ $code.=<<___;
 
 .L_bn_mul_words_loop:
 	$LD	$t0,0($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	$LD	$t2,$BNSZ($a1)
 	$LD	$ta0,2*$BNSZ($a1)
 	$LD	$ta2,3*$BNSZ($a1)
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$v0,$at
 	sltu	$t1,$v0,$at
-	 $MULTU	$t2,$a3
+	 $MULTU	($t2,$a3)
 	$ST	$v0,0($a0)
 	$ADDU	$v0,$t1,$t0
 
 	subu	$a2,4
 	$PTR_ADD $a0,4*$BNSZ
 	$PTR_ADD $a1,4*$BNSZ
-	mflo	$at
-	mfhi	$t2
+	mflo	($at,$t2,$a3)
+	mfhi	($t2,$t2,$a3)
 	$ADDU	$v0,$at
 	sltu	$t3,$v0,$at
-	 $MULTU	$ta0,$a3
+	 $MULTU	($ta0,$a3)
 	$ST	$v0,-3*$BNSZ($a0)
 	$ADDU	$v0,$t3,$t2
 
-	mflo	$at
-	mfhi	$ta0
+	mflo	($at,$ta0,$a3)
+	mfhi	($ta0,$ta0,$a3)
 	$ADDU	$v0,$at
 	sltu	$ta1,$v0,$at
-	 $MULTU	$ta2,$a3
+	 $MULTU	($ta2,$a3)
 	$ST	$v0,-2*$BNSZ($a0)
 	$ADDU	$v0,$ta1,$ta0
 
 	and	$ta0,$a2,$minus4
-	mflo	$at
-	mfhi	$ta2
+	mflo	($at,$ta2,$a3)
+	mfhi	($ta2,$ta2,$a3)
 	$ADDU	$v0,$at
 	sltu	$ta3,$v0,$at
 	$ST	$v0,-$BNSZ($a0)
@@ -357,10 +373,10 @@ $code.=<<___;
 .L_bn_mul_words_tail:
 	.set	reorder
 	$LD	$t0,0($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	subu	$a2,1
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$v0,$at
 	sltu	$t1,$v0,$at
 	$ST	$v0,0($a0)
@@ -368,10 +384,10 @@ $code.=<<___;
 	beqz	$a2,.L_bn_mul_words_return
 
 	$LD	$t0,$BNSZ($a1)
-	$MULTU	$t0,$a3
+	$MULTU	($t0,$a3)
 	subu	$a2,1
-	mflo	$at
-	mfhi	$t0
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$v0,$at
 	sltu	$t1,$v0,$at
 	$ST	$v0,$BNSZ($a0)
@@ -379,9 +395,9 @@ $code.=<<___;
 	beqz	$a2,.L_bn_mul_words_return
 
 	$LD	$t0,2*$BNSZ($a1)
-	$MULTU	$t0,$a3
-	mflo	$at
-	mfhi	$t0
+	$MULTU	($t0,$a3)
+	mflo	($at,$t0,$a3)
+	mfhi	($t0,$t0,$a3)
 	$ADDU	$v0,$at
 	sltu	$t1,$v0,$at
 	$ST	$v0,2*$BNSZ($a0)
@@ -438,35 +454,35 @@ $code.=<<___;
 
 .L_bn_sqr_words_loop:
 	$LD	$t0,0($a1)
-	$MULTU	$t0,$t0
+	$MULTU	($t0,$t0)
 	$LD	$t2,$BNSZ($a1)
 	$LD	$ta0,2*$BNSZ($a1)
 	$LD	$ta2,3*$BNSZ($a1)
-	mflo	$t1
-	mfhi	$t0
+	mflo	($t1,$t0,$t0)
+	mfhi	($t0,$t0,$t0)
 	$ST	$t1,0($a0)
 	$ST	$t0,$BNSZ($a0)
 
-	$MULTU	$t2,$t2
+	$MULTU	($t2,$t2)
 	subu	$a2,4
 	$PTR_ADD $a0,8*$BNSZ
 	$PTR_ADD $a1,4*$BNSZ
-	mflo	$t3
-	mfhi	$t2
+	mflo	($t3,$t2,$t2)
+	mfhi	($t2,$t2,$t2)
 	$ST	$t3,-6*$BNSZ($a0)
 	$ST	$t2,-5*$BNSZ($a0)
 
-	$MULTU	$ta0,$ta0
-	mflo	$ta1
-	mfhi	$ta0
+	$MULTU	($ta0,$ta0)
+	mflo	($ta1,$ta0,$ta0)
+	mfhi	($ta0,$ta0,$ta0)
 	$ST	$ta1,-4*$BNSZ($a0)
 	$ST	$ta0,-3*$BNSZ($a0)
 
 
-	$MULTU	$ta2,$ta2
+	$MULTU	($ta2,$ta2)
 	and	$ta0,$a2,$minus4
-	mflo	$ta3
-	mfhi	$ta2
+	mflo	($ta3,$ta2,$ta2)
+	mfhi	($ta2,$ta2,$ta2)
 	$ST	$ta3,-2*$BNSZ($a0)
 
 	.set	noreorder
@@ -479,27 +495,27 @@ $code.=<<___;
 .L_bn_sqr_words_tail:
 	.set	reorder
 	$LD	$t0,0($a1)
-	$MULTU	$t0,$t0
+	$MULTU	($t0,$t0)
 	subu	$a2,1
-	mflo	$t1
-	mfhi	$t0
+	mflo	($t1,$t0,$t0)
+	mfhi	($t0,$t0,$t0)
 	$ST	$t1,0($a0)
 	$ST	$t0,$BNSZ($a0)
 	beqz	$a2,.L_bn_sqr_words_return
 
 	$LD	$t0,$BNSZ($a1)
-	$MULTU	$t0,$t0
+	$MULTU	($t0,$t0)
 	subu	$a2,1
-	mflo	$t1
-	mfhi	$t0
+	mflo	($t1,$t0,$t0)
+	mfhi	($t0,$t0,$t0)
 	$ST	$t1,2*$BNSZ($a0)
 	$ST	$t0,3*$BNSZ($a0)
 	beqz	$a2,.L_bn_sqr_words_return
 
 	$LD	$t0,2*$BNSZ($a1)
-	$MULTU	$t0,$t0
-	mflo	$t1
-	mfhi	$t0
+	$MULTU	($t0,$t0)
+	mflo	($t1,$t0,$t0)
+	mfhi	($t0,$t0,$t0)
 	$ST	$t1,4*$BNSZ($a0)
 	$ST	$t0,5*$BNSZ($a0)
 
@@ -823,11 +839,11 @@ $code.=<<___;
 	move	$ta3,$ra
 	bal	bn_div_words_internal
 	move	$ra,$ta3
-	$MULTU	$ta2,$v0
+	$MULTU	($ta2,$v0)
 	$LD	$t2,-2*$BNSZ($a3)
 	move	$ta0,$zero
-	mfhi	$t1
-	mflo	$t0
+	mfhi	($t1,$ta2,$v0)
+	mflo	($t0,$ta2,$v0)
 	sltu	$t8,$t1,$a1
 .L_bn_div_3_words_inner_loop:
 	bnez	$t8,.L_bn_div_3_words_inner_loop_done
@@ -930,15 +946,15 @@ $code.=<<___;
 	$SRL	$HH,$a0,4*$BNSZ	# bits
 	$SRL	$QT,4*$BNSZ	# q=0xffffffff
 	beq	$DH,$HH,.L_bn_div_words_skip_div1
-	$DIVU	$zero,$a0,$DH
-	mflo	$QT
+	$DIVU	($a0,$DH)
+	mfqt	($QT,$a0,$DH)
 .L_bn_div_words_skip_div1:
-	$MULTU	$a2,$QT
+	$MULTU	($a2,$QT)
 	$SLL	$t3,$a0,4*$BNSZ	# bits
 	$SRL	$at,$a1,4*$BNSZ	# bits
 	or	$t3,$at
-	mflo	$t0
-	mfhi	$t1
+	mflo	($t0,$a2,$QT)
+	mfhi	($t1,$a2,$QT)
 .L_bn_div_words_inner_loop1:
 	sltu	$t2,$t3,$t0
 	seq	$t8,$HH,$t1
@@ -963,15 +979,15 @@ $code.=<<___;
 	$SRL	$HH,$a0,4*$BNSZ	# bits
 	$SRL	$QT,4*$BNSZ	# q=0xffffffff
 	beq	$DH,$HH,.L_bn_div_words_skip_div2
-	$DIVU	$zero,$a0,$DH
-	mflo	$QT
+	$DIVU	($a0,$DH)
+	mfqt	($QT,$a0,$DH)
 .L_bn_div_words_skip_div2:
-	$MULTU	$a2,$QT
+	$MULTU	($a2,$QT)
 	$SLL	$t3,$a0,4*$BNSZ	# bits
 	$SRL	$at,$a1,4*$BNSZ	# bits
 	or	$t3,$at
-	mflo	$t0
-	mfhi	$t1
+	mflo	($t0,$a2,$QT)
+	mfhi	($t1,$a2,$QT)
 .L_bn_div_words_inner_loop2:
 	sltu	$t2,$t3,$t0
 	seq	$t8,$HH,$t1
@@ -1070,592 +1086,592 @@ $code.=<<___;
 	$LD	$b_0,0($a2)
 	$LD	$a_1,$BNSZ($a1)
 	$LD	$a_2,2*$BNSZ($a1)
-	$MULTU	$a_0,$b_0		# mul_add_c(a[0],b[0],c1,c2,c3);
+	$MULTU	($a_0,$b_0)		# mul_add_c(a[0],b[0],c1,c2,c3);
 	$LD	$a_3,3*$BNSZ($a1)
 	$LD	$b_1,$BNSZ($a2)
 	$LD	$b_2,2*$BNSZ($a2)
 	$LD	$b_3,3*$BNSZ($a2)
-	mflo	$c_1
-	mfhi	$c_2
+	mflo	($c_1,$a_0,$b_0)
+	mfhi	($c_2,$a_0,$b_0)
 
 	$LD	$a_4,4*$BNSZ($a1)
 	$LD	$a_5,5*$BNSZ($a1)
-	$MULTU	$a_0,$b_1		# mul_add_c(a[0],b[1],c2,c3,c1);
+	$MULTU	($a_0,$b_1)		# mul_add_c(a[0],b[1],c2,c3,c1);
 	$LD	$a_6,6*$BNSZ($a1)
 	$LD	$a_7,7*$BNSZ($a1)
 	$LD	$b_4,4*$BNSZ($a2)
 	$LD	$b_5,5*$BNSZ($a2)
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_1)
+	mfhi	($t_2,$a_0,$b_1)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_1,$b_0		# mul_add_c(a[1],b[0],c2,c3,c1);
+	$MULTU	($a_1,$b_0)		# mul_add_c(a[1],b[0],c2,c3,c1);
 	$ADDU	$c_3,$t_2,$at
 	$LD	$b_6,6*$BNSZ($a2)
 	$LD	$b_7,7*$BNSZ($a2)
 	$ST	$c_1,0($a0)	# r[0]=c1;
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_0)
+	mfhi	($t_2,$a_1,$b_0)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_2,$b_0		# mul_add_c(a[2],b[0],c3,c1,c2);
+	 $MULTU	($a_2,$b_0)		# mul_add_c(a[2],b[0],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
 	$ST	$c_2,$BNSZ($a0)	# r[1]=c2;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_0)
+	mfhi	($t_2,$a_2,$b_0)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_1,$b_1		# mul_add_c(a[1],b[1],c3,c1,c2);
+	$MULTU	($a_1,$b_1)		# mul_add_c(a[1],b[1],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_1)
+	mfhi	($t_2,$a_1,$b_1)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_0,$b_2		# mul_add_c(a[0],b[2],c3,c1,c2);
+	$MULTU	($a_0,$b_2)		# mul_add_c(a[0],b[2],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$c_2,$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_2)
+	mfhi	($t_2,$a_0,$b_2)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_0,$b_3		# mul_add_c(a[0],b[3],c1,c2,c3);
+	 $MULTU	($a_0,$b_3)		# mul_add_c(a[0],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,2*$BNSZ($a0)	# r[2]=c3;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_3)
+	mfhi	($t_2,$a_0,$b_3)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_1,$b_2		# mul_add_c(a[1],b[2],c1,c2,c3);
+	$MULTU	($a_1,$b_2)		# mul_add_c(a[1],b[2],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$c_3,$c_2,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_2)
+	mfhi	($t_2,$a_1,$b_2)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_2,$b_1		# mul_add_c(a[2],b[1],c1,c2,c3);
+	$MULTU	($a_2,$b_1)		# mul_add_c(a[2],b[1],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_1)
+	mfhi	($t_2,$a_2,$b_1)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_3,$b_0		# mul_add_c(a[3],b[0],c1,c2,c3);
+	$MULTU	($a_3,$b_0)		# mul_add_c(a[3],b[0],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_0)
+	mfhi	($t_2,$a_3,$b_0)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_4,$b_0		# mul_add_c(a[4],b[0],c2,c3,c1);
+	 $MULTU	($a_4,$b_0)		# mul_add_c(a[4],b[0],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,3*$BNSZ($a0)	# r[3]=c1;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_0)
+	mfhi	($t_2,$a_4,$b_0)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_3,$b_1		# mul_add_c(a[3],b[1],c2,c3,c1);
+	$MULTU	($a_3,$b_1)		# mul_add_c(a[3],b[1],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_1)
+	mfhi	($t_2,$a_3,$b_1)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_2,$b_2		# mul_add_c(a[2],b[2],c2,c3,c1);
+	$MULTU	($a_2,$b_2)		# mul_add_c(a[2],b[2],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_2)
+	mfhi	($t_2,$a_2,$b_2)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_1,$b_3		# mul_add_c(a[1],b[3],c2,c3,c1);
+	$MULTU	($a_1,$b_3)		# mul_add_c(a[1],b[3],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_3)
+	mfhi	($t_2,$a_1,$b_3)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_0,$b_4		# mul_add_c(a[0],b[4],c2,c3,c1);
+	$MULTU	($a_0,$b_4)		# mul_add_c(a[0],b[4],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_4)
+	mfhi	($t_2,$a_0,$b_4)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_0,$b_5		# mul_add_c(a[0],b[5],c3,c1,c2);
+	 $MULTU	($a_0,$b_5)		# mul_add_c(a[0],b[5],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,4*$BNSZ($a0)	# r[4]=c2;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_5)
+	mfhi	($t_2,$a_0,$b_5)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_1,$b_4		# mul_add_c(a[1],b[4],c3,c1,c2);
+	$MULTU	($a_1,$b_4)		# mul_add_c(a[1],b[4],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$c_2,$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_4)
+	mfhi	($t_2,$a_1,$b_4)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_2,$b_3		# mul_add_c(a[2],b[3],c3,c1,c2);
+	$MULTU	($a_2,$b_3)		# mul_add_c(a[2],b[3],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_3)
+	mfhi	($t_2,$a_2,$b_3)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_3,$b_2		# mul_add_c(a[3],b[2],c3,c1,c2);
+	$MULTU	($a_3,$b_2)		# mul_add_c(a[3],b[2],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_2)
+	mfhi	($t_2,$a_3,$b_2)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_4,$b_1		# mul_add_c(a[4],b[1],c3,c1,c2);
+	$MULTU	($a_4,$b_1)		# mul_add_c(a[4],b[1],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_1)
+	mfhi	($t_2,$a_4,$b_1)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_5,$b_0		# mul_add_c(a[5],b[0],c3,c1,c2);
+	$MULTU	($a_5,$b_0)		# mul_add_c(a[5],b[0],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_0)
+	mfhi	($t_2,$a_5,$b_0)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_6,$b_0		# mul_add_c(a[6],b[0],c1,c2,c3);
+	 $MULTU	($a_6,$b_0)		# mul_add_c(a[6],b[0],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,5*$BNSZ($a0)	# r[5]=c3;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_0)
+	mfhi	($t_2,$a_6,$b_0)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_5,$b_1		# mul_add_c(a[5],b[1],c1,c2,c3);
+	$MULTU	($a_5,$b_1)		# mul_add_c(a[5],b[1],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$c_3,$c_2,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_1)
+	mfhi	($t_2,$a_5,$b_1)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_4,$b_2		# mul_add_c(a[4],b[2],c1,c2,c3);
+	$MULTU	($a_4,$b_2)		# mul_add_c(a[4],b[2],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_2)
+	mfhi	($t_2,$a_4,$b_2)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_3,$b_3		# mul_add_c(a[3],b[3],c1,c2,c3);
+	$MULTU	($a_3,$b_3)		# mul_add_c(a[3],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_3)
+	mfhi	($t_2,$a_3,$b_3)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_2,$b_4		# mul_add_c(a[2],b[4],c1,c2,c3);
+	$MULTU	($a_2,$b_4)		# mul_add_c(a[2],b[4],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_4)
+	mfhi	($t_2,$a_2,$b_4)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_1,$b_5		# mul_add_c(a[1],b[5],c1,c2,c3);
+	$MULTU	($a_1,$b_5)		# mul_add_c(a[1],b[5],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_5)
+	mfhi	($t_2,$a_1,$b_5)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_0,$b_6		# mul_add_c(a[0],b[6],c1,c2,c3);
+	$MULTU	($a_0,$b_6)		# mul_add_c(a[0],b[6],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_6)
+	mfhi	($t_2,$a_0,$b_6)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_0,$b_7		# mul_add_c(a[0],b[7],c2,c3,c1);
+	 $MULTU	($a_0,$b_7)		# mul_add_c(a[0],b[7],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,6*$BNSZ($a0)	# r[6]=c1;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_7)
+	mfhi	($t_2,$a_0,$b_7)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_1,$b_6		# mul_add_c(a[1],b[6],c2,c3,c1);
+	$MULTU	($a_1,$b_6)		# mul_add_c(a[1],b[6],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_6)
+	mfhi	($t_2,$a_1,$b_6)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_2,$b_5		# mul_add_c(a[2],b[5],c2,c3,c1);
+	$MULTU	($a_2,$b_5)		# mul_add_c(a[2],b[5],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_5)
+	mfhi	($t_2,$a_2,$b_5)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_3,$b_4		# mul_add_c(a[3],b[4],c2,c3,c1);
+	$MULTU	($a_3,$b_4)		# mul_add_c(a[3],b[4],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_4)
+	mfhi	($t_2,$a_3,$b_4)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_4,$b_3		# mul_add_c(a[4],b[3],c2,c3,c1);
+	$MULTU	($a_4,$b_3)		# mul_add_c(a[4],b[3],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_3)
+	mfhi	($t_2,$a_4,$b_3)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_5,$b_2		# mul_add_c(a[5],b[2],c2,c3,c1);
+	$MULTU	($a_5,$b_2)		# mul_add_c(a[5],b[2],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_2)
+	mfhi	($t_2,$a_5,$b_2)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_6,$b_1		# mul_add_c(a[6],b[1],c2,c3,c1);
+	$MULTU	($a_6,$b_1)		# mul_add_c(a[6],b[1],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_1)
+	mfhi	($t_2,$a_6,$b_1)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_7,$b_0		# mul_add_c(a[7],b[0],c2,c3,c1);
+	$MULTU	($a_7,$b_0)		# mul_add_c(a[7],b[0],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_0)
+	mfhi	($t_2,$a_7,$b_0)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_7,$b_1		# mul_add_c(a[7],b[1],c3,c1,c2);
+	 $MULTU	($a_7,$b_1)		# mul_add_c(a[7],b[1],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,7*$BNSZ($a0)	# r[7]=c2;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_1)
+	mfhi	($t_2,$a_7,$b_1)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_6,$b_2		# mul_add_c(a[6],b[2],c3,c1,c2);
+	$MULTU	($a_6,$b_2)		# mul_add_c(a[6],b[2],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$c_2,$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_2)
+	mfhi	($t_2,$a_6,$b_2)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_5,$b_3		# mul_add_c(a[5],b[3],c3,c1,c2);
+	$MULTU	($a_5,$b_3)		# mul_add_c(a[5],b[3],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_3)
+	mfhi	($t_2,$a_5,$b_3)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_4,$b_4		# mul_add_c(a[4],b[4],c3,c1,c2);
+	$MULTU	($a_4,$b_4)		# mul_add_c(a[4],b[4],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_4)
+	mfhi	($t_2,$a_4,$b_4)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_3,$b_5		# mul_add_c(a[3],b[5],c3,c1,c2);
+	$MULTU	($a_3,$b_5)		# mul_add_c(a[3],b[5],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_5)
+	mfhi	($t_2,$a_3,$b_5)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_2,$b_6		# mul_add_c(a[2],b[6],c3,c1,c2);
+	$MULTU	($a_2,$b_6)		# mul_add_c(a[2],b[6],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_6)
+	mfhi	($t_2,$a_2,$b_6)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_1,$b_7		# mul_add_c(a[1],b[7],c3,c1,c2);
+	$MULTU	($a_1,$b_7)		# mul_add_c(a[1],b[7],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_7)
+	mfhi	($t_2,$a_1,$b_7)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_2,$b_7		# mul_add_c(a[2],b[7],c1,c2,c3);
+	 $MULTU	($a_2,$b_7)		# mul_add_c(a[2],b[7],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,8*$BNSZ($a0)	# r[8]=c3;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_7)
+	mfhi	($t_2,$a_2,$b_7)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_3,$b_6		# mul_add_c(a[3],b[6],c1,c2,c3);
+	$MULTU	($a_3,$b_6)		# mul_add_c(a[3],b[6],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$c_3,$c_2,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_6)
+	mfhi	($t_2,$a_3,$b_6)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_4,$b_5		# mul_add_c(a[4],b[5],c1,c2,c3);
+	$MULTU	($a_4,$b_5)		# mul_add_c(a[4],b[5],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_5)
+	mfhi	($t_2,$a_4,$b_5)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_5,$b_4		# mul_add_c(a[5],b[4],c1,c2,c3);
+	$MULTU	($a_5,$b_4)		# mul_add_c(a[5],b[4],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_4)
+	mfhi	($t_2,$a_5,$b_4)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_6,$b_3		# mul_add_c(a[6],b[3],c1,c2,c3);
+	$MULTU	($a_6,$b_3)		# mul_add_c(a[6],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_3)
+	mfhi	($t_2,$a_6,$b_3)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_7,$b_2		# mul_add_c(a[7],b[2],c1,c2,c3);
+	$MULTU	($a_7,$b_2)		# mul_add_c(a[7],b[2],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_2)
+	mfhi	($t_2,$a_7,$b_2)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_7,$b_3		# mul_add_c(a[7],b[3],c2,c3,c1);
+	 $MULTU	($a_7,$b_3)		# mul_add_c(a[7],b[3],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,9*$BNSZ($a0)	# r[9]=c1;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_3)
+	mfhi	($t_2,$a_7,$b_3)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_6,$b_4		# mul_add_c(a[6],b[4],c2,c3,c1);
+	$MULTU	($a_6,$b_4)		# mul_add_c(a[6],b[4],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_4)
+	mfhi	($t_2,$a_6,$b_4)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_5,$b_5		# mul_add_c(a[5],b[5],c2,c3,c1);
+	$MULTU	($a_5,$b_5)		# mul_add_c(a[5],b[5],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_5)
+	mfhi	($t_2,$a_5,$b_5)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_4,$b_6		# mul_add_c(a[4],b[6],c2,c3,c1);
+	$MULTU	($a_4,$b_6)		# mul_add_c(a[4],b[6],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_6)
+	mfhi	($t_2,$a_4,$b_6)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_3,$b_7		# mul_add_c(a[3],b[7],c2,c3,c1);
+	$MULTU	($a_3,$b_7)		# mul_add_c(a[3],b[7],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_7)
+	mfhi	($t_2,$a_3,$b_7)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_4,$b_7		# mul_add_c(a[4],b[7],c3,c1,c2);
+	$MULTU	($a_4,$b_7)		# mul_add_c(a[4],b[7],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,10*$BNSZ($a0)	# r[10]=c2;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_4,$b_7)
+	mfhi	($t_2,$a_4,$b_7)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_5,$b_6		# mul_add_c(a[5],b[6],c3,c1,c2);
+	$MULTU	($a_5,$b_6)		# mul_add_c(a[5],b[6],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$c_2,$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_6)
+	mfhi	($t_2,$a_5,$b_6)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_6,$b_5		# mul_add_c(a[6],b[5],c3,c1,c2);
+	$MULTU	($a_6,$b_5)		# mul_add_c(a[6],b[5],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_5)
+	mfhi	($t_2,$a_6,$b_5)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_7,$b_4		# mul_add_c(a[7],b[4],c3,c1,c2);
+	$MULTU	($a_7,$b_4)		# mul_add_c(a[7],b[4],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_4)
+	mfhi	($t_2,$a_7,$b_4)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_7,$b_5		# mul_add_c(a[7],b[5],c1,c2,c3);
+	 $MULTU	($a_7,$b_5)		# mul_add_c(a[7],b[5],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,11*$BNSZ($a0)	# r[11]=c3;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_5)
+	mfhi	($t_2,$a_7,$b_5)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_6,$b_6		# mul_add_c(a[6],b[6],c1,c2,c3);
+	$MULTU	($a_6,$b_6)		# mul_add_c(a[6],b[6],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$c_3,$c_2,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_6)
+	mfhi	($t_2,$a_6,$b_6)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_5,$b_7		# mul_add_c(a[5],b[7],c1,c2,c3);
+	$MULTU	($a_5,$b_7)		# mul_add_c(a[5],b[7],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_5,$b_7)
+	mfhi	($t_2,$a_5,$b_7)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_6,$b_7		# mul_add_c(a[6],b[7],c2,c3,c1);
+	 $MULTU	($a_6,$b_7)		# mul_add_c(a[6],b[7],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,12*$BNSZ($a0)	# r[12]=c1;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_6,$b_7)
+	mfhi	($t_2,$a_6,$b_7)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_7,$b_6		# mul_add_c(a[7],b[6],c2,c3,c1);
+	$MULTU	($a_7,$b_6)		# mul_add_c(a[7],b[6],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_6)
+	mfhi	($t_2,$a_7,$b_6)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_7,$b_7		# mul_add_c(a[7],b[7],c3,c1,c2);
+	$MULTU	($a_7,$b_7)		# mul_add_c(a[7],b[7],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,13*$BNSZ($a0)	# r[13]=c2;
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_7,$b_7)
+	mfhi	($t_2,$a_7,$b_7)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
 	$ADDU	$t_2,$at
@@ -1716,144 +1732,144 @@ $code.=<<___;
 	$LD	$b_0,0($a2)
 	$LD	$a_1,$BNSZ($a1)
 	$LD	$a_2,2*$BNSZ($a1)
-	$MULTU	$a_0,$b_0		# mul_add_c(a[0],b[0],c1,c2,c3);
+	$MULTU	($a_0,$b_0)		# mul_add_c(a[0],b[0],c1,c2,c3);
 	$LD	$a_3,3*$BNSZ($a1)
 	$LD	$b_1,$BNSZ($a2)
 	$LD	$b_2,2*$BNSZ($a2)
 	$LD	$b_3,3*$BNSZ($a2)
-	mflo	$c_1
-	mfhi	$c_2
+	mflo	($c_1,$a_0,$b_0)
+	mfhi	($c_2,$a_0,$b_0)
 	$ST	$c_1,0($a0)
 
-	$MULTU	$a_0,$b_1		# mul_add_c(a[0],b[1],c2,c3,c1);
-	mflo	$t_1
-	mfhi	$t_2
+	$MULTU	($a_0,$b_1)		# mul_add_c(a[0],b[1],c2,c3,c1);
+	mflo	($t_1,$a_0,$b_1)
+	mfhi	($t_2,$a_0,$b_1)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_1,$b_0		# mul_add_c(a[1],b[0],c2,c3,c1);
+	$MULTU	($a_1,$b_0)		# mul_add_c(a[1],b[0],c2,c3,c1);
 	$ADDU	$c_3,$t_2,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_0)
+	mfhi	($t_2,$a_1,$b_0)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_2,$b_0		# mul_add_c(a[2],b[0],c3,c1,c2);
+	 $MULTU	($a_2,$b_0)		# mul_add_c(a[2],b[0],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
 	$ST	$c_2,$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_0)
+	mfhi	($t_2,$a_2,$b_0)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_1,$b_1		# mul_add_c(a[1],b[1],c3,c1,c2);
+	$MULTU	($a_1,$b_1)		# mul_add_c(a[1],b[1],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_1)
+	mfhi	($t_2,$a_1,$b_1)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_0,$b_2		# mul_add_c(a[0],b[2],c3,c1,c2);
+	$MULTU	($a_0,$b_2)		# mul_add_c(a[0],b[2],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$c_2,$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_2)
+	mfhi	($t_2,$a_0,$b_2)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_0,$b_3		# mul_add_c(a[0],b[3],c1,c2,c3);
+	 $MULTU	($a_0,$b_3)		# mul_add_c(a[0],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,2*$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_0,$b_3)
+	mfhi	($t_2,$a_0,$b_3)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_1,$b_2		# mul_add_c(a[1],b[2],c1,c2,c3);
+	$MULTU	($a_1,$b_2)		# mul_add_c(a[1],b[2],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$c_3,$c_2,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_2)
+	mfhi	($t_2,$a_1,$b_2)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_2,$b_1		# mul_add_c(a[2],b[1],c1,c2,c3);
+	$MULTU	($a_2,$b_1)		# mul_add_c(a[2],b[1],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_1)
+	mfhi	($t_2,$a_2,$b_1)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	$MULTU	$a_3,$b_0		# mul_add_c(a[3],b[0],c1,c2,c3);
+	$MULTU	($a_3,$b_0)		# mul_add_c(a[3],b[0],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_0)
+	mfhi	($t_2,$a_3,$b_0)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_3,$b_1		# mul_add_c(a[3],b[1],c2,c3,c1);
+	 $MULTU	($a_3,$b_1)		# mul_add_c(a[3],b[1],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,3*$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_1)
+	mfhi	($t_2,$a_3,$b_1)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_2,$b_2		# mul_add_c(a[2],b[2],c2,c3,c1);
+	$MULTU	($a_2,$b_2)		# mul_add_c(a[2],b[2],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$c_1,$c_3,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_2)
+	mfhi	($t_2,$a_2,$b_2)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	$MULTU	$a_1,$b_3		# mul_add_c(a[1],b[3],c2,c3,c1);
+	$MULTU	($a_1,$b_3)		# mul_add_c(a[1],b[3],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_1,$b_3)
+	mfhi	($t_2,$a_1,$b_3)
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_2,$b_3		# mul_add_c(a[2],b[3],c3,c1,c2);
+	 $MULTU	($a_2,$b_3)		# mul_add_c(a[2],b[3],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,4*$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_2,$b_3)
+	mfhi	($t_2,$a_2,$b_3)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	$MULTU	$a_3,$b_2		# mul_add_c(a[3],b[2],c3,c1,c2);
+	$MULTU	($a_3,$b_2)		# mul_add_c(a[3],b[2],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$c_2,$c_1,$t_2
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_2)
+	mfhi	($t_2,$a_3,$b_2)
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_3,$b_3		# mul_add_c(a[3],b[3],c1,c2,c3);
+	 $MULTU	($a_3,$b_3)		# mul_add_c(a[3],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,5*$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
+	mflo	($t_1,$a_3,$b_3)
+	mfhi	($t_2,$a_3,$b_3)
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
 	$ADDU	$t_2,$at
@@ -1888,11 +1904,9 @@ my ($hi,$lo,$c0,$c1,$c2,
                 # commented as "forward multiplication" below];
     )=@_;
 $code.=<<___;
-	mflo	$lo
-	mfhi	$hi
 	$ADDU	$c0,$lo
 	sltu	$at,$c0,$lo
-	 $MULTU	$an,$bn			# forward multiplication
+	 $MULTU	($an,$bn)		# forward multiplication
 	$ADDU	$c0,$lo
 	$ADDU	$at,$hi
 	sltu	$lo,$c0,$lo
@@ -1902,15 +1916,17 @@ ___
 $code.=<<___	if (!$warm);
 	sltu	$c2,$c1,$at
 	$ADDU	$c1,$hi
-	sltu	$hi,$c1,$hi
-	$ADDU	$c2,$hi
 ___
 $code.=<<___	if ($warm);
 	sltu	$at,$c1,$at
 	$ADDU	$c1,$hi
 	$ADDU	$c2,$at
+___
+$code.=<<___;
 	sltu	$hi,$c1,$hi
 	$ADDU	$c2,$hi
+	mflo	($lo,$an,$bn)
+	mfhi	($hi,$an,$bn)
 ___
 }
 
@@ -1940,21 +1956,21 @@ $code.=<<___;
 	$LD	$a_2,2*$BNSZ($a1)
 	$LD	$a_3,3*$BNSZ($a1)
 
-	$MULTU	$a_0,$a_0		# mul_add_c(a[0],b[0],c1,c2,c3);
+	$MULTU	($a_0,$a_0)		# mul_add_c(a[0],b[0],c1,c2,c3);
 	$LD	$a_4,4*$BNSZ($a1)
 	$LD	$a_5,5*$BNSZ($a1)
 	$LD	$a_6,6*$BNSZ($a1)
 	$LD	$a_7,7*$BNSZ($a1)
-	mflo	$c_1
-	mfhi	$c_2
+	mflo	($c_1,$a_0,$a_0)
+	mfhi	($c_2,$a_0,$a_0)
 	$ST	$c_1,0($a0)
 
-	$MULTU	$a_0,$a_1		# mul_add_c2(a[0],b[1],c2,c3,c1);
-	mflo	$t_1
-	mfhi	$t_2
+	$MULTU	($a_0,$a_1)		# mul_add_c2(a[0],b[1],c2,c3,c1);
+	mflo	($t_1,$a_0,$a_1)
+	mfhi	($t_2,$a_0,$a_1)
 	slt	$c_1,$t_2,$zero
 	$SLL	$t_2,1
-	 $MULTU	$a_2,$a_0		# mul_add_c2(a[2],b[0],c3,c1,c2);
+	 $MULTU	($a_2,$a_0)		# mul_add_c2(a[2],b[0],c3,c1,c2);
 	slt	$a2,$t_1,$zero
 	$ADDU	$t_2,$a2
 	$SLL	$t_1,1
@@ -1962,20 +1978,22 @@ $code.=<<___;
 	sltu	$at,$c_2,$t_1
 	$ADDU	$c_3,$t_2,$at
 	$ST	$c_2,$BNSZ($a0)
+	mflo	($t_1,$a_2,$a_0)
+	mfhi	($t_2,$a_2,$a_0)
 ___
 	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,
 		$a_1,$a_1);		# mul_add_c(a[1],b[1],c3,c1,c2);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_0,$a_3		# mul_add_c2(a[0],b[3],c1,c2,c3);
+	 $MULTU	($a_0,$a_3)		# mul_add_c2(a[0],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,2*$BNSZ($a0)
+	mflo	($t_1,$a_0,$a_3)
+	mfhi	($t_2,$a_0,$a_3)
 ___
 	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,
 		$a_1,$a_2);		# mul_add_c2(a[1],b[2],c1,c2,c3);
@@ -1989,16 +2007,16 @@ ___
 	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,
 		$a_2,$a_2);		# mul_add_c(a[2],b[2],c2,c3,c1);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_0,$a_5		# mul_add_c2(a[0],b[5],c3,c1,c2);
+	 $MULTU	($a_0,$a_5)		# mul_add_c2(a[0],b[5],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,4*$BNSZ($a0)
+	mflo	($t_1,$a_0,$a_5)
+	mfhi	($t_2,$a_0,$a_5)
 ___
 	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,
 		$a_1,$a_4);		# mul_add_c2(a[1],b[4],c3,c1,c2);
@@ -2016,16 +2034,16 @@ ___
 	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,
 		$a_3,$a_3);		# mul_add_c(a[3],b[3],c1,c2,c3);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_0,$a_7		# mul_add_c2(a[0],b[7],c2,c3,c1);
+	 $MULTU	($a_0,$a_7)		# mul_add_c2(a[0],b[7],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,6*$BNSZ($a0)
+	mflo	($t_1,$a_0,$a_7)
+	mfhi	($t_2,$a_0,$a_7)
 ___
 	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,
 		$a_1,$a_6);		# mul_add_c2(a[1],b[6],c2,c3,c1);
@@ -2045,16 +2063,16 @@ ___
 	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,1,
 		$a_4,$a_4);		# mul_add_c(a[4],b[4],c3,c1,c2);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_2,$a_7		# mul_add_c2(a[2],b[7],c1,c2,c3);
+	 $MULTU	($a_2,$a_7)		# mul_add_c2(a[2],b[7],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,8*$BNSZ($a0)
+	mflo	($t_1,$a_2,$a_7)
+	mfhi	($t_2,$a_2,$a_7)
 ___
 	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,
 		$a_3,$a_6);		# mul_add_c2(a[3],b[6],c1,c2,c3);
@@ -2070,16 +2088,16 @@ ___
 	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,
 		$a_5,$a_5);		# mul_add_c(a[5],b[5],c2,c3,c1);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_4,$a_7		# mul_add_c2(a[4],b[7],c3,c1,c2);
+	 $MULTU	($a_4,$a_7)		# mul_add_c2(a[4],b[7],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,10*$BNSZ($a0)
+	mflo	($t_1,$a_4,$a_7)
+	mfhi	($t_2,$a_4,$a_7)
 ___
 	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,
 		$a_5,$a_6);		# mul_add_c2(a[5],b[6],c3,c1,c2);
@@ -2091,24 +2109,22 @@ ___
 	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,
 		$a_6,$a_6);		# mul_add_c(a[6],b[6],c1,c2,c3);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
-	 $MULTU	$a_6,$a_7		# mul_add_c2(a[6],b[7],c2,c3,c1);
+	 $MULTU	($a_6,$a_7)		# mul_add_c2(a[6],b[7],c2,c3,c1);
 	$ADDU	$t_2,$at
 	$ADDU	$c_2,$t_2
 	sltu	$at,$c_2,$t_2
 	$ADDU	$c_3,$at
 	$ST	$c_1,12*$BNSZ($a0)
+	mflo	($t_1,$a_6,$a_7)
+	mfhi	($t_2,$a_6,$a_7)
 ___
 	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,
 		$a_7,$a_7);		# mul_add_c(a[7],b[7],c3,c1,c2);
 $code.=<<___;
 	$ST	$c_2,13*$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
 	$ADDU	$t_2,$at
@@ -2152,19 +2168,19 @@ $code.=<<___;
 	.set	reorder
 	$LD	$a_0,0($a1)
 	$LD	$a_1,$BNSZ($a1)
-	$MULTU	$a_0,$a_0		# mul_add_c(a[0],b[0],c1,c2,c3);
+	$MULTU	($a_0,$a_0)		# mul_add_c(a[0],b[0],c1,c2,c3);
 	$LD	$a_2,2*$BNSZ($a1)
 	$LD	$a_3,3*$BNSZ($a1)
-	mflo	$c_1
-	mfhi	$c_2
+	mflo	($c_1,$a_0,$a_0)
+	mfhi	($c_2,$a_0,$a_0)
 	$ST	$c_1,0($a0)
 
-	$MULTU	$a_0,$a_1		# mul_add_c2(a[0],b[1],c2,c3,c1);
-	mflo	$t_1
-	mfhi	$t_2
+	$MULTU	($a_0,$a_1)		# mul_add_c2(a[0],b[1],c2,c3,c1);
+	mflo	($t_1,$a_0,$a_1)
+	mfhi	($t_2,$a_0,$a_1)
 	slt	$c_1,$t_2,$zero
 	$SLL	$t_2,1
-	 $MULTU	$a_2,$a_0		# mul_add_c2(a[2],b[0],c3,c1,c2);
+	 $MULTU	($a_2,$a_0)		# mul_add_c2(a[2],b[0],c3,c1,c2);
 	slt	$a2,$t_1,$zero
 	$ADDU	$t_2,$a2
 	$SLL	$t_1,1
@@ -2172,20 +2188,22 @@ $code.=<<___;
 	sltu	$at,$c_2,$t_1
 	$ADDU	$c_3,$t_2,$at
 	$ST	$c_2,$BNSZ($a0)
+	mflo	($t_1,$a_2,$a_0)
+	mfhi	($t_2,$a_2,$a_0)
 ___
 	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,
 		$a_1,$a_1);		# mul_add_c(a[1],b[1],c3,c1,c2);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_3,$t_1
 	sltu	$at,$c_3,$t_1
-	 $MULTU	$a_0,$a_3		# mul_add_c2(a[0],b[3],c1,c2,c3);
+	 $MULTU	($a_0,$a_3)		# mul_add_c2(a[0],b[3],c1,c2,c3);
 	$ADDU	$t_2,$at
 	$ADDU	$c_1,$t_2
 	sltu	$at,$c_1,$t_2
 	$ADDU	$c_2,$at
 	$ST	$c_3,2*$BNSZ($a0)
+	mflo	($t_1,$a_0,$a_3)
+	mfhi	($t_2,$a_0,$a_3)
 ___
 	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,
 		$a_1,$a_2);		# mul_add_c2(a2[1],b[2],c1,c2,c3);
@@ -2197,24 +2215,22 @@ ___
 	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,
 		$a_2,$a_2);		# mul_add_c(a[2],b[2],c2,c3,c1);
 $code.=<<___;
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_2,$t_1
 	sltu	$at,$c_2,$t_1
-	 $MULTU	$a_2,$a_3		# mul_add_c2(a[2],b[3],c3,c1,c2);
+	 $MULTU	($a_2,$a_3)		# mul_add_c2(a[2],b[3],c3,c1,c2);
 	$ADDU	$t_2,$at
 	$ADDU	$c_3,$t_2
 	sltu	$at,$c_3,$t_2
 	$ADDU	$c_1,$at
 	$ST	$c_2,4*$BNSZ($a0)
+	mflo	($t_1,$a_2,$a_3)
+	mfhi	($t_2,$a_2,$a_3)
 ___
 	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,
 		$a_3,$a_3);		# mul_add_c(a[3],b[3],c1,c2,c3);
 $code.=<<___;
 	$ST	$c_3,5*$BNSZ($a0)
 
-	mflo	$t_1
-	mfhi	$t_2
 	$ADDU	$c_1,$t_1
 	sltu	$at,$c_1,$t_1
 	$ADDU	$t_2,$at
diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index c608ecc..3544106 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -34,8 +34,10 @@ INCLUDE[sparct4-mont.o]=..
 GENERATE[sparcv9-gf2m.S]=asm/sparcv9-gf2m.pl $(PERLASM_SCHEME)
 INCLUDE[sparcv9-gf2m.o]=..
 
-GENERATE[bn-mips.s]=asm/mips.pl $(PERLASM_SCHEME)
-GENERATE[mips-mont.s]=asm/mips-mont.pl $(PERLASM_SCHEME)
+GENERATE[bn-mips.S]=asm/mips.pl $(PERLASM_SCHEME)
+INCLUDE[bn-mips.o]=..
+GENERATE[mips-mont.S]=asm/mips-mont.pl $(PERLASM_SCHEME)
+INCLUDE[mips-mont.o]=..
 
 GENERATE[s390x-mont.S]=asm/s390x-mont.pl $(PERLASM_SCHEME)
 GENERATE[s390x-gf2m.s]=asm/s390x-gf2m.pl $(PERLASM_SCHEME)
@@ -64,16 +66,8 @@ GENERATE[armv4-gf2m.S]=asm/armv4-gf2m.pl $(PERLASM_SCHEME)
 INCLUDE[armv4-gf2m.o]=..
 GENERATE[armv8-mont.S]=asm/armv8-mont.pl $(PERLASM_SCHEME)
 
-OVERRIDES=bn-mips3.o pa-risc2W.o pa-risc2.c
+OVERRIDES=pa-risc2W.o pa-risc2.c
 BEGINRAW[Makefile]
-##### BN assembler implementations
-
-{- $builddir -}/bn-mips3.o:	{- $sourcedir -}/asm/mips3.s
-	@if [ "$(CC)" = "gcc" ]; then \
-		ABI=`expr "$(CFLAGS)" : ".*-mabi=\([n3264]*\)"` && \
-		as -$$ABI -O -o $@ {- $sourcedir -}/asm/mips3.s; \
-	else	$(CC) -c $(CFLAGS) $(LIB_CFLAGS) -o $@ {- $sourcedir -}/asm/mips3.s; fi
-
 # GNU assembler fails to compile PA-RISC2 modules, insist on calling
 # vendor assembler...
 {- $builddir -}/pa-risc2W.o: {- $sourcedir -}/asm/pa-risc2W.s
diff --git a/crypto/mips_arch.h b/crypto/mips_arch.h
new file mode 100644
index 0000000..e0cd905
--- /dev/null
+++ b/crypto/mips_arch.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef __MIPS_ARCH_H__
+# define __MIPS_ARCH_H__
+
+# if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \
+      defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6))
+      && !defined(_MIPS_ARCH_MIPS32R2)
+#  define _MIPS_ARCH_MIPS32R2
+# endif
+ 
+# if (defined(_MIPS_ARCH_MIPS64R3) || defined(_MIPS_ARCH_MIPS64R5) || \
+      defined(_MIPS_ARCH_MIPS64R6)) \
+      && !defined(_MIPS_ARCH_MIPS64R2)
+#  define _MIPS_ARCH_MIPS64R2
+# endif
+
+# if defined(_MIPS_ARCH_MIPS64R6)
+#  define dmultu(rs,rt)
+#  define mflo(rd,rs,rt)	dmulu	rd,rs,rt
+#  define mfhi(rd,rs,rt)	dmuhu	rd,rs,rt
+# elif defined(_MIPS_ARCH_MIPS32R6)
+#  define multu(rs,rt)
+#  define mflo(rd,rs,rt)	mulu	rd,rs,rt
+#  define mfhi(rd,rs,rt)	muhu	rd,rs,rt
+# else
+#  define dmultu(rs,rt)		dmultu	rs,rt
+#  define multu(rs,rt)		multu	rs,rt
+#  define mflo(rd,rs,rt)	mflo	rd
+#  define mfhi(rd,rs,rt)	mfhi	rd
+# endif
+
+#endif
diff --git a/crypto/poly1305/asm/poly1305-mips.pl b/crypto/poly1305/asm/poly1305-mips.pl
index d2b3e90..28b6772 100755
--- a/crypto/poly1305/asm/poly1305-mips.pl
+++ b/crypto/poly1305/asm/poly1305-mips.pl
@@ -67,6 +67,8 @@ $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0x0003f000" : "0x00030000";
 ($in0,$in1,$tmp0,$tmp1,$tmp2,$tmp3,$tmp4) = ($a4,$a5,$a6,$a7,$at,$t0,$t1);
 
 $code.=<<___;
+#include "mips_arch.h"
+
 #ifdef MIPSEB
 # define MSB 0
 # define LSB 7
@@ -92,10 +94,15 @@ poly1305_init:
 
 	beqz	$inp,.Lno_key
 
+#if defined(_MIPS_ARCH_MIPS64R6)
+	ld	$in0,0($inp)
+	ld	$in1,8($inp)
+#else
 	ldl	$in0,0+MSB($inp)
 	ldl	$in1,8+MSB($inp)
 	ldr	$in0,0+LSB($inp)
 	ldr	$in1,8+LSB($inp)
+#endif
 #ifdef	MIPSEB
 # if defined(_MIPS_ARCH_MIPS64R2)
 	dsbh	$in0,$in0		# byte swap
@@ -182,7 +189,7 @@ poly1305_blocks_internal:
 	.frame	$sp,6*8,$ra
 	.mask	$SAVED_REGS_MASK,-8
 	.set	noreorder
-	dsub	$sp,6*8
+	dsubu	$sp,6*8
 	sd	$s5,40($sp)
 	sd	$s4,32($sp)
 ___
@@ -204,11 +211,16 @@ $code.=<<___;
 	ld	$s1,40($ctx)
 
 .Loop:
+#if defined(_MIPS_ARCH_MIPS64R6)
+	ld	$in0,0($inp)		# load input
+	ld	$in1,8($inp)
+#else
 	ldl	$in0,0+MSB($inp)	# load input
 	ldl	$in1,8+MSB($inp)
 	ldr	$in0,0+LSB($inp)
-	daddiu	$len,-1
 	ldr	$in1,8+LSB($inp)
+#endif
+	daddiu	$len,-1
 	daddiu	$inp,16
 #ifdef	MIPSEB
 # if defined(_MIPS_ARCH_MIPS64R2)
@@ -258,42 +270,42 @@ $code.=<<___;
 	sltu	$tmp1,$h1,$in1
 	daddu	$h1,$tmp0
 
-	dmultu	$r0,$h0			# h0*r0
+	dmultu	($r0,$h0)		# h0*r0
 	 daddu	$h2,$padbit
 	 sltu	$tmp0,$h1,$tmp0
-	mflo	$d0
-	mfhi	$d1
+	mflo	($d0,$r0,$h0)
+	mfhi	($d1,$r0,$h0)
 
-	dmultu	$s1,$h1			# h1*5*r1
+	dmultu	($s1,$h1)		# h1*5*r1
 	 daddu	$tmp0,$tmp1
 	 daddu	$h2,$tmp0
-	mflo	$tmp0
-	mfhi	$tmp1
+	mflo	($tmp0,$s1,$h1)
+	mfhi	($tmp1,$s1,$h1)
 
-	dmultu	$r1,$h0			# h0*r1
+	dmultu	($r1,$h0)		# h0*r1
 	 daddu	$d0,$tmp0
 	 daddu	$d1,$tmp1
-	mflo	$tmp2
-	mfhi	$d2
+	mflo	($tmp2,$r1,$h0)
+	mfhi	($d2,$r1,$h0)
 	 sltu	$tmp0,$d0,$tmp0
 	 daddu	$d1,$tmp0
 
-	dmultu	$r0,$h1			# h1*r0
+	dmultu	($r0,$h1)		# h1*r0
 	 daddu	$d1,$tmp2
 	 sltu	$tmp2,$d1,$tmp2
-	mflo	$tmp0
-	mfhi	$tmp1
+	mflo	($tmp0,$r0,$h1)
+	mfhi	($tmp1,$r0,$h1)
 	 daddu	$d2,$tmp2
 
-	dmultu	$s1,$h2			# h2*5*r1
+	dmultu	($s1,$h2)		# h2*5*r1
 	 daddu	$d1,$tmp0
 	 daddu	$d2,$tmp1
-	mflo	$tmp2
+	mflo	($tmp2,$s1,$h2)
 
-	dmultu	$r0,$h2			# h2*r0
+	dmultu	($r0,$h2)		# h2*r0
 	 sltu	$tmp0,$d1,$tmp0
 	 daddu	$d2,$tmp0
-	mflo	$tmp3
+	mflo	($tmp3,$r0,$h2)
 
 	daddu	$d1,$tmp2
 	daddu	$d2,$tmp3
@@ -329,7 +341,7 @@ $code.=<<___ if ($flavour =~ /nubi/i);	# optimize non-nubi epilogue
 ___
 $code.=<<___;
 	jr	$ra
-	dadd	$sp,6*8
+	daddu	$sp,6*8
 .end	poly1305_blocks_internal
 ___
 }
diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info
index d575f5a..358fa82 100644
--- a/crypto/poly1305/build.info
+++ b/crypto/poly1305/build.info
@@ -13,6 +13,7 @@ INCLUDE[poly1305-armv4.o]=..
 GENERATE[poly1305-armv8.S]=asm/poly1305-armv8.pl $(PERLASM_SCHEME)
 INCLUDE[poly1305-armv8.o]=..
 GENERATE[poly1305-mips.S]=asm/poly1305-mips.pl $(PERLASM_SCHEME)
+INCLUDE[poly1305-mips.o]=..
 
 BEGINRAW[Makefile(unix)]
 {- $builddir -}/poly1305-%.S:	{- $sourcedir -}/asm/poly1305-%.pl
diff --git a/crypto/sha/asm/sha1-mips.pl b/crypto/sha/asm/sha1-mips.pl
index 882f973..d9911c8 100644
--- a/crypto/sha/asm/sha1-mips.pl
+++ b/crypto/sha/asm/sha1-mips.pl
@@ -56,15 +56,15 @@
 $flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64
 
 if ($flavour =~ /64|n32/i) {
-	$PTR_ADD="dadd";	# incidentally works even on n32
-	$PTR_SUB="dsub";	# incidentally works even on n32
+	$PTR_ADD="daddu";	# incidentally works even on n32
+	$PTR_SUB="dsubu";	# incidentally works even on n32
 	$REG_S="sd";
 	$REG_L="ld";
 	$PTR_SLL="dsll";	# incidentally works even on n32
 	$SZREG=8;
 } else {
-	$PTR_ADD="add";
-	$PTR_SUB="sub";
+	$PTR_ADD="addu";
+	$PTR_SUB="subu";
 	$REG_S="sw";
 	$REG_L="lw";
 	$PTR_SLL="sll";
@@ -126,10 +126,14 @@ $code.=<<___;
 	addu	$e,$K		# $i
 	xor	$t0,$c,$d
 	rotr	$t1,$a,27
-	 lwl	@X[$j],$j*4+$MSB($inp)
 	and	$t0,$b
 	addu	$e,$t1
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	 lw	@X[$j],$j*4($inp)
+#else
+	 lwl	@X[$j],$j*4+$MSB($inp)
 	 lwr	@X[$j],$j*4+$LSB($inp)
+#endif
 	xor	$t0,$d
 	addu	$e, at X[$i]
 	rotr	$b,$b,2
@@ -336,14 +340,12 @@ $FRAMESIZE=16;	# large enough to accommodate NUBI saved registers
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
 
 $code=<<___;
+#include "mips_arch.h"
+
 #ifdef OPENSSL_FIPSCANISTER
 # include <openssl/fipssyms.h>
 #endif
 
-#if defined(__mips_smartmips) && !defined(_MIPS_ARCH_MIPS32R2)
-#define _MIPS_ARCH_MIPS32R2
-#endif
-
 .text
 
 .set	noat
@@ -387,10 +389,16 @@ $code.=<<___;
 .align	4
 .Loop:
 	.set	reorder
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	lui	$K,0x5a82
+	lw	@X[0],($inp)
+	ori	$K,0x7999	# K_00_19
+#else
 	lwl	@X[0],$MSB($inp)
 	lui	$K,0x5a82
 	lwr	@X[0],$LSB($inp)
 	ori	$K,0x7999	# K_00_19
+#endif
 ___
 for ($i=0;$i<15;$i++)	{ &BODY_00_14($i, at V); unshift(@V,pop(@V)); }
 for (;$i<20;$i++)	{ &BODY_15_19($i, at V); unshift(@V,pop(@V)); }
diff --git a/crypto/sha/asm/sha512-mips.pl b/crypto/sha/asm/sha512-mips.pl
index 5c2d23f..5464543 100644
--- a/crypto/sha/asm/sha512-mips.pl
+++ b/crypto/sha/asm/sha512-mips.pl
@@ -60,16 +60,16 @@ $flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64
 
 if ($flavour =~ /64|n32/i) {
 	$PTR_LA="dla";
-	$PTR_ADD="dadd";	# incidentally works even on n32
-	$PTR_SUB="dsub";	# incidentally works even on n32
+	$PTR_ADD="daddu";	# incidentally works even on n32
+	$PTR_SUB="dsubu";	# incidentally works even on n32
 	$REG_S="sd";
 	$REG_L="ld";
 	$PTR_SLL="dsll";	# incidentally works even on n32
 	$SZREG=8;
 } else {
 	$PTR_LA="la";
-	$PTR_ADD="add";
-	$PTR_SUB="sub";
+	$PTR_ADD="addu";
+	$PTR_SUB="subu";
 	$REG_S="sw";
 	$REG_L="lw";
 	$PTR_SLL="sll";
@@ -135,8 +135,12 @@ my ($i,$a,$b,$c,$d,$e,$f,$g,$h)=@_;
 my ($T1,$tmp0,$tmp1,$tmp2)=(@X[4], at X[5], at X[6], at X[7]);
 
 $code.=<<___ if ($i<15);
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	${LD}	@X[1],`($i+1)*$SZ`($inp)
+#else
 	${LD}l	@X[1],`($i+1)*$SZ+$MSB`($inp)
 	${LD}r	@X[1],`($i+1)*$SZ+$LSB`($inp)
+#endif
 ___
 $code.=<<___	if (!$big_endian && $i<16 && $SZ==4);
 #if defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2)
@@ -298,14 +302,12 @@ $FRAMESIZE=16*$SZ+16*$SZREG;
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
 
 $code.=<<___;
+#include "mips_arch.h"
+
 #ifdef OPENSSL_FIPSCANISTER
 # include <openssl/fipssyms.h>
 #endif
 
-#if defined(__mips_smartmips) && !defined(_MIPS_ARCH_MIPS32R2)
-#define _MIPS_ARCH_MIPS32R2
-#endif
-
 .text
 .set	noat
 #if !defined(__mips_eabi) && (!defined(__vxworks) || defined(__pic__))
@@ -369,8 +371,12 @@ $code.=<<___;
 
 .align	5
 .Loop:
+#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+	${LD}	@X[0],($inp)
+#else
 	${LD}l	@X[0],$MSB($inp)
 	${LD}r	@X[0],$LSB($inp)
+#endif
 ___
 for ($i=0;$i<16;$i++)
 { &BODY_00_15($i, at V); unshift(@V,pop(@V)); push(@X,shift(@X)); }
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 5843e50..4b3225b 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -39,8 +39,11 @@ GENERATE[sha256-parisc.s]=asm/sha512-parisc.pl $(PERLASM_SCHEME)
 GENERATE[sha512-parisc.s]=asm/sha512-parisc.pl $(PERLASM_SCHEME)
 
 GENERATE[sha1-mips.S]=asm/sha1-mips.pl $(PERLASM_SCHEME)
+INCLUDE[sha1-mips.o]=..
 GENERATE[sha256-mips.S]=asm/sha512-mips.pl $(PERLASM_SCHEME)
+INCLUDE[sha256-mips.o]=..
 GENERATE[sha512-mips.S]=asm/sha512-mips.pl $(PERLASM_SCHEME)
+INCLUDE[sha512-mips.o]=..
 
 GENERATE[sha1-armv4-large.S]=asm/sha1-armv4-large.pl $(PERLASM_SCHEME)
 INCLUDE[sha1-armv4-large.o]=..

From no-reply at appveyor.com  Fri Sep  2 15:38:40 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 02 Sep 2016 15:38:40 +0000
Subject: [openssl-commits] Build failed: openssl master.5159
Message-ID: <20160902153840.3022.59824.7A5FEA5C@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160902/a0ff6625/attachment.html>

From rsalz at openssl.org  Fri Sep  2 15:47:29 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 15:47:29 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472831249.623409.2336.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a19fdc7d14742b2c1b64e7d2078fd397c12ad409 (commit)
      from  356f13f0feb84c5ece13c3aeb5bd2bed0c612deb (commit)


- Log -----------------------------------------------------------------
commit a19fdc7d14742b2c1b64e7d2078fd397c12ad409
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 11:47:22 2016 -0400

    test SSI to get nav names better

-----------------------------------------------------------------------

Summary of changes:
 inc/head.inc     | 3 ++-
 news/index.html  | 1 +
 news/pgpkey.html | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/inc/head.inc b/inc/head.inc
index 009e58a..d1d12d0 100644
--- a/inc/head.inc
+++ b/inc/head.inc
@@ -1,5 +1,6 @@
 <!-- head.inc -->
-  <title>OpenSSL</title>
+  <!--#config errmsg="OpenSSL" -->
+  <title><!--#echo var="$TITLE" --></title>
   <meta charset="utf-8">
   <meta name="author" content="OpenSSL Foundation, Inc.">
   <meta name="HandheldFriendly" content="True">
diff --git a/news/index.html b/news/index.html
index e157bcb..7a14034 100644
--- a/news/index.html
+++ b/news/index.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+<!--#set var="TITLE" value="News" -->
 <!--#include virtual="/inc/head.inc" -->
 
 <body>
diff --git a/news/pgpkey.html b/news/pgpkey.html
index b89628f..1f87dd9 100644
--- a/news/pgpkey.html
+++ b/news/pgpkey.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+<!--#set var="TITLE" value="$DOCUMENT_URI" -->
 <!--#include virtual="/inc/head.inc" -->
 <body>
   <!--#include virtual="/inc/banner.inc" -->

From rsalz at openssl.org  Fri Sep  2 15:50:23 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 15:50:23 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472831423.472705.3768.nullmailer@dev.openssl.org>

The branch master has been updated
       via  820f756c145f9f91b56c6a110826f40f56f8261f (commit)
      from  a19fdc7d14742b2c1b64e7d2078fd397c12ad409 (commit)


- Log -----------------------------------------------------------------
commit 820f756c145f9f91b56c6a110826f40f56f8261f
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 11:50:19 2016 -0400

    more testing

-----------------------------------------------------------------------

Summary of changes:
 inc/head.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/head.inc b/inc/head.inc
index d1d12d0..f0a017e 100644
--- a/inc/head.inc
+++ b/inc/head.inc
@@ -1,6 +1,8 @@
 <!-- head.inc -->
   <!--#config errmsg="OpenSSL" -->
-  <title><!--#echo var="$TITLE" --></title>
+  <title>
+  <!--#echo var="$TITLE" -->
+  </title>
   <meta charset="utf-8">
   <meta name="author" content="OpenSSL Foundation, Inc.">
   <meta name="HandheldFriendly" content="True">

From rsalz at openssl.org  Fri Sep  2 15:57:14 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 15:57:14 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472831834.623441.5912.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f2fc509834e60d3e901dba817052278becf203e9 (commit)
      from  820f756c145f9f91b56c6a110826f40f56f8261f (commit)


- Log -----------------------------------------------------------------
commit f2fc509834e60d3e901dba817052278becf203e9
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 11:55:28 2016 -0400

    more testing

-----------------------------------------------------------------------

Summary of changes:
 inc/{head.inc => head.shtml} | 0
 news/index.html              | 2 +-
 news/pgpkey.html             | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 copy inc/{head.inc => head.shtml} (100%)

diff --git a/inc/head.inc b/inc/head.shtml
similarity index 100%
copy from inc/head.inc
copy to inc/head.shtml
diff --git a/news/index.html b/news/index.html
index 7a14034..7273180 100644
--- a/news/index.html
+++ b/news/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <!--#set var="TITLE" value="News" -->
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
 <!--#include virtual="/inc/banner.inc" -->
diff --git a/news/pgpkey.html b/news/pgpkey.html
index 1f87dd9..7258680 100644
--- a/news/pgpkey.html
+++ b/news/pgpkey.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <!--#set var="TITLE" value="$DOCUMENT_URI" -->
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
   <!--#include virtual="/inc/banner.inc" -->
   <div id="main">

From rsalz at openssl.org  Fri Sep  2 15:58:20 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 15:58:20 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472831900.039790.6766.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7cb880c96d12b96dcdd8cea17076f6a616faaa57 (commit)
      from  f2fc509834e60d3e901dba817052278becf203e9 (commit)


- Log -----------------------------------------------------------------
commit 7cb880c96d12b96dcdd8cea17076f6a616faaa57
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 11:58:16 2016 -0400

    still more

-----------------------------------------------------------------------

Summary of changes:
 inc/head.shtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/head.shtml b/inc/head.shtml
index f0a017e..7443fee 100644
--- a/inc/head.shtml
+++ b/inc/head.shtml
@@ -1,7 +1,7 @@
 <!-- head.inc -->
   <!--#config errmsg="OpenSSL" -->
   <title>
-  <!--#echo var="$TITLE" -->
+  <!--#echo var="TITLE" -->
   </title>
   <meta charset="utf-8">
   <meta name="author" content="OpenSSL Foundation, Inc.">

From rsalz at openssl.org  Fri Sep  2 16:10:57 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 16:10:57 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472832657.866778.11548.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8749c57308886f250c42d655f7d664b6d322d410 (commit)
      from  7cb880c96d12b96dcdd8cea17076f6a616faaa57 (commit)


- Log -----------------------------------------------------------------
commit 8749c57308886f250c42d655f7d664b6d322d410
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 12:10:29 2016 -0400

    Rename .inc files to .shtml
    
    So that SSI can work and we can properly generate TITLE elements.
    See RT 4668.

-----------------------------------------------------------------------

Summary of changes:
 bin/mk-manpages                          |  6 +++---
 community/binaries.html                  |  8 ++++----
 community/conduct.html                   |  8 ++++----
 community/contacts.html                  |  8 ++++----
 community/getting-started.html           |  8 ++++----
 community/index.html                     |  8 ++++----
 community/mailinglists.html              |  8 ++++----
 community/team.html                      |  8 ++++----
 community/thanks.html                    |  8 ++++----
 docs/faq.html                            | 10 +++++-----
 docs/fips.html                           | 10 +++++-----
 docs/fips/privatelabel.html              |  6 +++---
 docs/fipsnotes.html                      |  8 ++++----
 docs/fipsvalidation.html                 |  8 ++++----
 docs/index.html                          |  8 ++++----
 docs/man1.0.1/apps/index.html            | 10 +++++-----
 docs/man1.0.1/crypto/index.html          | 10 +++++-----
 docs/man1.0.1/index.html                 |  8 ++++----
 docs/man1.0.1/ssl/index.html             | 10 +++++-----
 docs/man1.0.2/apps/index.html            | 10 +++++-----
 docs/man1.0.2/crypto/index.html          | 10 +++++-----
 docs/man1.0.2/index.html                 |  8 ++++----
 docs/man1.0.2/ssl/index.html             | 10 +++++-----
 docs/man1.1.0/apps/index.html            | 10 +++++-----
 docs/man1.1.0/crypto/index.html          | 10 +++++-----
 docs/man1.1.0/index.html                 |  8 ++++----
 docs/man1.1.0/ssl/index.html             | 10 +++++-----
 docs/manmaster/apps/index.html           | 10 +++++-----
 docs/manmaster/crypto/index.html         | 10 +++++-----
 docs/manmaster/index.html                |  8 ++++----
 docs/manmaster/ssl/index.html            | 10 +++++-----
 docs/manpages.html                       |  8 ++++----
 docs/standards.html                      |  8 ++++----
 err404.html                              |  8 ++++----
 inc/{banner.inc => banner.shtml}         |  0
 inc/{footer.inc => footer.shtml}         |  0
 inc/head.inc                             | 28 ----------------------------
 inc/head.shtml                           |  3 +--
 inc/{legalities.inc => legalities.shtml} |  0
 inc/{mansidebar.inc => mansidebar.shtml} |  0
 index.html                               | 12 ++++++------
 news/changelog.html                      | 10 +++++-----
 news/index.html                          |  7 +++----
 news/newslog.html                        | 10 +++++-----
 news/openssl-notes.html.in               | 10 +++++-----
 news/pgpkey.html                         |  7 +++----
 news/vulnerabilities.html                | 10 +++++-----
 policies/cla.html                        |  8 ++++----
 policies/codingstyle.html                |  8 ++++----
 policies/index.html                      |  8 ++++----
 policies/releasestrat.html               |  8 ++++----
 policies/roadmap.html                    |  8 ++++----
 policies/secpolicy.html                  |  8 ++++----
 source/gitrepo.html                      |  8 ++++----
 source/index.html                        | 12 ++++++------
 source/license.html                      |  8 ++++----
 source/mirror.html                       |  8 ++++----
 source/old/0.9.x/index.html              | 12 ++++++------
 source/old/1.0.0/index.html              | 12 ++++++------
 source/old/1.0.1/index.html              | 12 ++++++------
 source/old/1.0.2/index.html              | 12 ++++++------
 source/old/1.1.0/index.html              | 12 ++++++------
 source/old/fips/index.html               | 12 ++++++------
 source/old/index.html                    | 10 +++++-----
 support/acks.html                        |  8 ++++----
 support/contracts.html                   |  8 ++++----
 support/donations.html                   |  8 ++++----
 support/index.html                       |  8 ++++----
 template-file.html                       |  8 ++++----
 69 files changed, 284 insertions(+), 315 deletions(-)
 rename inc/{banner.inc => banner.shtml} (100%)
 rename inc/{footer.inc => footer.shtml} (100%)
 delete mode 100644 inc/head.inc
 rename inc/{legalities.inc => legalities.shtml} (100%)
 rename inc/{mansidebar.inc => mansidebar.shtml} (100%)

diff --git a/bin/mk-manpages b/bin/mk-manpages
index a605436..3884a6a 100755
--- a/bin/mk-manpages
+++ b/bin/mk-manpages
@@ -226,9 +226,9 @@ sub htmlHeader {
     return <<EOFH;
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -284,7 +284,7 @@ sub htmlFooter {
       $sidebar
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 EOFT
diff --git a/community/binaries.html b/community/binaries.html
index 6773bc3..ef9d407 100644
--- a/community/binaries.html
+++ b/community/binaries.html
@@ -1,10 +1,10 @@
 
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -29,11 +29,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/conduct.html b/community/conduct.html
index 9b8c2d0..e0bea4f 100644
--- a/community/conduct.html
+++ b/community/conduct.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -41,11 +41,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/contacts.html b/community/contacts.html
index 6f77339..88e01f7 100644
--- a/community/contacts.html
+++ b/community/contacts.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -96,11 +96,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/getting-started.html b/community/getting-started.html
index c02b288..d9d695b 100644
--- a/community/getting-started.html
+++ b/community/getting-started.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -96,9 +96,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/community/index.html b/community/index.html
index 980dd21..a9fe68f 100644
--- a/community/index.html
+++ b/community/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -82,11 +82,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/mailinglists.html b/community/mailinglists.html
index 1ffb8b0..7da8086 100644
--- a/community/mailinglists.html
+++ b/community/mailinglists.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -99,11 +99,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/team.html b/community/team.html
index ca8eda9..adde487 100644
--- a/community/team.html
+++ b/community/team.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -169,9 +169,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
   </body>
   </html>
diff --git a/community/thanks.html b/community/thanks.html
index b7a44a9..9a7e52c 100644
--- a/community/thanks.html
+++ b/community/thanks.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -83,11 +83,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/docs/faq.html b/docs/faq.html
index 6f4be47..7f5f039 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -11,7 +11,7 @@
 	<article>
 	  <header><h2>Frequently Asked Questions</h2></header>
 	  <div class="entry-content">
-	    <!--#include virtual="faq.inc" -->
+	    <!--#include virtual="faq.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -21,11 +21,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/docs/fips.html b/docs/fips.html
index 84be232..23fddbe 100644
--- a/docs/fips.html
+++ b/docs/fips.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -46,7 +46,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="fips.inc" -->
+	      <!--#include virtual="fips.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -59,9 +59,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/fips/privatelabel.html b/docs/fips/privatelabel.html
index ab13f0b..5262215 100644
--- a/docs/fips/privatelabel.html
+++ b/docs/fips/privatelabel.html
@@ -2,9 +2,9 @@
 <!-- THIS FILE IS OUTDATED.  THE INFORMATION HERE IS IN THE FIPS.HTML
      FILE.  THIS FILE EXISTS SO OLD LINKS STILL WORK. -->
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -128,6 +128,6 @@
       </div>
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
   </body>
   </html>
diff --git a/docs/fipsnotes.html b/docs/fipsnotes.html
index ec9a39c..dfc50e3 100644
--- a/docs/fipsnotes.html
+++ b/docs/fipsnotes.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -125,9 +125,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/fipsvalidation.html b/docs/fipsvalidation.html
index 5bfc1a5..4b36886 100644
--- a/docs/fipsvalidation.html
+++ b/docs/fipsvalidation.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -113,9 +113,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index 7a41609..f3f1b66 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -44,11 +44,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/docs/man1.0.1/apps/index.html b/docs/man1.0.1/apps/index.html
index 17c5e92..e3e09b5 100644
--- a/docs/man1.0.1/apps/index.html
+++ b/docs/man1.0.1/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.1/crypto/index.html b/docs/man1.0.1/crypto/index.html
index d25091b..2919701 100644
--- a/docs/man1.0.1/crypto/index.html
+++ b/docs/man1.0.1/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/man1.0.1/index.html b/docs/man1.0.1/index.html
index 580c87f..4d250a7 100644
--- a/docs/man1.0.1/index.html
+++ b/docs/man1.0.1/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.1/ssl/index.html b/docs/man1.0.1/ssl/index.html
index afc66b7..bf88125 100644
--- a/docs/man1.0.1/ssl/index.html
+++ b/docs/man1.0.1/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.2/apps/index.html b/docs/man1.0.2/apps/index.html
index 21b3d91..f719989 100644
--- a/docs/man1.0.2/apps/index.html
+++ b/docs/man1.0.2/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.2/crypto/index.html b/docs/man1.0.2/crypto/index.html
index faf5b1c..7974fb7 100644
--- a/docs/man1.0.2/crypto/index.html
+++ b/docs/man1.0.2/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/man1.0.2/index.html b/docs/man1.0.2/index.html
index 34b0fdb..c789469 100644
--- a/docs/man1.0.2/index.html
+++ b/docs/man1.0.2/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.2/ssl/index.html b/docs/man1.0.2/ssl/index.html
index e0c0864..80e2bd8 100644
--- a/docs/man1.0.2/ssl/index.html
+++ b/docs/man1.0.2/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.1.0/apps/index.html b/docs/man1.1.0/apps/index.html
index e54abd1..42f2879 100644
--- a/docs/man1.1.0/apps/index.html
+++ b/docs/man1.1.0/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.1.0/crypto/index.html b/docs/man1.1.0/crypto/index.html
index 64af490..d1b69d6 100644
--- a/docs/man1.1.0/crypto/index.html
+++ b/docs/man1.1.0/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/man1.1.0/index.html b/docs/man1.1.0/index.html
index dc447be..3d41a80 100644
--- a/docs/man1.1.0/index.html
+++ b/docs/man1.1.0/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.1.0/ssl/index.html b/docs/man1.1.0/ssl/index.html
index 5bad03b..33ed9e7 100644
--- a/docs/man1.1.0/ssl/index.html
+++ b/docs/man1.1.0/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manmaster/apps/index.html b/docs/manmaster/apps/index.html
index afda6dd..951f0b8 100644
--- a/docs/manmaster/apps/index.html
+++ b/docs/manmaster/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manmaster/crypto/index.html b/docs/manmaster/crypto/index.html
index 74414a0..4d49c02 100644
--- a/docs/manmaster/crypto/index.html
+++ b/docs/manmaster/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/manmaster/index.html b/docs/manmaster/index.html
index b9d39b8..beac148 100644
--- a/docs/manmaster/index.html
+++ b/docs/manmaster/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manmaster/ssl/index.html b/docs/manmaster/ssl/index.html
index 1001761..457466c 100644
--- a/docs/manmaster/ssl/index.html
+++ b/docs/manmaster/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manpages.html b/docs/manpages.html
index c9cf0f3..dfe2242 100644
--- a/docs/manpages.html
+++ b/docs/manpages.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -27,10 +27,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/standards.html b/docs/standards.html
index 9234652..fca0e39 100644
--- a/docs/standards.html
+++ b/docs/standards.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -201,10 +201,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/err404.html b/err404.html
index 4dc6b1e..5035194 100644
--- a/err404.html
+++ b/err404.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
   <div id="content">
@@ -31,11 +31,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/inc/banner.inc b/inc/banner.shtml
similarity index 100%
rename from inc/banner.inc
rename to inc/banner.shtml
diff --git a/inc/footer.inc b/inc/footer.shtml
similarity index 100%
rename from inc/footer.inc
rename to inc/footer.shtml
diff --git a/inc/head.inc b/inc/head.inc
deleted file mode 100644
index f0a017e..0000000
--- a/inc/head.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- head.inc -->
-  <!--#config errmsg="OpenSSL" -->
-  <title>
-  <!--#echo var="$TITLE" -->
-  </title>
-  <meta charset="utf-8">
-  <meta name="author" content="OpenSSL Foundation, Inc.">
-  <meta name="HandheldFriendly" content="True">
-  <meta name="MobileOptimized" content="320">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-  <link rel="canonical" href="https://www.openssl.org/">
-  <link href="/favicon.ico" rel="icon">
-  <link href="/inc/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
-
-  <script src="/inc/modernizr-2.0.js"></script>
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-  <script>!window.jQuery && document.write(unescape('%3Cscript src="./inc/libs/jquery.min.js"%3E%3C/script%3E'))</script>
-  <script src="/inc/octopress.js" type="text/javascript"></script>
-
-  <link href="//fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
-  <link href="//fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
-
-  <!--[if lt IE 9]>
-    <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-<!-- end -->
diff --git a/inc/head.shtml b/inc/head.shtml
index 7443fee..c988fe8 100644
--- a/inc/head.shtml
+++ b/inc/head.shtml
@@ -1,7 +1,6 @@
 <!-- head.inc -->
-  <!--#config errmsg="OpenSSL" -->
   <title>
-  <!--#echo var="TITLE" -->
+  <!--#echo var="DOCUMENT_URI"" -->
   </title>
   <meta charset="utf-8">
   <meta name="author" content="OpenSSL Foundation, Inc.">
diff --git a/inc/legalities.inc b/inc/legalities.shtml
similarity index 100%
rename from inc/legalities.inc
rename to inc/legalities.shtml
diff --git a/inc/mansidebar.inc b/inc/mansidebar.shtml
similarity index 100%
rename from inc/mansidebar.inc
rename to inc/mansidebar.shtml
diff --git a/index.html b/index.html
index d1cfe46..d12161a 100644
--- a/index.html
+++ b/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
   <div id="content">
@@ -33,12 +33,12 @@
 
 	  <h3>Latest News</h3>
 	  <table class="newsflash" width="90%">
-	    <!--#include virtual="newsflash.inc"-->
+	    <!--#include virtual="newsflash.shtml"-->
 	    <tr><td class="d"><a href="news">More...</a></td><td class="t"></td></tr>
 	  </table>
 	  <p>&nbsp;</p>
 
-	  <!--#include virtual="/inc/legalities.inc" -->
+	  <!--#include virtual="/inc/legalities.shtml" -->
 
 	</div>
 	<footer>
@@ -47,11 +47,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/changelog.html b/news/changelog.html
index a19b08d..05d85ac 100644
--- a/news/changelog.html
+++ b/news/changelog.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -33,7 +33,7 @@
               <li><a href="cl102.txt">1.0.2</a></li>
               <li><a href="cl110.txt">1.1.0</a></li>
             </ul>
-	    <!--#include virtual="changelog.inc" -->
+	    <!--#include virtual="changelog.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -43,11 +43,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/index.html b/news/index.html
index 7273180..d01858a 100644
--- a/news/index.html
+++ b/news/index.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#set var="TITLE" value="News" -->
 <!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -37,11 +36,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/newslog.html b/news/newslog.html
index 942c80e..07c6b54 100644
--- a/news/newslog.html
+++ b/news/newslog.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -14,7 +14,7 @@
 	    They are almost release notices.
 	    </p>
 	    <table class="newsflash" width="90%">
-	      <!--#include virtual="newsflash.inc"-->
+	      <!--#include virtual="newsflash.shtml"-->
 	    </table>
 	  </div>
 	  <footer>
@@ -25,9 +25,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/news/openssl-notes.html.in b/news/openssl-notes.html.in
index 1376da6..ce5c9c5 100644
--- a/news/openssl-notes.html.in
+++ b/news/openssl-notes.html.in
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -22,7 +22,7 @@
 	    More details can be found in the <a href="changelog.html">ChangeLog</a>.
 	    </p>
 
-	    <!--#include virtual="openssl- at VERSION@-notes.inc" -->
+	    <!--#include virtual="openssl- at VERSION@-notes.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -31,11 +31,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/pgpkey.html b/news/pgpkey.html
index 7258680..492a80d 100644
--- a/news/pgpkey.html
+++ b/news/pgpkey.html
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#set var="TITLE" value="$DOCUMENT_URI" -->
 <!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,9 +29,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/news/vulnerabilities.html b/news/vulnerabilities.html
index fa66b41..8760693 100644
--- a/news/vulnerabilities.html
+++ b/news/vulnerabilities.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -24,7 +24,7 @@
             as discussed in our
             <a href="/policies/secpolicy.html">Security Policy</a>.
 	    </p>
-            <!--#include virtual="vulnerabilities.inc" -->
+            <!--#include virtual="vulnerabilities.shtml" -->
 	    </p>
 	  </div>
 	  <footer>
@@ -35,11 +35,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/cla.html b/policies/cla.html
index e9526bc..1e6e297 100644
--- a/policies/cla.html
+++ b/policies/cla.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -68,11 +68,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/codingstyle.html b/policies/codingstyle.html
index 70a417e..78f5e66 100644
--- a/policies/codingstyle.html
+++ b/policies/codingstyle.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -29,11 +29,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/index.html b/policies/index.html
index 51187d2..d63090d 100644
--- a/policies/index.html
+++ b/policies/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -62,11 +62,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/releasestrat.html b/policies/releasestrat.html
index 71b7353..acbaedf 100644
--- a/policies/releasestrat.html
+++ b/policies/releasestrat.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -116,11 +116,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/roadmap.html b/policies/roadmap.html
index 5659938..133584a 100644
--- a/policies/roadmap.html
+++ b/policies/roadmap.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -410,11 +410,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/secpolicy.html b/policies/secpolicy.html
index c17f08a..5dbd624 100644
--- a/policies/secpolicy.html
+++ b/policies/secpolicy.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -205,10 +205,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
   </body>
   </html>
 
diff --git a/source/gitrepo.html b/source/gitrepo.html
index 92ea47a..2b9b603 100644
--- a/source/gitrepo.html
+++ b/source/gitrepo.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -66,11 +66,11 @@ $ git checkout .
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/source/index.html b/source/index.html
index 5c1fa5a..4b245bb 100644
--- a/source/index.html
+++ b/source/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -44,7 +44,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p>&nbsp;</p>
 
@@ -61,7 +61,7 @@
 	    want to keep yourself up-to-date please clone the git repository
 	    instead.</p>
 
-	  <!--#include virtual="/inc/legalities.inc" -->
+	  <!--#include virtual="/inc/legalities.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -71,11 +71,11 @@
 
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/source/license.html b/source/license.html
index a2ce2e4..851b39e 100644
--- a/source/license.html
+++ b/source/license.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -30,9 +30,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
diff --git a/source/mirror.html b/source/mirror.html
index 8b084bb..ecfa1c0 100644
--- a/source/mirror.html
+++ b/source/mirror.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -53,11 +53,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/source/old/0.9.x/index.html b/source/old/0.9.x/index.html
index f66199b..9bb3e77 100644
--- a/source/old/0.9.x/index.html
+++ b/source/old/0.9.x/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p>&nbsp;</p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -30,10 +30,10 @@
         </footer>
       </article>
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.0.0/index.html b/source/old/1.0.0/index.html
index 125ef28..8ae6265 100644
--- a/source/old/1.0.0/index.html
+++ b/source/old/1.0.0/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p>&nbsp;</p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.0.1/index.html b/source/old/1.0.1/index.html
index 627193c..f6fe7c5 100644
--- a/source/old/1.0.1/index.html
+++ b/source/old/1.0.1/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p>&nbsp;</p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.0.2/index.html b/source/old/1.0.2/index.html
index 930d2bf..31d97e6 100644
--- a/source/old/1.0.2/index.html
+++ b/source/old/1.0.2/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p>&nbsp;</p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.1.0/index.html b/source/old/1.1.0/index.html
index 90f1b73..f077f4a 100644
--- a/source/old/1.1.0/index.html
+++ b/source/old/1.1.0/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p>&nbsp;</p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/fips/index.html b/source/old/fips/index.html
index 4842af3..29929bc 100644
--- a/source/old/fips/index.html
+++ b/source/old/fips/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p>&nbsp;</p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/index.html b/source/old/index.html
index 058bd20..a5fe85d 100644
--- a/source/old/index.html
+++ b/source/old/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -19,7 +19,7 @@
             <li><a href="fips">fips</a></li>
           </ul>
         </div>
-        <!--#include virtual="/inc/legalities.inc" -->
+        <!--#include virtual="/inc/legalities.shtml" -->
         <footer>
           You are here: <a href="/">Home</a>
           : <a href=".">Downloads</a>
@@ -30,10 +30,10 @@
 
 
     </div>
-    <!--#include virtual="../sidebar.inc" -->
+    <!--#include virtual="../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/support/acks.html b/support/acks.html
index 29bb761..47d0d4d 100644
--- a/support/acks.html
+++ b/support/acks.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -67,9 +67,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/support/contracts.html b/support/contracts.html
index 9d7a46c..0651184 100644
--- a/support/contracts.html
+++ b/support/contracts.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -158,11 +158,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/support/donations.html b/support/donations.html
index 4969f66..9a1715f 100644
--- a/support/donations.html
+++ b/support/donations.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -70,9 +70,9 @@ Please do not donate to any PayPal account claiming to be associated with us!
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/support/index.html b/support/index.html
index 4ac999e..c618aaf 100644
--- a/support/index.html
+++ b/support/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -37,9 +37,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/template-file.html b/template-file.html
index 298c5a0..a7483d5 100644
--- a/template-file.html
+++ b/template-file.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -23,9 +23,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>

From rsalz at openssl.org  Fri Sep  2 16:15:13 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 16:15:13 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472832913.127189.12977.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2e9c84feffdc36b6277b40c950041c0d41eec145 (commit)
      from  8749c57308886f250c42d655f7d664b6d322d410 (commit)


- Log -----------------------------------------------------------------
commit 2e9c84feffdc36b6277b40c950041c0d41eec145
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 12:15:10 2016 -0400

    remove extra quote

-----------------------------------------------------------------------

Summary of changes:
 inc/head.shtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/head.shtml b/inc/head.shtml
index c988fe8..244afed 100644
--- a/inc/head.shtml
+++ b/inc/head.shtml
@@ -1,6 +1,6 @@
 <!-- head.inc -->
   <title>
-  <!--#echo var="DOCUMENT_URI"" -->
+  <!--#echo var="DOCUMENT_URI" -->
   </title>
   <meta charset="utf-8">
   <meta name="author" content="OpenSSL Foundation, Inc.">

From rsalz at openssl.org  Fri Sep  2 16:19:07 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 16:19:07 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472833147.097945.14429.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7994d0e7b8935b55bb67126fe13b6466573a1a5a (commit)
      from  2e9c84feffdc36b6277b40c950041c0d41eec145 (commit)


- Log -----------------------------------------------------------------
commit 7994d0e7b8935b55bb67126fe13b6466573a1a5a
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 12:19:02 2016 -0400

    fix one inc link

-----------------------------------------------------------------------

Summary of changes:
 source/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/index.html b/source/index.html
index 4b245bb..c88e451 100644
--- a/source/index.html
+++ b/source/index.html
@@ -44,7 +44,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 

From rsalz at openssl.org  Fri Sep  2 18:26:17 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 18:26:17 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472840777.931503.26047.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0fc417b1fda3f23ce0e4f11c059a267b3709d165 (commit)
      from  7994d0e7b8935b55bb67126fe13b6466573a1a5a (commit)


- Log -----------------------------------------------------------------
commit 0fc417b1fda3f23ce0e4f11c059a267b3709d165
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 14:25:46 2016 -0400

    More .inc->.shtml renaming

-----------------------------------------------------------------------

Summary of changes:
 community/{sidebar.inc => sidebar.shtml} | 0
 docs/{sidebar.inc => sidebar.shtml}      | 0
 news/{sidebar.inc => sidebar.shtml}      | 0
 policies/{sidebar.inc => sidebar.shtml}  | 0
 sidebar.inc => sidebar.shtml             | 0
 source/{sidebar.inc => sidebar.shtml}    | 0
 support/{sidebar.inc => sidebar.shtml}   | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename community/{sidebar.inc => sidebar.shtml} (100%)
 rename docs/{sidebar.inc => sidebar.shtml} (100%)
 rename news/{sidebar.inc => sidebar.shtml} (100%)
 rename policies/{sidebar.inc => sidebar.shtml} (100%)
 rename sidebar.inc => sidebar.shtml (100%)
 rename source/{sidebar.inc => sidebar.shtml} (100%)
 rename support/{sidebar.inc => sidebar.shtml} (100%)

diff --git a/community/sidebar.inc b/community/sidebar.shtml
similarity index 100%
rename from community/sidebar.inc
rename to community/sidebar.shtml
diff --git a/docs/sidebar.inc b/docs/sidebar.shtml
similarity index 100%
rename from docs/sidebar.inc
rename to docs/sidebar.shtml
diff --git a/news/sidebar.inc b/news/sidebar.shtml
similarity index 100%
rename from news/sidebar.inc
rename to news/sidebar.shtml
diff --git a/policies/sidebar.inc b/policies/sidebar.shtml
similarity index 100%
rename from policies/sidebar.inc
rename to policies/sidebar.shtml
diff --git a/sidebar.inc b/sidebar.shtml
similarity index 100%
rename from sidebar.inc
rename to sidebar.shtml
diff --git a/source/sidebar.inc b/source/sidebar.shtml
similarity index 100%
rename from source/sidebar.inc
rename to source/sidebar.shtml
diff --git a/support/sidebar.inc b/support/sidebar.shtml
similarity index 100%
rename from support/sidebar.inc
rename to support/sidebar.shtml

From rsalz at openssl.org  Fri Sep  2 19:18:40 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 02 Sep 2016 19:18:40 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472843920.775360.14161.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f6772297ba385fb7c59f483d692d336adcc6fb88 (commit)
      from  0fc417b1fda3f23ce0e4f11c059a267b3709d165 (commit)


- Log -----------------------------------------------------------------
commit f6772297ba385fb7c59f483d692d336adcc6fb88
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 15:18:25 2016 -0400

    Some .inc files should not have been renamed.

-----------------------------------------------------------------------

Summary of changes:
 docs/fips.html                   | 2 +-
 docs/man1.0.1/apps/index.html    | 2 +-
 docs/man1.0.1/crypto/index.html  | 2 +-
 docs/man1.0.1/ssl/index.html     | 2 +-
 docs/man1.0.2/apps/index.html    | 2 +-
 docs/man1.0.2/crypto/index.html  | 2 +-
 docs/man1.0.2/ssl/index.html     | 2 +-
 docs/man1.1.0/apps/index.html    | 2 +-
 docs/man1.1.0/crypto/index.html  | 2 +-
 docs/man1.1.0/ssl/index.html     | 2 +-
 docs/manmaster/apps/index.html   | 2 +-
 docs/manmaster/crypto/index.html | 2 +-
 docs/manmaster/ssl/index.html    | 2 +-
 index.html                       | 2 +-
 news/changelog.html              | 2 +-
 source/old/0.9.x/index.html      | 2 +-
 source/old/1.0.0/index.html      | 2 +-
 source/old/1.0.1/index.html      | 2 +-
 source/old/1.0.2/index.html      | 2 +-
 source/old/1.1.0/index.html      | 2 +-
 source/old/fips/index.html       | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/fips.html b/docs/fips.html
index 23fddbe..7983e97 100644
--- a/docs/fips.html
+++ b/docs/fips.html
@@ -46,7 +46,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="fips.shtml" -->
+	      <!--#include virtual="fips.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.0.1/apps/index.html b/docs/man1.0.1/apps/index.html
index e3e09b5..28c3059 100644
--- a/docs/man1.0.1/apps/index.html
+++ b/docs/man1.0.1/apps/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.0.1/crypto/index.html b/docs/man1.0.1/crypto/index.html
index 2919701..d7c0478 100644
--- a/docs/man1.0.1/crypto/index.html
+++ b/docs/man1.0.1/crypto/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.0.1/ssl/index.html b/docs/man1.0.1/ssl/index.html
index bf88125..bbb559c 100644
--- a/docs/man1.0.1/ssl/index.html
+++ b/docs/man1.0.1/ssl/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.0.2/apps/index.html b/docs/man1.0.2/apps/index.html
index f719989..5ce458a 100644
--- a/docs/man1.0.2/apps/index.html
+++ b/docs/man1.0.2/apps/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.0.2/crypto/index.html b/docs/man1.0.2/crypto/index.html
index 7974fb7..dd79aa9 100644
--- a/docs/man1.0.2/crypto/index.html
+++ b/docs/man1.0.2/crypto/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.0.2/ssl/index.html b/docs/man1.0.2/ssl/index.html
index 80e2bd8..71cd650 100644
--- a/docs/man1.0.2/ssl/index.html
+++ b/docs/man1.0.2/ssl/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.1.0/apps/index.html b/docs/man1.1.0/apps/index.html
index 42f2879..1e80193 100644
--- a/docs/man1.1.0/apps/index.html
+++ b/docs/man1.1.0/apps/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.1.0/crypto/index.html b/docs/man1.1.0/crypto/index.html
index d1b69d6..1538615 100644
--- a/docs/man1.1.0/crypto/index.html
+++ b/docs/man1.1.0/crypto/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/man1.1.0/ssl/index.html b/docs/man1.1.0/ssl/index.html
index 33ed9e7..dd24494 100644
--- a/docs/man1.1.0/ssl/index.html
+++ b/docs/man1.1.0/ssl/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/manmaster/apps/index.html b/docs/manmaster/apps/index.html
index 951f0b8..0fe45d3 100644
--- a/docs/manmaster/apps/index.html
+++ b/docs/manmaster/apps/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/manmaster/crypto/index.html b/docs/manmaster/crypto/index.html
index 4d49c02..6b87a86 100644
--- a/docs/manmaster/crypto/index.html
+++ b/docs/manmaster/crypto/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/docs/manmaster/ssl/index.html b/docs/manmaster/ssl/index.html
index 457466c..5d3213a 100644
--- a/docs/manmaster/ssl/index.html
+++ b/docs/manmaster/ssl/index.html
@@ -21,7 +21,7 @@
 		<td>Date&nbsp;&nbsp;</td>
 		<td>File&nbsp;</td>
 	      </tr>
-	      <!--#include virtual="index.shtml" -->
+	      <!--#include virtual="index.inc" -->
 	    </table>
 	    <p>&nbsp;</p>
 
diff --git a/index.html b/index.html
index d12161a..1aa74e2 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@
 
 	  <h3>Latest News</h3>
 	  <table class="newsflash" width="90%">
-	    <!--#include virtual="newsflash.shtml"-->
+	    <!--#include virtual="newsflash.inc"-->
 	    <tr><td class="d"><a href="news">More...</a></td><td class="t"></td></tr>
 	  </table>
 	  <p>&nbsp;</p>
diff --git a/news/changelog.html b/news/changelog.html
index 05d85ac..643c214 100644
--- a/news/changelog.html
+++ b/news/changelog.html
@@ -33,7 +33,7 @@
               <li><a href="cl102.txt">1.0.2</a></li>
               <li><a href="cl110.txt">1.1.0</a></li>
             </ul>
-	    <!--#include virtual="changelog.shtml" -->
+	    <!--#include virtual="changelog.inc" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
diff --git a/source/old/0.9.x/index.html b/source/old/0.9.x/index.html
index 9bb3e77..7a9a2b6 100644
--- a/source/old/0.9.x/index.html
+++ b/source/old/0.9.x/index.html
@@ -16,7 +16,7 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.shtml" -->
+            <!--#include virtual="index.inc" -->
           </table>
           <p>&nbsp;</p>
           <!--#include virtual="/inc/legalities.shtml" -->
diff --git a/source/old/1.0.0/index.html b/source/old/1.0.0/index.html
index 8ae6265..f289fe1 100644
--- a/source/old/1.0.0/index.html
+++ b/source/old/1.0.0/index.html
@@ -16,7 +16,7 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.shtml" -->
+            <!--#include virtual="index.inc" -->
           </table>
           <p>&nbsp;</p>
           <!--#include virtual="/inc/legalities.shtml" -->
diff --git a/source/old/1.0.1/index.html b/source/old/1.0.1/index.html
index f6fe7c5..e201ac5 100644
--- a/source/old/1.0.1/index.html
+++ b/source/old/1.0.1/index.html
@@ -16,7 +16,7 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.shtml" -->
+            <!--#include virtual="index.inc" -->
           </table>
           <p>&nbsp;</p>
           <!--#include virtual="/inc/legalities.shtml" -->
diff --git a/source/old/1.0.2/index.html b/source/old/1.0.2/index.html
index 31d97e6..da5007c 100644
--- a/source/old/1.0.2/index.html
+++ b/source/old/1.0.2/index.html
@@ -16,7 +16,7 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.shtml" -->
+            <!--#include virtual="index.inc" -->
           </table>
           <p>&nbsp;</p>
           <!--#include virtual="/inc/legalities.shtml" -->
diff --git a/source/old/1.1.0/index.html b/source/old/1.1.0/index.html
index f077f4a..e9b4c7a 100644
--- a/source/old/1.1.0/index.html
+++ b/source/old/1.1.0/index.html
@@ -16,7 +16,7 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.shtml" -->
+            <!--#include virtual="index.inc" -->
           </table>
           <p>&nbsp;</p>
           <!--#include virtual="/inc/legalities.shtml" -->
diff --git a/source/old/fips/index.html b/source/old/fips/index.html
index 29929bc..c483b81 100644
--- a/source/old/fips/index.html
+++ b/source/old/fips/index.html
@@ -16,7 +16,7 @@
               <td>Date&nbsp;&nbsp;</td>
               <td>File&nbsp;</td>
             </tr>
-            <!--#include virtual="index.shtml" -->
+            <!--#include virtual="index.inc" -->
           </table>
           <p>&nbsp;</p>
           <!--#include virtual="/inc/legalities.shtml" -->

From no-reply at appveyor.com  Fri Sep  2 22:09:22 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 02 Sep 2016 22:09:22 +0000
Subject: [openssl-commits] Build completed: openssl master.5160
Message-ID: <20160902220921.17131.76072.E519281F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160902/85fee38d/attachment.html>

From appro at openssl.org  Sat Sep  3 08:31:26 2016
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 03 Sep 2016 08:31:26 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472891486.976082.28969.nullmailer@dev.openssl.org>

The branch master has been updated
       via  047d97afd97520eae268f6d8a36fbf9a0239a994 (commit)
      from  c1ec40ef1d9b487061f4f9e2843d4a1894f96660 (commit)


- Log -----------------------------------------------------------------
commit 047d97afd97520eae268f6d8a36fbf9a0239a994
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Sep 1 21:36:13 2016 +0200

    Configure: clarify and refine -static.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Configure b/Configure
index 0a1b68a..86e30d9 100755
--- a/Configure
+++ b/Configure
@@ -66,6 +66,22 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx
 # no-sse2	disables IA-32 SSE2 code, above option implies no-sse2
 # no-<cipher>   build without specified algorithm (rsa, idea, rc5, ...)
 # -<xxx> +<xxx> compiler options are passed through
+# -static       while -static is also a pass-through compiler option (and
+#               as such is limited to environments where it's actually
+#               meaningful), it triggers a number configuration options,
+#               namely no-dso, no-pic, no-shared and no-threads. It is
+#               argued that the only reason to produce statically linked
+#               binaries (and in context it means executables linked with
+#               -static flag, and not just executables linked with static
+#               libcrypto.a) is to eliminate dependency on specific run-time,
+#               a.k.a. libc version. The mentioned config options are meant
+#               to achieve just that. Unfortunately on Linux it's impossible
+#               to eliminate the dependency completely for openssl executable
+#               because of getaddrinfo and gethostbyname calls, which can
+#               invoke dynamically loadable library facility anyway to meet
+#               the lookup requests. For this reason on Linux statically
+#               linked openssl executable has rather debugging value than
+#               production quality.
 #
 # DEBUG_SAFESTACK use type-safe stacks to enforce type-safety on stack items
 #		provided to stack calls. Generates unique stack functions for
@@ -715,6 +731,7 @@ foreach (@argvcopy)
 		elsif (/^-static$/)
 			{
 			$libs.=$_." ";
+			$disabled{"dso"} = "forced";
 			$disabled{"pic"} = "forced";
 			$disabled{"shared"} = "forced";
 			$disabled{"threads"} = "forced";

From appro at openssl.org  Sat Sep  3 08:42:25 2016
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 03 Sep 2016 08:42:25 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1472892145.657081.3919.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6cf412c473d8145562b76219ce3da73b201b3255 (commit)
      from  047d97afd97520eae268f6d8a36fbf9a0239a994 (commit)


- Log -----------------------------------------------------------------
commit 6cf412c473d8145562b76219ce3da73b201b3255
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Aug 27 20:22:03 2016 +0200

    modes/asm/ghash-armv4.pl: improve interoperability with Android NDK.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/asm/ghash-armv4.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index db56c85..7d880c9 100644
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -143,8 +143,10 @@ $code=<<___;
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__)
+#if defined(__thumb2__) || defined(__clang__)
 .syntax	unified
+#endif
+#if defined(__thumb2__)
 .thumb
 #else
 .code	32

From appro at openssl.org  Sat Sep  3 08:44:27 2016
From: appro at openssl.org (Andy Polyakov)
Date: Sat, 03 Sep 2016 08:44:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1472892267.456590.5588.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  90ed28b7979954d075c4a58c083dee931205ef2e (commit)
      from  eba44ca0a697845b2cf695d984f8d46a49c866f8 (commit)


- Log -----------------------------------------------------------------
commit 90ed28b7979954d075c4a58c083dee931205ef2e
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Aug 27 20:22:03 2016 +0200

    modes/asm/ghash-armv4.pl: improve interoperability with Android NDK.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 6cf412c473d8145562b76219ce3da73b201b3255)

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/asm/ghash-armv4.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index db56c85..7d880c9 100644
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -143,8 +143,10 @@ $code=<<___;
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__)
+#if defined(__thumb2__) || defined(__clang__)
 .syntax	unified
+#endif
+#if defined(__thumb2__)
 .thumb
 #else
 .code	32

From levitte at openssl.org  Sat Sep  3 09:15:38 2016
From: levitte at openssl.org (Richard Levitte)
Date: Sat, 03 Sep 2016 09:15:38 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1472894138.681159.24761.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7e9ec7123cc35dd7fde0508e3efc915a62c209ce (commit)
      from  f6772297ba385fb7c59f483d692d336adcc6fb88 (commit)


- Log -----------------------------------------------------------------
commit 7e9ec7123cc35dd7fde0508e3efc915a62c209ce
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Sep 3 11:15:33 2016 +0200

    The FAQ include is still named .inc

-----------------------------------------------------------------------

Summary of changes:
 docs/faq.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.html b/docs/faq.html
index 7f5f039..a988032 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -11,7 +11,7 @@
 	<article>
 	  <header><h2>Frequently Asked Questions</h2></header>
 	  <div class="entry-content">
-	    <!--#include virtual="faq.shtml" -->
+	    <!--#include virtual="faq.inc" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>

From no-reply at appveyor.com  Sat Sep  3 15:36:58 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 03 Sep 2016 15:36:58 +0000
Subject: [openssl-commits] Build failed: openssl master.5168
Message-ID: <20160903153657.37966.1616.4B30E9DC@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160903/892e74b6/attachment.html>

From no-reply at appveyor.com  Sat Sep  3 16:01:20 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 03 Sep 2016 16:01:20 +0000
Subject: [openssl-commits] Build completed: openssl master.5169
Message-ID: <20160903160120.6548.28682.78D09F79@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160903/90a74a4c/attachment.html>

From levitte at openssl.org  Mon Sep  5 14:07:52 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 05 Sep 2016 14:07:52 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473084472.352227.18321.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7e5b8b93f2ffa8300b992d2e79c50f0e5266c61b (commit)
      from  6cf412c473d8145562b76219ce3da73b201b3255 (commit)


- Log -----------------------------------------------------------------
commit 7e5b8b93f2ffa8300b992d2e79c50f0e5266c61b
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 4 08:10:22 2016 +0200

    Unix build: have the makedepend and cc actions in one recipe
    
    In the case of using an independent makedepend, we had split that into
    two separate recipes, one depending on the other.  However, there are
    cases where the makedepend recipe was always trying, but doesn't
    update the time stamp of the .d file because there are no actual
    changes, and thereby causing constant updates of the object files.
    
    This change makes one recipe that takes care of both makedepend och
    cc, thereby avoiding these extra updates.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 608c204..1392295 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -944,38 +944,35 @@ EOF
                       dso => '$(DSO_CFLAGS)',
                       bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
       my $makedepprog = $config{makedepprog};
-      my $recipe = "";
-      if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) {
+      my $recipe = <<"EOF";
+$obj$objext: $deps
+EOF
+      if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) {
           $recipe .= <<"EOF";
-$obj$depext: $deps
-	-\$(MAKEDEPEND) -f- -o"|$obj$objext" -- $incs \$(CFLAGS) $ecflags -- $srcs \\
-	    >\$\@.tmp 2>/dev/null
-	-\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
-	\@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
-		rm -f \$\@.tmp; \\
+	\$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
+	\@touch $obj$depext.tmp
+	\@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
+		rm -f $obj$depext.tmp; \\
 	else \\
-		mv \$\@.tmp \$\@; \\
+		mv $obj$depext.tmp $obj$depext; \\
 	fi
 EOF
-          $deps = $obj.$depext;
-      }
-      if ($disabled{makedepend} || $makedepprog =~ /\/makedepend/) {
+      } else {
           $recipe .= <<"EOF";
-$obj$objext: $deps
 	\$(CC) $incs \$(CFLAGS) $ecflags -c -o \$\@ $srcs
 EOF
-      }
-      if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) {
-          $recipe .= <<"EOF";
-$obj$objext: $deps
-	\$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
-	\@touch $obj$depext.tmp
+          if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) {
+              $recipe .= <<"EOF";
+	-\$(MAKEDEPEND) -f- -o"|\$\@" -- $incs \$(CFLAGS) $ecflags -- $srcs \\
+	    >$obj$depext.tmp 2>/dev/null
+	-\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' $obj$depext.tmp
 	\@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
 		rm -f $obj$depext.tmp; \\
 	else \\
 		mv $obj$depext.tmp $obj$depext; \\
 	fi
 EOF
+          }
       }
       return $recipe;
   }

From levitte at openssl.org  Mon Sep  5 14:09:02 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 05 Sep 2016 14:09:02 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473084542.343740.19634.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  578dc1cea3e2d725987d78ad21a5a86bfb0cef82 (commit)
      from  90ed28b7979954d075c4a58c083dee931205ef2e (commit)


- Log -----------------------------------------------------------------
commit 578dc1cea3e2d725987d78ad21a5a86bfb0cef82
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 4 08:10:22 2016 +0200

    Unix build: have the makedepend and cc actions in one recipe
    
    In the case of using an independent makedepend, we had split that into
    two separate recipes, one depending on the other.  However, there are
    cases where the makedepend recipe was always trying, but doesn't
    update the time stamp of the .d file because there are no actual
    changes, and thereby causing constant updates of the object files.
    
    This change makes one recipe that takes care of both makedepend och
    cc, thereby avoiding these extra updates.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 7e5b8b93f2ffa8300b992d2e79c50f0e5266c61b)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 608c204..1392295 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -944,38 +944,35 @@ EOF
                       dso => '$(DSO_CFLAGS)',
                       bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
       my $makedepprog = $config{makedepprog};
-      my $recipe = "";
-      if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) {
+      my $recipe = <<"EOF";
+$obj$objext: $deps
+EOF
+      if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) {
           $recipe .= <<"EOF";
-$obj$depext: $deps
-	-\$(MAKEDEPEND) -f- -o"|$obj$objext" -- $incs \$(CFLAGS) $ecflags -- $srcs \\
-	    >\$\@.tmp 2>/dev/null
-	-\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
-	\@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
-		rm -f \$\@.tmp; \\
+	\$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
+	\@touch $obj$depext.tmp
+	\@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
+		rm -f $obj$depext.tmp; \\
 	else \\
-		mv \$\@.tmp \$\@; \\
+		mv $obj$depext.tmp $obj$depext; \\
 	fi
 EOF
-          $deps = $obj.$depext;
-      }
-      if ($disabled{makedepend} || $makedepprog =~ /\/makedepend/) {
+      } else {
           $recipe .= <<"EOF";
-$obj$objext: $deps
 	\$(CC) $incs \$(CFLAGS) $ecflags -c -o \$\@ $srcs
 EOF
-      }
-      if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) {
-          $recipe .= <<"EOF";
-$obj$objext: $deps
-	\$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
-	\@touch $obj$depext.tmp
+          if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) {
+              $recipe .= <<"EOF";
+	-\$(MAKEDEPEND) -f- -o"|\$\@" -- $incs \$(CFLAGS) $ecflags -- $srcs \\
+	    >$obj$depext.tmp 2>/dev/null
+	-\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' $obj$depext.tmp
 	\@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
 		rm -f $obj$depext.tmp; \\
 	else \\
 		mv $obj$depext.tmp $obj$depext; \\
 	fi
 EOF
+          }
       }
       return $recipe;
   }

From builds at travis-ci.org  Mon Sep  5 14:47:43 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 05 Sep 2016 14:47:43 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5856 (master - 7e5b8b9)
In-Reply-To: <openssl/openssl+157646643+errored@travis-ci.org>
Message-ID: <57cd858ebbb0f_33f80a7c60e28908142@3d0c994f-3b54-4e46-a156-64e57a7df581.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5856
Status: Errored

Duration: 39 minutes and 14 seconds
Commit: 7e5b8b9 (master)
Author: Richard Levitte
Message: Unix build: have the makedepend and cc actions in one recipe

In the case of using an independent makedepend, we had split that into
two separate recipes, one depending on the other.  However, there are
cases where the makedepend recipe was always trying, but doesn't
update the time stamp of the .d file because there are no actual
changes, and thereby causing constant updates of the object files.

This change makes one recipe that takes care of both makedepend och
cc, thereby avoiding these extra updates.

Reviewed-by: Andy Polyakov <appro at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/6cf412c473d8...7e5b8b93f2ff

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/157646643

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160905/b0e095fd/attachment-0001.html>

From builds at travis-ci.org  Mon Sep  5 15:13:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 05 Sep 2016 15:13:11 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5857
	(OpenSSL_1_1_0-stable - 578dc1c)
In-Reply-To: <openssl/openssl+157647010+errored@travis-ci.org>
Message-ID: <57cd8b87d5796_33fe4f8636b0073841b@619efdd1-074a-4d89-a6d5-675dd04b2533.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5857
Status: Errored

Duration: 42 minutes and 49 seconds
Commit: 578dc1c (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Unix build: have the makedepend and cc actions in one recipe

In the case of using an independent makedepend, we had split that into
two separate recipes, one depending on the other.  However, there are
cases where the makedepend recipe was always trying, but doesn't
update the time stamp of the .d file because there are no actual
changes, and thereby causing constant updates of the object files.

This change makes one recipe that takes care of both makedepend och
cc, thereby avoiding these extra updates.

Reviewed-by: Andy Polyakov <appro at openssl.org>
(cherry picked from commit 7e5b8b93f2ffa8300b992d2e79c50f0e5266c61b)

View the changeset: https://github.com/openssl/openssl/compare/90ed28b79799...578dc1cea3e2

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/157647010

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160905/42339662/attachment.html>

From no-reply at appveyor.com  Mon Sep  5 15:29:10 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 05 Sep 2016 15:29:10 +0000
Subject: [openssl-commits] Build failed: openssl ssltest_old_ct_args.289
Message-ID: <20160905152909.68767.1770.EC58385E@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160905/70ec1a71/attachment.html>

From no-reply at appveyor.com  Mon Sep  5 16:45:14 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 05 Sep 2016 16:45:14 +0000
Subject: [openssl-commits] Build completed: openssl
	update_ct_log_list_cnf.290
Message-ID: <20160905164514.38009.11743.CA116BBF@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160905/bd4d7fbf/attachment.html>

From builds at travis-ci.org  Mon Sep  5 16:52:59 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 05 Sep 2016 16:52:59 +0000
Subject: [openssl-commits] Failed: frezbo/openssl#1 (OpenSSL_1_0_2h_mod -
	0166cb5)
In-Reply-To: <frezbo/openssl+157683955+failed@travis-ci.org>
Message-ID: <57cda2e7132fa_33fe4f6b274cc8478f@619efdd1-074a-4d89-a6d5-675dd04b2533.mail>

Build Update for frezbo/openssl
-------------------------------------

Build: #1
Status: Failed

Duration: 10 minutes and 18 seconds
Commit: 0166cb5 (OpenSSL_1_0_2h_mod)
Author: Frezbo
Message: Updated README

View the changeset: https://github.com/frezbo/openssl/compare/ea68e7014a25...0166cb5b118b

View the full build log and details: https://travis-ci.org/frezbo/openssl/builds/157683955

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160905/013c94f3/attachment-0001.html>

From levitte at openssl.org  Tue Sep  6 06:30:51 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 06 Sep 2016 06:30:51 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473143451.031410.16453.nullmailer@dev.openssl.org>

The branch master has been updated
       via  77a42b5f177e308233ab108806c48b9590a780e2 (commit)
      from  7e5b8b93f2ffa8300b992d2e79c50f0e5266c61b (commit)


- Log -----------------------------------------------------------------
commit 77a42b5f177e308233ab108806c48b9590a780e2
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 00:48:13 2016 +0200

    Correct detection of group end in map file when testing symbol presence
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/01-test_symbol_presence.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index dbd4b10..7f2a2d7 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -69,6 +69,7 @@ foreach my $libname (@libnames) {
             map { s|;||; s|\s+||g; $_ }
             grep { $in_global = 1 if m|global:|;
                    $in_global = 0 if m|local:|;
+                   $in_global = 0 if m|\}|;
                    $in_global && m|;|; } @def_lines;
 
         note "Number of lines in \@nm_lines after massaging: ", scalar @nm_lines;

From levitte at openssl.org  Tue Sep  6 06:31:27 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 06 Sep 2016 06:31:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473143487.707104.17497.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  f52d16ac1d0f0bc3a13e32cc62dcbd4fed4ac649 (commit)
      from  578dc1cea3e2d725987d78ad21a5a86bfb0cef82 (commit)


- Log -----------------------------------------------------------------
commit f52d16ac1d0f0bc3a13e32cc62dcbd4fed4ac649
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 00:48:13 2016 +0200

    Correct detection of group end in map file when testing symbol presence
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 77a42b5f177e308233ab108806c48b9590a780e2)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/01-test_symbol_presence.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index dbd4b10..7f2a2d7 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -69,6 +69,7 @@ foreach my $libname (@libnames) {
             map { s|;||; s|\s+||g; $_ }
             grep { $in_global = 1 if m|global:|;
                    $in_global = 0 if m|local:|;
+                   $in_global = 0 if m|\}|;
                    $in_global && m|;|; } @def_lines;
 
         note "Number of lines in \@nm_lines after massaging: ", scalar @nm_lines;

From levitte at openssl.org  Tue Sep  6 06:43:44 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 06 Sep 2016 06:43:44 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473144224.586344.22577.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f9ede10163a41ef18eb1a62373ddc9ad00411e4e (commit)
      from  7e9ec7123cc35dd7fde0508e3efc915a62c209ce (commit)


- Log -----------------------------------------------------------------
commit f9ede10163a41ef18eb1a62373ddc9ad00411e4e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 08:43:28 2016 +0200

    The newsflash include is still named .inc

-----------------------------------------------------------------------

Summary of changes:
 news/newslog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/newslog.html b/news/newslog.html
index 07c6b54..b534061 100644
--- a/news/newslog.html
+++ b/news/newslog.html
@@ -14,7 +14,7 @@
 	    They are almost release notices.
 	    </p>
 	    <table class="newsflash" width="90%">
-	      <!--#include virtual="newsflash.shtml"-->
+	      <!--#include virtual="newsflash.inc"-->
 	    </table>
 	  </div>
 	  <footer>

From levitte at openssl.org  Tue Sep  6 06:53:20 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 06 Sep 2016 06:53:20 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473144800.684990.27000.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7db069a81d27f59d9878f04c8100663240a97ae0 (commit)
      from  f9ede10163a41ef18eb1a62373ddc9ad00411e4e (commit)


- Log -----------------------------------------------------------------
commit 7db069a81d27f59d9878f04c8100663240a97ae0
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 08:52:26 2016 +0200

    Correct the rest of included generated files
    
    As a rule, generated files end with .inc, not .shtml

-----------------------------------------------------------------------

Summary of changes:
 news/openssl-notes.html.in | 2 +-
 news/vulnerabilities.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/news/openssl-notes.html.in b/news/openssl-notes.html.in
index ce5c9c5..b215835 100644
--- a/news/openssl-notes.html.in
+++ b/news/openssl-notes.html.in
@@ -22,7 +22,7 @@
 	    More details can be found in the <a href="changelog.html">ChangeLog</a>.
 	    </p>
 
-	    <!--#include virtual="openssl- at VERSION@-notes.shtml" -->
+	    <!--#include virtual="openssl- at VERSION@-notes.inc" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
diff --git a/news/vulnerabilities.html b/news/vulnerabilities.html
index 8760693..508cc32 100644
--- a/news/vulnerabilities.html
+++ b/news/vulnerabilities.html
@@ -24,7 +24,7 @@
             as discussed in our
             <a href="/policies/secpolicy.html">Security Policy</a>.
 	    </p>
-            <!--#include virtual="vulnerabilities.shtml" -->
+            <!--#include virtual="vulnerabilities.inc" -->
 	    </p>
 	  </div>
 	  <footer>

From builds at travis-ci.org  Tue Sep  6 06:53:27 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 06 Sep 2016 06:53:27 +0000
Subject: [openssl-commits] Passed: openssl/openssl#5862 (master - 77a42b5)
In-Reply-To: <openssl/openssl+157800959+passed@travis-ci.org>
Message-ID: <57ce67e5e4284_33feee88aca48218681@63a63eae-5bcd-4a57-8125-1120137e9c79.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5862
Status: Passed

Duration: 22 minutes and 1 second
Commit: 77a42b5 (master)
Author: Richard Levitte
Message: Correct detection of group end in map file when testing symbol presence

Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/7e5b8b93f2ff...77a42b5f177e

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/157800959

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160906/ee8ca3da/attachment.html>

From builds at travis-ci.org  Tue Sep  6 07:05:38 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 06 Sep 2016 07:05:38 +0000
Subject: [openssl-commits] Passed: openssl/openssl#5863
	(OpenSSL_1_1_0-stable - f52d16a)
In-Reply-To: <openssl/openssl+157801015+passed@travis-ci.org>
Message-ID: <57ce6acec341f_33ffa156d1ccc5169e3@49d677c6-a84a-4859-8a82-f434de546004.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5863
Status: Passed

Duration: 24 minutes and 54 seconds
Commit: f52d16a (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Correct detection of group end in map file when testing symbol presence

Reviewed-by: Matt Caswell <matt at openssl.org>
(cherry picked from commit 77a42b5f177e308233ab108806c48b9590a780e2)

View the changeset: https://github.com/openssl/openssl/compare/578dc1cea3e2...f52d16ac1d0f

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/157801015

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160906/804b09ba/attachment-0001.html>

From matt at openssl.org  Tue Sep  6 08:11:12 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 06 Sep 2016 08:11:12 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473149472.634139.28145.nullmailer@dev.openssl.org>

The branch master has been updated
       via  90fa961058760088bb3715ea6f6407192db19399 (commit)
      from  7db069a81d27f59d9878f04c8100663240a97ae0 (commit)


- Log -----------------------------------------------------------------
commit 90fa961058760088bb3715ea6f6407192db19399
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 6 09:10:22 2016 +0100

    Update release strategy with agreed 1.1.0 support period
    
    Also removed out-of-date 1.1.0 release plans.

-----------------------------------------------------------------------

Summary of changes:
 policies/releasestrat.html | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/policies/releasestrat.html b/policies/releasestrat.html
index acbaedf..661fe27 100644
--- a/policies/releasestrat.html
+++ b/policies/releasestrat.html
@@ -13,7 +13,7 @@
 	  <h2>Release Strategy</h2>
 	  <h5>
 	    First issued 23rd December 2014<br/>
-	    Last modified 2nd August 2016
+	    Last modified 6th September 2016
 	  </h5>
 	</header>
 
@@ -52,7 +52,7 @@
 	  project has adopted the following policy:</p>
 
 	  <ul>
-	    <li>Version 1.1.0 will be supported until 2018-04-30.</li>
+	    <li>Version 1.1.0 will be supported until 2018-08-31.</li>
 	    <li>Version 1.0.2 will be supported until 2019-12-31 (LTS).</li>
 	    <li>Support for version 1.0.1 will cease on 2016-12-31. No
 	    further releases of 1.0.1 will be made after that date.
@@ -73,40 +73,6 @@
 
 	  <p>At this time, we are not planning a 1.0.3 release.</p>
 
-	  <p>Version 1.1.0 will (moderately) break source compatibility
-	  (for example we will make most structures opaque etc). Our current plans
-      for the release timetable are:</p>
-
-	  <ul>
-	    <li>10th December 2015, alpha release 1</li>
-	    <li>14th January 2016, alpha release 2</li>
-	    <li>11th February 2016, alpha release 3</li>
-	    <li>10th March 2016, 1.1.0 beta 1 release</li>
-	    <li>14th April 2016, 1.1.0 beta 2 release</li>
-	    <li>4th August 2016, 1.1.0 beta 3 release</li>
-	    <li>25th August 2016, 1.1.0 public release</li>
-	  </ul>
-
-	  <p>An alpha release means:</p>
-
-	  <ul>
-	    <li>Not (necessarily) feature complete</li>
-	    <li>Not necessarily all new APIs in place yet</li>
-	  </ul>
-
-	  <p>A beta release means:</p>
-
-	  <ul>
-	    <li>Feature complete/Feature freeze</li>
-	    <li>Bug fixes and cleanup</li>
-	  </ul>
-
-	  <p>Beta 2 release means:</p>
-
-	  <ul>
-	    <li>Opaque work complete</li>
-	  </ul>
-
 	</div>
 	<footer>
 	  You are here: <a href="/">Home</a>

From rsalz at openssl.org  Tue Sep  6 14:42:35 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 06 Sep 2016 14:42:35 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473172955.308803.2855.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  e9590d00fc7c269f3e90b93cf6ac17238f0ca2c6 (commit)
      from  f52d16ac1d0f0bc3a13e32cc62dcbd4fed4ac649 (commit)


- Log -----------------------------------------------------------------
commit e9590d00fc7c269f3e90b93cf6ac17238f0ca2c6
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Sep 5 18:08:43 2016 -0400

    Misc BN fixes
    
    Never output -0; make "negative zero" an impossibility.
    Do better checking on BN_rand top/bottom requirements and #bits.
    Update doc.
    Ignoring trailing garbage in BN_asc2bn.
    
    Port this commit from boringSSL: https://boringssl.googlesource.com/boringssl/+/899b9b19a4cd3fe526aaf5047ab9234cdca19f7d%5E!/
            Ensure |BN_div| never gives negative zero in the no_branch code.
    
            Have |bn_correct_top| fix |bn->neg| if the input is zero so that we
            don't have negative zeros lying around.
    
            Thanks to Brian Smith for noticing.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 01c09f9fde5793e0b3712d602b02e2aed4908e8d)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_lib.c       |  2 ++
 crypto/bn/bn_print.c     | 23 +++++++++++++----------
 crypto/bn/bn_rand.c      | 13 ++++++++-----
 doc/crypto/BN_bn2bin.pod |  1 +
 doc/crypto/BN_rand.pod   |  4 +++-
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 0be42f8..17d34c3 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -1031,5 +1031,7 @@ void bn_correct_top(BIGNUM *a)
         }
         a->top = tmp_top;
     }
+    if (a->top == 0)
+        a->neg = 0;
     bn_pollute(a);
 }
diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index 39fb034..a16bde8 100644
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -23,12 +23,9 @@ char *BN_bn2hex(const BIGNUM *a)
     char *buf;
     char *p;
 
-    if (a->neg && BN_is_zero(a)) {
-        /* "-0" == 3 bytes including NULL terminator */
-        buf = OPENSSL_malloc(3);
-    } else {
-        buf = OPENSSL_malloc(a->top * BN_BYTES * 2 + 2);
-    }
+    if (BN_is_zero(a))
+        return OPENSSL_strdup("0");
+    buf = OPENSSL_malloc(a->top * BN_BYTES * 2 + 2);
     if (buf == NULL) {
         BNerr(BN_F_BN_BN2HEX, ERR_R_MALLOC_FAILURE);
         goto err;
@@ -186,10 +183,12 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
     }
     ret->top = h;
     bn_correct_top(ret);
-    ret->neg = neg;
 
     *bn = ret;
     bn_check_top(ret);
+    /* Don't set the negative flag if it's zero. */
+    if (ret->top != 0)
+        ret->neg = neg;
     return (num);
  err:
     if (*bn == NULL)
@@ -241,7 +240,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
     if (j == BN_DEC_NUM)
         j = 0;
     l = 0;
-    while (*a) {
+    while (--i >= 0) {
         l *= 10;
         l += *a - '0';
         a++;
@@ -253,11 +252,13 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
             j = 0;
         }
     }
-    ret->neg = neg;
 
     bn_correct_top(ret);
     *bn = ret;
     bn_check_top(ret);
+    /* Don't set the negative flag if it's zero. */
+    if (ret->top != 0)
+        ret->neg = neg;
     return (num);
  err:
     if (*bn == NULL)
@@ -268,6 +269,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
 int BN_asc2bn(BIGNUM **bn, const char *a)
 {
     const char *p = a;
+
     if (*p == '-')
         p++;
 
@@ -278,7 +280,8 @@ int BN_asc2bn(BIGNUM **bn, const char *a)
         if (!BN_dec2bn(bn, p))
             return 0;
     }
-    if (*a == '-')
+    /* Don't set the negative flag if it's zero. */
+    if (*a == '-' && (*bn)->top != 0)
         (*bn)->neg = 1;
     return 1;
 }
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 5ad8050..c577fd1 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -20,15 +20,14 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     int ret = 0, bit, bytes, mask;
     time_t tim;
 
-    if (bits < 0 || (bits == 1 && top > 0)) {
-        BNerr(BN_F_BNRAND, BN_R_BITS_TOO_SMALL);
-        return 0;
-    }
-
     if (bits == 0) {
+        if (top != BN_RAND_TOP_ANY || bottom != BN_RAND_BOTTOM_ANY)
+            goto toosmall;
         BN_zero(rnd);
         return 1;
     }
+    if (bits < 0 || (bits == 1 && top > 0))
+        goto toosmall;
 
     bytes = (bits + 7) / 8;
     bit = (bits - 1) % 8;
@@ -88,6 +87,10 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     OPENSSL_clear_free(buf, bytes);
     bn_check_top(rnd);
     return (ret);
+
+toosmall:
+    BNerr(BN_F_BNRAND, BN_R_BITS_TOO_SMALL);
+    return 0;
 }
 
 int BN_rand(BIGNUM *rnd, int bits, int top, int bottom)
diff --git a/doc/crypto/BN_bn2bin.pod b/doc/crypto/BN_bn2bin.pod
index 14b152e..b272010 100644
--- a/doc/crypto/BN_bn2bin.pod
+++ b/doc/crypto/BN_bn2bin.pod
@@ -57,6 +57,7 @@ including the leading character '-' which means negative, to form a valid
 hexadecimal number representation and converts them to a B<BIGNUM> and
 stores it in **B<bn>. If *B<bn> is NULL, a new B<BIGNUM> is created. If
 B<bn> is NULL, it only computes the length of valid representation.
+A "negative zero" is converted to zero.
 BN_dec2bn() is the same using the decimal system.
 
 BN_print() and BN_print_fp() write the hexadecimal encoding of B<a>,
diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod
index ba505e1..ae15ada 100644
--- a/doc/crypto/BN_rand.pod
+++ b/doc/crypto/BN_rand.pod
@@ -20,7 +20,9 @@ BN_rand, BN_pseudo_rand, BN_rand_range, BN_pseudo_rand_range - generate pseudo-r
 
 BN_rand() generates a cryptographically strong pseudo-random number of
 B<bits> in length and stores it in B<rnd>.
-The value of B<bits> must be zero or greater.
+If B<bits> is less than zero, or too small to
+accomodate the requirements specified by the B<top> and B<bottom>
+parameters, an error is returned.
 The B<top> parameters specifies
 requirements on the most significant bit of the generated number.
 If it is B<BN_RAND_TOP_ANY>, there is no constraint.

From rsalz at openssl.org  Tue Sep  6 14:42:47 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 06 Sep 2016 14:42:47 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473172967.431853.3232.nullmailer@dev.openssl.org>

The branch master has been updated
       via  01c09f9fde5793e0b3712d602b02e2aed4908e8d (commit)
      from  77a42b5f177e308233ab108806c48b9590a780e2 (commit)


- Log -----------------------------------------------------------------
commit 01c09f9fde5793e0b3712d602b02e2aed4908e8d
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Sep 5 18:08:43 2016 -0400

    Misc BN fixes
    
    Never output -0; make "negative zero" an impossibility.
    Do better checking on BN_rand top/bottom requirements and #bits.
    Update doc.
    Ignoring trailing garbage in BN_asc2bn.
    
    Port this commit from boringSSL: https://boringssl.googlesource.com/boringssl/+/899b9b19a4cd3fe526aaf5047ab9234cdca19f7d%5E!/
            Ensure |BN_div| never gives negative zero in the no_branch code.
    
            Have |bn_correct_top| fix |bn->neg| if the input is zero so that we
            don't have negative zeros lying around.
    
            Thanks to Brian Smith for noticing.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_lib.c       |  2 ++
 crypto/bn/bn_print.c     | 23 +++++++++++++----------
 crypto/bn/bn_rand.c      | 13 ++++++++-----
 doc/crypto/BN_bn2bin.pod |  1 +
 doc/crypto/BN_rand.pod   |  4 +++-
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 0be42f8..17d34c3 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -1031,5 +1031,7 @@ void bn_correct_top(BIGNUM *a)
         }
         a->top = tmp_top;
     }
+    if (a->top == 0)
+        a->neg = 0;
     bn_pollute(a);
 }
diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index 39fb034..a16bde8 100644
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -23,12 +23,9 @@ char *BN_bn2hex(const BIGNUM *a)
     char *buf;
     char *p;
 
-    if (a->neg && BN_is_zero(a)) {
-        /* "-0" == 3 bytes including NULL terminator */
-        buf = OPENSSL_malloc(3);
-    } else {
-        buf = OPENSSL_malloc(a->top * BN_BYTES * 2 + 2);
-    }
+    if (BN_is_zero(a))
+        return OPENSSL_strdup("0");
+    buf = OPENSSL_malloc(a->top * BN_BYTES * 2 + 2);
     if (buf == NULL) {
         BNerr(BN_F_BN_BN2HEX, ERR_R_MALLOC_FAILURE);
         goto err;
@@ -186,10 +183,12 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
     }
     ret->top = h;
     bn_correct_top(ret);
-    ret->neg = neg;
 
     *bn = ret;
     bn_check_top(ret);
+    /* Don't set the negative flag if it's zero. */
+    if (ret->top != 0)
+        ret->neg = neg;
     return (num);
  err:
     if (*bn == NULL)
@@ -241,7 +240,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
     if (j == BN_DEC_NUM)
         j = 0;
     l = 0;
-    while (*a) {
+    while (--i >= 0) {
         l *= 10;
         l += *a - '0';
         a++;
@@ -253,11 +252,13 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
             j = 0;
         }
     }
-    ret->neg = neg;
 
     bn_correct_top(ret);
     *bn = ret;
     bn_check_top(ret);
+    /* Don't set the negative flag if it's zero. */
+    if (ret->top != 0)
+        ret->neg = neg;
     return (num);
  err:
     if (*bn == NULL)
@@ -268,6 +269,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
 int BN_asc2bn(BIGNUM **bn, const char *a)
 {
     const char *p = a;
+
     if (*p == '-')
         p++;
 
@@ -278,7 +280,8 @@ int BN_asc2bn(BIGNUM **bn, const char *a)
         if (!BN_dec2bn(bn, p))
             return 0;
     }
-    if (*a == '-')
+    /* Don't set the negative flag if it's zero. */
+    if (*a == '-' && (*bn)->top != 0)
         (*bn)->neg = 1;
     return 1;
 }
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 5ad8050..c577fd1 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -20,15 +20,14 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     int ret = 0, bit, bytes, mask;
     time_t tim;
 
-    if (bits < 0 || (bits == 1 && top > 0)) {
-        BNerr(BN_F_BNRAND, BN_R_BITS_TOO_SMALL);
-        return 0;
-    }
-
     if (bits == 0) {
+        if (top != BN_RAND_TOP_ANY || bottom != BN_RAND_BOTTOM_ANY)
+            goto toosmall;
         BN_zero(rnd);
         return 1;
     }
+    if (bits < 0 || (bits == 1 && top > 0))
+        goto toosmall;
 
     bytes = (bits + 7) / 8;
     bit = (bits - 1) % 8;
@@ -88,6 +87,10 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     OPENSSL_clear_free(buf, bytes);
     bn_check_top(rnd);
     return (ret);
+
+toosmall:
+    BNerr(BN_F_BNRAND, BN_R_BITS_TOO_SMALL);
+    return 0;
 }
 
 int BN_rand(BIGNUM *rnd, int bits, int top, int bottom)
diff --git a/doc/crypto/BN_bn2bin.pod b/doc/crypto/BN_bn2bin.pod
index 14b152e..b272010 100644
--- a/doc/crypto/BN_bn2bin.pod
+++ b/doc/crypto/BN_bn2bin.pod
@@ -57,6 +57,7 @@ including the leading character '-' which means negative, to form a valid
 hexadecimal number representation and converts them to a B<BIGNUM> and
 stores it in **B<bn>. If *B<bn> is NULL, a new B<BIGNUM> is created. If
 B<bn> is NULL, it only computes the length of valid representation.
+A "negative zero" is converted to zero.
 BN_dec2bn() is the same using the decimal system.
 
 BN_print() and BN_print_fp() write the hexadecimal encoding of B<a>,
diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod
index ba505e1..ae15ada 100644
--- a/doc/crypto/BN_rand.pod
+++ b/doc/crypto/BN_rand.pod
@@ -20,7 +20,9 @@ BN_rand, BN_pseudo_rand, BN_rand_range, BN_pseudo_rand_range - generate pseudo-r
 
 BN_rand() generates a cryptographically strong pseudo-random number of
 B<bits> in length and stores it in B<rnd>.
-The value of B<bits> must be zero or greater.
+If B<bits> is less than zero, or too small to
+accomodate the requirements specified by the B<top> and B<bottom>
+parameters, an error is returned.
 The B<top> parameters specifies
 requirements on the most significant bit of the generated number.
 If it is B<BN_RAND_TOP_ANY>, there is no constraint.

From rsalz at openssl.org  Tue Sep  6 15:09:57 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 06 Sep 2016 15:09:57 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473174597.371937.15266.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  3f1014960353af29a05a7b5dac40afd30d4f9bb3 (commit)
      from  2a20b6d9731488bcb500e58a434375f59fb9adcc (commit)


- Log -----------------------------------------------------------------
commit 3f1014960353af29a05a7b5dac40afd30d4f9bb3
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Sep 5 18:08:43 2016 -0400

    Misc BN fixes
    
    Never output -0; make "negative zero" an impossibility.
    Do better checking on BN_rand top/bottom requirements and #bits.
    Update doc.
    Ignoring trailing garbage in BN_asc2bn.
    
    Port this commit from boringSSL: https://boringssl.googlesource.com/boringssl/+/899b9b19a4cd3fe526aaf5047ab9234cdca19f7d%5E!/
            Ensure |BN_div| never gives negative zero in the no_branch code.
    
            Have |bn_correct_top| fix |bn->neg| if the input is zero so that we
            don't have negative zeros lying around.
    
            Thanks to Brian Smith for noticing.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 01c09f9fde5793e0b3712d602b02e2aed4908e8d)
    (Some manual work required)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn.h           |  2 ++
 crypto/bn/bn_print.c     | 23 +++++++++++++----------
 crypto/bn/bn_rand.c      | 13 ++++++++-----
 doc/crypto/BN_bn2bin.pod |  4 +++-
 doc/crypto/BN_rand.pod   |  6 +++++-
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 86264ae..633d1b1 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -842,6 +842,8 @@ int RAND_pseudo_bytes(unsigned char *buf, int num);
                         if (*(ftl--)) break; \
                 (a)->top = tmp_top; \
                 } \
+        if ((a)->top == 0) \
+            (a)->neg = 0; \
         bn_pollute(a); \
         }
 
diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index a9ff271..f121fb6 100644
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -72,12 +72,9 @@ char *BN_bn2hex(const BIGNUM *a)
     char *buf;
     char *p;
 
-    if (a->neg && BN_is_zero(a)) {
-        /* "-0" == 3 bytes including NULL terminator */
-        buf = OPENSSL_malloc(3);
-    } else {
-        buf = OPENSSL_malloc(a->top * BN_BYTES * 2 + 2);
-    }
+    if (BN_is_zero(a))
+        return OPENSSL_strdup("0");
+    buf = OPENSSL_malloc(a->top * BN_BYTES * 2 + 2);
     if (buf == NULL) {
         BNerr(BN_F_BN_BN2HEX, ERR_R_MALLOC_FAILURE);
         goto err;
@@ -244,10 +241,12 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
     }
     ret->top = h;
     bn_correct_top(ret);
-    ret->neg = neg;
 
     *bn = ret;
     bn_check_top(ret);
+    /* Don't set the negative flag if it's zero. */
+    if (ret->top != 0)
+        ret->neg = neg;
     return (num);
  err:
     if (*bn == NULL)
@@ -299,7 +298,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
     if (j == BN_DEC_NUM)
         j = 0;
     l = 0;
-    while (*a) {
+    while (--i >= 0) {
         l *= 10;
         l += *a - '0';
         a++;
@@ -310,11 +309,13 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
             j = 0;
         }
     }
-    ret->neg = neg;
 
     bn_correct_top(ret);
     *bn = ret;
     bn_check_top(ret);
+    /* Don't set the negative flag if it's zero. */
+    if (ret->top != 0)
+        ret->neg = neg;
     return (num);
  err:
     if (*bn == NULL)
@@ -325,6 +326,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
 int BN_asc2bn(BIGNUM **bn, const char *a)
 {
     const char *p = a;
+
     if (*p == '-')
         p++;
 
@@ -335,7 +337,8 @@ int BN_asc2bn(BIGNUM **bn, const char *a)
         if (!BN_dec2bn(bn, p))
             return 0;
     }
-    if (*a == '-')
+    /* Don't set the negative flag if it's zero. */
+    if (*a == '-' && (*bn)->top != 0)
         (*bn)->neg = 1;
     return 1;
 }
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 2266d22..60d3f22 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -121,15 +121,14 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     int ret = 0, bit, bytes, mask;
     time_t tim;
 
-    if (bits < 0 || (bits == 1 && top > 0)) {
-        BNerr(BN_F_BNRAND, BN_R_BITS_TOO_SMALL);
-        return 0;
-    }
-
     if (bits == 0) {
+        if (top != -1 || bottom != 0)
+            goto toosmall;
         BN_zero(rnd);
         return 1;
     }
+    if (bits < 0 || (bits == 1 && top > 0))
+        goto toosmall;
 
     bytes = (bits + 7) / 8;
     bit = (bits - 1) % 8;
@@ -195,6 +194,10 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     }
     bn_check_top(rnd);
     return (ret);
+
+toosmall:
+    BNerr(BN_F_BNRAND, BN_R_BITS_TOO_SMALL);
+    return 0;
 }
 
 int BN_rand(BIGNUM *rnd, int bits, int top, int bottom)
diff --git a/doc/crypto/BN_bn2bin.pod b/doc/crypto/BN_bn2bin.pod
index a4b17ca..3bed47f 100644
--- a/doc/crypto/BN_bn2bin.pod
+++ b/doc/crypto/BN_bn2bin.pod
@@ -42,7 +42,9 @@ BN_hex2bn() converts the string B<str> containing a hexadecimal number
 to a B<BIGNUM> and stores it in **B<bn>. If *B<bn> is NULL, a new
 B<BIGNUM> is created. If B<bn> is NULL, it only computes the number's
 length in hexadecimal digits. If the string starts with '-', the
-number is negative. BN_dec2bn() is the same using the decimal system.
+number is negative.
+A "negative zero" is converted to zero.
+BN_dec2bn() is the same using the decimal system.
 
 BN_print() and BN_print_fp() write the hexadecimal encoding of B<a>,
 with a leading '-' for negative numbers, to the B<BIO> or B<FILE>
diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod
index e8cbf65..a1513a9 100644
--- a/doc/crypto/BN_rand.pod
+++ b/doc/crypto/BN_rand.pod
@@ -19,7 +19,11 @@ BN_rand, BN_pseudo_rand, BN_rand_range, BN_pseudo_rand_range - generate pseudo-r
 =head1 DESCRIPTION
 
 BN_rand() generates a cryptographically strong pseudo-random number of
-B<bits> in length and stores it in B<rnd>. If B<top> is -1, the
+B<bits> in length and stores it in B<rnd>.
+If B<bits> is less than zero, or too small to
+accomodate the requirements specified by the B<top> and B<bottom>
+parameters, an error is returned.
+If B<top> is -1, the
 most significant bit of the random number can be zero. If B<top> is 0,
 it is set to 1, and if B<top> is 1, the two most significant bits of
 the number will be set to 1, so that the product of two such random

From rsalz at openssl.org  Wed Sep  7 13:42:34 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 13:42:34 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473255754.772389.19941.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d65c3615f6c658478503f4862f8055203a98038c (commit)
      from  01c09f9fde5793e0b3712d602b02e2aed4908e8d (commit)


- Log -----------------------------------------------------------------
commit d65c3615f6c658478503f4862f8055203a98038c
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date:   Wed Sep 7 09:41:20 2016 -0400

    GH1537: Avoid double-free in the EVP_PKEY API
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/p_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index a4dcf58..9828620 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -398,6 +398,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
         return;
     REF_ASSERT_ISNT(i < 0);
     EVP_PKEY_free_it(x);
+    CRYPTO_THREAD_lock_free(x->lock);
     sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);
     OPENSSL_free(x);
 }
@@ -413,7 +414,6 @@ static void EVP_PKEY_free_it(EVP_PKEY *x)
     ENGINE_finish(x->engine);
     x->engine = NULL;
 #endif
-    CRYPTO_THREAD_lock_free(x->lock);
 }
 
 static int unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent,

From rsalz at openssl.org  Wed Sep  7 13:42:57 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 13:42:57 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473255777.379883.20828.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  b7d2480c820531df2a5a300a7b24bbaa7755c288 (commit)
      from  e9590d00fc7c269f3e90b93cf6ac17238f0ca2c6 (commit)


- Log -----------------------------------------------------------------
commit b7d2480c820531df2a5a300a7b24bbaa7755c288
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date:   Wed Sep 7 09:41:20 2016 -0400

    GH1537: Avoid double-free in the EVP_PKEY API
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit d65c3615f6c658478503f4862f8055203a98038c)

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/p_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index a4dcf58..9828620 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -398,6 +398,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
         return;
     REF_ASSERT_ISNT(i < 0);
     EVP_PKEY_free_it(x);
+    CRYPTO_THREAD_lock_free(x->lock);
     sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);
     OPENSSL_free(x);
 }
@@ -413,7 +414,6 @@ static void EVP_PKEY_free_it(EVP_PKEY *x)
     ENGINE_finish(x->engine);
     x->engine = NULL;
 #endif
-    CRYPTO_THREAD_lock_free(x->lock);
 }
 
 static int unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent,

From levitte at openssl.org  Wed Sep  7 15:27:37 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 07 Sep 2016 15:27:37 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473262057.474323.32118.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3e2dd30d665f3a312a45f945ffafb74ff6c420d6 (commit)
      from  d65c3615f6c658478503f4862f8055203a98038c (commit)


- Log -----------------------------------------------------------------
commit 3e2dd30d665f3a312a45f945ffafb74ff6c420d6
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 20:14:33 2016 +0200

    Configure: Reorganise the checking of disabled options
    
    The way we figured out what options are crypto algorithms and what are
    something other was somewhat sketchy.  This change bases the
    distinction on available sdirs instead.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/Configure b/Configure
index 86e30d9..71700ec 100755
--- a/Configure
+++ b/Configure
@@ -863,33 +863,34 @@ foreach (sort (keys %disabled))
 		@{$config{dirs}} = grep !/^engines$/, @{$config{dirs}};
 		@{$config{sdirs}} = grep !/^engine$/, @{$config{sdirs}};
 		push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
+		print " OPENSSL_NO_ENGINE (skip engines)";
 		}
 	else
 		{
-		my ($ALGO, $algo);
-		($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
+		my ($WHAT, $what);
 
-		if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/
-				|| /^autoalginit/ || /^autoerrinit/)
+		($WHAT = $what = $_) =~ tr/[\-a-z]/[_A-Z]/;
+
+		# Fix up C macro end names
+		$WHAT = "RMD160" if $what eq "ripemd";
+
+		# fix-up crypto/directory name(s)
+		$what = "ripemd" if $what eq "rmd160";
+		$what = "whrlpool" if $what eq "whirlpool";
+
+		if (grep { $_ eq $what } @{$config{sdirs}})
 			{
-			push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO";
-			print " OPENSSL_NO_$ALGO";
+			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$WHAT";
+			@{$config{sdirs}} = grep { $_ ne $what} @{$config{sdirs}};
 
-			if (/^err$/)	{ push @user_defines, "OPENSSL_NO_ERR"; }
+			print " OPENSSL_NO_$WHAT (skip dir)";
 			}
 		else
 			{
-			($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
+			push @{$config{openssl_other_defines}}, "OPENSSL_NO_$WHAT";
+			print " OPENSSL_NO_$WHAT";
 
-			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$ALGO";
-			print " OPENSSL_NO_$ALGO";
-
-			# fix-up crypto/directory name(s)
-			$algo="whrlpool" if $algo eq "whirlpool";
-			$algo="ripemd" if $algo eq "rmd160";
-			@{$config{sdirs}} = grep { $_ ne $algo} @{$config{sdirs}};
-
-			print " (skip dir)";
+			if (/^err$/)	{ push @user_defines, "OPENSSL_NO_ERR"; }
 			}
 		}
 

From levitte at openssl.org  Wed Sep  7 15:28:13 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 07 Sep 2016 15:28:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473262093.183265.714.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  79e5eae6ab164efe4966685758b8f15c13698bb1 (commit)
      from  b7d2480c820531df2a5a300a7b24bbaa7755c288 (commit)


- Log -----------------------------------------------------------------
commit 79e5eae6ab164efe4966685758b8f15c13698bb1
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 20:14:33 2016 +0200

    Configure: Reorganise the checking of disabled options
    
    The way we figured out what options are crypto algorithms and what are
    something other was somewhat sketchy.  This change bases the
    distinction on available sdirs instead.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 3e2dd30d665f3a312a45f945ffafb74ff6c420d6)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/Configure b/Configure
index 0a1b68a..f77177f 100755
--- a/Configure
+++ b/Configure
@@ -846,33 +846,34 @@ foreach (sort (keys %disabled))
 		@{$config{dirs}} = grep !/^engines$/, @{$config{dirs}};
 		@{$config{sdirs}} = grep !/^engine$/, @{$config{sdirs}};
 		push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
+		print " OPENSSL_NO_ENGINE (skip engines)";
 		}
 	else
 		{
-		my ($ALGO, $algo);
-		($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
+		my ($WHAT, $what);
 
-		if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/
-				|| /^autoalginit/ || /^autoerrinit/)
+		($WHAT = $what = $_) =~ tr/[\-a-z]/[_A-Z]/;
+
+		# Fix up C macro end names
+		$WHAT = "RMD160" if $what eq "ripemd";
+
+		# fix-up crypto/directory name(s)
+		$what = "ripemd" if $what eq "rmd160";
+		$what = "whrlpool" if $what eq "whirlpool";
+
+		if (grep { $_ eq $what } @{$config{sdirs}})
 			{
-			push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO";
-			print " OPENSSL_NO_$ALGO";
+			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$WHAT";
+			@{$config{sdirs}} = grep { $_ ne $what} @{$config{sdirs}};
 
-			if (/^err$/)	{ push @user_defines, "OPENSSL_NO_ERR"; }
+			print " OPENSSL_NO_$WHAT (skip dir)";
 			}
 		else
 			{
-			($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
+			push @{$config{openssl_other_defines}}, "OPENSSL_NO_$WHAT";
+			print " OPENSSL_NO_$WHAT";
 
-			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$ALGO";
-			print " OPENSSL_NO_$ALGO";
-
-			# fix-up crypto/directory name(s)
-			$algo="whrlpool" if $algo eq "whirlpool";
-			$algo="ripemd" if $algo eq "rmd160";
-			@{$config{sdirs}} = grep { $_ ne $algo} @{$config{sdirs}};
-
-			print " (skip dir)";
+			if (/^err$/)	{ push @user_defines, "OPENSSL_NO_ERR"; }
 			}
 		}
 

From no-reply at appveyor.com  Wed Sep  7 16:55:01 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 07 Sep 2016 16:55:01 +0000
Subject: [openssl-commits] Build failed: openssl sct_from_b64.291
Message-ID: <20160907165457.3633.16550.FD1275E0@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160907/35f8e06e/attachment.html>

From no-reply at appveyor.com  Wed Sep  7 17:25:17 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 07 Sep 2016 17:25:17 +0000
Subject: [openssl-commits] Build completed: openssl sct_from_b64.292
Message-ID: <20160907172516.39296.58749.8147EECD@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160907/163fbef3/attachment.html>

From rsalz at openssl.org  Wed Sep  7 17:55:58 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 17:55:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473270958.552597.17635.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  92ed7fa575a80955f3bb6efefca9bf576a953586 (commit)
      from  79e5eae6ab164efe4966685758b8f15c13698bb1 (commit)


- Log -----------------------------------------------------------------
commit 92ed7fa575a80955f3bb6efefca9bf576a953586
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 7 16:53:18 2016 +0100

    Avoid EVP_PKEY_cmp() crash on EC keys without public component
    
    Some hardware devices don't provide the public EC_POINT data. The only
    way for X509_check_private_key() to validate that the key matches a
    given certificate is to actually perform a sign operation and then
    verify it using the public key in the certificate.
    
    Maybe that can come later, as discussed in issue 1532. But for now let's
    at least make it fail gracefully and not crash.
    
    GH: 1532
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1547)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_ameth.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index a899932..9792007 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -171,6 +171,8 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
     const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
     const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
         *pb = EC_KEY_get0_public_key(b->pkey.ec);
+    if (group == NULL || pa == NULL || pb == NULL)
+        return -2;
     r = EC_POINT_cmp(group, pa, pb, NULL);
     if (r == 0)
         return 1;
@@ -311,6 +313,8 @@ static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
         *group_b = EC_KEY_get0_group(b->pkey.ec);
+    if (group_a == NULL || group_b == NULL)
+        return -2;
     if (EC_GROUP_cmp(group_a, group_b, NULL))
         return 0;
     else

From rsalz at openssl.org  Wed Sep  7 17:56:58 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 17:56:58 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473271018.405923.18357.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  8195a8691108d89fbb0dd11599154067009d10d6 (commit)
      from  3f1014960353af29a05a7b5dac40afd30d4f9bb3 (commit)


- Log -----------------------------------------------------------------
commit 8195a8691108d89fbb0dd11599154067009d10d6
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 7 16:53:18 2016 +0100

    Avoid EVP_PKEY_cmp() crash on EC keys without public component
    
    Some hardware devices don't provide the public EC_POINT data. The only
    way for X509_check_private_key() to validate that the key matches a
    given certificate is to actually perform a sign operation and then
    verify it using the public key in the certificate.
    
    Maybe that can come later, as discussed in issue 1532. But for now let's
    at least make it fail gracefully and not crash.
    
    GH: 1532
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1547)
    (cherry picked from commit 92ed7fa575a80955f3bb6efefca9bf576a953586)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_ameth.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 61a97f6..d089af7 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -224,6 +224,8 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
     const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
     const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
         *pb = EC_KEY_get0_public_key(b->pkey.ec);
+    if (group == NULL || pa == NULL || pb == NULL)
+        return -2;
     r = EC_POINT_cmp(group, pa, pb, NULL);
     if (r == 0)
         return 1;
@@ -394,6 +396,8 @@ static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
         *group_b = EC_KEY_get0_group(b->pkey.ec);
+    if (group_a == NULL || group_b == NULL)
+        return -2;
     if (EC_GROUP_cmp(group_a, group_b, NULL))
         return 0;
     else

From rsalz at openssl.org  Wed Sep  7 17:58:02 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 17:58:02 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473271082.285887.19086.nullmailer@dev.openssl.org>

The branch master has been updated
       via  978ecbb08be69864c2a85524eafbdb70487becb0 (commit)
      from  3e2dd30d665f3a312a45f945ffafb74ff6c420d6 (commit)


- Log -----------------------------------------------------------------
commit 978ecbb08be69864c2a85524eafbdb70487becb0
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 7 16:53:18 2016 +0100

    Avoid EVP_PKEY_cmp() crash on EC keys without public component
    
    Some hardware devices don't provide the public EC_POINT data. The only
    way for X509_check_private_key() to validate that the key matches a
    given certificate is to actually perform a sign operation and then
    verify it using the public key in the certificate.
    
    Maybe that can come later, as discussed in issue 1532. But for now let's
    at least make it fail gracefully and not crash.
    
    GH: 1532
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1547)
    (cherry picked from commit 92ed7fa575a80955f3bb6efefca9bf576a953586)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_ameth.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index a899932..9792007 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -171,6 +171,8 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
     const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
     const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
         *pb = EC_KEY_get0_public_key(b->pkey.ec);
+    if (group == NULL || pa == NULL || pb == NULL)
+        return -2;
     r = EC_POINT_cmp(group, pa, pb, NULL);
     if (r == 0)
         return 1;
@@ -311,6 +313,8 @@ static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
         *group_b = EC_KEY_get0_group(b->pkey.ec);
+    if (group_a == NULL || group_b == NULL)
+        return -2;
     if (EC_GROUP_cmp(group_a, group_b, NULL))
         return 0;
     else

From rsalz at openssl.org  Wed Sep  7 19:46:15 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 19:46:15 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473277575.440673.32024.nullmailer@dev.openssl.org>

The branch master has been updated
       via  bc357b452ebd4788929c3159d92e528cc71aa8c7 (commit)
      from  90fa961058760088bb3715ea6f6407192db19399 (commit)


- Log -----------------------------------------------------------------
commit bc357b452ebd4788929c3159d92e528cc71aa8c7
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Sep 7 15:46:08 2016 -0400

    Add Travis thanks, for more quota

-----------------------------------------------------------------------

Summary of changes:
 community/thanks.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/community/thanks.html b/community/thanks.html
index 9a7e52c..3e4d673 100644
--- a/community/thanks.html
+++ b/community/thanks.html
@@ -24,6 +24,10 @@
               <li>Thanks to
               <a href="https://www.akamai.com">Akamai Technologies</a>
               for providing free CDN and security services.</li>
+              <li>Thanks to
+              <a href="https://travis-ci.com">Travis CI</a> for increasing
+              our quota on GitHub so that we can do more continuous
+              integration builds and testing.</li>
 	      <li>Thanks to
 	      <a href="https://www.globalsign.com">GMO GlobalSign</a>
 	      for providing free TLS certificates on our origin sites.</li>

From levitte at openssl.org  Wed Sep  7 19:53:48 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 07 Sep 2016 19:53:48 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473278028.522323.3182.nullmailer@dev.openssl.org>

The branch master has been updated
       via  342a1a23793cb99921abeabe882adf8652ba715d (commit)
      from  978ecbb08be69864c2a85524eafbdb70487becb0 (commit)


- Log -----------------------------------------------------------------
commit 342a1a23793cb99921abeabe882adf8652ba715d
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 7 20:56:20 2016 +0200

    Allow asan, msan and ubsan to be configured with shared libraries
    
    The background story is that util/shlib_wrap.sh was setting LD_PRELOAD
    or similar platform dependent variables, just in case the shared
    libraries were built with -rpath.  Unfortunately, this doesn't work
    too well with asan, msan or ubsan.
    
    So, the solution is to forbid the combination of shared libraries,
    -rpath and any of the sanity analyzers we can configure.
    
    This changes util/shlib_wrap.sh so it only contains the code that sets
    LD_PRELOAD when -rpath has been used when configuring.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl        | 8 ++------
 Configure                                | 9 ++++++++-
 util/build.info                          | 2 ++
 util/{shlib_wrap.sh => shlib_wrap.sh.in} | 2 ++
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 util/build.info
 rename util/{shlib_wrap.sh => shlib_wrap.sh.in} (96%)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1392295..d486d9e 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -775,18 +775,14 @@ dist:
 
 # Helper targets #####################################################
 
-link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh
+link-utils: $(BLDDIR)/util/opensslwrap.sh
 
 $(BLDDIR)/util/opensslwrap.sh: configdata.pm
 	@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
 	    mkdir -p "$(BLDDIR)/util"; \
 	    ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \
 	fi
-$(BLDDIR)/util/shlib_wrap.sh: configdata.pm
-	@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
-	    mkdir -p "$(BLDDIR)/util"; \
-	    ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \
-	fi
+
 FORCE:
 
 # Building targets ###################################################
diff --git a/Configure b/Configure
index 71700ec..96b6590 100755
--- a/Configure
+++ b/Configure
@@ -300,7 +300,7 @@ my $default_ranlib;
 $config{fips}=0;
 
 # Top level directories to build
-$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "tools", "fuzz" ];
+$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "util", "tools", "fuzz" ];
 # crypto/ subdirectories to build
 $config{sdirs} = [
     "objects",
@@ -780,6 +780,13 @@ foreach (@argvcopy)
 		}
 	}
 
+if ($libs =~ /(^|\s)-Wl,-rpath,/
+    && !$disabled{shared}
+    && !($disabled{asan} && $disabled{msan} && $disabled{ubsan})) {
+    die "***** Cannot simultaneously use -rpath, shared libraries, and\n",
+	"***** any of asan, msan or ubsan\n";
+}
+
 if ($config{fips})
 	{
 	delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);
diff --git a/util/build.info b/util/build.info
new file mode 100644
index 0000000..616fbd7
--- /dev/null
+++ b/util/build.info
@@ -0,0 +1,2 @@
+SCRIPTS_NO_INST=shlib_wrap.sh
+SOURCE[shlib_wrap.sh]=shlib_wrap.sh.in
diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh.in
similarity index 96%
rename from util/shlib_wrap.sh
rename to util/shlib_wrap.sh.in
index ce463f1..eff1141 100755
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh.in
@@ -81,6 +81,7 @@ SunOS|IRIX*)
 	;;
 esac
 
+{- output_off() if $config{ex_libs} !~ /(^|\s)-Wl,-rpath,/; ""; -}
 if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
 	# Following three lines are major excuse for isolating them into
 	# this wrapper script. Original reason for setting LD_PRELOAD
@@ -96,6 +97,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
 	DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO"	# MacOS X
 	export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
 fi
+{- output_on() if $config{ex_libs} !~ /(^|\s)-Wl,-rpath,/; ""; -}
 
 cmd="$1"; [ -x "$cmd" ] || cmd="$cmd${EXE_EXT}"
 shift

From levitte at openssl.org  Wed Sep  7 19:54:12 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 07 Sep 2016 19:54:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473278052.275468.4176.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  c3cfc9962b883a1da7082735f77a9c4b4e4ffdd8 (commit)
      from  92ed7fa575a80955f3bb6efefca9bf576a953586 (commit)


- Log -----------------------------------------------------------------
commit c3cfc9962b883a1da7082735f77a9c4b4e4ffdd8
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 7 20:56:20 2016 +0200

    Allow asan, msan and ubsan to be configured with shared libraries
    
    The background story is that util/shlib_wrap.sh was setting LD_PRELOAD
    or similar platform dependent variables, just in case the shared
    libraries were built with -rpath.  Unfortunately, this doesn't work
    too well with asan, msan or ubsan.
    
    So, the solution is to forbid the combination of shared libraries,
    -rpath and any of the sanity analyzers we can configure.
    
    This changes util/shlib_wrap.sh so it only contains the code that sets
    LD_PRELOAD when -rpath has been used when configuring.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 342a1a23793cb99921abeabe882adf8652ba715d)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl        | 8 ++------
 Configure                                | 9 ++++++++-
 util/build.info                          | 2 ++
 util/{shlib_wrap.sh => shlib_wrap.sh.in} | 2 ++
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 util/build.info
 rename util/{shlib_wrap.sh => shlib_wrap.sh.in} (96%)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1392295..d486d9e 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -775,18 +775,14 @@ dist:
 
 # Helper targets #####################################################
 
-link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh
+link-utils: $(BLDDIR)/util/opensslwrap.sh
 
 $(BLDDIR)/util/opensslwrap.sh: configdata.pm
 	@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
 	    mkdir -p "$(BLDDIR)/util"; \
 	    ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \
 	fi
-$(BLDDIR)/util/shlib_wrap.sh: configdata.pm
-	@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
-	    mkdir -p "$(BLDDIR)/util"; \
-	    ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \
-	fi
+
 FORCE:
 
 # Building targets ###################################################
diff --git a/Configure b/Configure
index f77177f..4be1f33 100755
--- a/Configure
+++ b/Configure
@@ -284,7 +284,7 @@ my $default_ranlib;
 $config{fips}=0;
 
 # Top level directories to build
-$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "tools", "fuzz" ];
+$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "util", "tools", "fuzz" ];
 # crypto/ subdirectories to build
 $config{sdirs} = [
     "objects",
@@ -763,6 +763,13 @@ foreach (@argvcopy)
 		}
 	}
 
+if ($libs =~ /(^|\s)-Wl,-rpath,/
+    && !$disabled{shared}
+    && !($disabled{asan} && $disabled{msan} && $disabled{ubsan})) {
+    die "***** Cannot simultaneously use -rpath, shared libraries, and\n",
+	"***** any of asan, msan or ubsan\n";
+}
+
 if ($config{fips})
 	{
 	delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);
diff --git a/util/build.info b/util/build.info
new file mode 100644
index 0000000..616fbd7
--- /dev/null
+++ b/util/build.info
@@ -0,0 +1,2 @@
+SCRIPTS_NO_INST=shlib_wrap.sh
+SOURCE[shlib_wrap.sh]=shlib_wrap.sh.in
diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh.in
similarity index 96%
rename from util/shlib_wrap.sh
rename to util/shlib_wrap.sh.in
index ce463f1..eff1141 100755
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh.in
@@ -81,6 +81,7 @@ SunOS|IRIX*)
 	;;
 esac
 
+{- output_off() if $config{ex_libs} !~ /(^|\s)-Wl,-rpath,/; ""; -}
 if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
 	# Following three lines are major excuse for isolating them into
 	# this wrapper script. Original reason for setting LD_PRELOAD
@@ -96,6 +97,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
 	DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO"	# MacOS X
 	export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
 fi
+{- output_on() if $config{ex_libs} !~ /(^|\s)-Wl,-rpath,/; ""; -}
 
 cmd="$1"; [ -x "$cmd" ] || cmd="$cmd${EXE_EXT}"
 shift

From rsalz at openssl.org  Wed Sep  7 20:08:48 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 20:08:48 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473278928.169172.10727.nullmailer@dev.openssl.org>

The branch master has been updated
       via  252cfef151e302dce598503de09fd3a3341810d7 (commit)
      from  342a1a23793cb99921abeabe882adf8652ba715d (commit)


- Log -----------------------------------------------------------------
commit 252cfef151e302dce598503de09fd3a3341810d7
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 7 15:40:16 2016 -0400

    Add missing debug strings.
    
    Found by turning -Wswitch-enum on.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_stat.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index cc0d477..014340f 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -43,6 +43,14 @@ const char *SSL_state_string_long(const SSL *s)
         return "error";
 
     switch (SSL_get_state(s)) {
+    case TLS_ST_CR_CERT_STATUS:
+        return "SSLv3/TLS read certificate status";
+    case TLS_ST_CW_NEXT_PROTO:
+        return "SSLv3/TLS write next proto";
+    case TLS_ST_SR_NEXT_PROTO:
+        return "SSLv3/TLS write next proto";
+    case TLS_ST_SW_CERT_STATUS:
+        return "SSLv3/TLS write next proto";
     case TLS_ST_BEFORE:
         return "before SSL initialization";
     case TLS_ST_OK:
@@ -116,6 +124,18 @@ const char *SSL_state_string(const SSL *s)
         return "SSLERR";
 
     switch (SSL_get_state(s)) {
+    case TLS_ST_SR_NEXT_PROTO:
+        return "TRNP";
+    case TLS_ST_SW_SESSION_TICKET:
+        return "TWST";
+    case TLS_ST_SW_CERT_STATUS:
+        return "TWCS";
+    case TLS_ST_CR_CERT_STATUS:
+        return "TRCS";
+    case TLS_ST_CR_SESSION_TICKET:
+        return "TRST";
+    case TLS_ST_CW_NEXT_PROTO:
+        return "TWNP";
     case TLS_ST_BEFORE:
         return "PINIT ";
     case TLS_ST_OK:

From rsalz at openssl.org  Wed Sep  7 20:09:07 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 07 Sep 2016 20:09:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473278947.815840.11602.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  f2befe3444dd05700f0bb62137ceebeea06f966d (commit)
      from  c3cfc9962b883a1da7082735f77a9c4b4e4ffdd8 (commit)


- Log -----------------------------------------------------------------
commit f2befe3444dd05700f0bb62137ceebeea06f966d
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 7 15:40:16 2016 -0400

    Add missing debug strings.
    
    Found by turning -Wswitch-enum on.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 252cfef151e302dce598503de09fd3a3341810d7)

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_stat.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index cc0d477..014340f 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -43,6 +43,14 @@ const char *SSL_state_string_long(const SSL *s)
         return "error";
 
     switch (SSL_get_state(s)) {
+    case TLS_ST_CR_CERT_STATUS:
+        return "SSLv3/TLS read certificate status";
+    case TLS_ST_CW_NEXT_PROTO:
+        return "SSLv3/TLS write next proto";
+    case TLS_ST_SR_NEXT_PROTO:
+        return "SSLv3/TLS write next proto";
+    case TLS_ST_SW_CERT_STATUS:
+        return "SSLv3/TLS write next proto";
     case TLS_ST_BEFORE:
         return "before SSL initialization";
     case TLS_ST_OK:
@@ -116,6 +124,18 @@ const char *SSL_state_string(const SSL *s)
         return "SSLERR";
 
     switch (SSL_get_state(s)) {
+    case TLS_ST_SR_NEXT_PROTO:
+        return "TRNP";
+    case TLS_ST_SW_SESSION_TICKET:
+        return "TWST";
+    case TLS_ST_SW_CERT_STATUS:
+        return "TWCS";
+    case TLS_ST_CR_CERT_STATUS:
+        return "TRCS";
+    case TLS_ST_CR_SESSION_TICKET:
+        return "TRST";
+    case TLS_ST_CW_NEXT_PROTO:
+        return "TWNP";
     case TLS_ST_BEFORE:
         return "PINIT ";
     case TLS_ST_OK:

From builds at travis-ci.org  Wed Sep  7 23:18:36 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 07 Sep 2016 23:18:36 +0000
Subject: [openssl-commits] Broken: openssl/openssl#5882 (master - 252cfef)
In-Reply-To: <openssl/openssl+158276261+broken@travis-ci.org>
Message-ID: <57d0a05f32815_33fd72f28c5e47300b7@f3b68199-c419-4988-aaf7-9b55725c26b4.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5882
Status: Broken

Duration: 1 hour, 11 minutes, and 1 second
Commit: 252cfef (master)
Author: Rich Salz
Message: Add missing debug strings.

Found by turning -Wswitch-enum on.

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/342a1a23793c...252cfef151e3

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/158276261

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160907/1cf1b73a/attachment-0001.html>

From appro at openssl.org  Thu Sep  8 07:07:17 2016
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 08 Sep 2016 07:07:17 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473318437.376884.21075.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  656bce035762ae5abd9089438dae5797c4e38b0b (commit)
      from  f2befe3444dd05700f0bb62137ceebeea06f966d (commit)


- Log -----------------------------------------------------------------
commit 656bce035762ae5abd9089438dae5797c4e38b0b
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 3 00:46:01 2016 +0200

    chacha/asm/chacha-ppc.pl: add missing .text directive.
    
    RT#4667
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit abcbf7ed7ea249609d225e43e1bce3af1fa1028c)

-----------------------------------------------------------------------

Summary of changes:
 crypto/chacha/asm/chacha-ppc.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/chacha/asm/chacha-ppc.pl b/crypto/chacha/asm/chacha-ppc.pl
index b978f58..8a54cba 100755
--- a/crypto/chacha/asm/chacha-ppc.pl
+++ b/crypto/chacha/asm/chacha-ppc.pl
@@ -133,6 +133,7 @@ my ($a3,$b3,$c3,$d3)=map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
 
 $code.=<<___;
 .machine	"any"
+.text
 
 .globl	.ChaCha20_ctr32_int
 .align	5

From appro at openssl.org  Thu Sep  8 07:07:17 2016
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 08 Sep 2016 07:07:17 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473318437.479438.21097.nullmailer@dev.openssl.org>

The branch master has been updated
       via  abcbf7ed7ea249609d225e43e1bce3af1fa1028c (commit)
      from  252cfef151e302dce598503de09fd3a3341810d7 (commit)


- Log -----------------------------------------------------------------
commit abcbf7ed7ea249609d225e43e1bce3af1fa1028c
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 3 00:46:01 2016 +0200

    chacha/asm/chacha-ppc.pl: add missing .text directive.
    
    RT#4667
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/chacha/asm/chacha-ppc.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/chacha/asm/chacha-ppc.pl b/crypto/chacha/asm/chacha-ppc.pl
index b978f58..8a54cba 100755
--- a/crypto/chacha/asm/chacha-ppc.pl
+++ b/crypto/chacha/asm/chacha-ppc.pl
@@ -133,6 +133,7 @@ my ($a3,$b3,$c3,$d3)=map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
 
 $code.=<<___;
 .machine	"any"
+.text
 
 .globl	.ChaCha20_ctr32_int
 .align	5

From appro at openssl.org  Thu Sep  8 07:12:20 2016
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 08 Sep 2016 07:12:20 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473318740.616272.22241.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  054ef95f56d5dc9feb6f4b9272d3d8bd27b4d4c6 (commit)
      from  656bce035762ae5abd9089438dae5797c4e38b0b (commit)


- Log -----------------------------------------------------------------
commit 054ef95f56d5dc9feb6f4b9272d3d8bd27b4d4c6
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 3 22:03:55 2016 +0200

    Configurations/10-main.cf: AIX "facelift".
    
    Improve interchangeability of aix*-gcc targets by linking shared
    libraries with -static-libgcc, and address linking problems with
    vendor compiler.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit f780eaad5be140cf192191b8d79dc3671443e0b2)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 14 +++++++++-----
 Makefile.shared             |  6 ++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 843647d..008120b 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1142,6 +1142,11 @@ sub vms_info {
     },
 
 #### IBM's AIX.
+    # Below targets assume AIX >=5. Caveat lector. If you are accustomed
+    # to control compilation "bitness" by setting $OBJECT_MODE environment
+    # variable, then you should know that in OpenSSL case it's considered
+    # only in ./config. Once configured, build procedure remains "deaf" to
+    # current value of $OBJECT_MODE.
     "aix-gcc" => {
         inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
         cc               => "gcc",
@@ -1155,7 +1160,7 @@ sub vms_info {
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
-        shared_ldflag    => "-shared -Wl,-G",
+        shared_ldflag    => "-shared -static-libgcc -Wl,-G",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X32",
     },
@@ -1172,13 +1177,10 @@ sub vms_info {
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
-        shared_ldflag    => "-maix64 -shared -Wl,-G",
+        shared_ldflag    => "-maix64 -shared -static-libgcc -Wl,-G",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X64",
     },
-    # Below targets assume AIX 5. Idea is to effectively disregard
-    # $OBJECT_MODE at build time. $OBJECT_MODE is respected at
-    # ./config stage!
     "aix-cc" => {
         inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
         cc               => "cc",
@@ -1189,6 +1191,7 @@ sub vms_info {
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
         thread_scheme    => "pthreads",
+        ex_libs          => threads("-lpthreads"),
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
@@ -1206,6 +1209,7 @@ sub vms_info {
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         thread_scheme    => "pthreads",
+        ex_libs          => threads("-lpthreads"),
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
diff --git a/Makefile.shared b/Makefile.shared
index d856180..77dae6e 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -150,8 +150,8 @@ LINK_SO_DSO=	INHIBIT_SYMLINKS=yes; SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
 LINK_SO_SHLIB_VIA_O=	\
   SHOBJECTS=$(DSTDIR)/lib$(LIBNAME).o; \
   ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
-  ( echo ld $(LDFLAGS) -r -o $$SHOBJECTS.o $$ALL lib$(LIBNAME).a $(LIBEXTRAS); \
-    ld $(LDFLAGS) -r -o $$SHOBJECTS.o $$ALL $(DSTDIR)/lib$(LIBNAME).a $(LIBEXTRAS) ); \
+  ( echo ld $(LDFLAGS) -r -o $$SHOBJECTS $$ALL lib$(LIBNAME).a $(LIBEXTRAS); \
+    ld $(LDFLAGS) -r -o $$SHOBJECTS $$ALL $(DSTDIR)/lib$(LIBNAME).a $(LIBEXTRAS) ); \
   $(LINK_SO) && ( echo rm -f $$SHOBJECTS; rm -f $$SHOBJECTS )
 
 LINK_SO_SHLIB_UNPACKED=	\
@@ -526,6 +526,7 @@ link_dso.aix:
 	ALLSYMSFLAGS=''; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+	rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \
 	$(LINK_SO_DSO);
 link_shlib.aix:
 	@ $(CALC_VERSIONS); \
@@ -536,6 +537,7 @@ link_shlib.aix:
 	ALLSYMSFLAGS='-bnogc'; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+	rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \
 	$(LINK_SO_SHLIB_VIA_O)
 link_app.aix:
 	LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \

From appro at openssl.org  Thu Sep  8 07:12:20 2016
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 08 Sep 2016 07:12:20 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473318740.677121.22263.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f780eaad5be140cf192191b8d79dc3671443e0b2 (commit)
      from  abcbf7ed7ea249609d225e43e1bce3af1fa1028c (commit)


- Log -----------------------------------------------------------------
commit f780eaad5be140cf192191b8d79dc3671443e0b2
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 3 22:03:55 2016 +0200

    Configurations/10-main.cf: AIX "facelift".
    
    Improve interchangeability of aix*-gcc targets by linking shared
    libraries with -static-libgcc, and address linking problems with
    vendor compiler.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 14 +++++++++-----
 Makefile.shared             |  6 ++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f32ccbb..463365d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1159,6 +1159,11 @@ sub vms_info {
     },
 
 #### IBM's AIX.
+    # Below targets assume AIX >=5. Caveat lector. If you are accustomed
+    # to control compilation "bitness" by setting $OBJECT_MODE environment
+    # variable, then you should know that in OpenSSL case it's considered
+    # only in ./config. Once configured, build procedure remains "deaf" to
+    # current value of $OBJECT_MODE.
     "aix-gcc" => {
         inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
         cc               => "gcc",
@@ -1172,7 +1177,7 @@ sub vms_info {
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
-        shared_ldflag    => "-shared -Wl,-G",
+        shared_ldflag    => "-shared -static-libgcc -Wl,-G",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X32",
     },
@@ -1189,13 +1194,10 @@ sub vms_info {
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
-        shared_ldflag    => "-maix64 -shared -Wl,-G",
+        shared_ldflag    => "-maix64 -shared -static-libgcc -Wl,-G",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X64",
     },
-    # Below targets assume AIX 5. Idea is to effectively disregard
-    # $OBJECT_MODE at build time. $OBJECT_MODE is respected at
-    # ./config stage!
     "aix-cc" => {
         inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
         cc               => "cc",
@@ -1206,6 +1208,7 @@ sub vms_info {
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
         thread_scheme    => "pthreads",
+        ex_libs          => threads("-lpthreads"),
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
@@ -1223,6 +1226,7 @@ sub vms_info {
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         thread_scheme    => "pthreads",
+        ex_libs          => threads("-lpthreads"),
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
diff --git a/Makefile.shared b/Makefile.shared
index d856180..77dae6e 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -150,8 +150,8 @@ LINK_SO_DSO=	INHIBIT_SYMLINKS=yes; SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
 LINK_SO_SHLIB_VIA_O=	\
   SHOBJECTS=$(DSTDIR)/lib$(LIBNAME).o; \
   ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
-  ( echo ld $(LDFLAGS) -r -o $$SHOBJECTS.o $$ALL lib$(LIBNAME).a $(LIBEXTRAS); \
-    ld $(LDFLAGS) -r -o $$SHOBJECTS.o $$ALL $(DSTDIR)/lib$(LIBNAME).a $(LIBEXTRAS) ); \
+  ( echo ld $(LDFLAGS) -r -o $$SHOBJECTS $$ALL lib$(LIBNAME).a $(LIBEXTRAS); \
+    ld $(LDFLAGS) -r -o $$SHOBJECTS $$ALL $(DSTDIR)/lib$(LIBNAME).a $(LIBEXTRAS) ); \
   $(LINK_SO) && ( echo rm -f $$SHOBJECTS; rm -f $$SHOBJECTS )
 
 LINK_SO_SHLIB_UNPACKED=	\
@@ -526,6 +526,7 @@ link_dso.aix:
 	ALLSYMSFLAGS=''; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+	rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \
 	$(LINK_SO_DSO);
 link_shlib.aix:
 	@ $(CALC_VERSIONS); \
@@ -536,6 +537,7 @@ link_shlib.aix:
 	ALLSYMSFLAGS='-bnogc'; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+	rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \
 	$(LINK_SO_SHLIB_VIA_O)
 link_app.aix:
 	LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \

From appro at openssl.org  Thu Sep  8 07:16:32 2016
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 08 Sep 2016 07:16:32 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473318992.234696.23353.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  a0c5ccc7c1ec1614b77c76ee0f057e681e7a12e9 (commit)
      from  054ef95f56d5dc9feb6f4b9272d3d8bd27b4d4c6 (commit)


- Log -----------------------------------------------------------------
commit a0c5ccc7c1ec1614b77c76ee0f057e681e7a12e9
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Sep 4 22:53:22 2016 +0200

    engines/afalg: make it compile with backward compatibility headers.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 4e3997293b3825ed19de20d5484f8c0f66fce534)

-----------------------------------------------------------------------

Summary of changes:
 engines/afalg/e_afalg.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/afalg/e_afalg.c b/engines/afalg/e_afalg.c
index 2ea5ba5..2c13ba8 100644
--- a/engines/afalg/e_afalg.c
+++ b/engines/afalg/e_afalg.c
@@ -8,7 +8,9 @@
  */
 
 /* Required for vmsplice */
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -17,11 +19,13 @@
 #include <openssl/async.h>
 #include <openssl/err.h>
 
+#include <sys/socket.h>
 #include <linux/version.h>
 #define K_MAJ   4
 #define K_MIN1  1
 #define K_MIN2  0
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2) || \
+    !defined(AF_ALG)
 # warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
 # warning "Skipping Compilation of AFALG engine"
 void engine_load_afalg_int(void)
@@ -30,7 +34,6 @@ void engine_load_afalg_int(void)
 #else
 
 # include <linux/if_alg.h>
-# include <sys/socket.h>
 # include <fcntl.h>
 # include <sys/utsname.h>
 

From appro at openssl.org  Thu Sep  8 07:16:32 2016
From: appro at openssl.org (Andy Polyakov)
Date: Thu, 08 Sep 2016 07:16:32 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473318992.291798.23375.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4e3997293b3825ed19de20d5484f8c0f66fce534 (commit)
      from  f780eaad5be140cf192191b8d79dc3671443e0b2 (commit)


- Log -----------------------------------------------------------------
commit 4e3997293b3825ed19de20d5484f8c0f66fce534
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Sep 4 22:53:22 2016 +0200

    engines/afalg: make it compile with backward compatibility headers.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 engines/afalg/e_afalg.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/afalg/e_afalg.c b/engines/afalg/e_afalg.c
index 2ea5ba5..2c13ba8 100644
--- a/engines/afalg/e_afalg.c
+++ b/engines/afalg/e_afalg.c
@@ -8,7 +8,9 @@
  */
 
 /* Required for vmsplice */
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -17,11 +19,13 @@
 #include <openssl/async.h>
 #include <openssl/err.h>
 
+#include <sys/socket.h>
 #include <linux/version.h>
 #define K_MAJ   4
 #define K_MIN1  1
 #define K_MIN2  0
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2) || \
+    !defined(AF_ALG)
 # warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
 # warning "Skipping Compilation of AFALG engine"
 void engine_load_afalg_int(void)
@@ -30,7 +34,6 @@ void engine_load_afalg_int(void)
 #else
 
 # include <linux/if_alg.h>
-# include <sys/socket.h>
 # include <fcntl.h>
 # include <sys/utsname.h>
 

From builds at travis-ci.org  Thu Sep  8 07:29:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 08 Sep 2016 07:29:40 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#5885 (master - abcbf7e)
In-Reply-To: <openssl/openssl+158377139+fixed@travis-ci.org>
Message-ID: <57d11365a01d2_33fd1108923506981da@60e46665-6f78-4f3a-b546-6a0c9e2311a3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5885
Status: Fixed

Duration: 21 minutes and 46 seconds
Commit: abcbf7e (master)
Author: Andy Polyakov
Message: chacha/asm/chacha-ppc.pl: add missing .text directive.

RT#4667

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/252cfef151e3...abcbf7ed7ea2

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/158377139

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/9ef2ca07/attachment-0001.html>

From builds at travis-ci.org  Thu Sep  8 08:08:49 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 08 Sep 2016 08:08:49 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#5887 (master - f780eaa)
In-Reply-To: <openssl/openssl+158377921+fixed@travis-ci.org>
Message-ID: <57d11c8ce8d3b_33fd72f8a6204107527b@f3b68199-c419-4988-aaf7-9b55725c26b4.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5887
Status: Fixed

Duration: 34 minutes and 18 seconds
Commit: f780eaa (master)
Author: Andy Polyakov
Message: Configurations/10-main.cf: AIX "facelift".

Improve interchangeability of aix*-gcc targets by linking shared
libraries with -static-libgcc, and address linking problems with
vendor compiler.

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/abcbf7ed7ea2...f780eaad5be1

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/158377921

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/8f7a5ebd/attachment.html>

From builds at travis-ci.org  Thu Sep  8 09:01:02 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 08 Sep 2016 09:01:02 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#5889 (master - 4e39972)
In-Reply-To: <openssl/openssl+158378562+fixed@travis-ci.org>
Message-ID: <57d128cebb68f_33fd72f7cbbb81125438@f3b68199-c419-4988-aaf7-9b55725c26b4.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5889
Status: Fixed

Duration: 30 minutes and 43 seconds
Commit: 4e39972 (master)
Author: Andy Polyakov
Message: engines/afalg: make it compile with backward compatibility headers.

Reviewed-by: Tim Hudson <tjh at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/f780eaad5be1...4e3997293b38

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/158378562

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/13fcadae/attachment.html>

From matt at openssl.org  Thu Sep  8 11:38:37 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 08 Sep 2016 11:38:37 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473334717.111667.8629.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2d11f5b2ca863d4bd9e20b224932b247ed85842b (commit)
      from  4e3997293b3825ed19de20d5484f8c0f66fce534 (commit)


- Log -----------------------------------------------------------------
commit 2d11f5b2ca863d4bd9e20b224932b247ed85842b
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 2 10:42:36 2016 +0100

    Ensure trace recognises X25519
    
    Using the -trace option to s_server or s_client was incorrectly printing
    UNKNOWN for the X25519 curve.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_trce.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 00632e5..4577f03 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -490,6 +490,7 @@ static ssl_trace_tbl ssl_curve_tbl[] = {
     {26, "brainpoolP256r1"},
     {27, "brainpoolP384r1"},
     {28, "brainpoolP512r1"},
+    {29, "ecdh_x25519"},
     {0xFF01, "arbitrary_explicit_prime_curves"},
     {0xFF02, "arbitrary_explicit_char2_curves"}
 };

From matt at openssl.org  Thu Sep  8 11:38:47 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 08 Sep 2016 11:38:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473334727.861629.9419.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  baee63371d568a2439cd1dddf584bcdf19b7cbbc (commit)
      from  a0c5ccc7c1ec1614b77c76ee0f057e681e7a12e9 (commit)


- Log -----------------------------------------------------------------
commit baee63371d568a2439cd1dddf584bcdf19b7cbbc
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 2 10:42:36 2016 +0100

    Ensure trace recognises X25519
    
    Using the -trace option to s_server or s_client was incorrectly printing
    UNKNOWN for the X25519 curve.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 2d11f5b2ca863d4bd9e20b224932b247ed85842b)

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_trce.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 00632e5..4577f03 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -490,6 +490,7 @@ static ssl_trace_tbl ssl_curve_tbl[] = {
     {26, "brainpoolP256r1"},
     {27, "brainpoolP384r1"},
     {28, "brainpoolP512r1"},
+    {29, "ecdh_x25519"},
     {0xFF01, "arbitrary_explicit_prime_curves"},
     {0xFF02, "arbitrary_explicit_char2_curves"}
 };

From matt at openssl.org  Thu Sep  8 11:45:01 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 08 Sep 2016 11:45:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473335101.217765.10492.nullmailer@dev.openssl.org>

The branch master has been updated
       via  135648bcd0e9db029582d3d7627a90a1b566c5d6 (commit)
      from  2d11f5b2ca863d4bd9e20b224932b247ed85842b (commit)


- Log -----------------------------------------------------------------
commit 135648bcd0e9db029582d3d7627a90a1b566c5d6
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 5 14:12:58 2016 +0100

    Fix mem leaks during auto-deinit
    
    Certain functions are automatically called during auto-deinit in order
    to deallocate resources. However, if we have never entered a function which
    marks lib crypto as inited then they never get called. This can happen if
    the user only ever makes use of a small sub-set of functions that don't hit
    the auto-init code.
    
    This commit ensures all such resources deallocated by these functions also
    init libcrypto when they are initially allocated.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Ben Laurie <ben at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/b_addr.c     | 1 +
 crypto/engine/eng_lib.c | 1 +
 crypto/err/err.c        | 1 +
 crypto/ex_data.c        | 1 +
 crypto/rand/md_rand.c   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index f924e10..29f92cf 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -604,6 +604,7 @@ static int addrinfo_wrap(int family, int socktype,
 
 DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     bio_lookup_lock = CRYPTO_THREAD_lock_new();
     return bio_lookup_lock != NULL;
 }
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 67d755a..28de21d 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -18,6 +18,7 @@ CRYPTO_ONCE engine_lock_init = CRYPTO_ONCE_STATIC_INIT;
 
 DEFINE_RUN_ONCE(do_engine_lock_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     global_engine_lock = CRYPTO_THREAD_lock_new();
     return global_engine_lock != NULL;
 }
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 584bb9e..c3f7212 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -251,6 +251,7 @@ static void ERR_STATE_free(ERR_STATE *s)
 
 DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     err_string_lock = CRYPTO_THREAD_lock_new();
     return err_string_lock != NULL;
 }
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 986ef70..bb1af0b 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -38,6 +38,7 @@ static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT;
 
 DEFINE_RUN_ONCE_STATIC(do_ex_data_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     ex_data_lock = CRYPTO_THREAD_lock_new();
     return ex_data_lock != NULL;
 }
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 7924478..85ce4e6 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -89,6 +89,7 @@ static RAND_METHOD rand_meth = {
 
 DEFINE_RUN_ONCE_STATIC(do_rand_lock_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     rand_lock = CRYPTO_THREAD_lock_new();
     rand_tmp_lock = CRYPTO_THREAD_lock_new();
     return rand_lock != NULL && rand_tmp_lock != NULL;

From matt at openssl.org  Thu Sep  8 11:45:18 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 08 Sep 2016 11:45:18 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473335118.479482.11279.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  ea42bd40595faefb19e2ec8d7a9efad4f75cff80 (commit)
      from  baee63371d568a2439cd1dddf584bcdf19b7cbbc (commit)


- Log -----------------------------------------------------------------
commit ea42bd40595faefb19e2ec8d7a9efad4f75cff80
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 5 14:12:58 2016 +0100

    Fix mem leaks during auto-deinit
    
    Certain functions are automatically called during auto-deinit in order
    to deallocate resources. However, if we have never entered a function which
    marks lib crypto as inited then they never get called. This can happen if
    the user only ever makes use of a small sub-set of functions that don't hit
    the auto-init code.
    
    This commit ensures all such resources deallocated by these functions also
    init libcrypto when they are initially allocated.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Ben Laurie <ben at openssl.org>
    (cherry picked from commit 135648bcd0e9db029582d3d7627a90a1b566c5d6)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/b_addr.c     | 1 +
 crypto/engine/eng_lib.c | 1 +
 crypto/err/err.c        | 1 +
 crypto/ex_data.c        | 1 +
 crypto/rand/md_rand.c   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index f924e10..29f92cf 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -604,6 +604,7 @@ static int addrinfo_wrap(int family, int socktype,
 
 DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     bio_lookup_lock = CRYPTO_THREAD_lock_new();
     return bio_lookup_lock != NULL;
 }
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 67d755a..28de21d 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -18,6 +18,7 @@ CRYPTO_ONCE engine_lock_init = CRYPTO_ONCE_STATIC_INIT;
 
 DEFINE_RUN_ONCE(do_engine_lock_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     global_engine_lock = CRYPTO_THREAD_lock_new();
     return global_engine_lock != NULL;
 }
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 584bb9e..c3f7212 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -251,6 +251,7 @@ static void ERR_STATE_free(ERR_STATE *s)
 
 DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     err_string_lock = CRYPTO_THREAD_lock_new();
     return err_string_lock != NULL;
 }
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 986ef70..bb1af0b 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -38,6 +38,7 @@ static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT;
 
 DEFINE_RUN_ONCE_STATIC(do_ex_data_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     ex_data_lock = CRYPTO_THREAD_lock_new();
     return ex_data_lock != NULL;
 }
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 7924478..85ce4e6 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -89,6 +89,7 @@ static RAND_METHOD rand_meth = {
 
 DEFINE_RUN_ONCE_STATIC(do_rand_lock_init)
 {
+    OPENSSL_init_crypto(0, NULL);
     rand_lock = CRYPTO_THREAD_lock_new();
     rand_tmp_lock = CRYPTO_THREAD_lock_new();
     return rand_lock != NULL && rand_tmp_lock != NULL;

From builds at travis-ci.org  Thu Sep  8 12:16:25 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 08 Sep 2016 12:16:25 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5891
	(OpenSSL_1_1_0-stable - baee633)
In-Reply-To: <openssl/openssl+158430026+errored@travis-ci.org>
Message-ID: <57d1569946b05_33fd11049e67c883753@60e46665-6f78-4f3a-b546-6a0c9e2311a3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5891
Status: Errored

Duration: 26 minutes and 57 seconds
Commit: baee633 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Ensure trace recognises X25519

Using the -trace option to s_server or s_client was incorrectly printing
UNKNOWN for the X25519 curve.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 2d11f5b2ca863d4bd9e20b224932b247ed85842b)

View the changeset: https://github.com/openssl/openssl/compare/a0c5ccc7c1ec...baee63371d56

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/158430026

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/e3731573/attachment.html>

From levitte at openssl.org  Thu Sep  8 15:55:00 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 08 Sep 2016 15:55:00 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473350100.316400.18951.nullmailer@dev.openssl.org>

The branch master has been updated
       via  047a5da2494abf565f5fb76f5cd92a05cd7fadd4 (commit)
      from  135648bcd0e9db029582d3d7627a90a1b566c5d6 (commit)


- Log -----------------------------------------------------------------
commit 047a5da2494abf565f5fb76f5cd92a05cd7fadd4
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 10:57:31 2016 +0200

    Travis: Do asan and msan with shared libraries
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad56a5f..f15ca6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,16 +39,16 @@ matrix:
           env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-shared enable-asan"
+          env: CONFIG_OPTS="enable-asan"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-shared enable-msan"
+          env: CONFIG_OPTS="enable-msan"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method -fno-sanitize=alignment"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-shared no-asm enable-asan enable-rc5 enable-md2"
+          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="no-stdio"

From levitte at openssl.org  Thu Sep  8 15:55:42 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 08 Sep 2016 15:55:42 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473350142.385877.20048.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  d3fa9addd24f50aa58cf2687cfa7dda579c2c5f6 (commit)
      from  ea42bd40595faefb19e2ec8d7a9efad4f75cff80 (commit)


- Log -----------------------------------------------------------------
commit d3fa9addd24f50aa58cf2687cfa7dda579c2c5f6
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 10:57:31 2016 +0200

    Travis: Do asan and msan with shared libraries
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 047a5da2494abf565f5fb76f5cd92a05cd7fadd4)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad56a5f..f15ca6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,16 +39,16 @@ matrix:
           env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-shared enable-asan"
+          env: CONFIG_OPTS="enable-asan"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-shared enable-msan"
+          env: CONFIG_OPTS="enable-msan"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method -fno-sanitize=alignment"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-shared no-asm enable-asan enable-rc5 enable-md2"
+          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="no-stdio"

From builds at travis-ci.org  Thu Sep  8 21:47:21 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 08 Sep 2016 21:47:21 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#1885
	(apps-speed-rework-n-clean - 65cccc6)
In-Reply-To: <FdaSilvaYY/openssl+158561929+passed@travis-ci.org>
Message-ID: <57d1dc6971b29_33ff88e3a241c823724@93b5ce21-078e-4237-bf34-6c60db6be286.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1885
Status: Passed

Duration: 1 hour, 32 minutes, and 11 seconds
Commit: 65cccc6 (apps-speed-rework-n-clean)
Author: FdaSilvaYY
Message: Add typedef on callback method pointers

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/37464611dc43...65cccc65ba6a

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158561929

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/e7332f0e/attachment.html>

From levitte at openssl.org  Thu Sep  8 22:10:32 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 08 Sep 2016 22:10:32 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473372632.696076.8496.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e82e2186e93e9a678dd8c0c5ba084d21d27d4d62 (commit)
      from  047a5da2494abf565f5fb76f5cd92a05cd7fadd4 (commit)


- Log -----------------------------------------------------------------
commit e82e2186e93e9a678dd8c0c5ba084d21d27d4d62
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 23:39:26 2016 +0200

    If errno is ENXIO in BSS_new_file(), set BIO_R_NO_SUCH_FILE
    
    VMS sets that errno when the device part of a file spec is malformed
    or a logical name that doesn't exist.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_file.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 4f79c32..6af2d9c 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -73,7 +73,11 @@ BIO *BIO_new_file(const char *filename, const char *mode)
     if (file == NULL) {
         SYSerr(SYS_F_FOPEN, get_last_sys_error());
         ERR_add_error_data(5, "fopen('", filename, "','", mode, "')");
-        if (errno == ENOENT)
+        if (errno == ENOENT
+# ifdef ENXIO
+            || errno == ENXIO
+# endif
+            )
             BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
         else
             BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB);

From levitte at openssl.org  Thu Sep  8 22:12:02 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 08 Sep 2016 22:12:02 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473372722.513246.9446.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  20d402a38e4d0b0e4b6ffc540ab7c756b39f3904 (commit)
      from  8195a8691108d89fbb0dd11599154067009d10d6 (commit)


- Log -----------------------------------------------------------------
commit 20d402a38e4d0b0e4b6ffc540ab7c756b39f3904
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 23:39:26 2016 +0200

    If errno is ENXIO in BSS_new_file(), set BIO_R_NO_SUCH_FILE
    
    VMS sets that errno when the device part of a file spec is malformed
    or a logical name that doesn't exist.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit e82e2186e93e9a678dd8c0c5ba084d21d27d4d62)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_file.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index bfba93e..a6e3b3a 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -174,7 +174,11 @@ BIO *BIO_new_file(const char *filename, const char *mode)
     if (file == NULL) {
         SYSerr(SYS_F_FOPEN, get_last_sys_error());
         ERR_add_error_data(5, "fopen('", filename, "','", mode, "')");
-        if (errno == ENOENT)
+        if (errno == ENOENT
+# ifdef ENXIO
+            || errno == ENXIO
+# endif
+            )
             BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
         else
             BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB);

From levitte at openssl.org  Thu Sep  8 22:12:07 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 08 Sep 2016 22:12:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473372727.513568.9752.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  0adfd49e47b08df699c941efef01b88d12b4a060 (commit)
      from  d3fa9addd24f50aa58cf2687cfa7dda579c2c5f6 (commit)


- Log -----------------------------------------------------------------
commit 0adfd49e47b08df699c941efef01b88d12b4a060
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 23:39:26 2016 +0200

    If errno is ENXIO in BSS_new_file(), set BIO_R_NO_SUCH_FILE
    
    VMS sets that errno when the device part of a file spec is malformed
    or a logical name that doesn't exist.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit e82e2186e93e9a678dd8c0c5ba084d21d27d4d62)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_file.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 4f79c32..6af2d9c 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -73,7 +73,11 @@ BIO *BIO_new_file(const char *filename, const char *mode)
     if (file == NULL) {
         SYSerr(SYS_F_FOPEN, get_last_sys_error());
         ERR_add_error_data(5, "fopen('", filename, "','", mode, "')");
-        if (errno == ENOENT)
+        if (errno == ENOENT
+# ifdef ENXIO
+            || errno == ENXIO
+# endif
+            )
             BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
         else
             BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB);

From levitte at openssl.org  Thu Sep  8 22:13:34 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 08 Sep 2016 22:13:34 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473372814.439726.10176.nullmailer@dev.openssl.org>

The branch master has been updated
       via  1750142f43436c9e074352580f1b434fd3b87f3a (commit)
       via  84f3867536625253b48e270cc261f0559b8861a9 (commit)
      from  e82e2186e93e9a678dd8c0c5ba084d21d27d4d62 (commit)


- Log -----------------------------------------------------------------
commit 1750142f43436c9e074352580f1b434fd3b87f3a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 19:23:38 2016 +0200

    VMS: Use different C flags for programs that aren't to be installed
    
    This is generalised by having the following macros for stuff that won't
    be installed:
    
        NO_INST_LIB_CFLAGS, used instead of LIB_CFLAGS
        NO_INST_DSO_CFLAGS, used instead of DSO_CFLAGS
        NO_INST_BIN_CFLAGS, used instead of BIN_CFLAGS
    
    They take values from corresponding target config fields if those are
    defined, otherwise they take the respective values from LIB_CFLAGS,
    DSO_CFLAGS and BIN_CFLAGS.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 84f3867536625253b48e270cc261f0559b8861a9
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 18:09:47 2016 +0200

    Build file templates: additional information to build file template functions
    
    Send a bit information to the build file template functions.  For
    src2obj(), the additional option 'product' holds the name of the final
    file that the object file will go into.  Additionally, the diverse
    functions will get the option 'installed', with a value that evaluates
    true if the final product is to be installed, otherwise false.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf     |  3 +++
 Configurations/common.tmpl      | 29 +++++++++++++++++++++++------
 Configurations/descrip.mms.tmpl | 16 +++++++++++++---
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 463365d..895385f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1768,6 +1768,9 @@ sub vms_info {
                                    release => "/NODEBUG/NOTRACEBACK"),
         lib_cflags       => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"),
         dso_cflags       => add("/NAMES=(AS_IS,SHORTENED)"),
+        # no_inst_bin_cflags is used instead of bin_cflags by descrip.mms.tmpl
+        # for object files belonging to selected internal programs
+        no_inst_bin_cflags => "/NAMES=(AS_IS,SHORTENED)",
         shared_target    => "vms-shared",
         dso_scheme       => "vms",
         thread_scheme    => "pthreads",
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl
index 9d7fbf2..d811a2a 100644
--- a/Configurations/common.tmpl
+++ b/Configurations/common.tmpl
@@ -34,6 +34,18 @@
      @newlist;
  }
 
+ # is_installed checks if a given file will be installed (i.e. they are
+ # not defined _NO_INST in build.info)
+ sub is_installed {
+     my $product = shift;
+     if (grep { $product eq $_ }
+         map { (@{$unified_info{install}->{$_}}) }
+         keys %{$unified_info{install}}) {
+         return 1;
+     }
+     return 0;
+ }
+
  # dogenerate is responsible for producing all the recipes that build
  # generated source files.  It recurses in case a dependency is also a
  # generated source file.
@@ -72,6 +84,7 @@
      my %opts = @_;
      if (@{$unified_info{sources}->{$obj}}) {
          $OUT .= src2obj(obj => $obj_no_o,
+                         product => $bin,
                          srcs => $unified_info{sources}->{$obj},
                          deps => $unified_info{depends}->{$obj},
                          incs => [ @{$unified_info{includes}->{$bin}},
@@ -102,9 +115,10 @@
                                         (@{$unified_info{sources}->{$lib}},
                                          @{$unified_info{shared_sources}->{$lib}}) ],
                               deps => [ reducedepends(resolvedepends($lib)) ],
+                              installed => is_installed($lib),
                               %ordinals);
          foreach (@{$unified_info{shared_sources}->{$lib}}) {
-             doobj($_, $lib, intent => "lib");
+             doobj($_, $lib, intent => "lib", installed => is_installed($lib));
          }
      }
      $OUT .= obj2lib(lib => $lib,
@@ -126,10 +140,11 @@
                      objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
                                (@{$unified_info{sources}->{$lib}},
                                 @{$unified_info{shared_sources}->{$lib}}) ],
-                     deps => [ resolvedepends($lib) ]);
+                     deps => [ resolvedepends($lib) ],
+                     installed => is_installed($lib));
      foreach ((@{$unified_info{sources}->{$lib}},
                @{$unified_info{shared_sources}->{$lib}})) {
-         doobj($_, $lib, intent => "dso");
+         doobj($_, $lib, intent => "dso", installed => is_installed($lib));
      }
      $cache{$lib} = 1;
  }
@@ -143,9 +158,10 @@
      $OUT .= obj2bin(bin => $bin,
                      objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
                                @{$unified_info{sources}->{$bin}} ],
-                     deps => $deps);
+                     deps => $deps,
+                     installed => is_installed($bin));
      foreach (@{$unified_info{sources}->{$bin}}) {
-         doobj($_, $bin, intent => "bin");
+         doobj($_, $bin, intent => "bin", installed => is_installed($bin));
      }
      $cache{$bin} = 1;
  }
@@ -156,7 +172,8 @@
      my $script = shift;
      return "" if $cache{$script};
      $OUT .= in2script(script => $script,
-                       sources => $unified_info{sources}->{$script});
+                       sources => $unified_info{sources}->{$script},
+                       installed => is_installed($script));
      $cache{$script} = 1;
  }
 
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index ce96778..108ab5d 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -168,6 +168,9 @@ EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ?
 LIB_CFLAGS={- $target{lib_cflags} || "" -}
 DSO_CFLAGS={- $target{dso_cflags} || "" -}
 BIN_CFLAGS={- $target{bin_cflags} || "" -}
+NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} || '$(LIB_CFLAGS)' -}
+NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} || '$(DSO_CFLAGS)' -}
+NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} || '$(BIN_CFLAGS)' -}
 
 PERL={- $config{perl} -}
 
@@ -567,9 +570,16 @@ EOF
       my $srcs =
           join(", ",
                map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}});
-      my $ecflags = { lib => '$(LIB_CFLAGS)',
-                      dso => '$(DSO_CFLAGS)',
-                      bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
+      my $ecflags;
+      if ($args{installed}) {
+          $ecflags = { lib => '$(LIB_CFLAGS)',
+                       dso => '$(DSO_CFLAGS)',
+                       bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
+      } else {
+          $ecflags = { lib => '$(NO_INST_LIB_CFLAGS)',
+                       dso => '$(NO_INST_DSO_CFLAGS)',
+                       bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}};
+      }
       my $incs_on = "\@ !";
       my $incs_off = "\@ !";
       my $incs = "";

From no-reply at appveyor.com  Thu Sep  8 23:03:53 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 08 Sep 2016 23:03:53 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1164
Message-ID: <20160908230352.59475.9380.6380D0F4@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/c07b2264/attachment.html>

From no-reply at appveyor.com  Thu Sep  8 23:23:37 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 08 Sep 2016 23:23:37 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1165
Message-ID: <20160908232337.69891.22927.99D284FF@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/8beeb3f4/attachment.html>

From no-reply at appveyor.com  Thu Sep  8 23:25:31 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 08 Sep 2016 23:25:31 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_0_2-stable.5230
Message-ID: <20160908232531.48417.69868.D6E10A2A@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/659fd282/attachment.html>

From no-reply at appveyor.com  Thu Sep  8 23:51:31 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 08 Sep 2016 23:51:31 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1166
Message-ID: <20160908235131.36379.19994.C63EC8BC@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/482b8413/attachment.html>

From no-reply at appveyor.com  Thu Sep  8 23:53:02 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 08 Sep 2016 23:53:02 +0000
Subject: [openssl-commits] Build completed: openssl OpenSSL_1_1_0-stable.5231
Message-ID: <20160908235301.69549.14858.8B7DFD0E@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160908/1246cb3d/attachment.html>

From no-reply at appveyor.com  Fri Sep  9 00:28:19 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 00:28:19 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1168
Message-ID: <20160909002818.1920.68312.0E682A29@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/a90b2541/attachment.html>

From builds at travis-ci.org  Fri Sep  9 00:20:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 00:20:52 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#1887 (MFL-rebase-test
	- 1ceccb7)
In-Reply-To: <FdaSilvaYY/openssl+158563409+passed@travis-ci.org>
Message-ID: <57d20063c7fbf_33ff88e3a2034978116@93b5ce21-078e-4237-bf34-6c60db6be286.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1887
Status: Passed

Duration: 1 hour, 21 minutes, and 49 seconds
Commit: 1ceccb7 (MFL-rebase-test)
Author: FdaSilvaYY
Message: Implement Maximum Fragment Length TLS extension.

based on https://groups.google.com/forum/#!topic/mailing.openssl.dev/fQxXvCg1uQY
adapted to the new Packet API.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/1fc62a9bd681...1ceccb7ea3fc

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158563409

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/f8300bf6/attachment-0001.html>

From no-reply at appveyor.com  Fri Sep  9 00:56:24 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 00:56:24 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1169
Message-ID: <20160909005623.48681.96535.BD623444@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/32c08958/attachment.html>

From builds at travis-ci.org  Fri Sep  9 01:44:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 01:44:03 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1889 (oss_constify_api
	- 38bdf6c)
In-Reply-To: <FdaSilvaYY/openssl+158577223+failed@travis-ci.org>
Message-ID: <57d213e3b3799_33ff2b9192eb86979bd@a8489d10-7e39-4328-873e-1b44d9896969.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1889
Status: Failed

Duration: 36 minutes and 13 seconds
Commit: 38bdf6c (oss_constify_api)
Author: FdaSilvaYY
Message: WIP: Constify more API using get0 pattern

X509_NAME_get0_entry
X509_NAME_ENTRY_get0_data
X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/63af07e95681...38bdf6c9d888

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158577223

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/efbaa6fe/attachment.html>

From builds at travis-ci.org  Fri Sep  9 03:04:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 03:04:18 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1891 (sk_num_alloc -
	5760998)
In-Reply-To: <FdaSilvaYY/openssl+158580391+broken@travis-ci.org>
Message-ID: <57d226b0ed98b_33ff88e09982410819dd@93b5ce21-078e-4237-bf34-6c60db6be286.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1891
Status: Broken

Duration: 47 minutes and 44 seconds
Commit: 5760998 (sk_num_alloc)
Author: FdaSilvaYY
Message: Add sk_new_num & sk_new_null_num methods

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/ce7ceb99065a...576099825951

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158580391

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/ca9ac15d/attachment.html>

From builds at travis-ci.org  Fri Sep  9 03:08:06 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 03:08:06 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1892
	(constify_2 - 343b11b)
In-Reply-To: <FdaSilvaYY/openssl+158580644+still failing@travis-ci.org>
Message-ID: <57d22798327e8_33ff88e3384541084112@93b5ce21-078e-4237-bf34-6c60db6be286.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1892
Status: Still Failing

Duration: 13 minutes and 7 seconds
Commit: 343b11b (constify_2)
Author: FdaSilvaYY
Message: Constify some X509_NAME, ASN1 printing code

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/1fc23bdedf34...343b11ba4a2d

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158580644

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/b35fcd87/attachment-0001.html>

From builds at travis-ci.org  Fri Sep  9 12:56:17 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 12:56:17 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1882
	(oss_builds_options_check - ba81be4)
In-Reply-To: <FdaSilvaYY/openssl+154781982+fixed@travis-ci.org>
Message-ID: <57d2b1717a999_33fc50483eefc999991@4c78c51a-eb9a-4c08-8403-f83995972194.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1882
Status: Fixed

Duration: 37 minutes and 51 seconds
Commit: ba81be4 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/f5a7599e7118...ba81be46c38e

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/154781982

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/0acb8aa8/attachment.html>

From rsalz at openssl.org  Fri Sep  9 14:07:52 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 09 Sep 2016 14:07:52 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473430072.785258.3056.nullmailer@dev.openssl.org>

The branch master has been updated
       via  141d7325e7e513102fb8c123dab62dbbd61e846d (commit)
      from  1750142f43436c9e074352580f1b434fd3b87f3a (commit)


- Log -----------------------------------------------------------------
commit 141d7325e7e513102fb8c123dab62dbbd61e846d
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Sep 6 12:26:38 2016 -0400

    Trim config output
    
    With extensive help and feedback from Richard and Andy.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 67 ++++++++++++++++++++++++---------------------------------------
 config    |  3 +--
 2 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/Configure b/Configure
index 96b6590..445f928 100755
--- a/Configure
+++ b/Configure
@@ -11,6 +11,7 @@
 
 require 5.10.0;
 use strict;
+use Config;
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
 use File::Path qw/mkpath/;
@@ -905,7 +906,6 @@ foreach (sort (keys %disabled))
 	}
 
 print "Configuring for $target\n";
-
 # Support for legacy targets having a name starting with 'debug-'
 my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
 if ($d) {
@@ -2019,46 +2019,19 @@ EOF
 print OUT "1;\n";
 close(OUT);
 
-
+my $perlvers = &get_perl_version();
+print "\n";
+print "PROCESSOR     =$config{processor}\n" if $config{processor};
+print "PERL          =$config{perl}\n";
+print "PERLVERSION   =$perlvers\n";
+print "HASHBANGPERL  =$config{hashbangperl}\n";
 print "CC            =$config{cross_compile_prefix}$target{cc}\n";
 print "CFLAG         =$target{cflags} $config{cflags}\n";
-print "SHARED_CFLAG  =$target{shared_cflag}\n";
 print "DEFINES       =",join(" ", @{$target{defines}}, @{$config{defines}}),"\n";
-print "LFLAG         =$target{lflags}\n";
-print "PLIB_LFLAG    =$target{plib_lflags}\n";
+#print "RANLIB        =", $target{ranlib} eq '$(CROSS_COMPILE)ranlib' ?
+#                             "$config{cross_compile_prefix}ranlib" :
+#                             "$target{ranlib}", "\n";
 print "EX_LIBS       =$target{ex_libs} $config{ex_libs}\n";
-print "APPS_OBJ      =$target{apps_obj}\n";
-print "CPUID_OBJ     =$target{cpuid_obj}\n";
-print "UPLINK_OBJ    =$target{uplink_obj}\n";
-print "BN_ASM        =$target{bn_obj}\n";
-print "EC_ASM        =$target{ec_obj}\n";
-print "DES_ENC       =$target{des_obj}\n";
-print "AES_ENC       =$target{aes_obj}\n";
-print "BF_ENC        =$target{bf_obj}\n";
-print "CAST_ENC      =$target{cast_obj}\n";
-print "RC4_ENC       =$target{rc4_obj}\n";
-print "RC5_ENC       =$target{rc5_obj}\n";
-print "MD5_OBJ_ASM   =$target{md5_obj}\n";
-print "SHA1_OBJ_ASM  =$target{sha1_obj}\n";
-print "RMD160_OBJ_ASM=$target{rmd160_obj}\n";
-print "CMLL_ENC      =$target{cmll_obj}\n";
-print "MODES_OBJ     =$target{modes_obj}\n";
-print "PADLOCK_OBJ   =$target{padlock_obj}\n";
-print "CHACHA_ENC    =$target{chacha_obj}\n";
-print "POLY1305_OBJ  =$target{poly1305_obj}\n";
-print "BLAKE2_OBJ    =$target{blake2_obj}\n";
-print "PROCESSOR     =$config{processor}\n";
-print "RANLIB        =", $target{ranlib} eq '$(CROSS_COMPILE)ranlib' ?
-                             "$config{cross_compile_prefix}ranlib" :
-                             "$target{ranlib}", "\n";
-print "ARFLAGS       =$target{arflags}\n";
-print "PERL          =$config{perl}\n";
-print "\n";
-print "SIXTY_FOUR_BIT_LONG mode\n" if $config{b64l};
-print "SIXTY_FOUR_BIT mode\n" if $config{b64};
-print "THIRTY_TWO_BIT mode\n" if $config{b32};
-print "BN_LLONG mode\n" if $config{bn_ll};
-print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} ne $def_int;
 
 my %builders = (
     unified => sub {
@@ -2070,11 +2043,6 @@ my %builders = (
 
 $builders{$builder}->($builder_platform, @builder_opts);
 
-print <<"EOF";
-
-Configured for $target.
-EOF
-
 print <<"EOF" if ($disabled{threads} eq "unavailable");
 
 The library could not be configured for supporting multi-threaded
@@ -2416,6 +2384,21 @@ sub usage
 	exit(1);
 	}
 
+# Return the perl version.
+sub get_perl_version
+{
+    return "$Config{version} for $Config{archname}" if $config{perl} eq $^X;
+    my $l;
+    open my $FH, "$config{perl} -v|" || return "??unknown??";
+    while ( <$FH> ) {
+        chop;
+        $l .= $_;
+    }
+    close $FH;
+    $l =~ s/This is (.{1,70}).*/$1/;
+    return $l;
+}
+
 sub run_dofile
 {
     my $out = shift;
diff --git a/config b/config
index eef07d8..6504143 100755
--- a/config
+++ b/config
@@ -903,8 +903,6 @@ OUT="$OUT"
 
 $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
 if [ $? = "0" ]; then
-  echo Configuring for $OUT
-
   if [ "$VERBOSE" = "true" ]; then
     echo $PERL $THERE/Configure $OUT $options
   fi  
@@ -913,5 +911,6 @@ if [ $? = "0" ]; then
   fi
 else
   echo "This system ($OUT) is not supported. See file INSTALL for details."
+  exit 1
 fi
 )

From rsalz at openssl.org  Fri Sep  9 17:40:32 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 09 Sep 2016 17:40:32 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473442832.562108.15671.nullmailer@dev.openssl.org>

The branch master has been updated
       via  18aa2f8a7aa09fa3654db8b8f9e2cbba09851ebf (commit)
      from  bc357b452ebd4788929c3159d92e528cc71aa8c7 (commit)


- Log -----------------------------------------------------------------
commit 18aa2f8a7aa09fa3654db8b8f9e2cbba09851ebf
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 9 13:40:28 2016 -0400

    Tweak travis thanks

-----------------------------------------------------------------------

Summary of changes:
 community/thanks.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/community/thanks.html b/community/thanks.html
index 3e4d673..fd076f0 100644
--- a/community/thanks.html
+++ b/community/thanks.html
@@ -25,9 +25,8 @@
               <a href="https://www.akamai.com">Akamai Technologies</a>
               for providing free CDN and security services.</li>
               <li>Thanks to
-              <a href="https://travis-ci.com">Travis CI</a> for increasing
-              our quota on GitHub so that we can do more continuous
-              integration builds and testing.</li>
+              <a href="https://travis-ci.com">Travis CI</a> for 
+              for powering OpenSSL's continuous integration pipeline.</li>
 	      <li>Thanks to
 	      <a href="https://www.globalsign.com">GMO GlobalSign</a>
 	      for providing free TLS certificates on our origin sites.</li>

From tjh at openssl.org  Fri Sep  9 20:59:50 2016
From: tjh at openssl.org (Tim Hudson)
Date: Fri, 09 Sep 2016 20:59:50 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473454790.330169.7243.nullmailer@dev.openssl.org>

The branch master has been updated
       via  82f52631b21b021787f344733e08bb53f1e7f0ec (commit)
      from  141d7325e7e513102fb8c123dab62dbbd61e846d (commit)


- Log -----------------------------------------------------------------
commit 82f52631b21b021787f344733e08bb53f1e7f0ec
Author: Tim Hudson <tjh at openssl.org>
Date:   Sat Sep 10 06:53:33 2016 +1000

    Fix EC_KEY_print so it prints out private key information
    even when the public key is not present in an EC_KEY
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_ameth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 9792007..66437e0 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -345,7 +345,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
         return 0;
     }
 
-    if (ktype != EC_KEY_PRINT_PARAM) {
+    if (ktype != EC_KEY_PRINT_PARAM && EC_KEY_get0_public_key(x) != NULL) {
         publen = EC_KEY_key2buf(x, EC_KEY_get_conv_form(x), &pub, NULL);
         if (publen == 0)
             goto err;

From tjh at openssl.org  Fri Sep  9 21:05:03 2016
From: tjh at openssl.org (Tim Hudson)
Date: Fri, 09 Sep 2016 21:05:03 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473455103.287447.11127.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  718951c2f2bd0065425e560584eee89ec65d22a5 (commit)
      from  0adfd49e47b08df699c941efef01b88d12b4a060 (commit)


- Log -----------------------------------------------------------------
commit 718951c2f2bd0065425e560584eee89ec65d22a5
Author: Tim Hudson <tjh at openssl.org>
Date:   Sat Sep 10 06:53:33 2016 +1000

    Fix EC_KEY_print so it prints out private key information
    even when the public key is not present in an EC_KEY
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit 82f52631b21b021787f344733e08bb53f1e7f0ec)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_ameth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 9792007..66437e0 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -345,7 +345,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
         return 0;
     }
 
-    if (ktype != EC_KEY_PRINT_PARAM) {
+    if (ktype != EC_KEY_PRINT_PARAM && EC_KEY_get0_public_key(x) != NULL) {
         publen = EC_KEY_key2buf(x, EC_KEY_get_conv_form(x), &pub, NULL);
         if (publen == 0)
             goto err;

From rsalz at openssl.org  Fri Sep  9 21:26:38 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 09 Sep 2016 21:26:38 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473456398.603657.23669.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  373a56139f910c3ef08f6df2d48ad954a5c3a0f4 (commit)
      from  20d402a38e4d0b0e4b6ffc540ab7c756b39f3904 (commit)


- Log -----------------------------------------------------------------
commit 373a56139f910c3ef08f6df2d48ad954a5c3a0f4
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 9 12:17:47 2016 -0400

    Make update
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/Makefile | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index bda1899..8f272ef 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -594,25 +594,24 @@ asn1test.o: ../include/openssl/sha.h ../include/openssl/stack.h
 asn1test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
 asn1test.o: ../include/openssl/x509_vfy.h asn1test.c
 bad_dtls_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-bad_dtls_test.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-bad_dtls_test.o: ../include/openssl/comp.h ../include/openssl/crypto.h
-bad_dtls_test.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
-bad_dtls_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-bad_dtls_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
-bad_dtls_test.o: ../include/openssl/evp.h ../include/openssl/hmac.h
-bad_dtls_test.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
-bad_dtls_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-bad_dtls_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-bad_dtls_test.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-bad_dtls_test.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-bad_dtls_test.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
-bad_dtls_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-bad_dtls_test.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-bad_dtls_test.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-bad_dtls_test.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-bad_dtls_test.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-bad_dtls_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-bad_dtls_test.o: bad_dtls_test.c
+bad_dtls_test.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+bad_dtls_test.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
+bad_dtls_test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+bad_dtls_test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+bad_dtls_test.o: ../include/openssl/err.h ../include/openssl/evp.h
+bad_dtls_test.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
+bad_dtls_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+bad_dtls_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+bad_dtls_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+bad_dtls_test.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+bad_dtls_test.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+bad_dtls_test.o: ../include/openssl/rand.h ../include/openssl/safestack.h
+bad_dtls_test.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+bad_dtls_test.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+bad_dtls_test.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+bad_dtls_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+bad_dtls_test.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+bad_dtls_test.o: ../include/openssl/x509_vfy.h bad_dtls_test.c
 bftest.o: ../e_os.h ../include/openssl/blowfish.h ../include/openssl/e_os2.h
 bftest.o: ../include/openssl/opensslconf.h bftest.c
 bntest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

From builds at travis-ci.org  Fri Sep  9 22:06:06 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 22:06:06 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5907
	(OpenSSL_1_1_0-stable - 718951c)
In-Reply-To: <openssl/openssl+158854412+errored@travis-ci.org>
Message-ID: <57d3324fbbf4b_33fdb1e78b1886912c6@8916c340-6d50-45d7-8089-748193f793f6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5907
Status: Errored

Duration: 39 minutes and 36 seconds
Commit: 718951c (OpenSSL_1_1_0-stable)
Author: Tim Hudson
Message: Fix EC_KEY_print so it prints out private key information
even when the public key is not present in an EC_KEY

Reviewed-by: Stephen Henson <steve at openssl.org>
(cherry picked from commit 82f52631b21b021787f344733e08bb53f1e7f0ec)

View the changeset: https://github.com/openssl/openssl/compare/0adfd49e47b0...718951c2f2bd

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/158854412

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/221237e2/attachment.html>

From no-reply at appveyor.com  Fri Sep  9 22:10:36 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 22:10:36 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_1_0-stable.5238
Message-ID: <20160909221035.21256.80573.E9CE1C98@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/4c78072e/attachment.html>

From no-reply at appveyor.com  Fri Sep  9 22:14:08 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 22:14:08 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1173
Message-ID: <20160909221406.13637.36375.279CBB9F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/98fe8536/attachment.html>

From no-reply at appveyor.com  Fri Sep  9 22:35:40 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 22:35:40 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1174
Message-ID: <20160909223540.12395.19340.9129AC8B@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/4ee7c35c/attachment.html>

From builds at travis-ci.org  Fri Sep  9 22:40:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 09 Sep 2016 22:40:40 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1896
	(oss_constify_api - 5ef307a)
In-Reply-To: <FdaSilvaYY/openssl+158868522+still failing@travis-ci.org>
Message-ID: <57d33a68bbb41_33fdb1e78b5ac7318ed@8916c340-6d50-45d7-8089-748193f793f6.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1896
Status: Still Failing

Duration: 31 minutes and 3 seconds
Commit: 5ef307a (oss_constify_api)
Author: FdaSilvaYY
Message: WIP: Constify more API using get0 pattern

X509_NAME_get0_entry
X509_NAME_ENTRY_get0_data
X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/38bdf6c9d888...5ef307a1d208

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158868522

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/9057cf8c/attachment-0001.html>

From no-reply at appveyor.com  Fri Sep  9 22:59:39 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 22:59:39 +0000
Subject: [openssl-commits] Build completed: openssl OpenSSL_1_0_2-stable.5239
Message-ID: <20160909225936.19067.91183.0E65FF15@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/9bb8fa9b/attachment.html>

From no-reply at appveyor.com  Fri Sep  9 23:04:19 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 23:04:19 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1175
Message-ID: <20160909230419.59448.71315.35C14100@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/d7a21970/attachment.html>

From no-reply at appveyor.com  Fri Sep  9 23:43:55 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 09 Sep 2016 23:43:55 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1177
Message-ID: <20160909234354.8732.24862.A9FFFF2F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160909/417e604a/attachment.html>

From no-reply at appveyor.com  Sat Sep 10 00:12:07 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 10 Sep 2016 00:12:07 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1178
Message-ID: <20160910001206.18971.44429.AB22EAD4@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/c98e240a/attachment.html>

From builds at travis-ci.org  Sat Sep 10 01:37:34 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 10 Sep 2016 01:37:34 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1902
	(oss_builds_options_check - 2c08f62)
In-Reply-To: <FdaSilvaYY/openssl+158875629+broken@travis-ci.org>
Message-ID: <57d363de22ed8_33fdb1e78b5ac8772a@8916c340-6d50-45d7-8089-748193f793f6.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1902
Status: Broken

Duration: 44 minutes and 54 seconds
Commit: 2c08f62 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/ba81be46c38e...2c08f62c1c6b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158875629

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/17095e4c/attachment.html>

From no-reply at appveyor.com  Sat Sep 10 05:44:35 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 10 Sep 2016 05:44:35 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1181
Message-ID: <20160910054434.2666.98962.C80181C0@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/5b954a54/attachment-0001.html>

From no-reply at appveyor.com  Sat Sep 10 05:52:19 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 10 Sep 2016 05:52:19 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1182
Message-ID: <20160910055219.12414.9133.ACBEA2D8@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/63980738/attachment.html>

From builds at travis-ci.org  Sat Sep 10 06:01:13 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 10 Sep 2016 06:01:13 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1904
	(oss_constify_api - 157af0b)
In-Reply-To: <FdaSilvaYY/openssl+158916505+still failing@travis-ci.org>
Message-ID: <57d3a1a9b03c9_33fdb1ead34bc9864bc@8916c340-6d50-45d7-8089-748193f793f6.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1904
Status: Still Failing

Duration: 40 minutes and 42 seconds
Commit: 157af0b (oss_constify_api)
Author: FdaSilvaYY
Message: WIP: Constify more API using get0 pattern

X509_NAME_get0_entry
X509_NAME_ENTRY_get0_data
X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5ef307a1d208...157af0b499f3

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158916505

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/126bba30/attachment.html>

From builds at travis-ci.org  Sat Sep 10 06:01:32 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 10 Sep 2016 06:01:32 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1905
	(constify_2 - 484c3b5)
In-Reply-To: <FdaSilvaYY/openssl+158916652+still failing@travis-ci.org>
Message-ID: <57d3a1bc5380e_33fae4da88e606736e3@69f16426-63a1-44cf-8447-a645c76b4602.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1905
Status: Still Failing

Duration: 12 minutes and 15 seconds
Commit: 484c3b5 (constify_2)
Author: FdaSilvaYY
Message: Constify some X509_NAME, ASN1 printing code

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/343b11ba4a2d...484c3b5aa371

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158916652

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/419d1191/attachment.html>

From no-reply at appveyor.com  Sat Sep 10 06:18:36 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 10 Sep 2016 06:18:36 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1183
Message-ID: <20160910061836.69581.73009.C1971191@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/10e77820/attachment-0001.html>

From no-reply at appveyor.com  Sat Sep 10 06:46:31 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 10 Sep 2016 06:46:31 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1185
Message-ID: <20160910064631.13107.37013.BD0F06C4@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/112bd0a9/attachment.html>

From builds at travis-ci.org  Sat Sep 10 06:54:24 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 10 Sep 2016 06:54:24 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1908
	(fix-ca-buf-usage - 7ebec4d)
In-Reply-To: <FdaSilvaYY/openssl+158917028+errored@travis-ci.org>
Message-ID: <57d3ae1c3ea3_33f8a9a49756482787c@8c73ed37-0a86-48fb-a60b-54597ccd9e50.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1908
Status: Errored

Duration: 6 minutes and 17 seconds
Commit: 7ebec4d (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/8344f4facb67...7ebec4df115f

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/158917028

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/fe64dc73/attachment.html>

From no-reply at appveyor.com  Sat Sep 10 07:13:00 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 10 Sep 2016 07:13:00 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1186
Message-ID: <20160910071300.59525.98320.A9D5D890@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160910/ed8bb6e0/attachment.html>

From builds at travis-ci.org  Sun Sep 11 14:13:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 11 Sep 2016 14:13:40 +0000
Subject: [openssl-commits] Canceled: FdaSilvaYY/openssl#1913
	(oss_constify_api - 3996078)
In-Reply-To: <FdaSilvaYY/openssl+159117247+canceled@travis-ci.org>
Message-ID: <57d566942ccd1_33fac19d8865014993@9ab4dc34-f25f-4284-a0bd-e3bf67024d43.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1913
Status: Canceled

Duration: 2 minutes and 36 seconds
Commit: 3996078 (oss_constify_api)
Author: FdaSilvaYY
Message: WIP: Constify more API using get0 pattern

X509_NAME_get0_entry
X509_NAME_ENTRY_get0_data
X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/157af0b499f3...39960783c775

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159117247

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/00369b92/attachment-0001.html>

From no-reply at appveyor.com  Sun Sep 11 14:19:15 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 11 Sep 2016 14:19:15 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1190
Message-ID: <20160911141915.13248.76668.BB3699CE@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/d217bd5c/attachment.html>

From no-reply at appveyor.com  Sun Sep 11 14:44:51 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 11 Sep 2016 14:44:51 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1191
Message-ID: <20160911144451.8829.92591.E0B51344@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/af8a170d/attachment.html>

From builds at travis-ci.org  Sun Sep 11 14:52:16 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 11 Sep 2016 14:52:16 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1914 (oss_constify_api
	- 8ddd7c7)
In-Reply-To: <FdaSilvaYY/openssl+159117450+fixed@travis-ci.org>
Message-ID: <57d56fad369c3_33fac19d892d01699e@9ab4dc34-f25f-4284-a0bd-e3bf67024d43.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1914
Status: Fixed

Duration: 38 minutes and 24 seconds
Commit: 8ddd7c7 (oss_constify_api)
Author: FdaSilvaYY
Message: WIP: Constify more API using get0 pattern

X509_NAME_get0_entry
X509_NAME_ENTRY_get0_data
X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/39960783c775...8ddd7c71c6d9

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159117450

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/39df178f/attachment.html>

From rsalz at openssl.org  Sun Sep 11 16:48:01 2016
From: rsalz at openssl.org (Rich Salz)
Date: Sun, 11 Sep 2016 16:48:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473612481.930625.6051.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6462876f8d9f6538ad0fcd70717077d9ae174e56 (commit)
      from  82f52631b21b021787f344733e08bb53f1e7f0ec (commit)


- Log -----------------------------------------------------------------
commit 6462876f8d9f6538ad0fcd70717077d9ae174e56
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Sep 11 12:47:39 2016 -0400

    util/shlib_wrap.sh is now auto-generated so tell git to ignore it
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e55ab65..730731f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ Makefile
 /include/openssl/opensslconf.h
 /tools/c_rehash
 /tools/c_rehash.pl
+/util/shlib_wrap.sh
 /tags
 /TAGS
 /crypto.map

From no-reply at appveyor.com  Sun Sep 11 18:03:56 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 11 Sep 2016 18:03:56 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1
Message-ID: <20160911180356.12514.12772.4660DED2@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/20505874/attachment.html>

From builds at travis-ci.org  Sun Sep 11 18:12:38 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 11 Sep 2016 18:12:38 +0000
Subject: [openssl-commits] Passed: degustaf/openssl#1 (master - 6462876)
In-Reply-To: <degustaf/openssl+159144762+passed@travis-ci.org>
Message-ID: <57d59e969ecb5_33fac19d88ce0318533@9ab4dc34-f25f-4284-a0bd-e3bf67024d43.mail>

Build Update for degustaf/openssl
-------------------------------------

Build: #1
Status: Passed

Duration: 36 minutes and 24 seconds
Commit: 6462876 (master)
Author: Matt Caswell
Message: util/shlib_wrap.sh is now auto-generated so tell git to ignore it

Signed-off-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/degustaf/openssl/compare/3d9a51f7edc4...6462876f8d9f

View the full build log and details: https://travis-ci.org/degustaf/openssl/builds/159144762

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/b38ecad6/attachment-0001.html>

From levitte at openssl.org  Sun Sep 11 21:18:14 2016
From: levitte at openssl.org (Richard Levitte)
Date: Sun, 11 Sep 2016 21:18:14 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473628694.973514.32357.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3abcc4ac912d6e416b81a310b457064f6f01cd75 (commit)
       via  278a33da3cf10f0a9ab12c2a1f643f9027b06679 (commit)
      from  6462876f8d9f6538ad0fcd70717077d9ae174e56 (commit)


- Log -----------------------------------------------------------------
commit 3abcc4ac912d6e416b81a310b457064f6f01cd75
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 20:54:34 2016 +0200

    VMS: Don't force symbol mixed case when building DSOs
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 278a33da3cf10f0a9ab12c2a1f643f9027b06679
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 20:48:30 2016 +0200

    VMS: be less picky when loading DSOs
    
    The DSO API was picky about casing of symbol names on VMS.
    
    There's really no reason to be that picky, it's mostly just annoying.
    Therefore, we take away the possibility to flag for a choice, and will
    instead first try to find a symbol with exact case, and failing that,
    we try to find it in upper case.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 VMS/engine.opt         |  3 ++-
 crypto/dso/dso_vms.c   | 16 +++++++---------
 include/internal/dso.h |  6 ------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/VMS/engine.opt b/VMS/engine.opt
index 1c73c80..9725023 100644
--- a/VMS/engine.opt
+++ b/VMS/engine.opt
@@ -1,2 +1,3 @@
 CASE_SENSITIVE=YES
-SYMBOL_VECTOR=(bind_engine=PROCEDURE,v_check=PROCEDURE)
+SYMBOL_VECTOR=(BIND_ENGINE=PROCEDURE,V_CHECK=PROCEDURE,-
+               bind_engine/BIND_ENGINE=PROCEDURE,v_check/V_CHECK=PROCEDURE)
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 90d387e..2e0d84c 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -261,15 +261,13 @@ static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
                                      symname_dsc, sym, 0, flags);
 }
 
+# ifndef LIB$M_FIS_MIXEDCASE
+#  define LIB$M_FIS_MIXEDCASE (1 << 4);
+# endif
 void vms_bind_sym(DSO *dso, const char *symname, void **sym)
 {
     DSO_VMS_INTERNAL *ptr;
-    int status;
-# ifdef LIB$M_FIS_MIXEDCASE
-    int flags = LIB$M_FIS_MIXEDCASE;
-# else
-    int flags = (1 << 4);
-# endif
+    int status = 0;
     struct dsc$descriptor_s symname_dsc;
 
 /* Arrange 32-bit pointer to (copied) string storage, if needed. */
@@ -312,10 +310,10 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
         return;
     }
 
-    if (dso->flags & DSO_FLAG_UPCASE_SYMBOL)
-        flags = 0;
+    status = do_find_symbol(ptr, &symname_dsc, sym, LIB$M_FIS_MIXEDCASE);
 
-    status = do_find_symbol(ptr, &symname_dsc, sym, flags);
+    if (!$VMS_STATUS_SUCCESS(status))
+        status = do_find_symbol(ptr, &symname_dsc, sym, 0);
 
     if (!$VMS_STATUS_SUCCESS(status)) {
         unsigned short length;
diff --git a/include/internal/dso.h b/include/internal/dso.h
index 970beeb..79d98f4 100644
--- a/include/internal/dso.h
+++ b/include/internal/dso.h
@@ -43,12 +43,6 @@ extern "C" {
 # define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY      0x02
 
 /*
- * The following flag controls the translation of symbol names to upper case.
- * This is currently only being implemented for OpenVMS.
- */
-# define DSO_FLAG_UPCASE_SYMBOL                  0x10
-
-/*
  * This flag loads the library with public symbols. Meaning: The exported
  * symbols of this library are public to all libraries loaded after this
  * library. At the moment only implemented in unix.

From builds at travis-ci.org  Sun Sep 11 21:41:47 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 11 Sep 2016 21:41:47 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5918 (master - 3abcc4a)
In-Reply-To: <openssl/openssl+159176312+errored@travis-ci.org>
Message-ID: <57d5cf9b1fb30_33fac19d8883054912c@9ab4dc34-f25f-4284-a0bd-e3bf67024d43.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5918
Status: Errored

Duration: 23 minutes and 2 seconds
Commit: 3abcc4a (master)
Author: Richard Levitte
Message: VMS: Don't force symbol mixed case when building DSOs

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/6462876f8d9f...3abcc4ac912d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159176312

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/c0227364/attachment.html>

From steve at openssl.org  Sun Sep 11 22:58:13 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 11 Sep 2016 22:58:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473634693.395782.7306.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  5ecb5467b6960ab41b8f8b45f9380fcba74c3ed8 (commit)
      from  373a56139f910c3ef08f6df2d48ad954a5c3a0f4 (commit)


- Log -----------------------------------------------------------------
commit 5ecb5467b6960ab41b8f8b45f9380fcba74c3ed8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Sep 8 15:10:32 2016 +0100

    Fix memory leak on error.
    
    Backport leak fix from master branch.
    
    Thanks to Shi Lei for reporting this bug.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509spki.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509spki.c b/crypto/x509/x509spki.c
index 2df84ea..5ae5d30 100644
--- a/crypto/x509/x509spki.c
+++ b/crypto/x509/x509spki.c
@@ -112,6 +112,8 @@ char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
     der_spki = OPENSSL_malloc(der_len);
     b64_str = OPENSSL_malloc(der_len * 2);
     if (!der_spki || !b64_str) {
+        OPENSSL_free(der_spki);
+        OPENSSL_free(b64_str);
         X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE);
         return NULL;
     }

From builds at travis-ci.org  Sun Sep 11 23:25:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 11 Sep 2016 23:25:03 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1918 (master -
	d7331a0)
In-Reply-To: <FdaSilvaYY/openssl+159184482+errored@travis-ci.org>
Message-ID: <57d5e7cfa326_33ffc382d7ee422392a@43b360c9-f8b1-442a-ac83-97d12539e7f1.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1918
Status: Errored

Duration: 39 minutes and 53 seconds
Commit: d7331a0 (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/7b3c54762034...d7331a0b75ba

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159184482

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/4391a839/attachment-0001.html>

From no-reply at appveyor.com  Sun Sep 11 23:26:05 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 11 Sep 2016 23:26:05 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1196
Message-ID: <20160911232605.8517.52280.1AFEBE47@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160911/86a566f7/attachment.html>

From no-reply at appveyor.com  Mon Sep 12 00:40:17 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 12 Sep 2016 00:40:17 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_0_2-stable.5251
Message-ID: <20160912004017.36379.72352.274DC401@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/2fe8cc3a/attachment.html>

From no-reply at appveyor.com  Mon Sep 12 01:02:15 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 12 Sep 2016 01:02:15 +0000
Subject: [openssl-commits] Build completed: openssl master.5252
Message-ID: <20160912010215.20950.94142.B1AEEE2F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/686c40c9/attachment.html>

From levitte at openssl.org  Mon Sep 12 14:24:40 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 12 Sep 2016 14:24:40 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473690280.112133.24169.nullmailer@dev.openssl.org>

The branch master has been updated
       via  cdbbf9900253e8006868eba948248b1092a057de (commit)
      from  3abcc4ac912d6e416b81a310b457064f6f01cd75 (commit)


- Log -----------------------------------------------------------------
commit cdbbf9900253e8006868eba948248b1092a057de
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Aug 27 20:33:23 2016 +0100

    Add enginesdir to libcrypto.pc pkg-config file
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index d486d9e..f5a0274 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -793,6 +793,7 @@ libcrypto.pc:
 	    echo 'exec_prefix=$${prefix}'; \
 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
 	    echo 'includedir=$${prefix}/include'; \
+	    echo 'enginesdir=$${libdir}/engines-{- $sover -}'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL-libcrypto'; \
 	    echo 'Description: OpenSSL cryptography library'; \

From levitte at openssl.org  Mon Sep 12 14:26:22 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 12 Sep 2016 14:26:22 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473690382.055174.25651.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  469f593170d9170da632bb0afd634e971c3234e7 (commit)
      from  718951c2f2bd0065425e560584eee89ec65d22a5 (commit)


- Log -----------------------------------------------------------------
commit 469f593170d9170da632bb0afd634e971c3234e7
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Aug 27 20:33:23 2016 +0100

    Add enginesdir to libcrypto.pc pkg-config file
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit cdbbf9900253e8006868eba948248b1092a057de)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index d486d9e..f5a0274 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -793,6 +793,7 @@ libcrypto.pc:
 	    echo 'exec_prefix=$${prefix}'; \
 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
 	    echo 'includedir=$${prefix}/include'; \
+	    echo 'enginesdir=$${libdir}/engines-{- $sover -}'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL-libcrypto'; \
 	    echo 'Description: OpenSSL cryptography library'; \

From builds at travis-ci.org  Mon Sep 12 14:52:02 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 12 Sep 2016 14:52:02 +0000
Subject: [openssl-commits] Passed: openssl/openssl#5925 (master - cdbbf99)
In-Reply-To: <openssl/openssl+159328498+passed@travis-ci.org>
Message-ID: <57d6c111d695e_33fd95c4bc93476234d@9452a6b4-91f9-4f33-a428-81573877bbd2.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5925
Status: Passed

Duration: 26 minutes and 15 seconds
Commit: cdbbf99 (master)
Author: David Woodhouse
Message: Add enginesdir to libcrypto.pc pkg-config file

Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/3abcc4ac912d...cdbbf9900253

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159328498

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/3b9f51fa/attachment.html>

From levitte at openssl.org  Mon Sep 12 15:07:22 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 12 Sep 2016 15:07:22 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473692842.844476.9893.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  204fb53895618672120474bac194269c0f837632 (commit)
      from  5ecb5467b6960ab41b8f8b45f9380fcba74c3ed8 (commit)


- Log -----------------------------------------------------------------
commit 204fb53895618672120474bac194269c0f837632
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 12 16:29:39 2016 +0200

    Add enginesdir to libcrypto.pc pkg-config file
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.org b/Makefile.org
index bda6c09..2377f50 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -368,6 +368,7 @@ libcrypto.pc: Makefile
 	    echo 'exec_prefix=$${prefix}'; \
 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
 	    echo 'includedir=$${prefix}/include'; \
+	    echo 'enginesdir=$${libdir}/engines'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL-libcrypto'; \
 	    echo 'Description: OpenSSL cryptography library'; \

From builds at travis-ci.org  Mon Sep 12 15:11:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 12 Sep 2016 15:11:35 +0000
Subject: [openssl-commits] Passed: openssl/openssl#5926
	(OpenSSL_1_1_0-stable - 469f593)
In-Reply-To: <openssl/openssl+159328894+passed@travis-ci.org>
Message-ID: <57d6c5a7de05_33f898ef9af90604935@2628fd89-5170-44ab-b465-f8753a4db9ca.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5926
Status: Passed

Duration: 31 minutes and 36 seconds
Commit: 469f593 (OpenSSL_1_1_0-stable)
Author: David Woodhouse
Message: Add enginesdir to libcrypto.pc pkg-config file

Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit cdbbf9900253e8006868eba948248b1092a057de)

View the changeset: https://github.com/openssl/openssl/compare/718951c2f2bd...469f593170d9

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159328894

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/c271aec3/attachment.html>

From matt at openssl.org  Mon Sep 12 16:29:45 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 12 Sep 2016 16:29:45 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473697785.937159.10707.nullmailer@dev.openssl.org>

The branch master has been updated
       via  58c57b7facce86de54a6ced83d660846b8df253f (commit)
      from  18aa2f8a7aa09fa3654db8b8f9e2cbba09851ebf (commit)


- Log -----------------------------------------------------------------
commit 58c57b7facce86de54a6ced83d660846b8df253f
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 17:29:15 2016 +0100

    Add statement about email addresses in the ICLA

-----------------------------------------------------------------------

Summary of changes:
 policies/cla.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/policies/cla.html b/policies/cla.html
index 1e6e297..09b0ce1 100644
--- a/policies/cla.html
+++ b/policies/cla.html
@@ -36,7 +36,9 @@
 	  <p>
 	  The ICLA is not tied to any employer you may have, so we
 	  recommend you use a personal email address in the contact
-	  details, rather than a work address.
+	  details, rather than a work address. <b>Please make sure that the email
+	  address matches the one that you use for the "Author" in your git commits.
+	  List multiple email addresses if necessary.</b>
 	  </p>
 
 	  <p>

From matt at openssl.org  Mon Sep 12 16:31:10 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 12 Sep 2016 16:31:10 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473697870.495129.11589.nullmailer@dev.openssl.org>

The branch master has been updated
       via  978e985e20a2971aebbef7263d4b2c432a90d018 (commit)
      from  58c57b7facce86de54a6ced83d660846b8df253f (commit)


- Log -----------------------------------------------------------------
commit 978e985e20a2971aebbef7263d4b2c432a90d018
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 17:31:02 2016 +0100

    Remove <b> tags

-----------------------------------------------------------------------

Summary of changes:
 policies/cla.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/policies/cla.html b/policies/cla.html
index 09b0ce1..531acd6 100644
--- a/policies/cla.html
+++ b/policies/cla.html
@@ -36,9 +36,9 @@
 	  <p>
 	  The ICLA is not tied to any employer you may have, so we
 	  recommend you use a personal email address in the contact
-	  details, rather than a work address. <b>Please make sure that the email
+	  details, rather than a work address. Please make sure that the email
 	  address matches the one that you use for the "Author" in your git commits.
-	  List multiple email addresses if necessary.</b>
+	  List multiple email addresses if necessary.
 	  </p>
 
 	  <p>

From matt at openssl.org  Mon Sep 12 16:42:22 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 12 Sep 2016 16:42:22 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473698542.140672.16372.nullmailer@dev.openssl.org>

The branch master has been updated
       via  5587c46721853723471058cb8bb13e287b3f83e0 (commit)
      from  978e985e20a2971aebbef7263d4b2c432a90d018 (commit)


- Log -----------------------------------------------------------------
commit 5587c46721853723471058cb8bb13e287b3f83e0
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 17:42:15 2016 +0100

    Add <em> tags

-----------------------------------------------------------------------

Summary of changes:
 policies/cla.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/policies/cla.html b/policies/cla.html
index 531acd6..95d4ec5 100644
--- a/policies/cla.html
+++ b/policies/cla.html
@@ -36,9 +36,9 @@
 	  <p>
 	  The ICLA is not tied to any employer you may have, so we
 	  recommend you use a personal email address in the contact
-	  details, rather than a work address. Please make sure that the email
+	  details, rather than a work address. <em>Please make sure that the email
 	  address matches the one that you use for the "Author" in your git commits.
-	  List multiple email addresses if necessary.
+	  List multiple email addresses if necessary.</em>
 	  </p>
 
 	  <p>

From no-reply at appveyor.com  Mon Sep 12 18:35:26 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 12 Sep 2016 18:35:26 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1197
Message-ID: <20160912183525.36273.61940.03BF175E@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/f681c1e0/attachment.html>

From builds at travis-ci.org  Mon Sep 12 19:15:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 12 Sep 2016 19:15:03 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#1920 (master - bfcdb17)
In-Reply-To: <FdaSilvaYY/openssl+159384076+passed@travis-ci.org>
Message-ID: <57d6feb7a71d0_33f8990f46948957165@2628fd89-5170-44ab-b465-f8753a4db9ca.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1920
Status: Passed

Duration: 1 hour, 8 minutes, and 12 seconds
Commit: bfcdb17 (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/d7331a0b75ba...bfcdb1762bf7

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159384076

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/27540985/attachment-0001.html>

From no-reply at appveyor.com  Mon Sep 12 23:11:09 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 12 Sep 2016 23:11:09 +0000
Subject: [openssl-commits] Build failed: openssl master.5269
Message-ID: <20160912231109.18827.11456.33B5DC94@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/d42ea00a/attachment.html>

From no-reply at appveyor.com  Mon Sep 12 23:16:30 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 12 Sep 2016 23:16:30 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1203
Message-ID: <20160912231630.87325.92278.42C1007F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160912/d99cbaa3/attachment.html>

From builds at travis-ci.org  Tue Sep 13 01:06:48 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 01:06:48 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1924
	(apps-speed-rework-n-clean - 8568093)
In-Reply-To: <FdaSilvaYY/openssl+159421412+errored@travis-ci.org>
Message-ID: <57d75128a7134_33f8992e944a813793aa@2628fd89-5170-44ab-b465-f8753a4db9ca.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1924
Status: Errored

Duration: 16 seconds
Commit: 8568093 (apps-speed-rework-n-clean)
Author: FdaSilvaYY
Message: Intall INSTALL about no-md5 removal

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/d458a6351833...85680936dc94

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159421412

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/12533803/attachment.html>

From builds at travis-ci.org  Tue Sep 13 01:40:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 01:40:41 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1926
	(app_ca_valid_doc_n_fix - f1af76e)
In-Reply-To: <FdaSilvaYY/openssl+159449400+broken@travis-ci.org>
Message-ID: <57d75918d631e_33f8992e8927414055d0@2628fd89-5170-44ab-b465-f8753a4db9ca.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1926
Status: Broken

Duration: 42 minutes and 48 seconds
Commit: f1af76e (app_ca_valid_doc_n_fix)
Author: FdaSilvaYY
Message: Fix some magic values about revocation info type...

Add comments, document -valid option.
Add some const qualifiers.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/ccde2c964eea...f1af76ef28f4

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159449400

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/e0b80060/attachment-0001.html>

From matt at openssl.org  Tue Sep 13 08:47:03 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 13 Sep 2016 08:47:03 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473756423.003801.11048.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c0f9e23c6b8d1076796987d5a84557d410682d85 (commit)
       via  df065a2b3b325fb55f085f95afbc3896b49e8f05 (commit)
       via  826573559df6c74a6773475a1b7a2a2ba13cec28 (commit)
       via  c39609aa6a575c9645d87711e3db439eb832ca70 (commit)
       via  de451856f08364ad6c6659b6eacbe820edc2aab9 (commit)
       via  6ae4f5e087d204e02a5dc88ea905cca9d144a30d (commit)
       via  9bf85bf9c52359813b5f9f6709b381497671d625 (commit)
       via  d6c4cc293974e622b387458d2293e29f8f14fbbb (commit)
       via  796a627e0a816ffbd79f53fa7d349e4edb624573 (commit)
       via  871bc59bc190d24ddd7b29aeb5fb2493b48e9cf5 (commit)
       via  fb790f1673884f4a9db9118e93714650f92eed66 (commit)
       via  0217dd19c00657b8bfd2bce1090785eb32abb235 (commit)
       via  ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3 (commit)
       via  2c7b4dbc1af9cfae4e4afd7c4a07db95a1133a6a (commit)
       via  b7273855acd7ec2d1e7a4ba626ed538808fc7517 (commit)
      from  cdbbf9900253e8006868eba948248b1092a057de (commit)


- Log -----------------------------------------------------------------
commit c0f9e23c6b8d1076796987d5a84557d410682d85
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 09:40:38 2016 +0100

    Fix a few style nits in the wpacket code
    
    Addressing more feedback comments.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit df065a2b3b325fb55f085f95afbc3896b49e8f05
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 09:41:01 2016 +0100

    Remove else after a return in packet code
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 826573559df6c74a6773475a1b7a2a2ba13cec28
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 09:39:10 2016 +0100

    Pull out some common packet code into a function
    
    Two locations had the same loop for writing out a value. Pull it out into
    a function.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit c39609aa6a575c9645d87711e3db439eb832ca70
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 09:49:16 2016 +0100

    Add some soft asserts where applicable
    
    This is an internal API. Some of the tests were for programmer erorr and
    "should not happen" situations, so a soft assert is reasonable.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit de451856f08364ad6c6659b6eacbe820edc2aab9
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 00:13:41 2016 +0100

    Address WPACKET review comments
    
    A few style tweaks here and there. The main change is that curr and
    packet_len are now offsets into the buffer to account for the fact that
    the pointers can change if the buffer grows. Also dropped support for the
    WPACKET_set_packet_len() function. I thought that was going to be needed
    but so far it hasn't been. It doesn't really work any more due to the
    offsets change.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 6ae4f5e087d204e02a5dc88ea905cca9d144a30d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 23:08:53 2016 +0100

    Simplify the overflow checks in WPACKET_allocate_bytes()
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 9bf85bf9c52359813b5f9f6709b381497671d625
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 11:44:25 2016 +0100

    Move the WPACKET documentation comments to packet_locl.h
    
    The PACKET documentation is already in packet_locl.h so it makes sense to
    have the WPACKET documentation there as well.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit d6c4cc293974e622b387458d2293e29f8f14fbbb
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 10:01:24 2016 +0100

    Add tests for the WPACKET implementation
    
    The tests will only work in no-shared builds because WPACKET is an
    internal only API that does not get exported by the shared library.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 796a627e0a816ffbd79f53fa7d349e4edb624573
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 10:00:56 2016 +0100

    Ensure the WPACKET gets cleaned up in the event of an error
    
    Otherwise a mem leak can occur.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 871bc59bc190d24ddd7b29aeb5fb2493b48e9cf5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 09:58:29 2016 +0100

    Various bug fixes and tweaks to WPACKET implementation
    
    Also added the WPACKET_cleanup() function to cleanup a WPACKET if we hit
    an error.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit fb790f1673884f4a9db9118e93714650f92eed66
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 6 15:19:32 2016 +0100

    Add WPACKET_sub_memcpy() function
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0217dd19c00657b8bfd2bce1090785eb32abb235
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 6 15:09:51 2016 +0100

    Move from explicit sub-packets to implicit ones
    
    No need to declare an explicit sub-packet. Just start one.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 5 17:34:04 2016 +0100

    Rename PACKETW to WPACKET
    
    To avoid confusion with the read PACKET structure.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 2c7b4dbc1af9cfae4e4afd7c4a07db95a1133a6a
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 3 20:57:52 2016 +0100

    Convert tls_construct_client_hello() to use PACKETW
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b7273855acd7ec2d1e7a4ba626ed538808fc7517
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 3 17:06:39 2016 +0100

    First pass at writing a writeable packets API
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h                              |   3 +-
 ssl/build.info                                     |   2 +-
 ssl/d1_lib.c                                       |   4 +
 ssl/d1_srtp.c                                      |  43 --
 ssl/packet.c                                       | 325 ++++++++++++++
 ssl/packet_locl.h                                  | 162 +++++++
 ssl/s3_lib.c                                       |  40 +-
 ssl/ssl_err.c                                      |   4 +-
 ssl/ssl_locl.h                                     |  37 +-
 ssl/statem/statem_clnt.c                           | 195 +++++----
 ssl/statem/statem_dtls.c                           |  43 ++
 ssl/statem/statem_lib.c                            |  14 +
 ssl/statem/statem_srvr.c                           |   4 +-
 ssl/t1_ext.c                                       |  69 ++-
 ssl/t1_lib.c                                       | 465 +++++++++++----------
 ssl/t1_reneg.c                                     |  24 --
 test/build.info                                    |   7 +
 .../{70-test_bad_dtls.t => 70-test_wpacket.t}      |   8 +-
 test/wpackettest.c                                 | 396 ++++++++++++++++++
 19 files changed, 1450 insertions(+), 395 deletions(-)
 create mode 100644 ssl/packet.c
 copy test/recipes/{70-test_bad_dtls.t => 70-test_wpacket.t} (69%)
 create mode 100644 test/wpackettest.c

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 41cb36e..af6d9b5 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2120,6 +2120,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_SSL_CHECK_PRIVATE_KEY                      163
 # define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT               280
 # define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG            279
+# define SSL_F_SSL_CIPHER_LIST_TO_BYTES                   425
 # define SSL_F_SSL_CIPHER_PROCESS_RULESTR                 230
 # define SSL_F_SSL_CIPHER_STRENGTH_SORT                   231
 # define SSL_F_SSL_CLEAR                                  164
@@ -2456,9 +2457,9 @@ int ERR_load_SSL_strings(void);
 # define SSL_R_SSL_SECTION_NOT_FOUND                      136
 # define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301
 # define SSL_R_SSL_SESSION_ID_CONFLICT                    302
-# define SSL_R_SSL_SESSION_ID_TOO_LONG                    408
 # define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
 # define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH              303
+# define SSL_R_SSL_SESSION_ID_TOO_LONG                    408
 # define SSL_R_SSL_SESSION_VERSION_MISMATCH               210
 # define SSL_R_TLSV1_ALERT_ACCESS_DENIED                  1049
 # define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050
diff --git a/ssl/build.info b/ssl/build.info
index 6977246..c7d4574 100644
--- a/ssl/build.info
+++ b/ssl/build.info
@@ -1,6 +1,6 @@
 LIBS=../libssl
 SOURCE[../libssl]=\
-        pqueue.c \
+        pqueue.c packet.c \
         statem/statem_srvr.c statem/statem_clnt.c  s3_lib.c  s3_enc.c record/rec_layer_s3.c \
         statem/statem_lib.c s3_cbc.c s3_msg.c \
         methods.c   t1_lib.c  t1_enc.c t1_ext.c \
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 0ada7ed..043057f 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -44,6 +44,8 @@ const SSL3_ENC_METHOD DTLSv1_enc_data = {
     SSL_ENC_FLAG_DTLS | SSL_ENC_FLAG_EXPLICIT_IV,
     DTLS1_HM_HEADER_LENGTH,
     dtls1_set_handshake_header,
+    dtls1_set_handshake_header2,
+    dtls1_close_construct_packet,
     dtls1_handshake_write
 };
 
@@ -63,6 +65,8 @@ const SSL3_ENC_METHOD DTLSv1_2_enc_data = {
         | SSL_ENC_FLAG_SHA256_PRF | SSL_ENC_FLAG_TLS1_2_CIPHERS,
     DTLS1_HM_HEADER_LENGTH,
     dtls1_set_handshake_header,
+    dtls1_set_handshake_header2,
+    dtls1_close_construct_packet,
     dtls1_handshake_write
 };
 
diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index 7e88f17..b5e5ef3 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -136,49 +136,6 @@ SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s)
     return s->srtp_profile;
 }
 
-/*
- * Note: this function returns 0 length if there are no profiles specified
- */
-int ssl_add_clienthello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
-                                     int maxlen)
-{
-    int ct = 0;
-    int i;
-    STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = 0;
-    SRTP_PROTECTION_PROFILE *prof;
-
-    clnt = SSL_get_srtp_profiles(s);
-    ct = sk_SRTP_PROTECTION_PROFILE_num(clnt); /* -1 if clnt == 0 */
-
-    if (p) {
-        if (ct == 0) {
-            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT,
-                   SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST);
-            return 1;
-        }
-
-        if ((2 + ct * 2 + 1) > maxlen) {
-            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT,
-                   SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG);
-            return 1;
-        }
-
-        /* Add the length */
-        s2n(ct * 2, p);
-        for (i = 0; i < ct; i++) {
-            prof = sk_SRTP_PROTECTION_PROFILE_value(clnt, i);
-            s2n(prof->id, p);
-        }
-
-        /* Add an empty use_mki value */
-        *p++ = 0;
-    }
-
-    *len = 2 + ct * 2 + 1;
-
-    return 0;
-}
-
 int ssl_parse_clienthello_use_srtp_ext(SSL *s, PACKET *pkt, int *al)
 {
     SRTP_PROTECTION_PROFILE *sprof;
diff --git a/ssl/packet.c b/ssl/packet.c
new file mode 100644
index 0000000..b7084b0
--- /dev/null
+++ b/ssl/packet.c
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <assert.h>
+#include "packet_locl.h"
+
+#define DEFAULT_BUF_SIZE    256
+
+int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
+{
+    /* Internal API, so should not fail */
+    assert(pkt->subs != NULL && len != 0);
+    if (pkt->subs == NULL || len == 0)
+        return 0;
+
+    if (pkt->maxsize - pkt->written < len)
+        return 0;
+
+    if (pkt->buf->length - pkt->written < len) {
+        size_t newlen;
+
+        if (pkt->buf->length > SIZE_MAX / 2) {
+            newlen = SIZE_MAX;
+        } else {
+            newlen = (pkt->buf->length == 0) ? DEFAULT_BUF_SIZE
+                                             : pkt->buf->length * 2;
+        }
+        if (BUF_MEM_grow(pkt->buf, newlen) == 0)
+            return 0;
+    }
+    *allocbytes = (unsigned char *)pkt->buf->data + pkt->curr;
+    pkt->written += len;
+    pkt->curr += len;
+
+    return 1;
+}
+
+static size_t maxmaxsize(size_t lenbytes)
+{
+    if (lenbytes >= sizeof(size_t) || lenbytes == 0)
+        return SIZE_MAX;
+
+    return ((size_t)1 << (lenbytes * 8)) - 1 + lenbytes;
+}
+
+int WPACKET_init_len(WPACKET *pkt, BUF_MEM *buf, size_t lenbytes)
+{
+    unsigned char *lenchars;
+
+    /* Internal API, so should not fail */
+    assert(buf != NULL);
+    if (buf == NULL)
+        return 0;
+
+    pkt->buf = buf;
+    pkt->curr = 0;
+    pkt->written = 0;
+    pkt->maxsize = maxmaxsize(lenbytes);
+
+    pkt->subs = OPENSSL_zalloc(sizeof(*pkt->subs));
+    if (pkt->subs == NULL)
+        return 0;
+
+    if (lenbytes == 0)
+        return 1;
+
+    pkt->subs->pwritten = lenbytes;
+    pkt->subs->lenbytes = lenbytes;
+
+    if (!WPACKET_allocate_bytes(pkt, lenbytes, &lenchars)) {
+        OPENSSL_free(pkt->subs);
+        pkt->subs = NULL;
+        return 0;
+    }
+    pkt->subs->packet_len = lenchars - (unsigned char *)pkt->buf->data;
+
+    return 1;
+}
+
+int WPACKET_init(WPACKET *pkt, BUF_MEM *buf)
+{
+    return WPACKET_init_len(pkt, buf, 0);
+}
+
+int WPACKET_set_flags(WPACKET *pkt, unsigned int flags)
+{
+    /* Internal API, so should not fail */
+    assert(pkt->subs != NULL);
+    if (pkt->subs == NULL)
+        return 0;
+
+    pkt->subs->flags = flags;
+
+    return 1;
+}
+
+/* Store the |value| of length |len| at location |data| */
+static int put_value(unsigned char *data, size_t value, size_t len)
+{
+    for (data += len - 1; len > 0; len--) {
+        *data = (unsigned char)(value & 0xff);
+        data--;
+        value >>= 8;
+    }
+
+    /* Check whether we could fit the value in the assigned number of bytes */
+    if (value > 0)
+        return 0;
+
+    return 1;
+}
+
+
+/*
+ * Internal helper function used by WPACKET_close() and WPACKET_finish() to
+ * close a sub-packet and write out its length if necessary.
+ */
+static int wpacket_intern_close(WPACKET *pkt)
+{
+    WPACKET_SUB *sub = pkt->subs;
+    size_t packlen = pkt->written - sub->pwritten;
+
+    if (packlen == 0
+            && (sub->flags & WPACKET_FLAGS_NON_ZERO_LENGTH) != 0)
+        return 0;
+
+    if (packlen == 0
+            && sub->flags & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) {
+        /* Deallocate any bytes allocated for the length of the WPACKET */
+        if ((pkt->curr - sub->lenbytes) == sub->packet_len) {
+            pkt->written -= sub->lenbytes;
+            pkt->curr -= sub->lenbytes;
+        }
+
+        /* Don't write out the packet length */
+        sub->packet_len = 0;
+        sub->lenbytes = 0;
+    }
+
+    /* Write out the WPACKET length if needed */
+    if (sub->lenbytes > 0 
+                && !put_value((unsigned char *)&pkt->buf->data[sub->packet_len],
+                              packlen, sub->lenbytes))
+            return 0;
+
+    pkt->subs = sub->parent;
+    OPENSSL_free(sub);
+
+    return 1;
+}
+
+int WPACKET_close(WPACKET *pkt)
+{
+    /*
+     * Internal API, so should not fail - but we do negative testing of this
+     * so no assert (otherwise the tests fail)
+     */
+    if (pkt->subs == NULL || pkt->subs->parent == NULL)
+        return 0;
+
+    return wpacket_intern_close(pkt);
+}
+
+int WPACKET_finish(WPACKET *pkt)
+{
+    int ret;
+
+    /*
+     * Internal API, so should not fail - but we do negative testing of this
+     * so no assert (otherwise the tests fail)
+     */
+    if (pkt->subs == NULL || pkt->subs->parent != NULL)
+        return 0;
+
+    ret = wpacket_intern_close(pkt);
+    if (ret) {
+        OPENSSL_free(pkt->subs);
+        pkt->subs = NULL;
+    }
+
+    return ret;
+}
+
+int WPACKET_start_sub_packet_len(WPACKET *pkt, size_t lenbytes)
+{
+    WPACKET_SUB *sub;
+    unsigned char *lenchars;
+
+    /* Internal API, so should not fail */
+    assert(pkt->subs != NULL);
+    if (pkt->subs == NULL)
+        return 0;
+
+    sub = OPENSSL_zalloc(sizeof(*sub));
+    if (sub == NULL)
+        return 0;
+
+    sub->parent = pkt->subs;
+    pkt->subs = sub;
+    sub->pwritten = pkt->written + lenbytes;
+    sub->lenbytes = lenbytes;
+
+    if (lenbytes == 0) {
+        sub->packet_len = 0;
+        return 1;
+    }
+
+    if (!WPACKET_allocate_bytes(pkt, lenbytes, &lenchars))
+        return 0;
+    sub->packet_len = lenchars - (unsigned char *)pkt->buf->data;
+
+    return 1;
+}
+
+int WPACKET_start_sub_packet(WPACKET *pkt)
+{
+    return WPACKET_start_sub_packet_len(pkt, 0);
+}
+
+int WPACKET_put_bytes(WPACKET *pkt, unsigned int val, size_t size)
+{
+    unsigned char *data;
+
+    /* Internal API, so should not fail */
+    assert(size <= sizeof(unsigned int));
+
+    if (size > sizeof(unsigned int)
+            || !WPACKET_allocate_bytes(pkt, size, &data)
+            || !put_value(data, val, size))
+        return 0;
+
+    return 1;
+}
+
+int WPACKET_set_max_size(WPACKET *pkt, size_t maxsize)
+{
+    WPACKET_SUB *sub;
+    size_t lenbytes;
+
+    /* Internal API, so should not fail */
+    assert(pkt->subs != NULL);
+    if (pkt->subs == NULL)
+        return 0;
+
+    /* Find the WPACKET_SUB for the top level */
+    for (sub = pkt->subs; sub->parent != NULL; sub = sub->parent)
+        continue;
+
+    lenbytes = sub->lenbytes;
+    if (lenbytes == 0)
+        lenbytes = sizeof(pkt->maxsize);
+
+    if (maxmaxsize(lenbytes) < maxsize || maxsize < pkt->written)
+        return 0;
+
+    pkt->maxsize = maxsize;
+
+    return 1;
+}
+
+int WPACKET_memcpy(WPACKET *pkt, const void *src, size_t len)
+{
+    unsigned char *dest;
+
+    if (len == 0)
+        return 1;
+
+    if (!WPACKET_allocate_bytes(pkt, len, &dest))
+        return 0;
+
+    memcpy(dest, src, len);
+
+    return 1;
+}
+
+int WPACKET_sub_memcpy(WPACKET *pkt, const void *src, size_t len, size_t lenbytes)
+{
+    if (!WPACKET_start_sub_packet_len(pkt, lenbytes)
+            || !WPACKET_memcpy(pkt, src, len)
+            || !WPACKET_close(pkt))
+        return 0;
+
+    return 1;
+}
+
+int WPACKET_get_total_written(WPACKET *pkt, size_t *written)
+{
+    /* Internal API, so should not fail */
+    assert(written != NULL);
+    if (written == NULL)
+        return 0;
+
+    *written = pkt->written;
+
+    return 1;
+}
+
+int WPACKET_get_length(WPACKET *pkt, size_t *len)
+{
+    /* Internal API, so should not fail */
+    assert(pkt->subs != NULL && len != NULL);
+    if (pkt->subs == NULL || len == NULL)
+        return 0;
+
+    *len = pkt->written - pkt->subs->pwritten;
+
+    return 1;
+}
+
+void WPACKET_cleanup(WPACKET *pkt)
+{
+    WPACKET_SUB *sub, *parent;
+
+    for (sub = pkt->subs; sub != NULL; sub = parent) {
+        parent = sub->parent;
+        OPENSSL_free(sub);
+    }
+    pkt->subs = NULL;
+}
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index d34034d..daef69e 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -548,6 +548,168 @@ __owur static ossl_inline int PACKET_get_length_prefixed_3(PACKET *pkt,
 
     return 1;
 }
+
+/* Writeable packets */
+
+typedef struct wpacket_sub WPACKET_SUB;
+struct wpacket_sub {
+    /* The parent WPACKET_SUB if we have one or NULL otherwise */
+    WPACKET_SUB *parent;
+
+    /*
+     * Offset into the buffer where the length of this WPACKET goes. We use an
+     * offset in case the buffer grows and gets reallocated.
+     */
+    size_t packet_len;
+
+    /* Number of bytes in the packet_len or 0 if we don't write the length */
+    size_t lenbytes;
+
+    /* Number of bytes written to the buf prior to this packet starting */
+    size_t pwritten;
+
+    /* Flags for this sub-packet */
+    unsigned int flags;
+};
+
+typedef struct wpacket_st WPACKET;
+struct wpacket_st {
+    /* The buffer where we store the output data */
+    BUF_MEM *buf;
+
+    /*
+     * Offset into the buffer where we are currently writing. We use an offset
+     * in case the buffer grows and gets reallocated.
+     */
+    size_t curr;
+
+    /* Number of bytes written so far */
+    size_t written;
+
+    /* Maximum number of bytes we will allow to be written to this WPACKET */
+    size_t maxsize;
+
+    /* Our sub-packets (always at least one if not finished) */
+    WPACKET_SUB *subs;
+};
+
+/* Flags */
+
+/* Default */
+#define WPACKET_FLAGS_NONE                      0
+
+/* Error on WPACKET_close() if no data written to the WPACKET */
+#define WPACKET_FLAGS_NON_ZERO_LENGTH           1
+
+/*
+ * Abandon all changes on WPACKET_close() if no data written to the WPACKET,
+ * i.e. this does not write out a zero packet length
+ */
+#define WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH    2
+
+
+/*
+ * Initialise a WPACKET with the buffer in |buf|. The buffer must exist
+ * for the whole time that the WPACKET is being used. Additionally |lenbytes| of
+ * data is preallocated at the start of the buffer to store the length of the
+ * WPACKET once we know it.
+ */
+int WPACKET_init_len(WPACKET *pkt, BUF_MEM *buf, size_t lenbytes);
+
+/*
+ * Same as WPACKET_init_len except there is no preallocation of the WPACKET
+ * length.
+ */
+int WPACKET_init(WPACKET *pkt, BUF_MEM *buf);
+
+/*
+ * Set the flags to be applied to the current sub-packet
+ */
+int WPACKET_set_flags(WPACKET *pkt, unsigned int flags);
+
+/*
+ * Closes the most recent sub-packet. It also writes out the length of the
+ * packet to the required location (normally the start of the WPACKET) if
+ * appropriate. The top level WPACKET should be closed using WPACKET_finish()
+ * instead of this function.
+ */
+int WPACKET_close(WPACKET *pkt);
+
+/*
+ * The same as WPACKET_close() but only for the top most WPACKET. Additionally
+ * frees memory resources for this WPACKET.
+ */
+int WPACKET_finish(WPACKET *pkt);
+
+/*
+ * Initialise a new sub-packet. Additionally |lenbytes| of data is preallocated
+ * at the start of the sub-packet to store its length once we know it.
+ */
+int WPACKET_start_sub_packet_len(WPACKET *pkt, size_t lenbytes);
+
+/*
+ * Convenience macros for calling WPACKET_start_sub_packet_len with different
+ * lengths
+ */
+#define WPACKET_start_sub_packet_u8(pkt) \
+    WPACKET_start_sub_packet_len((pkt), 1)
+#define WPACKET_start_sub_packet_u16(pkt) \
+    WPACKET_start_sub_packet_len((pkt), 2)
+#define WPACKET_start_sub_packet_u24(pkt) \
+    WPACKET_start_sub_packet_len((pkt), 3)
+#define WPACKET_start_sub_packet_u32(pkt) \
+    WPACKET_start_sub_packet_len((pkt), 4)
+
+/*
+ * Same as WPACKET_start_sub_packet_len() except no bytes are pre-allocated for
+ * the sub-packet length.
+ */
+int WPACKET_start_sub_packet(WPACKET *pkt);
+
+/*
+ * Allocate bytes in the WPACKET for the output. This reserves the bytes
+ * and counts them as "written", but doesn't actually do the writing. A pointer
+ * to the allocated bytes is stored in |*allocbytes|.
+ */
+int WPACKET_allocate_bytes(WPACKET *pkt, size_t bytes,
+                           unsigned char **allocbytes);
+
+/*
+ * Write the value stored in |val| into the WPACKET. The value will consume
+ * |bytes| amount of storage. An error will occur if |val| cannot be
+ * accommodated in |bytes| storage, e.g. attempting to write the value 256 into
+ * 1 byte will fail.
+ */
+int WPACKET_put_bytes(WPACKET *pkt, unsigned int val, size_t bytes);
+
+/* Set a maximum size that we will not allow the WPACKET to grow beyond */
+int WPACKET_set_max_size(WPACKET *pkt, size_t maxsize);
+
+/* Copy |len| bytes of data from |*src| into the WPACKET. */
+int WPACKET_memcpy(WPACKET *pkt, const void *src, size_t len);
+
+/*
+ * Copy |len| bytes of data from |*src| into the WPACKET and prefix with its
+ * length (consuming |lenbytes| of data for the length)
+ */
+int WPACKET_sub_memcpy(WPACKET *pkt, const void *src, size_t len,
+                       size_t lenbytes);
+
+/*
+ * Return the total number of bytes written so far to the underlying buffer
+ * including any storage allocated for length bytes
+ */
+int WPACKET_get_total_written(WPACKET *pkt, size_t *written);
+
+/*
+ * Returns the length of the current sub-packet. This excludes any bytes
+ * allocated for the length itself.
+ */
+int WPACKET_get_length(WPACKET *pkt, size_t *len);
+
+/* Release resources in a WPACKET if a failure has occurred. */
+void WPACKET_cleanup(WPACKET *pkt);
+
 # ifdef __cplusplus
 }
 # endif
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index e94ee83..3749b2c 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2751,6 +2751,8 @@ const SSL3_ENC_METHOD SSLv3_enc_data = {
     0,
     SSL3_HM_HEADER_LENGTH,
     ssl3_set_handshake_header,
+    ssl3_set_handshake_header2,
+    tls_close_construct_packet,
     ssl3_handshake_write
 };
 
@@ -2787,6 +2789,22 @@ int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len)
     return 1;
 }
 
+/*
+ * Temporary name. To be renamed ssl3_set_handshake_header() once all WPACKET
+ * conversion is complete. The old ssl3_set_handshake_heder() can be deleted
+ * at that point.
+ * TODO - RENAME ME
+ */
+int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype)
+{
+    /* Set the content type and 3 bytes for the message len */
+    if (!WPACKET_put_bytes(pkt, htype, 1)
+            || !WPACKET_start_sub_packet_u24(pkt))
+        return 0;
+
+    return 1;
+}
+
 int ssl3_handshake_write(SSL *s)
 {
     return ssl3_do_write(s, SSL3_RT_HANDSHAKE);
@@ -3553,7 +3571,13 @@ const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
     return cp;
 }
 
-int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
+/*
+ * Old version of the ssl3_put_cipher_by_char function used by code that has not
+ * yet been converted to WPACKET yet. It will be deleted once WPACKET conversion
+ * is complete.
+ * TODO - DELETE ME
+ */
+int ssl3_put_cipher_by_char_old(const SSL_CIPHER *c, unsigned char *p)
 {
     long l;
 
@@ -3567,6 +3591,20 @@ int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
     return (2);
 }
 
+int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt, size_t *len)
+{
+    if ((c->id & 0xff000000) != 0x03000000) {
+        *len = 0;
+        return 1;
+    }
+
+    if (!WPACKET_put_bytes(pkt, c->id & 0xffff, 2))
+        return 0;
+
+    *len = 2;
+    return 1;
+}
+
 /*
  * ssl3_choose_cipher - choose a cipher from those offered by the client
  * @s: SSL connection
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 1fddda6..f776f61 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -107,6 +107,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "ssl_check_serverhello_tlsext"},
     {ERR_FUNC(SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG),
      "ssl_check_srvr_ecc_cert_and_alg"},
+    {ERR_FUNC(SSL_F_SSL_CIPHER_LIST_TO_BYTES), "ssl_cipher_list_to_bytes"},
     {ERR_FUNC(SSL_F_SSL_CIPHER_PROCESS_RULESTR),
      "ssl_cipher_process_rulestr"},
     {ERR_FUNC(SSL_F_SSL_CIPHER_STRENGTH_SORT), "ssl_cipher_strength_sort"},
@@ -567,10 +568,9 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
     {ERR_REASON(SSL_R_SSL_SESSION_ID_CONFLICT), "ssl session id conflict"},
     {ERR_REASON(SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG),
      "ssl session id context too long"},
-    {ERR_REASON(SSL_R_SSL_SESSION_ID_TOO_LONG),
-     "ssl session id too long"},
     {ERR_REASON(SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH),
      "ssl session id has bad length"},
+    {ERR_REASON(SSL_R_SSL_SESSION_ID_TOO_LONG), "ssl session id too long"},
     {ERR_REASON(SSL_R_SSL_SESSION_VERSION_MISMATCH),
      "ssl session version mismatch"},
     {ERR_REASON(SSL_R_TLSV1_ALERT_ACCESS_DENIED),
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 4079b31..26485f6 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -457,7 +457,8 @@ struct ssl_method_st {
     long (*ssl_ctrl) (SSL *s, int cmd, long larg, void *parg);
     long (*ssl_ctx_ctrl) (SSL_CTX *ctx, int cmd, long larg, void *parg);
     const SSL_CIPHER *(*get_cipher_by_char) (const unsigned char *ptr);
-    int (*put_cipher_by_char) (const SSL_CIPHER *cipher, unsigned char *ptr);
+    int (*put_cipher_by_char) (const SSL_CIPHER *cipher, WPACKET *pkt,
+                               size_t *len);
     int (*ssl_pending) (const SSL *s);
     int (*num_ciphers) (void);
     const SSL_CIPHER *(*get_cipher) (unsigned ncipher);
@@ -1584,6 +1585,10 @@ typedef struct ssl3_enc_method {
     unsigned int hhlen;
     /* Set the handshake header */
     int (*set_handshake_header) (SSL *s, int type, unsigned long len);
+    /* Set the handshake header */
+    int (*set_handshake_header2) (SSL *s, WPACKET *pkt, int type);
+    /* Close construction of the handshake message */
+    int (*close_construct_packet) (SSL *s, WPACKET *pkt);
     /* Write out handshake message */
     int (*do_write) (SSL *s);
 } SSL3_ENC_METHOD;
@@ -1593,6 +1598,10 @@ typedef struct ssl3_enc_method {
         (((unsigned char *)s->init_buf->data) + s->method->ssl3_enc->hhlen)
 # define ssl_set_handshake_header(s, htype, len) \
         s->method->ssl3_enc->set_handshake_header(s, htype, len)
+# define ssl_set_handshake_header2(s, pkt, htype) \
+        s->method->ssl3_enc->set_handshake_header2((s), (pkt), (htype))
+# define ssl_close_construct_packet(s, pkt) \
+        s->method->ssl3_enc->close_construct_packet((s), (pkt))
 # define ssl_do_write(s)  s->method->ssl3_enc->do_write(s)
 
 /* Values for enc_flags */
@@ -1854,7 +1863,9 @@ __owur int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey);
 __owur EVP_PKEY *ssl_dh_to_pkey(DH *dh);
 
 __owur const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
-__owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
+__owur int ssl3_put_cipher_by_char_old(const SSL_CIPHER *c, unsigned char *p);
+__owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt,
+                                   size_t *len);
 int ssl3_init_finished_mac(SSL *s);
 __owur int ssl3_setup_key_block(SSL *s);
 __owur int ssl3_change_cipher_state(SSL *s, int which);
@@ -1894,6 +1905,10 @@ __owur int ssl3_do_change_cipher_spec(SSL *ssl);
 __owur long ssl3_default_timeout(void);
 
 __owur int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len);
+__owur int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype);
+__owur int tls_close_construct_packet(SSL *s, WPACKET *pkt);
+__owur int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype);
+__owur int dtls1_close_construct_packet(SSL *s, WPACKET *pkt);
 __owur int ssl3_handshake_write(SSL *s);
 
 __owur int ssl_allow_compression(SSL *s);
@@ -2002,8 +2017,7 @@ __owur EVP_PKEY *ssl_generate_pkey_curve(int id);
 __owur int tls1_shared_list(SSL *s,
                             const unsigned char *l1, size_t l1len,
                             const unsigned char *l2, size_t l2len, int nmatch);
-__owur unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
-                                                 unsigned char *limit, int *al);
+__owur int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al);
 __owur unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
                                                  unsigned char *limit, int *al);
 __owur int ssl_parse_clienthello_tlsext(SSL *s, PACKET *pkt);
@@ -2054,12 +2068,12 @@ void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
 __owur int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p,
                                                int *len, int maxlen);
 __owur int ssl_parse_serverhello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
-__owur int ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p,
-                                               int *len, int maxlen);
 __owur int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
 __owur long ssl_get_algorithm2(SSL *s);
-__owur size_t tls12_copy_sigalgs(SSL *s, unsigned char *out,
-                                 const unsigned char *psig, size_t psiglen);
+__owur size_t tls12_copy_sigalgs_old(SSL *s, unsigned char *out,
+                                     const unsigned char *psig, size_t psiglen);
+__owur int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,
+                              const unsigned char *psig, size_t psiglen);
 __owur int tls1_save_sigalgs(SSL *s, const unsigned char *data, int dsize);
 __owur int tls1_process_sigalgs(SSL *s);
 __owur size_t tls12_get_psigalgs(SSL *s, const unsigned char **psigs);
@@ -2068,8 +2082,6 @@ __owur int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s,
 void ssl_set_client_disabled(SSL *s);
 __owur int ssl_cipher_disabled(SSL *s, const SSL_CIPHER *c, int op);
 
-__owur int ssl_add_clienthello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
-                                            int maxlen);
 __owur int ssl_parse_clienthello_use_srtp_ext(SSL *s, PACKET *pkt, int *al);
 __owur int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
                                             int maxlen);
@@ -2108,8 +2120,9 @@ __owur int custom_ext_parse(SSL *s, int server,
                             unsigned int ext_type,
                             const unsigned char *ext_data, size_t ext_size,
                             int *al);
-__owur int custom_ext_add(SSL *s, int server, unsigned char **pret,
-                          unsigned char *limit, int *al);
+__owur int custom_ext_add_old(SSL *s, int server, unsigned char **pret,
+                              unsigned char *limit, int *al);
+__owur int custom_ext_add(SSL *s, int server, WPACKET *pkt, int *al);
 
 __owur int custom_exts_copy(custom_ext_methods *dst,
                             const custom_ext_methods *src);
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index ff42858..59d21df 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -63,7 +63,7 @@ static ossl_inline int cert_req_allowed(SSL *s);
 static int key_exchange_expected(SSL *s);
 static int ca_dn_cmp(const X509_NAME *const *a, const X509_NAME *const *b);
 static int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
-                                    unsigned char *p);
+                                    WPACKET *pkt);
 
 /*
  * Is a CertificateRequest message allowed at the moment or not?
@@ -689,19 +689,22 @@ WORK_STATE ossl_statem_client_post_process_message(SSL *s, WORK_STATE wst)
 
 int tls_construct_client_hello(SSL *s)
 {
-    unsigned char *buf;
-    unsigned char *p, *d;
+    unsigned char *p;
     int i;
     int protverr;
-    unsigned long l;
-    int al = 0;
+    int al = SSL_AD_HANDSHAKE_FAILURE;
 #ifndef OPENSSL_NO_COMP
-    int j;
     SSL_COMP *comp;
 #endif
     SSL_SESSION *sess = s->session;
+    WPACKET pkt;
 
-    buf = (unsigned char *)s->init_buf->data;
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !WPACKET_set_max_size(&pkt, SSL3_RT_MAX_PLAIN_LENGTH)) {
+        /* Should not happen */
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     /* Work out what SSL/TLS/DTLS version to use */
     protverr = ssl_set_client_hello_version(s);
@@ -743,8 +746,11 @@ int tls_construct_client_hello(SSL *s)
     if (i && ssl_fill_hello_random(s, 0, p, sizeof(s->s3->client_random)) <= 0)
         goto err;
 
-    /* Do the message type and length last */
-    d = p = ssl_handshake_start(s);
+    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CLIENT_HELLO)) {
+        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     /*-
      * version indicates the negotiated version: for example from
@@ -776,90 +782,90 @@ int tls_construct_client_hello(SSL *s)
      * client_version in client hello and not resetting it to
      * the negotiated version.
      */
-    *(p++) = s->client_version >> 8;
-    *(p++) = s->client_version & 0xff;
-
-    /* Random stuff */
-    memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
-    p += SSL3_RANDOM_SIZE;
+    if (!WPACKET_put_bytes(&pkt, s->client_version, 2)
+            || !WPACKET_memcpy(&pkt, s->s3->client_random, SSL3_RANDOM_SIZE)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     /* Session ID */
     if (s->new_session)
         i = 0;
     else
         i = s->session->session_id_length;
-    *(p++) = i;
-    if (i != 0) {
-        if (i > (int)sizeof(s->session->session_id)) {
-            SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
-            goto err;
-        }
-        memcpy(p, s->session->session_id, i);
-        p += i;
+    if (i > (int)sizeof(s->session->session_id)
+            || !WPACKET_start_sub_packet_u8(&pkt)
+            || (i != 0 && !WPACKET_memcpy(&pkt, s->session->session_id, i))
+            || !WPACKET_close(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
     }
 
     /* cookie stuff for DTLS */
     if (SSL_IS_DTLS(s)) {
-        if (s->d1->cookie_len > sizeof(s->d1->cookie)) {
+        if (s->d1->cookie_len > sizeof(s->d1->cookie)
+                || !WPACKET_sub_memcpy(&pkt, s->d1->cookie, s->d1->cookie_len,
+                                       1)) {
             SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
             goto err;
         }
-        *(p++) = s->d1->cookie_len;
-        memcpy(p, s->d1->cookie, s->d1->cookie_len);
-        p += s->d1->cookie_len;
     }
 
     /* Ciphers supported */
-    i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &(p[2]));
-    if (i == 0) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, SSL_R_NO_CIPHERS_AVAILABLE);
+    if (!WPACKET_start_sub_packet_u16(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+    /* ssl_cipher_list_to_bytes() raises SSLerr if appropriate */
+    if (!ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &pkt))
+        goto err;
+    if (!WPACKET_close(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
-#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
-    /*
-     * Some servers hang if client hello > 256 bytes as hack workaround
-     * chop number of supported ciphers to keep it well below this if we
-     * use TLS v1.2
-     */
-    if (TLS1_get_version(s) >= TLS1_2_VERSION
-        && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
-        i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
-#endif
-    s2n(i, p);
-    p += i;
 
     /* COMPRESSION */
-#ifdef OPENSSL_NO_COMP
-    *(p++) = 1;
-#else
-
-    if (!ssl_allow_compression(s) || !s->ctx->comp_methods)
-        j = 0;
-    else
-        j = sk_SSL_COMP_num(s->ctx->comp_methods);
-    *(p++) = 1 + j;
-    for (i = 0; i < j; i++) {
-        comp = sk_SSL_COMP_value(s->ctx->comp_methods, i);
-        *(p++) = comp->id;
+    if (!WPACKET_start_sub_packet_u8(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+#ifndef OPENSSL_NO_COMP
+    if (ssl_allow_compression(s) && s->ctx->comp_methods) {
+        int compnum = sk_SSL_COMP_num(s->ctx->comp_methods);
+        for (i = 0; i < compnum; i++) {
+            comp = sk_SSL_COMP_value(s->ctx->comp_methods, i);
+            if (!WPACKET_put_bytes(&pkt, comp->id, 1)) {
+                SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
+        }
     }
 #endif
-    *(p++) = 0;                 /* Add the NULL method */
+    /* Add the NULL method */
+    if (!WPACKET_put_bytes(&pkt, 0, 1) || !WPACKET_close(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     /* TLS extensions */
     if (ssl_prepare_clienthello_tlsext(s) <= 0) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
         goto err;
     }
-    if ((p =
-         ssl_add_clienthello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH,
-                                    &al)) == NULL) {
+    if (!WPACKET_start_sub_packet_u16(&pkt)
+               /*
+                * If extensions are of zero length then we don't even add the
+                * extensions length bytes
+                */
+            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+            || !ssl_add_clienthello_tlsext(s, &pkt, &al)
+            || !WPACKET_close(&pkt)) {
         ssl3_send_alert(s, SSL3_AL_FATAL, al);
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
-    l = p - d;
-    if (!ssl_set_handshake_header(s, SSL3_MT_CLIENT_HELLO, l)) {
+    if (!WPACKET_close(&pkt) || !ssl_close_construct_packet(s, &pkt)) {
         ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -868,6 +874,7 @@ int tls_construct_client_hello(SSL *s)
     return 1;
  err:
     ossl_statem_set_error(s);
+    WPACKET_cleanup(&pkt);
     return 0;
 }
 
@@ -2909,47 +2916,79 @@ int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)
     return i;
 }
 
-int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p)
+int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, WPACKET *pkt)
 {
-    int i, j = 0;
-    const SSL_CIPHER *c;
-    unsigned char *q;
+    int i;
+    size_t totlen = 0, len, maxlen;
     int empty_reneg_info_scsv = !s->renegotiate;
     /* Set disabled masks for this session */
     ssl_set_client_disabled(s);
 
     if (sk == NULL)
         return (0);
-    q = p;
 
-    for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
+#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
+# if OPENSSL_MAX_TLS1_2_CIPHER_LENGTH < 6
+#  error Max cipher length too short
+# endif
+    /*
+     * Some servers hang if client hello > 256 bytes as hack workaround
+     * chop number of supported ciphers to keep it well below this if we
+     * use TLS v1.2
+     */
+    if (TLS1_get_version(s) >= TLS1_2_VERSION)
+        maxlen = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
+    else
+#endif
+        /* Maximum length that can be stored in 2 bytes. Length must be even */
+        maxlen = 0xfffe;
+
+    if (empty_reneg_info_scsv)
+        maxlen -= 2;
+    if (s->mode & SSL_MODE_SEND_FALLBACK_SCSV)
+        maxlen -= 2;
+
+    for (i = 0; i < sk_SSL_CIPHER_num(sk) && totlen < maxlen; i++) {
+        const SSL_CIPHER *c;
+
         c = sk_SSL_CIPHER_value(sk, i);
         /* Skip disabled ciphers */
         if (ssl_cipher_disabled(s, c, SSL_SECOP_CIPHER_SUPPORTED))
             continue;
-        j = s->method->put_cipher_by_char(c, p);
-        p += j;
+
+        if (!s->method->put_cipher_by_char(c, pkt, &len)) {
+            SSLerr(SSL_F_SSL_CIPHER_LIST_TO_BYTES, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
+
+        totlen += len;
     }
-    /*
-     * If p == q, no ciphers; caller indicates an error. Otherwise, add
-     * applicable SCSVs.
-     */
-    if (p != q) {
+
+    if (totlen == 0) {
+        SSLerr(SSL_F_SSL_CIPHER_LIST_TO_BYTES, SSL_R_NO_CIPHERS_AVAILABLE);
+        return 0;
+    }
+
+    if (totlen != 0) {
         if (empty_reneg_info_scsv) {
             static SSL_CIPHER scsv = {
                 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0
             };
-            j = s->method->put_cipher_by_char(&scsv, p);
-            p += j;
+            if (!s->method->put_cipher_by_char(&scsv, pkt, &len)) {
+                SSLerr(SSL_F_SSL_CIPHER_LIST_TO_BYTES, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
         }
         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 = s->method->put_cipher_by_char(&scsv, p);
-            p += j;
+            if (!s->method->put_cipher_by_char(&scsv, pkt, &len)) {
+                SSLerr(SSL_F_SSL_CIPHER_LIST_TO_BYTES, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
         }
     }
 
-    return (p - q);
+    return 1;
 }
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index de2de09..25c4575 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -1190,3 +1190,46 @@ void dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr)
     n2l3(data, msg_hdr->frag_off);
     n2l3(data, msg_hdr->frag_len);
 }
+
+/*
+ * Temporary name. To be renamed dtls1_set_handshake_header() once all WPACKET
+ * conversion is complete. The old dtls1_set_handshake_heder() can be deleted
+ * at that point.
+ * TODO - RENAME ME
+ */
+int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype)
+{
+    unsigned char *header;
+
+    dtls1_set_message_header(s, htype, 0, 0, 0);
+
+    /*
+     * We allocate space at the start for the message header. This gets filled
+     * in later
+     */
+    if (!WPACKET_allocate_bytes(pkt, DTLS1_HM_HEADER_LENGTH, &header)
+            || !WPACKET_start_sub_packet(pkt))
+        return 0;
+
+    return 1;
+}
+
+int dtls1_close_construct_packet(SSL *s, WPACKET *pkt)
+{
+    size_t msglen;
+
+    if (!WPACKET_get_length(pkt, &msglen)
+            || msglen > INT_MAX
+            || !WPACKET_finish(pkt))
+        return 0;
+    s->d1->w_msg_hdr.msg_len = msglen - DTLS1_HM_HEADER_LENGTH;
+    s->d1->w_msg_hdr.frag_len = msglen - DTLS1_HM_HEADER_LENGTH;
+    s->init_num = (int)msglen;
+    s->init_off = 0;
+
+    /* Buffer the message to handle re-xmits */
+    if (!dtls1_buffer_message(s, 0))
+        return 0;
+
+    return 1;
+}
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 19b75a7..7ad3899 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -57,6 +57,20 @@ int ssl3_do_write(SSL *s, int type)
     return (0);
 }
 
+int tls_close_construct_packet(SSL *s, WPACKET *pkt)
+{
+    size_t msglen;
+
+    if (!WPACKET_get_length(pkt, &msglen)
+            || msglen > INT_MAX
+            || !WPACKET_finish(pkt))
+        return 0;
+    s->init_num = (int)msglen;
+    s->init_off = 0;
+
+    return 1;
+}
+
 int tls_construct_finished(SSL *s, const char *sender, int slen)
 {
     unsigned char *p;
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index a6b8a87..818f48d 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1551,7 +1551,7 @@ int tls_construct_server_hello(SSL *s)
     p += sl;
 
     /* put the cipher */
-    i = ssl3_put_cipher_by_char(s->s3->tmp.new_cipher, p);
+    i = ssl3_put_cipher_by_char_old(s->s3->tmp.new_cipher, p);
     p += i;
 
     /* put the compression method */
@@ -2002,7 +2002,7 @@ int tls_construct_certificate_request(SSL *s)
         nl = tls12_get_psigalgs(s, &psigs);
         /* Skip over length for now */
         p += 2;
-        nl = tls12_copy_sigalgs(s, p, psigs, nl);
+        nl = tls12_copy_sigalgs_old(s, p, psigs, nl);
         /* Now fill in length */
         s2n(nl, etmp);
         p += nl;
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index a8e9f9a..664906c 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -72,10 +72,13 @@ int custom_ext_parse(SSL *s, int server,
 
 /*
  * Request custom extension data from the application and add to the return
- * buffer.
+ * buffer. This is the old style function signature prior to WPACKET. This is
+ * here temporarily until the conversion to WPACKET is completed, i.e. it is
+ * used by code that hasn't been converted yet.
+ * TODO - REMOVE THIS FUNCTION
  */
-int custom_ext_add(SSL *s, int server,
-                   unsigned char **pret, unsigned char *limit, int *al)
+int custom_ext_add_old(SSL *s, int server,
+                       unsigned char **pret, unsigned char *limit, int *al)
 {
     custom_ext_methods *exts = server ? &s->cert->srv_ext : &s->cert->cli_ext;
     custom_ext_method *meth;
@@ -131,6 +134,66 @@ int custom_ext_add(SSL *s, int server,
     return 1;
 }
 
+
+/*
+ * Request custom extension data from the application and add to the return
+ * buffer.
+ */
+int custom_ext_add(SSL *s, int server, WPACKET *pkt, int *al)
+{
+    custom_ext_methods *exts = server ? &s->cert->srv_ext : &s->cert->cli_ext;
+    custom_ext_method *meth;
+    size_t i;
+
+    for (i = 0; i < exts->meths_count; i++) {
+        const unsigned char *out = NULL;
+        size_t outlen = 0;
+
+        meth = exts->meths + i;
+
+        if (server) {
+            /*
+             * For ServerHello only send extensions present in ClientHello.
+             */
+            if (!(meth->ext_flags & SSL_EXT_FLAG_RECEIVED))
+                continue;
+            /* If callback absent for server skip it */
+            if (!meth->add_cb)
+                continue;
+        }
+        if (meth->add_cb) {
+            int cb_retval = 0;
+            cb_retval = meth->add_cb(s, meth->ext_type,
+                                     &out, &outlen, al, meth->add_arg);
+            if (cb_retval < 0)
+                return 0;       /* error */
+            if (cb_retval == 0)
+                continue;       /* skip this extension */
+        }
+
+        if (!WPACKET_put_bytes(pkt, meth->ext_type, 2)
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || (outlen > 0 && !WPACKET_memcpy(pkt, out, outlen))
+                || !WPACKET_close(pkt)) {
+            *al = SSL_AD_INTERNAL_ERROR;
+            return 0;
+        }
+        /*
+         * We can't send duplicates: code logic should prevent this.
+         */
+        OPENSSL_assert(!(meth->ext_flags & SSL_EXT_FLAG_SENT));
+        /*
+         * Indicate extension has been sent: this is both a sanity check to
+         * ensure we don't send duplicate extensions and indicates that it is
+         * not an error if the extension is present in ServerHello.
+         */
+        meth->ext_flags |= SSL_EXT_FLAG_SENT;
+        if (meth->free_cb)
+            meth->free_cb(s, meth->ext_type, out, meth->add_arg);
+    }
+    return 1;
+}
+
 /* Copy table of custom extensions */
 int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src)
 {
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index b8f8fd2..50083a9 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -41,6 +41,8 @@ SSL3_ENC_METHOD const TLSv1_enc_data = {
     0,
     SSL3_HM_HEADER_LENGTH,
     ssl3_set_handshake_header,
+    ssl3_set_handshake_header2,
+    tls_close_construct_packet,
     ssl3_handshake_write
 };
 
@@ -59,6 +61,8 @@ SSL3_ENC_METHOD const TLSv1_1_enc_data = {
     SSL_ENC_FLAG_EXPLICIT_IV,
     SSL3_HM_HEADER_LENGTH,
     ssl3_set_handshake_header,
+    ssl3_set_handshake_header2,
+    tls_close_construct_packet,
     ssl3_handshake_write
 };
 
@@ -78,6 +82,8 @@ SSL3_ENC_METHOD const TLSv1_2_enc_data = {
         | SSL_ENC_FLAG_TLS1_2_CIPHERS,
     SSL3_HM_HEADER_LENGTH,
     ssl3_set_handshake_header,
+    ssl3_set_handshake_header2,
+    tls_close_construct_packet,
     ssl3_handshake_write
 };
 
@@ -1007,12 +1013,8 @@ static int tls1_check_duplicate_extensions(const PACKET *packet)
     return ret;
 }
 
-unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
-                                          unsigned char *limit, int *al)
+int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
 {
-    int extdatalen = 0;
-    unsigned char *orig = buf;
-    unsigned char *ret = buf;
 #ifndef OPENSSL_NO_EC
     /* See if we support any ECC ciphersuites */
     int using_ecc = 0;
@@ -1035,32 +1037,14 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
     }
 #endif
 
-    ret += 2;
-
-    if (ret >= limit)
-        return NULL;            /* this really never occurs, but ... */
-
     /* Add RI if renegotiating */
     if (s->renegotiate) {
-        int el;
-
-        if (!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0)) {
-            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
-        }
-
-        if ((limit - ret - 4 - el) < 0)
-            return NULL;
-
-        s2n(TLSEXT_TYPE_renegotiate, ret);
-        s2n(el, ret);
-
-        if (!ssl_add_clienthello_renegotiate_ext(s, ret, &el, el)) {
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_renegotiate, 2)
+                || !WPACKET_sub_memcpy(pkt, s->s3->previous_client_finished,
+                                   s->s3->previous_client_finished_len, 2)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
-
-        ret += el;
     }
     /* Only add RI for SSLv3 */
     if (s->client_version == SSL3_VERSION)
@@ -1068,61 +1052,36 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
 
     if (s->tlsext_hostname != NULL) {
         /* Add TLS extension servername to the Client Hello message */
-        unsigned long size_str;
-        long lenmax;
-
-        /*-
-         * check for enough space.
-         * 4 for the servername type and extension length
-         * 2 for servernamelist length
-         * 1 for the hostname type
-         * 2 for hostname length
-         * + hostname length
-         */
-
-        if ((lenmax = limit - ret - 9) < 0
-            || (size_str = strlen(s->tlsext_hostname)) > (unsigned long)lenmax)
-            return NULL;
-
-        /* extension type and length */
-        s2n(TLSEXT_TYPE_server_name, ret);
-        s2n(size_str + 5, ret);
-
-        /* length of servername list */
-        s2n(size_str + 3, ret);
-
-        /* hostname type, length and hostname */
-        *(ret++) = (unsigned char)TLSEXT_NAMETYPE_host_name;
-        s2n(size_str, ret);
-        memcpy(ret, s->tlsext_hostname, size_str);
-        ret += size_str;
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_server_name, 2)
+                   /* Sub-packet for server_name extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                   /* Sub-packet for servername list (always 1 hostname)*/
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_put_bytes(pkt, TLSEXT_NAMETYPE_host_name, 1)
+                || !WPACKET_sub_memcpy(pkt, s->tlsext_hostname,
+                                       strlen(s->tlsext_hostname), 2)
+                || !WPACKET_close(pkt)
+                || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #ifndef OPENSSL_NO_SRP
     /* Add SRP username if there is one */
-    if (s->srp_ctx.login != NULL) { /* Add TLS extension SRP username to the
-                                     * Client Hello message */
-
-        int login_len = strlen(s->srp_ctx.login);
-        if (login_len > 255 || login_len == 0) {
+    if (s->srp_ctx.login != NULL) {
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_srp, 2)
+                   /* Sub-packet for SRP extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_start_sub_packet_u8(pkt)
+                   /* login must not be zero...internal error if so */
+                || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
+                || !WPACKET_memcpy(pkt, s->srp_ctx.login,
+                                   strlen(s->srp_ctx.login))
+                || !WPACKET_close(pkt)
+                || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
-
-        /*-
-         * check for enough space.
-         * 4 for the srp type type and extension length
-         * 1 for the srp user identity
-         * + srp user identity length
-         */
-        if ((limit - ret - 5 - login_len) < 0)
-            return NULL;
-
-        /* fill in the extension */
-        s2n(TLSEXT_TYPE_srp, ret);
-        s2n(login_len + 1, ret);
-        (*ret++) = (unsigned char)login_len;
-        memcpy(ret, s->srp_ctx.login, login_len);
-        ret += login_len;
     }
 #endif
 
@@ -1131,61 +1090,52 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
         /*
          * Add TLS extension ECPointFormats to the ClientHello message
          */
-        long lenmax;
         const unsigned char *pcurves, *pformats;
-        size_t num_curves, num_formats, curves_list_len;
+        size_t num_curves, num_formats;
         size_t i;
-        unsigned char *etmp;
 
         tls1_get_formatlist(s, &pformats, &num_formats);
 
-        if ((lenmax = limit - ret - 5) < 0)
-            return NULL;
-        if (num_formats > (size_t)lenmax)
-            return NULL;
-        if (num_formats > 255) {
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_ec_point_formats, 2)
+                   /* Sub-packet for formats extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_sub_memcpy(pkt, pformats, num_formats, 1)
+                || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
 
-        s2n(TLSEXT_TYPE_ec_point_formats, ret);
-        /* The point format list has 1-byte length. */
-        s2n(num_formats + 1, ret);
-        *(ret++) = (unsigned char)num_formats;
-        memcpy(ret, pformats, num_formats);
-        ret += num_formats;
-
         /*
          * Add TLS extension EllipticCurves to the ClientHello message
          */
         pcurves = s->tlsext_ellipticcurvelist;
-        if (!tls1_get_curvelist(s, 0, &pcurves, &num_curves))
-            return NULL;
-
-        if ((lenmax = limit - ret - 6) < 0)
-            return NULL;
-        if (num_curves > (size_t)lenmax / 2)
-            return NULL;
-        if (num_curves > 65532 / 2) {
+        if (!tls1_get_curvelist(s, 0, &pcurves, &num_curves)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
 
-        s2n(TLSEXT_TYPE_elliptic_curves, ret);
-        etmp = ret + 4;
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_elliptic_curves, 2)
+                   /* Sub-packet for curves extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_start_sub_packet_u16(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
         /* Copy curve ID if supported */
         for (i = 0; i < num_curves; i++, pcurves += 2) {
             if (tls_curve_allowed(s, pcurves, SSL_SECOP_CURVE_SUPPORTED)) {
-                *etmp++ = pcurves[0];
-                *etmp++ = pcurves[1];
+                if (!WPACKET_put_bytes(pkt, pcurves[0], 1)
+                    || !WPACKET_put_bytes(pkt, pcurves[1], 1)) {
+                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT,
+                               ERR_R_INTERNAL_ERROR);
+                        return 0;
+                    }
             }
         }
-
-        curves_list_len = etmp - ret - 4;
-
-        s2n(curves_list_len + 2, ret);
-        s2n(curves_list_len, ret);
-        ret += curves_list_len;
+        if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #endif                          /* OPENSSL_NO_EC */
 
@@ -1197,8 +1147,10 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
                  s->tlsext_session_ticket->data) {
             ticklen = s->tlsext_session_ticket->length;
             s->session->tlsext_tick = OPENSSL_malloc(ticklen);
-            if (s->session->tlsext_tick == NULL)
-                return NULL;
+            if (s->session->tlsext_tick == NULL) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
             memcpy(s->session->tlsext_tick,
                    s->tlsext_session_ticket->data, ticklen);
             s->session->tlsext_ticklen = ticklen;
@@ -1207,17 +1159,12 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
         if (ticklen == 0 && s->tlsext_session_ticket &&
             s->tlsext_session_ticket->data == NULL)
             goto skip_ext;
-        /*
-         * Check for enough room 2 for extension type, 2 for len rest for
-         * ticket
-         */
-        if ((long)(limit - ret - 4 - ticklen) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_session_ticket, ret);
-        s2n(ticklen, ret);
-        if (ticklen) {
-            memcpy(ret, s->session->tlsext_tick, ticklen);
-            ret += ticklen;
+
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_session_ticket, 2)
+                || !WPACKET_sub_memcpy(pkt, s->session->tlsext_tick, ticklen,
+                                       2)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
         }
     }
  skip_ext:
@@ -1225,81 +1172,99 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
     if (SSL_CLIENT_USE_SIGALGS(s)) {
         size_t salglen;
         const unsigned char *salg;
-        unsigned char *etmp;
+
         salglen = tls12_get_psigalgs(s, &salg);
-        if ((size_t)(limit - ret) < salglen + 6)
-            return NULL;
-        s2n(TLSEXT_TYPE_signature_algorithms, ret);
-        etmp = ret;
-        /* Skip over lengths for now */
-        ret += 4;
-        salglen = tls12_copy_sigalgs(s, ret, salg, salglen);
-        /* Fill in lengths */
-        s2n(salglen + 2, etmp);
-        s2n(salglen, etmp);
-        ret += salglen;
+
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_signature_algorithms, 2)
+                   /* Sub-packet for sig-algs extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                   /* Sub-packet for the actual list */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !tls12_copy_sigalgs(s, pkt, salg, salglen)
+                || !WPACKET_close(pkt)
+                || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #ifndef OPENSSL_NO_OCSP
     if (s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp) {
         int i;
-        long extlen, idlen, itmp;
-        OCSP_RESPID *id;
 
-        idlen = 0;
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_status_request, 2)
+                   /* Sub-packet for status request extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_put_bytes(pkt, TLSEXT_STATUSTYPE_ocsp, 1)
+                   /* Sub-packet for the ids */
+                || !WPACKET_start_sub_packet_u16(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
         for (i = 0; i < sk_OCSP_RESPID_num(s->tlsext_ocsp_ids); i++) {
+            unsigned char *idbytes;
+            int idlen;
+            OCSP_RESPID *id;
+
             id = sk_OCSP_RESPID_value(s->tlsext_ocsp_ids, i);
-            itmp = i2d_OCSP_RESPID(id, NULL);
-            if (itmp <= 0)
-                return NULL;
-            idlen += itmp + 2;
+            idlen = i2d_OCSP_RESPID(id, NULL);
+            if (idlen <= 0
+                       /* Sub-packet for an individual id */
+                    || !WPACKET_start_sub_packet_u8(pkt)
+                    || !WPACKET_allocate_bytes(pkt, idlen, &idbytes)
+                    || i2d_OCSP_RESPID(id, &idbytes) != idlen
+                    || !WPACKET_close(pkt)) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
+        }
+        if (!WPACKET_close(pkt)
+                || !WPACKET_start_sub_packet_u16(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
         }
-
         if (s->tlsext_ocsp_exts) {
-            extlen = i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, NULL);
-            if (extlen < 0)
-                return NULL;
-        } else
-            extlen = 0;
+            unsigned char *extbytes;
+            int extlen = i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, NULL);
 
-        if ((long)(limit - ret - 7 - extlen - idlen) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_status_request, ret);
-        if (extlen + idlen > 0xFFF0)
-            return NULL;
-        s2n(extlen + idlen + 5, ret);
-        *(ret++) = TLSEXT_STATUSTYPE_ocsp;
-        s2n(idlen, ret);
-        for (i = 0; i < sk_OCSP_RESPID_num(s->tlsext_ocsp_ids); i++) {
-            /* save position of id len */
-            unsigned char *q = ret;
-            id = sk_OCSP_RESPID_value(s->tlsext_ocsp_ids, i);
-            /* skip over id len */
-            ret += 2;
-            itmp = i2d_OCSP_RESPID(id, &ret);
-            /* write id len */
-            s2n(itmp, q);
+            if (extlen < 0) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
+            if (!WPACKET_allocate_bytes(pkt, extlen, &extbytes)
+                    || i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, &extbytes)
+                       != extlen) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+           }
+        }
+        if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
         }
-        s2n(extlen, ret);
-        if (extlen > 0)
-            i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, &ret);
     }
 #endif
 #ifndef OPENSSL_NO_HEARTBEATS
     if (SSL_IS_DTLS(s)) {
-        /* Add Heartbeat extension */
-        if ((limit - ret - 4 - 1) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_heartbeat, ret);
-        s2n(1, ret);
+        unsigned int mode;
+
         /*-
          * Set mode:
          * 1: peer may send requests
          * 2: peer not allowed to send requests
          */
         if (s->tlsext_heartbeat & SSL_DTLSEXT_HB_DONT_RECV_REQUESTS)
-            *(ret++) = SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
+            mode = SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
         else
-            *(ret++) = SSL_DTLSEXT_HB_ENABLED;
+            mode = SSL_DTLSEXT_HB_ENABLED;
+
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_heartbeat, 2)
+                   /* Sub-packet for Hearbeat extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_put_bytes(pkt, mode, 1)
+                || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #endif
 
@@ -1309,10 +1274,11 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
          * The client advertises an empty extension to indicate its support
          * for Next Protocol Negotiation
          */
-        if (limit - ret - 4 < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_next_proto_neg, ret);
-        s2n(0, ret);
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_next_proto_neg, 2)
+                || !WPACKET_put_bytes(pkt, 0, 2)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #endif
 
@@ -1322,52 +1288,74 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
      * (see longer comment below)
      */
     if (s->alpn_client_proto_list && !s->s3->tmp.finish_md_len) {
-        if ((size_t)(limit - ret) < 6 + s->alpn_client_proto_list_len)
-            return NULL;
-        s2n(TLSEXT_TYPE_application_layer_protocol_negotiation, ret);
-        s2n(2 + s->alpn_client_proto_list_len, ret);
-        s2n(s->alpn_client_proto_list_len, ret);
-        memcpy(ret, s->alpn_client_proto_list, s->alpn_client_proto_list_len);
-        ret += s->alpn_client_proto_list_len;
+        if (!WPACKET_put_bytes(pkt,
+                    TLSEXT_TYPE_application_layer_protocol_negotiation, 2)
+                   /* Sub-packet ALPN extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_sub_memcpy(pkt, s->alpn_client_proto_list,
+                                       s->alpn_client_proto_list_len, 2)
+                || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
         s->s3->alpn_sent = 1;
     }
 #ifndef OPENSSL_NO_SRTP
     if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) {
-        int el;
-
-        /* Returns 0 on success!! */
-        if (ssl_add_clienthello_use_srtp_ext(s, 0, &el, 0)) {
+        STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = 0;
+        SRTP_PROTECTION_PROFILE *prof;
+        int i, ct;
+
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_use_srtp, 2)
+                   /* Sub-packet for SRTP extension */
+                || !WPACKET_start_sub_packet_u16(pkt)
+                   /* Sub-packet for the protection profile list */
+                || !WPACKET_start_sub_packet_u16(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
-
-        if ((limit - ret - 4 - el) < 0)
-            return NULL;
-
-        s2n(TLSEXT_TYPE_use_srtp, ret);
-        s2n(el, ret);
-
-        if (ssl_add_clienthello_use_srtp_ext(s, ret, &el, el)) {
+        ct = sk_SRTP_PROTECTION_PROFILE_num(clnt);
+        for (i = 0; i < ct; i++) {
+            prof = sk_SRTP_PROTECTION_PROFILE_value(clnt, i);
+            if (prof == NULL || !WPACKET_put_bytes(pkt, prof->id, 2)) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
+        }
+        if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
-        ret += el;
     }
 #endif
     custom_ext_init(&s->cert->cli_ext);
     /* Add custom TLS Extensions to ClientHello */
-    if (!custom_ext_add(s, 0, &ret, limit, al))
-        return NULL;
-    s2n(TLSEXT_TYPE_encrypt_then_mac, ret);
-    s2n(0, ret);
+    if (!custom_ext_add(s, 0, pkt, al)) {
+        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
+
+    if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_encrypt_then_mac, 2)
+            || !WPACKET_put_bytes(pkt, 0, 2)) {
+        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
+
 #ifndef OPENSSL_NO_CT
     if (s->ct_validation_callback != NULL) {
-        s2n(TLSEXT_TYPE_signed_certificate_timestamp, ret);
-        s2n(0, ret);
+        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_signed_certificate_timestamp, 2)
+                || !WPACKET_put_bytes(pkt, 0, 2)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #endif
-    s2n(TLSEXT_TYPE_extended_master_secret, ret);
-    s2n(0, ret);
+
+    if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_extended_master_secret, 2)
+            || !WPACKET_put_bytes(pkt, 0, 2)) {
+        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
 
     /*
      * Add padding to workaround bugs in F5 terminators. See
@@ -1376,7 +1364,13 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
      * appear last.
      */
     if (s->options & SSL_OP_TLSEXT_PADDING) {
-        int hlen = ret - (unsigned char *)s->init_buf->data;
+        unsigned char *padbytes;
+        size_t hlen;
+
+        if (!WPACKET_get_total_written(pkt, &hlen)) {
+            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
 
         if (hlen > 0xff && hlen < 0x200) {
             hlen = 0x200 - hlen;
@@ -1385,20 +1379,22 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
             else
                 hlen = 0;
 
-            s2n(TLSEXT_TYPE_padding, ret);
-            s2n(hlen, ret);
-            memset(ret, 0, hlen);
-            ret += hlen;
+            if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_padding, 2)
+                    || !WPACKET_start_sub_packet_u16(pkt)
+                    || !WPACKET_allocate_bytes(pkt, hlen, &padbytes)) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
+            memset(padbytes, 0, hlen);
+            if (!WPACKET_close(pkt)) {
+                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
         }
     }
 
  done:
-
-    if ((extdatalen = ret - orig - 2) == 0)
-        return orig;
-
-    s2n(extdatalen, orig);
-    return ret;
+    return 1;
 }
 
 unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
@@ -1589,7 +1585,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
         }
     }
 #endif
-    if (!custom_ext_add(s, 1, &ret, limit, al))
+    if (!custom_ext_add_old(s, 1, &ret, limit, al))
         return NULL;
     if (s->s3->flags & TLS1_FLAGS_ENCRYPT_THEN_MAC) {
         /*
@@ -3311,7 +3307,13 @@ void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op)
         *pmask_a |= SSL_aECDSA;
 }
 
-size_t tls12_copy_sigalgs(SSL *s, unsigned char *out,
+/*
+ * Old version of the tls12_copy_sigalgs function used by code that has not
+ * yet been converted to WPACKET yet. It will be deleted once WPACKET conversion
+ * is complete.
+ * TODO - DELETE ME
+ */
+size_t tls12_copy_sigalgs_old(SSL *s, unsigned char *out,
                           const unsigned char *psig, size_t psiglen)
 {
     unsigned char *tmpout = out;
@@ -3325,6 +3327,21 @@ size_t tls12_copy_sigalgs(SSL *s, unsigned char *out,
     return tmpout - out;
 }
 
+int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,
+                       const unsigned char *psig, size_t psiglen)
+{
+    size_t i;
+
+    for (i = 0; i < psiglen; i += 2, psig += 2) {
+        if (tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, psig)) {
+            if (!WPACKET_put_bytes(pkt, psig[0], 1)
+                    || !WPACKET_put_bytes(pkt, psig[1], 1))
+                return 0;
+        }
+    }
+    return 1;
+}
+
 /* Given preference and allowed sigalgs set shared sigalgs */
 static int tls12_shared_sigalgs(SSL *s, TLS_SIGALGS *shsig,
                                 const unsigned char *pref, size_t preflen,
diff --git a/ssl/t1_reneg.c b/ssl/t1_reneg.c
index 01dc403..f5136e2 100644
--- a/ssl/t1_reneg.c
+++ b/ssl/t1_reneg.c
@@ -11,30 +11,6 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
-/* Add the client's renegotiation binding */
-int ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
-                                        int maxlen)
-{
-    if (p) {
-        if ((s->s3->previous_client_finished_len + 1) > maxlen) {
-            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT,
-                   SSL_R_RENEGOTIATE_EXT_TOO_LONG);
-            return 0;
-        }
-
-        /* Length byte */
-        *p = s->s3->previous_client_finished_len;
-        p++;
-
-        memcpy(p, s->s3->previous_client_finished,
-               s->s3->previous_client_finished_len);
-    }
-
-    *len = s->s3->previous_client_finished_len + 1;
-
-    return 1;
-}
-
 /*
  * Parse the client's renegotiation binding and abort if it's not right
  */
diff --git a/test/build.info b/test/build.info
index b8fc431..013a0c6 100644
--- a/test/build.info
+++ b/test/build.info
@@ -274,6 +274,13 @@ IF[{- !$disabled{tests} -}]
   SOURCE[bio_enc_test]=bio_enc_test.c
   INCLUDE[bio_enc_test]=../include
   DEPEND[bio_enc_test]=../libcrypto
+
+  IF[{- $disabled{shared} -}]
+    PROGRAMS_NO_INST=wpackettest
+    SOURCE[wpackettest]=wpackettest.c testutil.c
+    INCLUDE[wpackettest]=../include
+    DEPEND[wpackettest]=../libcrypto ../libssl
+  ENDIF
 ENDIF
 
 {-
diff --git a/test/recipes/70-test_bad_dtls.t b/test/recipes/70-test_wpacket.t
similarity index 69%
copy from test/recipes/70-test_bad_dtls.t
copy to test/recipes/70-test_wpacket.t
index a20db77..9170122 100644
--- a/test/recipes/70-test_bad_dtls.t
+++ b/test/recipes/70-test_wpacket.t
@@ -10,11 +10,11 @@
 use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 
-setup("test_bad_dtls");
+setup("test_wpacket");
 
-plan skip_all => "DTLSv1 is not supported by this OpenSSL build"
-    if disabled("dtls1");
+plan skip_all => "Only supported in no-shared builds"
+    if !disabled("shared");
 
 plan tests => 1;
 
-ok(run(test(["bad_dtls_test"])), "running bad_dtls_test");
+ok(run(test(["wpackettest"])));
diff --git a/test/wpackettest.c b/test/wpackettest.c
new file mode 100644
index 0000000..ca2a1a7
--- /dev/null
+++ b/test/wpackettest.c
@@ -0,0 +1,396 @@
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <string.h>
+#include <openssl/buffer.h>
+#include "../ssl/packet_locl.h"
+#include "testutil.h"
+
+const static unsigned char simple1 = 0xff;
+const static unsigned char simple2[] = { 0x01, 0xff };
+const static unsigned char simple3[] = { 0x00, 0x00, 0x00, 0x01, 0xff };
+const static unsigned char nestedsub[] = { 0x03, 0xff, 0x01, 0xff };
+const static unsigned char seqsub[] = { 0x01, 0xff, 0x01, 0xff };
+const static unsigned char empty = 0x00;
+const static unsigned char alloc[] = { 0x02, 0xfe, 0xff };
+const static unsigned char submem[] = { 0x03, 0x02, 0xfe, 0xff };
+
+static BUF_MEM *buf;
+
+static void testfail(const char *msg, WPACKET *pkt)
+{
+    fprintf(stderr, "%s", msg);
+    WPACKET_cleanup(pkt);
+}
+
+static int test_WPACKET_init(void)
+{
+    WPACKET pkt;
+    int i;
+    size_t written;
+
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+                /* Closing a top level WPACKET should fail */
+            ||  WPACKET_close(&pkt)
+                /* Finishing a top level WPACKET should succeed */
+            || !WPACKET_finish(&pkt)
+                /*
+                 * Can't call close or finish on a WPACKET that's already
+                 * finished.
+                 */
+            ||  WPACKET_close(&pkt)
+            ||  WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple1)
+            ||  memcmp(buf->data, &simple1, written) != 0) {
+        testfail("test_WPACKET_init():1 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Now try with a one byte length prefix */
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple2)
+            ||  memcmp(buf->data, &simple2, written) != 0) {
+        testfail("test_WPACKET_init():2 failed\n", &pkt);
+        return 0;
+    }
+
+    /* And a longer length prefix */
+    if (       !WPACKET_init_len(&pkt, buf, 4)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple3)
+            ||  memcmp(buf->data, &simple3, written) != 0) {
+        testfail("test_WPACKET_init():3 failed\n", &pkt);
+        return 0;
+    }
+
+    if (!WPACKET_init_len(&pkt, buf, 1)) {
+        testfail("test_WPACKET_init():4 failed\n", &pkt);
+        return 0;
+    }
+    for (i = 1; i < 257; i++) {
+        /*
+         * Putting more bytes in than fit for the size of the length prefix
+         * should fail
+         */
+        if ((!WPACKET_put_bytes(&pkt, 0xff, 1)) == (i != 256)) {
+            testfail("test_WPACKET_init():4 failed\n", &pkt);
+            return 0;
+        }
+    }
+    if (!WPACKET_finish(&pkt)) {
+        testfail("test_WPACKET_init():4 failed\n", &pkt);
+        return 0;
+    }
+
+    return 1;
+}
+
+static int test_WPACKET_set_max_size(void)
+{
+    WPACKET pkt;
+    size_t written;
+
+    if (       !WPACKET_init(&pkt, buf)
+                /*
+                 * No previous lenbytes set so we should be ok to set the max
+                 * possible max size
+                 */
+            || !WPACKET_set_max_size(&pkt, SIZE_MAX)
+                /* We should be able to set it smaller too */
+            || !WPACKET_set_max_size(&pkt, SIZE_MAX -1)
+                /* And setting it bigger again should be ok */
+            || !WPACKET_set_max_size(&pkt, SIZE_MAX)
+            || !WPACKET_finish(&pkt)) {
+        testfail("test_WPACKET_set_max_size():1 failed\n", &pkt);
+        return 0; 
+    }
+
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+                /*
+                 * Should fail because we already consumed 1 byte with the
+                 * length
+                 */
+            ||  WPACKET_set_max_size(&pkt, 0)
+                /*
+                 * Max size can't be bigger than biggest that will fit in
+                 * lenbytes
+                 */
+            ||  WPACKET_set_max_size(&pkt, 0x0101)
+                /* It can be the same as the maximum possible size */
+            || !WPACKET_set_max_size(&pkt, 0x0100)
+                /* Or it can be less */
+            || !WPACKET_set_max_size(&pkt, 0x01)
+                /*
+                 * Should fail because packet is already filled
+                 */
+            ||  WPACKET_put_bytes(&pkt, 0xff, 1)
+                /*
+                 * You can't put in more bytes than max size
+                 */
+            || !WPACKET_set_max_size(&pkt, 0x02)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            ||  WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple2)
+            ||  memcmp(buf->data, &simple2, written) != 0) {
+        testfail("test_WPACKET_set_max_size():2 failed\n", &pkt);
+        return 0;
+    }
+
+    return 1;
+}
+
+static int test_WPACKET_start_sub_packet(void)
+{
+    WPACKET pkt;
+    size_t written;
+    size_t len;
+
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet(&pkt)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+                /* Can't finish because we have a sub packet */
+            ||  WPACKET_finish(&pkt)
+            || !WPACKET_close(&pkt)
+                /* Sub packet is closed so can't close again */
+            ||  WPACKET_close(&pkt)
+                /* Now a top level so finish should succeed */
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple1)
+            ||  memcmp(buf->data, &simple1, written) != 0) {
+        testfail("test_WPACKET_start_sub_packet():1 failed\n", &pkt);
+        return 0;
+    }
+
+   /* Single sub-packet with length prefix */
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_close(&pkt)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple2)
+            ||  memcmp(buf->data, &simple2, written) != 0) {
+        testfail("test_WPACKET_start_sub_packet():2 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Nested sub-packets with length prefixes */
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_get_length(&pkt, &len)
+            || len != 1
+            || !WPACKET_close(&pkt)
+            || !WPACKET_get_length(&pkt, &len)
+            || len != 3
+            || !WPACKET_close(&pkt)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(nestedsub)
+            ||  memcmp(buf->data, &nestedsub, written) != 0) {
+        testfail("test_WPACKET_start_sub_packet():3 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Sequential sub-packets with length prefixes */
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_close(&pkt)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_close(&pkt)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(seqsub)
+            ||  memcmp(buf->data, &seqsub, written) != 0) {
+        testfail("test_WPACKET_start_sub_packet():4 failed\n", &pkt);
+        return 0;
+    }
+
+    return 1;
+}
+
+
+static int test_WPACKET_set_flags(void)
+{
+    WPACKET pkt;
+    size_t written;
+
+    /* Set packet to be non-zero length */
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
+                /* Should fail because of zero length */
+            ||  WPACKET_finish(&pkt)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple1)
+            ||  memcmp(buf->data, &simple1, written) != 0) {
+        testfail("test_WPACKET_set_flags():1 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Repeat above test in a sub-packet */
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet(&pkt)
+            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
+                /* Should fail because of zero length */
+            ||  WPACKET_close(&pkt)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_close(&pkt)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple1)
+            ||  memcmp(buf->data, &simple1, written) != 0) {
+        testfail("test_WPACKET_set_flags():2 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Set packet to abandon non-zero length */
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != 0) {
+        testfail("test_WPACKET_set_flags():3 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Repeat above test but only abandon a sub-packet */
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+            || !WPACKET_close(&pkt)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(empty)
+            ||  memcmp(buf->data, &empty, written) != 0) {
+        testfail("test_WPACKET_set_flags():4 failed\n", &pkt);
+        return 0;
+    }
+
+    /* And repeat with a non empty sub-packet */
+    if (       !WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_close(&pkt)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(simple2)
+            ||  memcmp(buf->data, &simple2, written) != 0) {
+        testfail("test_WPACKET_set_flags():5 failed\n", &pkt);
+        return 0;
+    }
+    return 1;
+}
+
+static int test_WPACKET_allocate_bytes(void)
+{
+    WPACKET pkt;
+    size_t written;
+    unsigned char *bytes;
+
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_allocate_bytes(&pkt, 2, &bytes)) {
+        testfail("test_WPACKET_allocate_bytes():1 failed\n", &pkt);
+        return 0;
+    }
+    bytes[0] = 0xfe;
+    bytes[1] = 0xff;
+    if (       !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(alloc)
+            ||  memcmp(buf->data, &alloc, written) != 0) {
+        testfail("test_WPACKET_allocate_bytes():2 failed\n", &pkt);
+        return 0;
+    }
+
+    return 1;
+}
+
+static int test_WPACKET_memcpy(void)
+{
+    WPACKET pkt;
+    size_t written;
+    const unsigned char bytes[] = { 0xfe, 0xff };
+
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_memcpy(&pkt, bytes, sizeof(bytes))
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(alloc)
+            ||  memcmp(buf->data, &alloc, written) != 0) {
+        testfail("test_WPACKET_memcpy():1 failed\n", &pkt);
+        return 0;
+    }
+
+    /* Repeat with WPACKET_sub_memcpy() */
+    if (       !WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_sub_memcpy(&pkt, bytes, sizeof(bytes), 1)
+            || !WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(submem)
+            ||  memcmp(buf->data, &submem, written) != 0) {
+        testfail("test_WPACKET_memcpy():2 failed\n", &pkt);
+        return 0;
+    }
+
+    return 1;
+}
+
+int main(int argc, char *argv[])
+{
+    BIO *err = NULL;
+    int testresult = 0;
+
+    err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+
+    CRYPTO_set_mem_debug(1);
+    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+    buf = BUF_MEM_new();
+    if (buf != NULL) {
+        ADD_TEST(test_WPACKET_init);
+        ADD_TEST(test_WPACKET_set_max_size);
+        ADD_TEST(test_WPACKET_start_sub_packet);
+        ADD_TEST(test_WPACKET_set_flags);
+        ADD_TEST(test_WPACKET_allocate_bytes);
+        ADD_TEST(test_WPACKET_memcpy);
+
+        testresult = run_tests(argv[0]);
+
+        BUF_MEM_free(buf);
+    }
+
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
+    if (CRYPTO_mem_leaks(err) <= 0)
+        testresult = 1;
+#endif
+    BIO_free(err);
+
+    if (!testresult)
+        printf("PASS\n");
+
+    return testresult;
+}
+

From no-reply at appveyor.com  Tue Sep 13 09:16:50 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 09:16:50 +0000
Subject: [openssl-commits] Build completed: openssl master.5270
Message-ID: <20160913091647.7190.21168.66BC08BB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/8fb668bb/attachment.html>

From matt at openssl.org  Tue Sep 13 11:02:24 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 13 Sep 2016 11:02:24 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473764544.961086.2900.nullmailer@dev.openssl.org>

The branch master has been updated
       via  77a6be4dfc2ecf406c2559a99bea51317ce0f533 (commit)
      from  c0f9e23c6b8d1076796987d5a84557d410682d85 (commit)


- Log -----------------------------------------------------------------
commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 11:04:51 2016 +0100

    Abort on unrecognised warning alerts
    
    A peer continually sending unrecognised warning alerts could mean that we
    make no progress on a connection. We should abort rather than continuing if
    we receive an unrecognised warning alert.
    
    Thanks to Shi Lei for reporting this issue.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_s3.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 46870c0..aa148ba 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1351,9 +1351,15 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
                 goto f_err;
             }
 #ifdef SSL_AD_MISSING_SRP_USERNAME
-            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
-                return (0);
+            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME) {
+                return 0;
+            }
 #endif
+            else {
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNKNOWN_ALERT_TYPE);
+                goto f_err;
+            }
         } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 

From matt at openssl.org  Tue Sep 13 11:02:42 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 13 Sep 2016 11:02:42 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473764562.175843.3778.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  44c9339ca802746ac01c8144fb963beb1ed8c837 (commit)
       via  4bc54bf8b45ca0997ab6ffb13cc32b3ae1979ccc (commit)
      from  469f593170d9170da632bb0afd634e971c3234e7 (commit)


- Log -----------------------------------------------------------------
commit 44c9339ca802746ac01c8144fb963beb1ed8c837
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Sep 11 12:47:39 2016 -0400

    util/shlib_wrap.sh is now auto-generated so tell git to ignore it
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 6462876f8d9f6538ad0fcd70717077d9ae174e56)

commit 4bc54bf8b45ca0997ab6ffb13cc32b3ae1979ccc
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 11:04:51 2016 +0100

    Abort on unrecognised warning alerts
    
    A peer continually sending unrecognised warning alerts could mean that we
    make no progress on a connection. We should abort rather than continuing if
    we receive an unrecognised warning alert.
    
    Thanks to Shi Lei for reporting this issue.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                |  1 +
 ssl/record/rec_layer_s3.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e55ab65..730731f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ Makefile
 /include/openssl/opensslconf.h
 /tools/c_rehash
 /tools/c_rehash.pl
+/util/shlib_wrap.sh
 /tags
 /TAGS
 /crypto.map
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 46870c0..aa148ba 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1351,9 +1351,15 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
                 goto f_err;
             }
 #ifdef SSL_AD_MISSING_SRP_USERNAME
-            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
-                return (0);
+            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME) {
+                return 0;
+            }
 #endif
+            else {
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNKNOWN_ALERT_TYPE);
+                goto f_err;
+            }
         } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 

From matt at openssl.org  Tue Sep 13 11:02:52 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 13 Sep 2016 11:02:52 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473764572.960474.4172.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  15d81749322c3498027105f8ee44e8c25479d475 (commit)
      from  204fb53895618672120474bac194269c0f837632 (commit)


- Log -----------------------------------------------------------------
commit 15d81749322c3498027105f8ee44e8c25479d475
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 11:04:51 2016 +0100

    Abort on unrecognised warning alerts
    
    A peer continually sending unrecognised warning alerts could mean that we
    make no progress on a connection. We should abort rather than continuing if
    we receive an unrecognised warning alert.
    
    Thanks to Shi Lei for reporting this issue.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_pkt.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index df124cf..91f0c58 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1462,8 +1462,13 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             }
 #ifdef SSL_AD_MISSING_SRP_USERNAME
             else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
-                return (0);
+                return 0;
 #endif
+            else {
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNKNOWN_ALERT_TYPE);
+                goto f_err;
+            }
         } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 

From appro at openssl.org  Tue Sep 13 11:30:33 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 11:30:33 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473766233.492842.16209.nullmailer@dev.openssl.org>

The branch master has been updated
       via  758baa3dc250f12b92b1bebe86ad114f25763c04 (commit)
      from  77a6be4dfc2ecf406c2559a99bea51317ce0f533 (commit)


- Log -----------------------------------------------------------------
commit 758baa3dc250f12b92b1bebe86ad114f25763c04
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Sep 9 23:45:57 2016 +0200

    Configure: impose ^X on whole build procedure.
    
    Traditionally Configure passed $ENV{PERL} to Makefile. But this
    resulted in ambiguilty as Configure script could be executed by
    interpreter different from one executing remaining scripts. Since
    we separate compile- and run-time interpreters with HASHBANGPERL
    variable, there is no reason to segment the build procedure.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 20 ++------------------
 INSTALL   |  3 +++
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Configure b/Configure
index 445f928..f4a44cb 100755
--- a/Configure
+++ b/Configure
@@ -941,7 +941,7 @@ $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'}
 # Allow overriding the names of some tools.  USE WITH CARE
 # Note: only Unix cares about HASHBANGPERL...  that explains
 # the default string.
-$config{perl} =    $ENV{'PERL'}    || ($^O ne "VMS" ? $^X : "perl");
+$config{perl} =    ($^O ne "VMS" ? $^X : "perl");
 $config{hashbangperl} =
     $ENV{'HASHBANGPERL'}           || $ENV{'PERL'}     || "/usr/bin/env perl";
 $target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";
@@ -2019,11 +2019,10 @@ EOF
 print OUT "1;\n";
 close(OUT);
 
-my $perlvers = &get_perl_version();
 print "\n";
 print "PROCESSOR     =$config{processor}\n" if $config{processor};
 print "PERL          =$config{perl}\n";
-print "PERLVERSION   =$perlvers\n";
+print "PERLVERSION   =$Config{version} for $Config{archname}\n";
 print "HASHBANGPERL  =$config{hashbangperl}\n";
 print "CC            =$config{cross_compile_prefix}$target{cc}\n";
 print "CFLAG         =$target{cflags} $config{cflags}\n";
@@ -2384,21 +2383,6 @@ sub usage
 	exit(1);
 	}
 
-# Return the perl version.
-sub get_perl_version
-{
-    return "$Config{version} for $Config{archname}" if $config{perl} eq $^X;
-    my $l;
-    open my $FH, "$config{perl} -v|" || return "??unknown??";
-    while ( <$FH> ) {
-        chop;
-        $l .= $_;
-    }
-    close $FH;
-    $l =~ s/This is (.{1,70}).*/$1/;
-    return $l;
-}
-
 sub run_dofile
 {
     my $out = shift;
diff --git a/INSTALL b/INSTALL
index c63797a..e3f47db 100644
--- a/INSTALL
+++ b/INSTALL
@@ -812,6 +812,9 @@
 
  PERL
                 The name of the Perl executable to use when building OpenSSL.
+                This variable is used in config script only. Configure on the
+                other hand imposes the interpreter by which it itself was
+                executed on the whole build procedure.
 
  HASHBANGPERL
                 The command string for the Perl executable to insert in the

From appro at openssl.org  Tue Sep 13 11:34:03 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 11:34:03 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473766443.086756.18439.nullmailer@dev.openssl.org>

The branch master has been updated
       via  cc2cb7bf63c62aaebd387f546a2fd673f367d9a8 (commit)
      from  758baa3dc250f12b92b1bebe86ad114f25763c04 (commit)


- Log -----------------------------------------------------------------
commit cc2cb7bf63c62aaebd387f546a2fd673f367d9a8
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 10 18:57:14 2016 +0200

    bn/bn_lcl.h: improve interoperability with clang and Android NDK.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_lcl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 157dadc..a3911b1 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -428,8 +428,8 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
 #   endif
 #  elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
 #   if defined(__GNUC__) && __GNUC__>=2
-#    if __GNUC__>4 || (__GNUC__>=4 && __GNUC_MINOR__>=4)
-                                     /* "h" constraint is no more since 4.4 */
+#    if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
+      /* "h" constraint is not an option on R6 and was removed in 4.4 */
 #     define BN_UMULT_HIGH(a,b)          (((__uint128_t)(a)*(b))>>64)
 #     define BN_UMULT_LOHI(low,high,a,b) ({     \
         __uint128_t ret=(__uint128_t)(a)*(b);   \

From appro at openssl.org  Tue Sep 13 11:34:35 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 11:34:35 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473766475.182652.19376.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  ce7d2e152e721643bd93e331d627a4576521d058 (commit)
      from  44c9339ca802746ac01c8144fb963beb1ed8c837 (commit)


- Log -----------------------------------------------------------------
commit ce7d2e152e721643bd93e331d627a4576521d058
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 10 18:57:14 2016 +0200

    bn/bn_lcl.h: improve interoperability with clang and Android NDK.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit cc2cb7bf63c62aaebd387f546a2fd673f367d9a8)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_lcl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 157dadc..a3911b1 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -428,8 +428,8 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
 #   endif
 #  elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
 #   if defined(__GNUC__) && __GNUC__>=2
-#    if __GNUC__>4 || (__GNUC__>=4 && __GNUC_MINOR__>=4)
-                                     /* "h" constraint is no more since 4.4 */
+#    if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
+      /* "h" constraint is not an option on R6 and was removed in 4.4 */
 #     define BN_UMULT_HIGH(a,b)          (((__uint128_t)(a)*(b))>>64)
 #     define BN_UMULT_LOHI(low,high,a,b) ({     \
         __uint128_t ret=(__uint128_t)(a)*(b);   \

From builds at travis-ci.org  Tue Sep 13 11:26:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 11:26:11 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5940 (master - 77a6be4)
In-Reply-To: <openssl/openssl+159556568+errored@travis-ci.org>
Message-ID: <57d7e25371ab2_33fcdbd230d281761dd@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5940
Status: Errored

Duration: 23 minutes and 13 seconds
Commit: 77a6be4 (master)
Author: Matt Caswell
Message: Abort on unrecognised warning alerts

A peer continually sending unrecognised warning alerts could mean that we
make no progress on a connection. We should abort rather than continuing if
we receive an unrecognised warning alert.

Thanks to Shi Lei for reporting this issue.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/c0f9e23c6b8d...77a6be4dfc2e

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159556568

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/1548e22e/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 13 11:43:58 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 11:43:58 +0000
Subject: [openssl-commits] Broken: openssl/openssl#5941
	(OpenSSL_1_1_0-stable - 44c9339)
In-Reply-To: <openssl/openssl+159556638+broken@travis-ci.org>
Message-ID: <57d7e67dd6d98_33fec72d7da04908775@58db7b9e-7f8c-466c-bd4e-70ab8b51a189.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5941
Status: Broken

Duration: 29 minutes and 3 seconds
Commit: 44c9339 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: util/shlib_wrap.sh is now auto-generated so tell git to ignore it

Signed-off-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 6462876f8d9f6538ad0fcd70717077d9ae174e56)

View the changeset: https://github.com/openssl/openssl/compare/469f593170d9...44c9339ca802

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159556638

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/02f347db/attachment.html>

From appro at openssl.org  Tue Sep 13 12:03:17 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 12:03:17 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473768197.547396.32427.nullmailer@dev.openssl.org>

The branch master has been updated
       via  35c11bfc69e6b90fd1c4c4ca6ad3f500584ca939 (commit)
      from  cc2cb7bf63c62aaebd387f546a2fd673f367d9a8 (commit)


- Log -----------------------------------------------------------------
commit 35c11bfc69e6b90fd1c4c4ca6ad3f500584ca939
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 10 21:12:56 2016 +0200

    Configure: detect gcc's dependency generation capability more accurately.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index f4a44cb..36734d3 100755
--- a/Configure
+++ b/Configure
@@ -1198,7 +1198,7 @@ if ($^O ne "VMS" && !$disabled{makedepend}) {
         # We know that GNU C version 3 and up as well as all clang
         # versions support dependency generation
         $config{makedepprog} = $ccpcc
-            if (/clang/ || (/gcc/ && $compiler_major > 3));
+            if (/clang/ || (/gcc/ && $compiler_major >= 3));
         $ecc = "clang" if /clang/;
         $ecc = "gcc" if /gcc/;
         last if ($config{makedepprog} || !$lines--);

From appro at openssl.org  Tue Sep 13 12:03:47 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 12:03:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473768227.967117.968.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  1556abd0438eeba0160fb5a1fe8c552ed8a63d7e (commit)
      from  ce7d2e152e721643bd93e331d627a4576521d058 (commit)


- Log -----------------------------------------------------------------
commit 1556abd0438eeba0160fb5a1fe8c552ed8a63d7e
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 10 21:12:56 2016 +0200

    Configure: detect gcc's dependency generation capability more accurately.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 35c11bfc69e6b90fd1c4c4ca6ad3f500584ca939)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 4be1f33..9c183da 100755
--- a/Configure
+++ b/Configure
@@ -1181,7 +1181,7 @@ if ($^O ne "VMS" && !$disabled{makedepend}) {
         # We know that GNU C version 3 and up as well as all clang
         # versions support dependency generation
         $config{makedepprog} = $ccpcc
-            if (/clang/ || (/gcc/ && $compiler_major > 3));
+            if (/clang/ || (/gcc/ && $compiler_major >= 3));
         $ecc = "clang" if /clang/;
         $ecc = "gcc" if /gcc/;
         last if ($config{makedepprog} || !$lines--);

From builds at travis-ci.org  Tue Sep 13 12:05:46 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 12:05:46 +0000
Subject: [openssl-commits] Failed: openssl/openssl#5943 (master - 758baa3)
In-Reply-To: <openssl/openssl+159563689+failed@travis-ci.org>
Message-ID: <57d7eb9a18113_33ffd96e91d708412c@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5943
Status: Failed

Duration: 27 minutes and 13 seconds
Commit: 758baa3 (master)
Author: Andy Polyakov
Message: Configure: impose ^X on whole build procedure.

Traditionally Configure passed $ENV{PERL} to Makefile. But this
resulted in ambiguilty as Configure script could be executed by
interpreter different from one executing remaining scripts. Since
we separate compile- and run-time interpreters with HASHBANGPERL
variable, there is no reason to segment the build procedure.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/77a6be4dfc2e...758baa3dc250

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159563689

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/0a115b42/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 13 12:21:38 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 12:21:38 +0000
Subject: [openssl-commits] Failed: openssl/openssl#5944 (master - cc2cb7b)
In-Reply-To: <openssl/openssl+159564606+failed@travis-ci.org>
Message-ID: <57d7ef68b2dac_33ffd96e942a010257f@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5944
Status: Failed

Duration: 27 minutes and 11 seconds
Commit: cc2cb7b (master)
Author: Andy Polyakov
Message: bn/bn_lcl.h: improve interoperability with clang and Android NDK.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/758baa3dc250...cc2cb7bf63c6

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159564606

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/4f311e8b/attachment.html>

From builds at travis-ci.org  Tue Sep 13 12:43:42 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 12:43:42 +0000
Subject: [openssl-commits] Broken: openssl/openssl#5945
	(OpenSSL_1_1_0-stable - ce7d2e1)
In-Reply-To: <openssl/openssl+159564787+broken@travis-ci.org>
Message-ID: <57d7f48a374b7_33ffd96e940d4129738@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5945
Status: Broken

Duration: 33 minutes and 14 seconds
Commit: ce7d2e1 (OpenSSL_1_1_0-stable)
Author: Andy Polyakov
Message: bn/bn_lcl.h: improve interoperability with clang and Android NDK.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit cc2cb7bf63c62aaebd387f546a2fd673f367d9a8)

View the changeset: https://github.com/openssl/openssl/compare/44c9339ca802...ce7d2e152e72

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159564787

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/6ad22584/attachment.html>

From builds at travis-ci.org  Tue Sep 13 13:01:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 13:01:52 +0000
Subject: [openssl-commits] Failed: openssl/openssl#5946 (master - 35c11bf)
In-Reply-To: <openssl/openssl+159571858+failed@travis-ci.org>
Message-ID: <57d7f8bee3f52_33ffd96e955241567b8@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5946
Status: Failed

Duration: 31 minutes and 54 seconds
Commit: 35c11bf (master)
Author: Andy Polyakov
Message: Configure: detect gcc's dependency generation capability more accurately.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/cc2cb7bf63c6...35c11bfc69e6

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159571858

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/a08d5836/attachment-0001.html>

From rsalz at openssl.org  Tue Sep 13 13:17:58 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 13 Sep 2016 13:17:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473772678.869317.7063.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d485640b8083aea895ecf31b4ea6a338ee561b67 (commit)
      from  35c11bfc69e6b90fd1c4c4ca6ad3f500584ca939 (commit)


- Log -----------------------------------------------------------------
commit d485640b8083aea895ecf31b4ea6a338ee561b67
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Aug 30 03:01:16 2016 +0200

    s_client: avoid warning on Windows/MS-DOS systems
    
    it appears when using gcc/mingw:
    ```
    apps/s_client.c:815:9: warning: variable 'at_eof' set but not used [-Wunused-but-set-variable]
         int at_eof = 0;
             ^~~~~~
    ```
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1512)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index f43a578..9c83d64 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -812,7 +812,9 @@ int s_client_main(int argc, char **argv)
     int socket_family = AF_UNSPEC, socket_type = SOCK_STREAM;
     int starttls_proto = PROTO_OFF, crl_format = FORMAT_PEM, crl_download = 0;
     int write_tty, read_tty, write_ssl, read_ssl, tty_on, ssl_pending;
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
     int at_eof = 0;
+#endif
     int read_buf_len = 0;
     int fallback_scsv = 0;
     long randamt = 0;
@@ -2393,8 +2395,10 @@ int s_client_main(int argc, char **argv)
             } else
                 i = raw_read_stdin(cbuf, BUFSIZZ);
 
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
             if (i == 0)
                 at_eof = 1;
+#endif
 
             if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q' && cmdletters))) {
                 BIO_printf(bio_err, "DONE\n");

From rsalz at openssl.org  Tue Sep 13 13:23:21 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 13 Sep 2016 13:23:21 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473773002.001992.10971.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c2efa78309e39019642f922b2babc1fd35f68768 (commit)
      from  d485640b8083aea895ecf31b4ea6a338ee561b67 (commit)


- Log -----------------------------------------------------------------
commit c2efa78309e39019642f922b2babc1fd35f68768
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Aug 30 18:56:49 2016 +0200

    bio.h: fix number of arguments passed to BIO_ptr_ctrl()
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1520)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/bio.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 31d41b4..9bc941b 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -365,9 +365,9 @@ struct bio_dgram_sctp_prinfo {
 #  define BIO_set_conn_port(b,port)     BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
 #  define BIO_set_conn_address(b,addr)  BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)
 #  define BIO_set_conn_ip_family(b,f)   BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
-#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0,NULL))
-#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1,NULL))
-#  define BIO_get_conn_address(b)       ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2,NULL))
+#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))
+#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
+#  define BIO_get_conn_address(b)       ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2))
 #  define BIO_get_conn_ip_family(b)     BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
 #  define BIO_set_conn_mode(b,n)        BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
 

From rsalz at openssl.org  Tue Sep 13 13:24:30 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 13 Sep 2016 13:24:30 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473773070.339735.12154.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  e631d60280bf5f0ca3ac3ad33d4e785c5082198d (commit)
      from  1556abd0438eeba0160fb5a1fe8c552ed8a63d7e (commit)


- Log -----------------------------------------------------------------
commit e631d60280bf5f0ca3ac3ad33d4e785c5082198d
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Aug 30 03:01:16 2016 +0200

    s_client: avoid warning on Windows/MS-DOS systems
    
    it appears when using gcc/mingw:
    ```
    apps/s_client.c:815:9: warning: variable 'at_eof' set but not used [-Wunused-but-set-variable]
         int at_eof = 0;
             ^~~~~~
    ```
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1512)
    (cherry picked from commit d485640b8083aea895ecf31b4ea6a338ee561b67)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index f43a578..9c83d64 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -812,7 +812,9 @@ int s_client_main(int argc, char **argv)
     int socket_family = AF_UNSPEC, socket_type = SOCK_STREAM;
     int starttls_proto = PROTO_OFF, crl_format = FORMAT_PEM, crl_download = 0;
     int write_tty, read_tty, write_ssl, read_ssl, tty_on, ssl_pending;
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
     int at_eof = 0;
+#endif
     int read_buf_len = 0;
     int fallback_scsv = 0;
     long randamt = 0;
@@ -2393,8 +2395,10 @@ int s_client_main(int argc, char **argv)
             } else
                 i = raw_read_stdin(cbuf, BUFSIZZ);
 
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
             if (i == 0)
                 at_eof = 1;
+#endif
 
             if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q' && cmdletters))) {
                 BIO_printf(bio_err, "DONE\n");

From rsalz at openssl.org  Tue Sep 13 13:24:54 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 13 Sep 2016 13:24:54 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473773094.479622.12639.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  799398ca426fa25bd9af229b68977c48f8064974 (commit)
      from  e631d60280bf5f0ca3ac3ad33d4e785c5082198d (commit)


- Log -----------------------------------------------------------------
commit 799398ca426fa25bd9af229b68977c48f8064974
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Aug 30 18:56:49 2016 +0200

    bio.h: fix number of arguments passed to BIO_ptr_ctrl()
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1520)
    (cherry picked from commit c2efa78309e39019642f922b2babc1fd35f68768)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/bio.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 31d41b4..9bc941b 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -365,9 +365,9 @@ struct bio_dgram_sctp_prinfo {
 #  define BIO_set_conn_port(b,port)     BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
 #  define BIO_set_conn_address(b,addr)  BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)
 #  define BIO_set_conn_ip_family(b,f)   BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
-#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0,NULL))
-#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1,NULL))
-#  define BIO_get_conn_address(b)       ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2,NULL))
+#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))
+#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
+#  define BIO_get_conn_address(b)       ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2))
 #  define BIO_get_conn_ip_family(b)     BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
 #  define BIO_set_conn_mode(b,n)        BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
 

From appro at openssl.org  Tue Sep 13 13:26:52 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 13:26:52 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473773212.577454.13892.nullmailer@dev.openssl.org>

The branch master has been updated
       via  fa4618a2805e7115cf47d0cf0d15cb7b3c944bba (commit)
      from  c2efa78309e39019642f922b2babc1fd35f68768 (commit)


- Log -----------------------------------------------------------------
commit fa4618a2805e7115cf47d0cf0d15cb7b3c944bba
Author: Andy Grundman <andyg at activestate.com>
Date:   Tue Aug 30 17:25:10 2016 -0400

    Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.
    
    This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected
    side effect of the compiler building for 32-bit v8plusa instead of v9.
    
    GH#1521
    CLA: none; trivial
    
    Signed-off-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 895385f..7cb4451 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -308,11 +308,11 @@ sub vms_info {
     },
     "solaris-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before("-xarch=v8plus -xtarget=ultra"),
+        cflags           => add_before("-xarch=v8plus"),
     },
     "solaris64-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before("-xarch=v9 -xtarget=ultra"),
+        cflags           => add_before("-xarch=v9"),
         lflags           => add_before("-xarch=v9"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",

From appro at openssl.org  Tue Sep 13 13:29:39 2016
From: appro at openssl.org (Andy Polyakov)
Date: Tue, 13 Sep 2016 13:29:39 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473773379.789234.15746.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  8ff785f4eb4ff06213fbf68da389132e31a9e4af (commit)
      from  799398ca426fa25bd9af229b68977c48f8064974 (commit)


- Log -----------------------------------------------------------------
commit 8ff785f4eb4ff06213fbf68da389132e31a9e4af
Author: Andy Grundman <andyg at activestate.com>
Date:   Tue Aug 30 17:25:10 2016 -0400

    Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.
    
    This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected
    side effect of the compiler building for 32-bit v8plusa instead of v9.
    
    GH#1521
    CLA: none; trivial
    
    Signed-off-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit fa4618a2805e7115cf47d0cf0d15cb7b3c944bba)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 008120b..cde1bdb 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -308,11 +308,11 @@ sub vms_info {
     },
     "solaris-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before("-xarch=v8plus -xtarget=ultra"),
+        cflags           => add_before("-xarch=v8plus"),
     },
     "solaris64-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before("-xarch=v9 -xtarget=ultra"),
+        cflags           => add_before("-xarch=v9"),
         lflags           => add_before("-xarch=v9"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",

From builds at travis-ci.org  Tue Sep 13 13:19:56 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 13:19:56 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5947
	(OpenSSL_1_1_0-stable - 1556abd)
In-Reply-To: <openssl/openssl+159571964+still failing@travis-ci.org>
Message-ID: <57d7fcfc65673_33fcdbd01f9582565e6@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5947
Status: Still Failing

Duration: 31 minutes and 3 seconds
Commit: 1556abd (OpenSSL_1_1_0-stable)
Author: Andy Polyakov
Message: Configure: detect gcc's dependency generation capability more accurately.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 35c11bfc69e6b90fd1c4c4ca6ad3f500584ca939)

View the changeset: https://github.com/openssl/openssl/compare/ce7d2e152e72...1556abd0438e

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159571964

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/9c5eadd0/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 13 13:47:38 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 13:47:38 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5948 (master -
	d485640)
In-Reply-To: <openssl/openssl+159590184+still failing@travis-ci.org>
Message-ID: <57d8037aef97_33fcdbd00cfc428218d@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5948
Status: Still Failing

Duration: 29 minutes and 6 seconds
Commit: d485640 (master)
Author: Viktor Szakats
Message: s_client: avoid warning on Windows/MS-DOS systems

it appears when using gcc/mingw:
```
apps/s_client.c:815:9: warning: variable 'at_eof' set but not used [-Wunused-but-set-variable]
     int at_eof = 0;
         ^~~~~~
```
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1512)

View the changeset: https://github.com/openssl/openssl/compare/35c11bfc69e6...d485640b8083

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159590184

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/5ff47e4a/attachment.html>

From builds at travis-ci.org  Tue Sep 13 14:09:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 14:09:44 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5949 (master -
	c2efa78)
In-Reply-To: <openssl/openssl+159591381+still failing@travis-ci.org>
Message-ID: <57d808aa6b9c9_33ffd96e91d7025695b@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5949
Status: Still Failing

Duration: 35 minutes and 53 seconds
Commit: c2efa78 (master)
Author: Viktor Szakats
Message: bio.h: fix number of arguments passed to BIO_ptr_ctrl()
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1520)

View the changeset: https://github.com/openssl/openssl/compare/d485640b8083...c2efa78309e3

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159591381

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/aed49307/attachment.html>

From rsalz at openssl.org  Tue Sep 13 14:14:12 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 13 Sep 2016 14:14:12 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473776052.606710.1771.nullmailer@dev.openssl.org>

The branch master has been updated
       via  77297115cbaf72533cce99e444542192850e06db (commit)
      from  fa4618a2805e7115cf47d0cf0d15cb7b3c944bba (commit)


- Log -----------------------------------------------------------------
commit 77297115cbaf72533cce99e444542192850e06db
Author: Rich Salz <rsalz at openssl.org>
Date:   Sat Sep 10 15:46:48 2016 -0400

    Add --missing-help to list command
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/openssl.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 0f7176f..4f4175c 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -296,12 +296,30 @@ static void list_md_fn(const EVP_MD *m,
     }
 }
 
+static void list_missing_help(void)
+{
+    const FUNCTION *fp;
+    const OPTIONS *o;
+
+    for (fp = functions; fp->name != NULL; fp++) {
+        if ((o = fp->help) == NULL) {
+            BIO_printf(bio_out, "%s *\n", fp->name);
+            continue;
+        }
+        for ( ; o->name != NULL; o++) {
+            if (o->helpstr == NULL)
+                BIO_printf(bio_out, "%s %s\n", fp->name, o->name);
+        }
+    }
+}
+
+
 /* Unified enum for help and list commands. */
 typedef enum HELPLIST_CHOICE {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_COMMANDS, OPT_DIGEST_COMMANDS,
     OPT_DIGEST_ALGORITHMS, OPT_CIPHER_COMMANDS, OPT_CIPHER_ALGORITHMS,
-    OPT_PK_ALGORITHMS, OPT_DISABLED
+    OPT_PK_ALGORITHMS, OPT_DISABLED, OPT_MISSING_HELP
 } HELPLIST_CHOICE;
 
 OPTIONS list_options[] = {
@@ -318,6 +336,8 @@ OPTIONS list_options[] = {
      "List of public key algorithms"},
     {"disabled", OPT_DISABLED, '-',
      "List of disabled features"},
+    {"missing-help", OPT_MISSING_HELP, '-',
+     "List missing detailed help strings"},
     {NULL}
 };
 
@@ -358,6 +378,9 @@ int list_main(int argc, char **argv)
         case OPT_DISABLED:
             list_disabled();
             break;
+        case OPT_MISSING_HELP:
+            list_missing_help();
+            break;
         }
         done = 1;
     }

From builds at travis-ci.org  Tue Sep 13 14:34:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 14:34:40 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5950
	(OpenSSL_1_1_0-stable - e631d60)
In-Reply-To: <openssl/openssl+159591716+still failing@travis-ci.org>
Message-ID: <57d80e7f2085c_33ffd96ed1b14297148@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5950
Status: Still Failing

Duration: 39 minutes and 19 seconds
Commit: e631d60 (OpenSSL_1_1_0-stable)
Author: Viktor Szakats
Message: s_client: avoid warning on Windows/MS-DOS systems

it appears when using gcc/mingw:
```
apps/s_client.c:815:9: warning: variable 'at_eof' set but not used [-Wunused-but-set-variable]
     int at_eof = 0;
         ^~~~~~
```
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1512)
(cherry picked from commit d485640b8083aea895ecf31b4ea6a338ee561b67)

View the changeset: https://github.com/openssl/openssl/compare/1556abd0438e...e631d60280bf

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159591716

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/9607d66d/attachment.html>

From builds at travis-ci.org  Tue Sep 13 15:00:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 15:00:18 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5951
	(OpenSSL_1_1_0-stable - 799398c)
In-Reply-To: <openssl/openssl+159591886+still failing@travis-ci.org>
Message-ID: <57d8148210728_33ffd96ed1e0c3409be@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5951
Status: Still Failing

Duration: 39 minutes and 31 seconds
Commit: 799398c (OpenSSL_1_1_0-stable)
Author: Viktor Szakats
Message: bio.h: fix number of arguments passed to BIO_ptr_ctrl()

Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1520)
(cherry picked from commit c2efa78309e39019642f922b2babc1fd35f68768)

View the changeset: https://github.com/openssl/openssl/compare/e631d60280bf...799398ca426f

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159591886

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/d61e8c88/attachment.html>

From rsalz at openssl.org  Tue Sep 13 15:43:15 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 13 Sep 2016 15:43:15 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473781395.941923.5436.nullmailer@dev.openssl.org>

The branch master has been updated
       via  06a79af200b5ad0e5f5f078dc726c20c78f11885 (commit)
      from  77297115cbaf72533cce99e444542192850e06db (commit)


- Log -----------------------------------------------------------------
commit 06a79af200b5ad0e5f5f078dc726c20c78f11885
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sat Aug 6 14:19:03 2016 +0200

    Fix some magic values about revocation info type...
    
    Add comments, document -valid option.
    Add some const qualifiers.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1560)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.h |  7 +++--
 apps/ca.c   | 99 +++++++++++++++++++++++++++++--------------------------------
 2 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/apps/apps.h b/apps/apps.h
index 85b6519..1761501 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -456,9 +456,10 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                                  * disabled */
 # define DB_NUMBER       6
 
-# define DB_TYPE_REV     'R'
-# define DB_TYPE_EXP     'E'
-# define DB_TYPE_VAL     'V'
+# define DB_TYPE_REV     'R'    /* Revoked  */
+# define DB_TYPE_EXP     'E'    /* Expired  */
+# define DB_TYPE_VAL     'V'    /* Valid ; inserted with: ca ... -valid */
+# define DB_TYPE_SUSP    'S'    /* Suspended  */
 
 typedef struct db_attr_st {
     int unique_subject;
diff --git a/apps/ca.c b/apps/ca.c
index 34dfd9b..ecd628f 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -82,12 +82,14 @@
 #define ENV_DATABASE            "database"
 
 /* Additional revocation information types */
-
-#define REV_NONE                0 /* No additional information */
-#define REV_CRL_REASON          1 /* Value is CRL reason code */
-#define REV_HOLD                2 /* Value is hold instruction */
-#define REV_KEY_COMPROMISE      3 /* Value is cert key compromise time */
-#define REV_CA_COMPROMISE       4 /* Value is CA key compromise time */
+typedef enum {
+    REV_VALID             = -1, /* Valid (not-revoked) status */
+    REV_NONE              = 0, /* No additional information */
+    REV_CRL_REASON        = 1, /* Value is CRL reason code */
+    REV_HOLD              = 2, /* Value is hold instruction */
+    REV_KEY_COMPROMISE    = 3, /* Value is cert key compromise time */
+    REV_CA_COMPROMISE     = 4  /* Value is CA key compromise time */
+} REVINFO_TYPE;
 
 static char *lookup_conf(const CONF *conf, const char *group, const char *tag);
 
@@ -117,7 +119,6 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
                          const char *enddate, long days, const char *ext_sect, CONF *conf,
                          int verbose, unsigned long certopt,
                          unsigned long nameopt, int default_op, int ext_copy);
-static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
                    const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                    STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
@@ -126,13 +127,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
                    int batch, int verbose, X509_REQ *req, const char *ext_sect,
                    CONF *conf, unsigned long certopt, unsigned long nameopt,
                    int default_op, int ext_copy, int selfsign);
-static int do_revoke(X509 *x509, CA_DB *db, int ext, char *extval);
 static int get_certificate_status(const char *ser_status, CA_DB *db);
 static int do_updatedb(CA_DB *db);
 static int check_time_format(const char *str);
-char *make_revocation_str(int rev_type, char *rev_arg);
-int make_revoked(X509_REVOKED *rev, const char *str);
+static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
+                     const char *extval);
+static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg);
+static int make_revoked(X509_REVOKED *rev, const char *str);
 static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str);
+static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
 
 static CONF *extconf = NULL;
 static int preserve = 0;
@@ -148,8 +151,8 @@ typedef enum OPTION_choice {
     OPT_GENCRL, OPT_MSIE_HACK, OPT_CRLDAYS, OPT_CRLHOURS, OPT_CRLSEC,
     OPT_INFILES, OPT_SS_CERT, OPT_SPKAC, OPT_REVOKE, OPT_VALID,
     OPT_EXTENSIONS, OPT_EXTFILE, OPT_STATUS, OPT_UPDATEDB, OPT_CRLEXTS,
-    OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE,
-    OPT_CRL_CA_COMPROMISE
+    /* Do not change the order here; see related case statements below */
+    OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE, OPT_CRL_CA_COMPROMISE
 } OPTION_CHOICE;
 
 OPTIONS ca_options[] = {
@@ -250,10 +253,11 @@ int ca_main(int argc, char **argv)
     int batch = 0, default_op = 1, doupdatedb = 0, ext_copy = EXT_COPY_NONE;
     int keyformat = FORMAT_PEM, multirdn = 0, notext = 0, output_der = 0;
     int ret = 1, email_dn = 1, req = 0, verbose = 0, gencrl = 0, dorevoke = 0;
-    int i, j, rev_type = REV_NONE, selfsign = 0;
+    int i, j, selfsign = 0;
     long crldays = 0, crlhours = 0, crlsec = 0, days = 0;
     unsigned long chtype = MBSTRING_ASC, nameopt = 0, certopt = 0;
     X509 *x509 = NULL, *x509p = NULL, *x = NULL;
+    REVINFO_TYPE rev_type = REV_NONE;
     X509_REVOKED *r = NULL;
     OPTION_CHOICE o;
 
@@ -403,21 +407,12 @@ opthelp:
         case OPT_CRLEXTS:
             crl_ext = opt_arg();
             break;
-        case OPT_CRL_REASON:
-            rev_arg = opt_arg();
-            rev_type = REV_CRL_REASON;
-            break;
+        case OPT_CRL_REASON:        /* := REV_CRL_REASON */
         case OPT_CRL_HOLD:
-            rev_arg = opt_arg();
-            rev_type = REV_HOLD;
-            break;
         case OPT_CRL_COMPROMISE:
-            rev_arg = opt_arg();
-            rev_type = REV_KEY_COMPROMISE;
-            break;
         case OPT_CRL_CA_COMPROMISE:
             rev_arg = opt_arg();
-            rev_type = REV_CA_COMPROMISE;
+            rev_type = (o - OPT_CRL_REASON) + REV_CRL_REASON;
             break;
         case OPT_ENGINE:
             e = setup_engine(opt_arg(), 0);
@@ -1199,7 +1194,7 @@ end_of_options:
             if (revcert == NULL)
                 goto end;
             if (dorevoke == 2)
-                rev_type = -1;
+                rev_type = REV_VALID;
             j = do_revoke(revcert, db, rev_type, rev_arg);
             if (j <= 0)
                 goto end;
@@ -1640,16 +1635,16 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
 
     if (rrow != NULL) {
         BIO_printf(bio_err, "The matching entry has the following details\n");
-        if (rrow[DB_type][0] == 'E')
+        if (rrow[DB_type][0] == DB_TYPE_EXP)
             p = "Expired";
-        else if (rrow[DB_type][0] == 'R')
+        else if (rrow[DB_type][0] == DB_TYPE_REV)
             p = "Revoked";
-        else if (rrow[DB_type][0] == 'V')
+        else if (rrow[DB_type][0] == DB_TYPE_VAL)
             p = "Valid";
         else
             p = "\ninvalid type, Data base error\n";
         BIO_printf(bio_err, "Type          :%s\n", p);;
-        if (rrow[DB_type][0] == 'R') {
+        if (rrow[DB_type][0] == DB_TYPE_REV) {
             p = rrow[DB_exp_date];
             if (p == NULL)
                 p = "undef";
@@ -1821,7 +1816,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     if (!do_X509_sign(ret, pkey, dgst, sigopts))
         goto end;
 
-    /* We now just add it to the database */
+    /* We now just add it to the database as DB_TYPE_VAL('V') */
     row[DB_type] = OPENSSL_strdup("V");
     tm = X509_get0_notAfter(ret);
     row[DB_exp_date] = app_malloc(tm->length + 1, "row expdate");
@@ -2020,7 +2015,8 @@ static int check_time_format(const char *str)
     return ASN1_TIME_set_string(NULL, str);
 }
 
-static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
+static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
+                     const char *value)
 {
     const ASN1_TIME *tm = NULL;
     char *row[DB_NUMBER], **rrow, **irow;
@@ -2053,7 +2049,7 @@ static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
                    "Adding Entry with serial number %s to DB for %s\n",
                    row[DB_serial], row[DB_name]);
 
-        /* We now just add it to the database */
+        /* We now just add it to the database as DB_TYPE_REV('V') */
         row[DB_type] = OPENSSL_strdup("V");
         tm = X509_get0_notAfter(x509);
         row[DB_exp_date] = app_malloc(tm->length + 1, "row exp_data");
@@ -2076,32 +2072,33 @@ static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
         }
 
         /* Revoke Certificate */
-        if (type == -1)
+        if (rev_type == REV_VALID)
             ok = 1;
         else
-            ok = do_revoke(x509, db, type, value);
+            /* Retry revocation after DB insertion */
+            ok = do_revoke(x509, db, rev_type, value);
 
         goto end;
 
     } else if (index_name_cmp_noconst(row, rrow)) {
         BIO_printf(bio_err, "ERROR:name does not match %s\n", row[DB_name]);
         goto end;
-    } else if (type == -1) {
+    } else if (rev_type == REV_VALID) {
         BIO_printf(bio_err, "ERROR:Already present, serial number %s\n",
                    row[DB_serial]);
         goto end;
-    } else if (rrow[DB_type][0] == 'R') {
+    } else if (rrow[DB_type][0] == DB_TYPE_REV) {
         BIO_printf(bio_err, "ERROR:Already revoked, serial number %s\n",
                    row[DB_serial]);
         goto end;
     } else {
         BIO_printf(bio_err, "Revoking Certificate %s.\n", rrow[DB_serial]);
-        rev_str = make_revocation_str(type, value);
+        rev_str = make_revocation_str(rev_type, value);
         if (!rev_str) {
             BIO_printf(bio_err, "Error in revocation arguments\n");
             goto end;
         }
-        rrow[DB_type][0] = 'R';
+        rrow[DB_type][0] = DB_TYPE_REV;
         rrow[DB_type][1] = '\0';
         rrow[DB_rev_date] = rev_str;
     }
@@ -2153,19 +2150,19 @@ static int get_certificate_status(const char *serial, CA_DB *db)
         BIO_printf(bio_err, "Serial %s not present in db.\n", row[DB_serial]);
         ok = -1;
         goto end;
-    } else if (rrow[DB_type][0] == 'V') {
+    } else if (rrow[DB_type][0] == DB_TYPE_VAL) {
         BIO_printf(bio_err, "%s=Valid (%c)\n",
                    row[DB_serial], rrow[DB_type][0]);
         goto end;
-    } else if (rrow[DB_type][0] == 'R') {
+    } else if (rrow[DB_type][0] == DB_TYPE_REV) {
         BIO_printf(bio_err, "%s=Revoked (%c)\n",
                    row[DB_serial], rrow[DB_type][0]);
         goto end;
-    } else if (rrow[DB_type][0] == 'E') {
+    } else if (rrow[DB_type][0] == DB_TYPE_EXP) {
         BIO_printf(bio_err, "%s=Expired (%c)\n",
                    row[DB_serial], rrow[DB_type][0]);
         goto end;
-    } else if (rrow[DB_type][0] == 'S') {
+    } else if (rrow[DB_type][0] == DB_TYPE_SUSP) {
         BIO_printf(bio_err, "%s=Suspended (%c)\n",
                    row[DB_serial], rrow[DB_type][0]);
         goto end;
@@ -2207,7 +2204,7 @@ static int do_updatedb(CA_DB *db)
     for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
         rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
 
-        if (rrow[DB_type][0] == 'V') {
+        if (rrow[DB_type][0] == DB_TYPE_VAL) {
             /* ignore entries that are not valid */
             if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
                 db_y2k = 1;
@@ -2217,14 +2214,14 @@ static int do_updatedb(CA_DB *db)
             if (db_y2k == a_y2k) {
                 /* all on the same y2k side */
                 if (strcmp(rrow[DB_exp_date], a_tm_s) <= 0) {
-                    rrow[DB_type][0] = 'E';
+                    rrow[DB_type][0] = DB_TYPE_EXP;
                     rrow[DB_type][1] = '\0';
                     cnt++;
 
                     BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
                 }
             } else if (db_y2k < a_y2k) {
-                rrow[DB_type][0] = 'E';
+                rrow[DB_type][0] = DB_TYPE_EXP;
                 rrow[DB_type][1] = '\0';
                 cnt++;
 
@@ -2264,16 +2261,17 @@ static const char *crl_reasons[] = {
  * additional argument
  */
 
-char *make_revocation_str(int rev_type, char *rev_arg)
+static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg)
 {
     char *str;
-    const char *other = NULL;
-    const char *reason = NULL;
+    const char *reason = NULL, *other = NULL;
     ASN1_OBJECT *otmp;
     ASN1_UTCTIME *revtm = NULL;
     int i;
+
     switch (rev_type) {
     case REV_NONE:
+    case REV_VALID:
         break;
 
     case REV_CRL_REASON:
@@ -2291,7 +2289,6 @@ char *make_revocation_str(int rev_type, char *rev_arg)
 
     case REV_HOLD:
         /* Argument is an OID */
-
         otmp = OBJ_txt2obj(rev_arg, 0);
         ASN1_OBJECT_free(otmp);
 
@@ -2306,7 +2303,6 @@ char *make_revocation_str(int rev_type, char *rev_arg)
 
     case REV_KEY_COMPROMISE:
     case REV_CA_COMPROMISE:
-
         /* Argument is the key compromise time  */
         if (!ASN1_GENERALIZEDTIME_set_string(NULL, rev_arg)) {
             BIO_printf(bio_err,
@@ -2321,7 +2317,6 @@ char *make_revocation_str(int rev_type, char *rev_arg)
             reason = "CAkeyTime";
 
         break;
-
     }
 
     revtm = X509_gmtime_adj(NULL, 0);
@@ -2358,7 +2353,7 @@ char *make_revocation_str(int rev_type, char *rev_arg)
  * 2 OK and some extensions added (i.e. V2 CRL)
  */
 
-int make_revoked(X509_REVOKED *rev, const char *str)
+static int make_revoked(X509_REVOKED *rev, const char *str)
 {
     char *tmp = NULL;
     int reason_code = -1;

From builds at travis-ci.org  Tue Sep 13 15:57:56 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 15:57:56 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5953
	(OpenSSL_1_1_0-stable - 8ff785f)
In-Reply-To: <openssl/openssl+159593284+still failing@travis-ci.org>
Message-ID: <57d82203b1ac_33fcdbd2c44384221d0@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5953
Status: Still Failing

Duration: 44 minutes and 56 seconds
Commit: 8ff785f (OpenSSL_1_1_0-stable)
Author: Andy Grundman
Message: Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.

This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected
side effect of the compiler building for 32-bit v8plusa instead of v9.

GH#1521
CLA: none; trivial

Signed-off-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Tim Hudson <tjh at openssl.org>
(cherry picked from commit fa4618a2805e7115cf47d0cf0d15cb7b3c944bba)

View the changeset: https://github.com/openssl/openssl/compare/799398ca426f...8ff785f4eb4f

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159593284

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/d466ea00/attachment.html>

From builds at travis-ci.org  Tue Sep 13 15:28:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 15:28:41 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5952 (master -
	fa4618a)
In-Reply-To: <openssl/openssl+159592398+still failing@travis-ci.org>
Message-ID: <57d81b292672a_33ffd96e949e4392539@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5952
Status: Still Failing

Duration: 40 minutes and 48 seconds
Commit: fa4618a (master)
Author: Andy Grundman
Message: Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.

This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected
side effect of the compiler building for 32-bit v8plusa instead of v9.

GH#1521
CLA: none; trivial

Signed-off-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Tim Hudson <tjh at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/c2efa78309e3...fa4618a2805e

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159592398

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/283ce9bb/attachment.html>

From builds at travis-ci.org  Tue Sep 13 16:28:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 16:28:50 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5954 (master -
	7729711)
In-Reply-To: <openssl/openssl+159606272+still failing@travis-ci.org>
Message-ID: <57d829436f498_33ffd96ed1e0c49491a@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5954
Status: Still Failing

Duration: 49 minutes and 40 seconds
Commit: 7729711 (master)
Author: Rich Salz
Message: Add --missing-help to list command

Reviewed-by: Andy Polyakov <appro at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/fa4618a2805e...77297115cbaf

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159606272

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/8828af39/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 13 17:42:47 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 17:42:47 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5956 (master -
	06a79af)
In-Reply-To: <openssl/openssl+159631657+still failing@travis-ci.org>
Message-ID: <57d83a95a9506_33fcdbcc90a585081c4@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5956
Status: Still Failing

Duration: 1 hour, 3 minutes, and 14 seconds
Commit: 06a79af (master)
Author: FdaSilvaYY
Message: Fix some magic values about revocation info type...

Add comments, document -valid option.
Add some const qualifiers.

Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1560)

View the changeset: https://github.com/openssl/openssl/compare/77297115cbaf...06a79af200b5

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159631657

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/e6050be7/attachment.html>

From no-reply at appveyor.com  Tue Sep 13 18:32:20 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 18:32:20 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1204
Message-ID: <20160913183220.69581.13567.D0067DCA@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/b798dccb/attachment.html>

From no-reply at appveyor.com  Tue Sep 13 19:12:24 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 19:12:24 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1206
Message-ID: <20160913191224.13177.45130.6D57943C@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/e9e006bc/attachment.html>

From builds at travis-ci.org  Tue Sep 13 19:33:36 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 19:33:36 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1927 (master - 08b050c)
In-Reply-To: <FdaSilvaYY/openssl+159668774+broken@travis-ci.org>
Message-ID: <57d8549017f7_33ffd96e949e474975c@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1927
Status: Broken

Duration: 1 hour, 30 minutes, and 4 seconds
Commit: 08b050c (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/bfcdb1762bf7...08b050c957a9

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159668774

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/315c200c/attachment-0001.html>

From no-reply at appveyor.com  Tue Sep 13 19:50:15 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 19:50:15 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1207
Message-ID: <20160913195015.13151.58028.56285CA9@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/2eaba136/attachment.html>

From no-reply at appveyor.com  Tue Sep 13 20:21:30 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 20:21:30 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1208
Message-ID: <20160913202130.26760.21331.50C7A1F5@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/77ea82fe/attachment.html>

From no-reply at appveyor.com  Tue Sep 13 20:29:41 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 20:29:41 +0000
Subject: [openssl-commits] Build failed: openssl master.5289
Message-ID: <20160913202941.8705.23452.AD149918@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/c9fa5555/attachment.html>

From no-reply at appveyor.com  Tue Sep 13 20:54:52 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 13 Sep 2016 20:54:52 +0000
Subject: [openssl-commits] Build completed: openssl master.5290
Message-ID: <20160913205451.25674.1051.C60E816A@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/56ef02b3/attachment.html>

From builds at travis-ci.org  Tue Sep 13 21:00:22 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 21:00:22 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1928 (fix-ca-buf-usage
	- ecaef9c)
In-Reply-To: <FdaSilvaYY/openssl+159669066+broken@travis-ci.org>
Message-ID: <57d868e598c26_33ffd96e952188445fa@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1928
Status: Broken

Duration: 1 hour, 39 minutes, and 39 seconds
Commit: ecaef9c (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Simplify and fix usage of char buf[3][BSIZE]

char buf[3][BSIZE] usage fixed as this:
buf[0] -> char tmp[10 + 1] = "\0";
buf[1] -> unused
buf[2] -> char new_cert[BSIZE] = { 0 };

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/d45d4a49ec84...ecaef9cc8f01

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159669066

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/01772e9c/attachment.html>

From builds at travis-ci.org  Tue Sep 13 22:02:08 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 22:02:08 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1929 (MFL-rebase-test
	- d1a00f0)
In-Reply-To: <FdaSilvaYY/openssl+159676318+broken@travis-ci.org>
Message-ID: <57d87760463f6_33fcdbe163da478872a@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1929
Status: Broken

Duration: 1 hour, 14 minutes, and 53 seconds
Commit: d1a00f0 (MFL-rebase-test)
Author: FdaSilvaYY
Message: Implement Maximum Fragment Length TLS extension.

based on https://groups.google.com/forum/#!topic/mailing.openssl.dev/fQxXvCg1uQY
adapted to the new Packet API.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/8d97e323cb92...d1a00f00b335

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159676318

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/a907f8e6/attachment-0001.html>

From levitte at openssl.org  Tue Sep 13 22:30:51 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 13 Sep 2016 22:30:51 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473805851.983029.4328.nullmailer@dev.openssl.org>

The branch master has been updated
       via  497f3bf9a75a2917e50b16b7985e87c89b86a39b (commit)
       via  9f9f962d96425ed741569460791eee0280fcf942 (commit)
      from  06a79af200b5ad0e5f5f078dc726c20c78f11885 (commit)


- Log -----------------------------------------------------------------
commit 497f3bf9a75a2917e50b16b7985e87c89b86a39b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 13 23:23:51 2016 +0200

    Add a test for 'openssl passwd'
    
    Also, enlarge test group 20 to include openssl commands that aren't
    tested otherwise
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 9f9f962d96425ed741569460791eee0280fcf942
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 13 22:48:35 2016 +0200

    Fix 'openssl passwd' with arguments -1 or -apr1
    
    RT#4674
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/passwd.c                 |  1 +
 test/README                   |  2 +-
 test/recipes/20-test_passwd.t | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 test/recipes/20-test_passwd.t

diff --git a/apps/passwd.c b/apps/passwd.c
index e2c9096..a45245c 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -319,6 +319,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         || !EVP_DigestUpdate(md, magic, magic_len)
         || !EVP_DigestUpdate(md, "$", 1)
         || !EVP_DigestUpdate(md, salt_out, salt_len))
+        goto err;
 
     md2 = EVP_MD_CTX_new();
     if (md2 == NULL
diff --git a/test/README b/test/README
index 34ef29a..bca7ab8 100644
--- a/test/README
+++ b/test/README
@@ -22,7 +22,7 @@ The number {nn} is (somewhat loosely) grouped as follows:
 05  individual symmetric cipher algorithms
 10  math (bignum)
 15  individual asymmetric cipher algorithms
-20  openssl enc
+20  openssl commands (some otherwise not tested)
 25  certificate forms, generation and verification
 30  engine and evp
 70  PACKET layer
diff --git a/test/recipes/20-test_passwd.t b/test/recipes/20-test_passwd.t
new file mode 100644
index 0000000..68169ac
--- /dev/null
+++ b/test/recipes/20-test_passwd.t
@@ -0,0 +1,38 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use strict;
+use warnings;
+
+use OpenSSL::Test;
+
+setup("test_passwd");
+
+plan tests => 6;
+
+ok(compare1stline([qw{openssl passwd password}], '^.{13}\R$'),
+   'crypt password with random salt');
+ok(compare1stline([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'),
+   'BSD style MD5 password with random salt');
+ok(compare1stline([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'),
+   'Apache style MD5 password with random salt');
+ok(compare1stline([qw{openssl passwd -salt xx password}], '^xxj31ZMTZzkVA\R$'),
+   'crypt password with salt xx');
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -1 password}], '^\$1\$xxxxxxxx\$UYCIxa628\.9qXjpQCjM4a\.\R$'),
+   'BSD style MD5 password with salt xxxxxxxx');
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '^\$apr1\$xxxxxxxx\$dxHfLAsjHkDRmG83UXe8K0\R$'),
+   'Apache style MD5 password with salt xxxxxxxx');
+
+
+sub compare1stline {
+    my ($cmdarray, $regexp) = @_;
+    my @lines = run(app($cmdarray), capture => 1);
+
+    return $lines[0] =~ m|$regexp|;
+}

From levitte at openssl.org  Tue Sep 13 22:31:37 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 13 Sep 2016 22:31:37 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473805897.935150.5440.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  f7358595369fe08c26c95d37394f16be503524cf (commit)
       via  9fd47a037079f33ca3b71c32fb4a86397e0bfcd1 (commit)
      from  8ff785f4eb4ff06213fbf68da389132e31a9e4af (commit)


- Log -----------------------------------------------------------------
commit f7358595369fe08c26c95d37394f16be503524cf
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 13 23:23:51 2016 +0200

    Add a test for 'openssl passwd'
    
    Also, enlarge test group 20 to include openssl commands that aren't
    tested otherwise
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 497f3bf9a75a2917e50b16b7985e87c89b86a39b)

commit 9fd47a037079f33ca3b71c32fb4a86397e0bfcd1
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 13 22:48:35 2016 +0200

    Fix 'openssl passwd' with arguments -1 or -apr1
    
    RT#4674
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 9f9f962d96425ed741569460791eee0280fcf942)

-----------------------------------------------------------------------

Summary of changes:
 apps/passwd.c                 |  1 +
 test/README                   |  2 +-
 test/recipes/20-test_passwd.t | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 test/recipes/20-test_passwd.t

diff --git a/apps/passwd.c b/apps/passwd.c
index e2c9096..a45245c 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -319,6 +319,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         || !EVP_DigestUpdate(md, magic, magic_len)
         || !EVP_DigestUpdate(md, "$", 1)
         || !EVP_DigestUpdate(md, salt_out, salt_len))
+        goto err;
 
     md2 = EVP_MD_CTX_new();
     if (md2 == NULL
diff --git a/test/README b/test/README
index 34ef29a..bca7ab8 100644
--- a/test/README
+++ b/test/README
@@ -22,7 +22,7 @@ The number {nn} is (somewhat loosely) grouped as follows:
 05  individual symmetric cipher algorithms
 10  math (bignum)
 15  individual asymmetric cipher algorithms
-20  openssl enc
+20  openssl commands (some otherwise not tested)
 25  certificate forms, generation and verification
 30  engine and evp
 70  PACKET layer
diff --git a/test/recipes/20-test_passwd.t b/test/recipes/20-test_passwd.t
new file mode 100644
index 0000000..68169ac
--- /dev/null
+++ b/test/recipes/20-test_passwd.t
@@ -0,0 +1,38 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use strict;
+use warnings;
+
+use OpenSSL::Test;
+
+setup("test_passwd");
+
+plan tests => 6;
+
+ok(compare1stline([qw{openssl passwd password}], '^.{13}\R$'),
+   'crypt password with random salt');
+ok(compare1stline([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'),
+   'BSD style MD5 password with random salt');
+ok(compare1stline([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'),
+   'Apache style MD5 password with random salt');
+ok(compare1stline([qw{openssl passwd -salt xx password}], '^xxj31ZMTZzkVA\R$'),
+   'crypt password with salt xx');
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -1 password}], '^\$1\$xxxxxxxx\$UYCIxa628\.9qXjpQCjM4a\.\R$'),
+   'BSD style MD5 password with salt xxxxxxxx');
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '^\$apr1\$xxxxxxxx\$dxHfLAsjHkDRmG83UXe8K0\R$'),
+   'Apache style MD5 password with salt xxxxxxxx');
+
+
+sub compare1stline {
+    my ($cmdarray, $regexp) = @_;
+    my @lines = run(app($cmdarray), capture => 1);
+
+    return $lines[0] =~ m|$regexp|;
+}

From matt at openssl.org  Tue Sep 13 23:05:06 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 13 Sep 2016 23:05:06 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473807906.407008.19544.nullmailer@dev.openssl.org>

The branch master has been updated
       via  869d0a37cfa7cfdbd42026d2b75d14cdc64e81e0 (commit)
       via  c9216d1485a350585a7363f46f3e69a840f2d385 (commit)
       via  b2b3024e0eef58589f7a49ebd48da98d4564a348 (commit)
       via  f1ec23c0bcc8ebb40331120b87a0e99f6823da67 (commit)
      from  497f3bf9a75a2917e50b16b7985e87c89b86a39b (commit)


- Log -----------------------------------------------------------------
commit 869d0a37cfa7cfdbd42026d2b75d14cdc64e81e0
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 15:42:12 2016 +0100

    Encourage use of the macros for the various "sub" functions
    
    Don't call WPACKET_sub_memcpy(), WPACKET_sub_allocation_bytes() and
    WPACKET_start_sub_packet_len() directly.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit c9216d1485a350585a7363f46f3e69a840f2d385
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 14:17:09 2016 +0100

    Make wpackettest conform to style rules
    
    Remove extra indentation at the start of an "if".
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b2b3024e0eef58589f7a49ebd48da98d4564a348
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 11:32:52 2016 +0100

    Add a WPACKET_sub_allocate_bytes() function
    
    Updated the construction code to use the new function. Also added some
    convenience macros for WPACKET_sub_memcpy().
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f1ec23c0bcc8ebb40331120b87a0e99f6823da67
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 11:01:04 2016 +0100

    Convert CKE construction to use the WPACKET API
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/packet.c             |  20 ++++--
 ssl/packet_locl.h        |  54 ++++++++++++---
 ssl/statem/statem_clnt.c | 170 +++++++++++++++++++++++------------------------
 ssl/statem/statem_dtls.c |   3 +-
 ssl/statem/statem_lib.c  |   3 +-
 ssl/t1_lib.c             |  31 ++++-----
 test/wpackettest.c       |  68 +++++++++++--------
 7 files changed, 201 insertions(+), 148 deletions(-)

diff --git a/ssl/packet.c b/ssl/packet.c
index b7084b0..7d80ebc 100644
--- a/ssl/packet.c
+++ b/ssl/packet.c
@@ -41,6 +41,17 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
     return 1;
 }
 
+int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
+                                 unsigned char **allocbytes, size_t lenbytes)
+{
+    if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
+            || !WPACKET_allocate_bytes(pkt, len, allocbytes)
+            || !WPACKET_close(pkt))
+        return 0;
+
+    return 1;
+}
+
 static size_t maxmaxsize(size_t lenbytes)
 {
     if (lenbytes >= sizeof(size_t) || lenbytes == 0)
@@ -187,7 +198,7 @@ int WPACKET_finish(WPACKET *pkt)
     return ret;
 }
 
-int WPACKET_start_sub_packet_len(WPACKET *pkt, size_t lenbytes)
+int WPACKET_start_sub_packet_len__(WPACKET *pkt, size_t lenbytes)
 {
     WPACKET_SUB *sub;
     unsigned char *lenchars;
@@ -220,7 +231,7 @@ int WPACKET_start_sub_packet_len(WPACKET *pkt, size_t lenbytes)
 
 int WPACKET_start_sub_packet(WPACKET *pkt)
 {
-    return WPACKET_start_sub_packet_len(pkt, 0);
+    return WPACKET_start_sub_packet_len__(pkt, 0);
 }
 
 int WPACKET_put_bytes(WPACKET *pkt, unsigned int val, size_t size)
@@ -279,9 +290,10 @@ int WPACKET_memcpy(WPACKET *pkt, const void *src, size_t len)
     return 1;
 }
 
-int WPACKET_sub_memcpy(WPACKET *pkt, const void *src, size_t len, size_t lenbytes)
+int WPACKET_sub_memcpy__(WPACKET *pkt, const void *src, size_t len,
+                         size_t lenbytes)
 {
-    if (!WPACKET_start_sub_packet_len(pkt, lenbytes)
+    if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
             || !WPACKET_memcpy(pkt, src, len)
             || !WPACKET_close(pkt))
         return 0;
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index daef69e..0ec5a38 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -643,26 +643,27 @@ int WPACKET_finish(WPACKET *pkt);
 
 /*
  * Initialise a new sub-packet. Additionally |lenbytes| of data is preallocated
- * at the start of the sub-packet to store its length once we know it.
+ * at the start of the sub-packet to store its length once we know it. Don't
+ * call this directly. Use the convenience macros below instead.
  */
-int WPACKET_start_sub_packet_len(WPACKET *pkt, size_t lenbytes);
+int WPACKET_start_sub_packet_len__(WPACKET *pkt, size_t lenbytes);
 
 /*
  * Convenience macros for calling WPACKET_start_sub_packet_len with different
  * lengths
  */
 #define WPACKET_start_sub_packet_u8(pkt) \
-    WPACKET_start_sub_packet_len((pkt), 1)
+    WPACKET_start_sub_packet_len__((pkt), 1)
 #define WPACKET_start_sub_packet_u16(pkt) \
-    WPACKET_start_sub_packet_len((pkt), 2)
+    WPACKET_start_sub_packet_len__((pkt), 2)
 #define WPACKET_start_sub_packet_u24(pkt) \
-    WPACKET_start_sub_packet_len((pkt), 3)
+    WPACKET_start_sub_packet_len__((pkt), 3)
 #define WPACKET_start_sub_packet_u32(pkt) \
-    WPACKET_start_sub_packet_len((pkt), 4)
+    WPACKET_start_sub_packet_len__((pkt), 4)
 
 /*
- * Same as WPACKET_start_sub_packet_len() except no bytes are pre-allocated for
- * the sub-packet length.
+ * Same as WPACKET_start_sub_packet_len__() except no bytes are pre-allocated
+ * for the sub-packet length.
  */
 int WPACKET_start_sub_packet(WPACKET *pkt);
 
@@ -675,6 +676,28 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t bytes,
                            unsigned char **allocbytes);
 
 /*
+ * The same as WPACKET_allocate_bytes() except additionally a new sub-packet is
+ * started for the allocated bytes, and then closed immediately afterwards. The
+ * number of length bytes for the sub-packet is in |lenbytes|. Don't call this
+ * directly. Use the convenience macros below instead.
+ */
+int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
+                                 unsigned char **allocbytes, size_t lenbytes);
+
+/*
+ * Convenience macros for calling WPACKET_sub_allocate_bytes with different
+ * lengths
+ */
+#define WPACKET_sub_allocate_bytes_u8(pkt, len, bytes) \
+    WPACKET_sub_allocate_bytes__((pkt), (len), (bytes), 1)
+#define WPACKET_sub_allocate_bytes_u16(pkt, len, bytes) \
+    WPACKET_sub_allocate_bytes__((pkt), (len), (bytes), 2)
+#define WPACKET_sub_allocate_bytes_u24(pkt, len, bytes) \
+    WPACKET_sub_allocate_bytes__((pkt), (len), (bytes), 3)
+#define WPACKET_sub_allocate_bytes_u32(pkt, len, bytes) \
+    WPACKET_sub_allocate_bytes__((pkt), (len), (bytes), 4)
+
+/*
  * Write the value stored in |val| into the WPACKET. The value will consume
  * |bytes| amount of storage. An error will occur if |val| cannot be
  * accommodated in |bytes| storage, e.g. attempting to write the value 256 into
@@ -690,11 +713,22 @@ int WPACKET_memcpy(WPACKET *pkt, const void *src, size_t len);
 
 /*
  * Copy |len| bytes of data from |*src| into the WPACKET and prefix with its
- * length (consuming |lenbytes| of data for the length)
+ * length (consuming |lenbytes| of data for the length). Don't call this
+ * directly. Use the convenience macros below instead.
  */
-int WPACKET_sub_memcpy(WPACKET *pkt, const void *src, size_t len,
+int WPACKET_sub_memcpy__(WPACKET *pkt, const void *src, size_t len,
                        size_t lenbytes);
 
+/* Convenience macros for calling WPACKET_sub_memcpy with different lengths */
+#define WPACKET_sub_memcpy_u8(pkt, src, len) \
+    WPACKET_sub_memcpy__((pkt), (src), (len), 1)
+#define WPACKET_sub_memcpy_u16(pkt, src, len) \
+    WPACKET_sub_memcpy__((pkt), (src), (len), 2)
+#define WPACKET_sub_memcpy_bytes_u24(pkt, src, len) \
+    WPACKET_sub_memcpy__((pkt), (src), (len), 3)
+#define WPACKET_sub_memcpy_bytes_u32(pkt, src, len) \
+    WPACKET_sub_memcpy__((pkt), (src), (len), 4)
+
 /*
  * Return the total number of bytes written so far to the underlying buffer
  * including any storage allocated for length bytes
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 59d21df..703e6a6 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -804,8 +804,8 @@ int tls_construct_client_hello(SSL *s)
     /* cookie stuff for DTLS */
     if (SSL_IS_DTLS(s)) {
         if (s->d1->cookie_len > sizeof(s->d1->cookie)
-                || !WPACKET_sub_memcpy(&pkt, s->d1->cookie, s->d1->cookie_len,
-                                       1)) {
+                || !WPACKET_sub_memcpy_u8(&pkt, s->d1->cookie,
+                                          s->d1->cookie_len)) {
             SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -865,7 +865,7 @@ int tls_construct_client_hello(SSL *s)
         goto err;
     }
 
-    if (!WPACKET_close(&pkt) || !ssl_close_construct_packet(s, &pkt)) {
+    if (!ssl_close_construct_packet(s, &pkt)) {
         ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -2071,8 +2071,7 @@ MSG_PROCESS_RETURN tls_process_server_done(SSL *s, PACKET *pkt)
         return MSG_PROCESS_FINISHED_READING;
 }
 
-static int tls_construct_cke_psk_preamble(SSL *s, unsigned char **p,
-                                          size_t *pskhdrlen, int *al)
+static int tls_construct_cke_psk_preamble(SSL *s, WPACKET *pkt, int *al)
 {
 #ifndef OPENSSL_NO_PSK
     int ret = 0;
@@ -2133,10 +2132,12 @@ static int tls_construct_cke_psk_preamble(SSL *s, unsigned char **p,
     OPENSSL_free(s->session->psk_identity);
     s->session->psk_identity = tmpidentity;
     tmpidentity = NULL;
-    s2n(identitylen, *p);
-    memcpy(*p, identity, identitylen);
-    *pskhdrlen = 2 + identitylen;
-    *p += identitylen;
+
+    if (!WPACKET_sub_memcpy_u16(pkt, identity, identitylen))  {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE, ERR_R_INTERNAL_ERROR);
+        *al = SSL_AD_INTERNAL_ERROR;
+        goto err;
+    }
 
     ret = 1;
 
@@ -2154,10 +2155,10 @@ static int tls_construct_cke_psk_preamble(SSL *s, unsigned char **p,
 #endif
 }
 
-static int tls_construct_cke_rsa(SSL *s, unsigned char **p, int *len, int *al)
+static int tls_construct_cke_rsa(SSL *s, WPACKET *pkt, int *al)
 {
 #ifndef OPENSSL_NO_RSA
-    unsigned char *q;
+    unsigned char *encdata = NULL;
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *pctx = NULL;
     size_t enclen;
@@ -2192,21 +2193,22 @@ static int tls_construct_cke_rsa(SSL *s, unsigned char **p, int *len, int *al)
         goto err;
     }
 
-    q = *p;
     /* Fix buf for TLS and beyond */
-    if (s->version > SSL3_VERSION)
-        *p += 2;
+    if (s->version > SSL3_VERSION && !WPACKET_start_sub_packet_u16(pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_RSA, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
     pctx = EVP_PKEY_CTX_new(pkey, NULL);
     if (pctx == NULL || EVP_PKEY_encrypt_init(pctx) <= 0
         || EVP_PKEY_encrypt(pctx, NULL, &enclen, pms, pmslen) <= 0) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CKE_RSA, ERR_R_EVP_LIB);
         goto err;
     }
-    if (EVP_PKEY_encrypt(pctx, *p, &enclen, pms, pmslen) <= 0) {
+    if (!WPACKET_allocate_bytes(pkt, enclen, &encdata)
+            || EVP_PKEY_encrypt(pctx, encdata, &enclen, pms, pmslen) <= 0) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CKE_RSA, SSL_R_BAD_RSA_ENCRYPT);
         goto err;
     }
-    *len = enclen;
     EVP_PKEY_CTX_free(pctx);
     pctx = NULL;
 # ifdef PKCS1_CHECK
@@ -2217,9 +2219,9 @@ static int tls_construct_cke_rsa(SSL *s, unsigned char **p, int *len, int *al)
 # endif
 
     /* Fix buf for TLS and beyond */
-    if (s->version > SSL3_VERSION) {
-        s2n(*len, q);
-        *len += 2;
+    if (s->version > SSL3_VERSION && !WPACKET_close(pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_RSA, ERR_R_INTERNAL_ERROR);
+        goto err;
     }
 
     s->s3->tmp.pms = pms;
@@ -2238,49 +2240,48 @@ static int tls_construct_cke_rsa(SSL *s, unsigned char **p, int *len, int *al)
 #endif
 }
 
-static int tls_construct_cke_dhe(SSL *s, unsigned char **p, int *len, int *al)
+static int tls_construct_cke_dhe(SSL *s, WPACKET *pkt, int *al)
 {
 #ifndef OPENSSL_NO_DH
     DH *dh_clnt = NULL;
     const BIGNUM *pub_key;
     EVP_PKEY *ckey = NULL, *skey = NULL;
+    unsigned char *keybytes = NULL;
 
     skey = s->s3->peer_tmp;
-    if (skey == NULL) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_DHE, ERR_R_INTERNAL_ERROR);
-        return 0;
-    }
+    if (skey == NULL)
+        goto err;
+
     ckey = ssl_generate_pkey(skey);
     dh_clnt = EVP_PKEY_get0_DH(ckey);
 
-    if (dh_clnt == NULL || ssl_derive(s, ckey, skey) == 0) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_DHE, ERR_R_INTERNAL_ERROR);
-        EVP_PKEY_free(ckey);
-        return 0;
-    }
+    if (dh_clnt == NULL || ssl_derive(s, ckey, skey) == 0)
+        goto err;
 
     /* send off the data */
     DH_get0_key(dh_clnt, &pub_key, NULL);
-    *len = BN_num_bytes(pub_key);
-    s2n(*len, *p);
-    BN_bn2bin(pub_key, *p);
-    *len += 2;
+    if (!WPACKET_sub_allocate_bytes_u16(pkt, BN_num_bytes(pub_key), &keybytes))
+        goto err;
+
+    BN_bn2bin(pub_key, keybytes);
     EVP_PKEY_free(ckey);
 
     return 1;
-#else
+ err:
+    EVP_PKEY_free(ckey);
+#endif
     SSLerr(SSL_F_TLS_CONSTRUCT_CKE_DHE, ERR_R_INTERNAL_ERROR);
     *al = SSL_AD_INTERNAL_ERROR;
     return 0;
-#endif
 }
 
-static int tls_construct_cke_ecdhe(SSL *s, unsigned char **p, int *len, int *al)
+static int tls_construct_cke_ecdhe(SSL *s, WPACKET *pkt, int *al)
 {
 #ifndef OPENSSL_NO_EC
     unsigned char *encodedPoint = NULL;
     int encoded_pt_len = 0;
     EVP_PKEY *ckey = NULL, *skey = NULL;
+    int ret = 0;
 
     skey = s->s3->peer_tmp;
     if (skey == NULL) {
@@ -2303,25 +2304,16 @@ static int tls_construct_cke_ecdhe(SSL *s, unsigned char **p, int *len, int *al)
         goto err;
     }
 
-    EVP_PKEY_free(ckey);
-    ckey = NULL;
-
-    *len = encoded_pt_len;
-
-    /* length of encoded point */
-    **p = *len;
-    *p += 1;
-    /* copy the point */
-    memcpy(*p, encodedPoint, *len);
-    /* increment len to account for length field */
-    *len += 1;
-
-    OPENSSL_free(encodedPoint);
+    if (!WPACKET_sub_memcpy_u8(pkt, encodedPoint, encoded_pt_len)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_ECDHE, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
-    return 1;
+    ret = 1;
  err:
+    OPENSSL_free(encodedPoint);
     EVP_PKEY_free(ckey);
-    return 0;
+    return ret;
 #else
     SSLerr(SSL_F_TLS_CONSTRUCT_CKE_ECDHE, ERR_R_INTERNAL_ERROR);
     *al = SSL_AD_INTERNAL_ERROR;
@@ -2329,7 +2321,7 @@ static int tls_construct_cke_ecdhe(SSL *s, unsigned char **p, int *len, int *al)
 #endif
 }
 
-static int tls_construct_cke_gost(SSL *s, unsigned char **p, int *len, int *al)
+static int tls_construct_cke_gost(SSL *s, WPACKET *pkt, int *al)
 {
 #ifndef OPENSSL_NO_GOST
     /* GOST key exchange message creation */
@@ -2425,22 +2417,21 @@ static int tls_construct_cke_gost(SSL *s, unsigned char **p, int *len, int *al)
     /*
      * Encapsulate it into sequence
      */
-    *((*p)++) = V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
     msglen = 255;
     if (EVP_PKEY_encrypt(pkey_ctx, tmp, &msglen, pms, pmslen) <= 0) {
         *al = SSL_AD_INTERNAL_ERROR;
         SSLerr(SSL_F_TLS_CONSTRUCT_CKE_GOST, SSL_R_LIBRARY_BUG);
         goto err;
     }
-    if (msglen >= 0x80) {
-        *((*p)++) = 0x81;
-        *((*p)++) = msglen & 0xff;
-        *len = msglen + 3;
-    } else {
-        *((*p)++) = msglen & 0xff;
-        *len = msglen + 2;
+
+    if (!WPACKET_put_bytes(pkt, V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED, 1)
+            || (msglen >= 0x80 && !WPACKET_put_bytes(pkt, 0x81, 1))
+            || !WPACKET_sub_memcpy_u8(pkt, tmp, msglen)) {
+        *al = SSL_AD_INTERNAL_ERROR;
+        SSLerr(SSL_F_TLS_CONSTRUCT_CKE_GOST, ERR_R_INTERNAL_ERROR);
+        goto err;
     }
-    memcpy(*p, tmp, msglen);
+
     /* Check if pubkey from client certificate was used */
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2,
                           NULL) > 0) {
@@ -2464,19 +2455,19 @@ static int tls_construct_cke_gost(SSL *s, unsigned char **p, int *len, int *al)
 #endif
 }
 
-static int tls_construct_cke_srp(SSL *s, unsigned char **p, int *len, int *al)
+static int tls_construct_cke_srp(SSL *s, WPACKET *pkt, int *al)
 {
 #ifndef OPENSSL_NO_SRP
-    if (s->srp_ctx.A != NULL) {
-        /* send off the data */
-        *len = BN_num_bytes(s->srp_ctx.A);
-        s2n(*len, *p);
-        BN_bn2bin(s->srp_ctx.A, *p);
-        *len += 2;
-    } else {
+    unsigned char *abytes = NULL;
+
+    if (s->srp_ctx.A == NULL
+            || !WPACKET_sub_allocate_bytes_u16(pkt, BN_num_bytes(s->srp_ctx.A),
+                                               &abytes)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CKE_SRP, ERR_R_INTERNAL_ERROR);
         return 0;
     }
+    BN_bn2bin(s->srp_ctx.A, abytes);
+
     OPENSSL_free(s->session->srp_username);
     s->session->srp_username = OPENSSL_strdup(s->srp_ctx.login);
     if (s->session->srp_username == NULL) {
@@ -2494,36 +2485,42 @@ static int tls_construct_cke_srp(SSL *s, unsigned char **p, int *len, int *al)
 
 int tls_construct_client_key_exchange(SSL *s)
 {
-    unsigned char *p;
-    int len;
-    size_t pskhdrlen = 0;
     unsigned long alg_k;
     int al = -1;
+    WPACKET pkt;
 
-    alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
+    if (!WPACKET_init(&pkt, s->init_buf)) {
+        /* Should not happen */
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
-    p = ssl_handshake_start(s);
+    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CLIENT_KEY_EXCHANGE)) {
+        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
+    alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
     if ((alg_k & SSL_PSK)
-        && !tls_construct_cke_psk_preamble(s, &p, &pskhdrlen, &al))
+        && !tls_construct_cke_psk_preamble(s, &pkt, &al))
         goto err;
 
-    if (alg_k & SSL_kPSK) {
-        len = 0;
-    } else if (alg_k & (SSL_kRSA | SSL_kRSAPSK)) {
-        if (!tls_construct_cke_rsa(s, &p, &len, &al))
+    if (alg_k & (SSL_kRSA | SSL_kRSAPSK)) {
+        if (!tls_construct_cke_rsa(s, &pkt, &al))
             goto err;
     } else if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
-        if (!tls_construct_cke_dhe(s, &p, &len, &al))
+        if (!tls_construct_cke_dhe(s, &pkt, &al))
             goto err;
     } else if (alg_k & (SSL_kECDHE | SSL_kECDHEPSK)) {
-        if (!tls_construct_cke_ecdhe(s, &p, &len, &al))
+        if (!tls_construct_cke_ecdhe(s, &pkt, &al))
             goto err;
     } else if (alg_k & SSL_kGOST) {
-        if (!tls_construct_cke_gost(s, &p, &len, &al))
+        if (!tls_construct_cke_gost(s, &pkt, &al))
             goto err;
     } else if (alg_k & SSL_kSRP) {
-        if (!tls_construct_cke_srp(s, &p, &len, &al))
+        if (!tls_construct_cke_srp(s, &pkt, &al))
             goto err;
     } else {
         ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
@@ -2531,9 +2528,7 @@ int tls_construct_client_key_exchange(SSL *s)
         goto err;
     }
 
-    len += pskhdrlen;
-
-    if (!ssl_set_handshake_header(s, SSL3_MT_CLIENT_KEY_EXCHANGE, len)) {
+    if (!ssl_close_construct_packet(s, &pkt)) {
         ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -2549,6 +2544,7 @@ int tls_construct_client_key_exchange(SSL *s)
     OPENSSL_clear_free(s->s3->tmp.psk, s->s3->tmp.psklen);
     s->s3->tmp.psk = NULL;
 #endif
+    WPACKET_cleanup(&pkt);
     ossl_statem_set_error(s);
     return 0;
 }
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 25c4575..b9a53b0 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -1218,7 +1218,8 @@ int dtls1_close_construct_packet(SSL *s, WPACKET *pkt)
 {
     size_t msglen;
 
-    if (!WPACKET_get_length(pkt, &msglen)
+    if (!WPACKET_close(pkt)
+            || !WPACKET_get_length(pkt, &msglen)
             || msglen > INT_MAX
             || !WPACKET_finish(pkt))
         return 0;
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 7ad3899..4171594 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -61,7 +61,8 @@ int tls_close_construct_packet(SSL *s, WPACKET *pkt)
 {
     size_t msglen;
 
-    if (!WPACKET_get_length(pkt, &msglen)
+    if (!WPACKET_close(pkt)
+            || !WPACKET_get_length(pkt, &msglen)
             || msglen > INT_MAX
             || !WPACKET_finish(pkt))
         return 0;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 50083a9..696998f 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1040,8 +1040,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
     /* Add RI if renegotiating */
     if (s->renegotiate) {
         if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_renegotiate, 2)
-                || !WPACKET_sub_memcpy(pkt, s->s3->previous_client_finished,
-                                   s->s3->previous_client_finished_len, 2)) {
+                || !WPACKET_sub_memcpy_u16(pkt, s->s3->previous_client_finished,
+                                   s->s3->previous_client_finished_len)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1058,8 +1058,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
                    /* Sub-packet for servername list (always 1 hostname)*/
                 || !WPACKET_start_sub_packet_u16(pkt)
                 || !WPACKET_put_bytes(pkt, TLSEXT_NAMETYPE_host_name, 1)
-                || !WPACKET_sub_memcpy(pkt, s->tlsext_hostname,
-                                       strlen(s->tlsext_hostname), 2)
+                || !WPACKET_sub_memcpy_u16(pkt, s->tlsext_hostname,
+                                           strlen(s->tlsext_hostname))
                 || !WPACKET_close(pkt)
                 || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
@@ -1099,7 +1099,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
         if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_ec_point_formats, 2)
                    /* Sub-packet for formats extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_sub_memcpy(pkt, pformats, num_formats, 1)
+                || !WPACKET_sub_memcpy_u8(pkt, pformats, num_formats)
                 || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -1161,8 +1161,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             goto skip_ext;
 
         if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_session_ticket, 2)
-                || !WPACKET_sub_memcpy(pkt, s->session->tlsext_tick, ticklen,
-                                       2)) {
+                || !WPACKET_sub_memcpy_u16(pkt, s->session->tlsext_tick,
+                                           ticklen)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1209,10 +1209,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             idlen = i2d_OCSP_RESPID(id, NULL);
             if (idlen <= 0
                        /* Sub-packet for an individual id */
-                    || !WPACKET_start_sub_packet_u8(pkt)
-                    || !WPACKET_allocate_bytes(pkt, idlen, &idbytes)
-                    || i2d_OCSP_RESPID(id, &idbytes) != idlen
-                    || !WPACKET_close(pkt)) {
+                    || !WPACKET_sub_allocate_bytes_u8(pkt, idlen, &idbytes)
+                    || i2d_OCSP_RESPID(id, &idbytes) != idlen) {
                 SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
                 return 0;
             }
@@ -1292,8 +1290,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
                     TLSEXT_TYPE_application_layer_protocol_negotiation, 2)
                    /* Sub-packet ALPN extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_sub_memcpy(pkt, s->alpn_client_proto_list,
-                                       s->alpn_client_proto_list_len, 2)
+                || !WPACKET_sub_memcpy_u16(pkt, s->alpn_client_proto_list,
+                                           s->alpn_client_proto_list_len)
                 || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -1380,16 +1378,11 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
                 hlen = 0;
 
             if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_padding, 2)
-                    || !WPACKET_start_sub_packet_u16(pkt)
-                    || !WPACKET_allocate_bytes(pkt, hlen, &padbytes)) {
+                    || !WPACKET_sub_allocate_bytes_u16(pkt, hlen, &padbytes)) {
                 SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
                 return 0;
             }
             memset(padbytes, 0, hlen);
-            if (!WPACKET_close(pkt)) {
-                SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-                return 0;
-            }
         }
     }
 
diff --git a/test/wpackettest.c b/test/wpackettest.c
index ca2a1a7..ac712b4 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -35,7 +35,7 @@ static int test_WPACKET_init(void)
     int i;
     size_t written;
 
-    if (       !WPACKET_init(&pkt, buf)
+    if (!WPACKET_init(&pkt, buf)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
                 /* Closing a top level WPACKET should fail */
             ||  WPACKET_close(&pkt)
@@ -55,7 +55,7 @@ static int test_WPACKET_init(void)
     }
 
     /* Now try with a one byte length prefix */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -66,7 +66,7 @@ static int test_WPACKET_init(void)
     }
 
     /* And a longer length prefix */
-    if (       !WPACKET_init_len(&pkt, buf, 4)
+    if (!WPACKET_init_len(&pkt, buf, 4)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -103,7 +103,7 @@ static int test_WPACKET_set_max_size(void)
     WPACKET pkt;
     size_t written;
 
-    if (       !WPACKET_init(&pkt, buf)
+    if (!WPACKET_init(&pkt, buf)
                 /*
                  * No previous lenbytes set so we should be ok to set the max
                  * possible max size
@@ -118,7 +118,7 @@ static int test_WPACKET_set_max_size(void)
         return 0; 
     }
 
-    if (       !WPACKET_init_len(&pkt, buf, 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
                 /*
                  * Should fail because we already consumed 1 byte with the
                  * length
@@ -160,7 +160,7 @@ static int test_WPACKET_start_sub_packet(void)
     size_t written;
     size_t len;
 
-    if (       !WPACKET_init(&pkt, buf)
+    if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet(&pkt)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
                 /* Can't finish because we have a sub packet */
@@ -178,8 +178,8 @@ static int test_WPACKET_start_sub_packet(void)
     }
 
    /* Single sub-packet with length prefix */
-    if (       !WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+    if (!WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
@@ -191,10 +191,10 @@ static int test_WPACKET_start_sub_packet(void)
     }
 
     /* Nested sub-packets with length prefixes */
-    if (       !WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+    if (!WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_get_length(&pkt, &len)
             || len != 1
@@ -211,11 +211,11 @@ static int test_WPACKET_start_sub_packet(void)
     }
 
     /* Sequential sub-packets with length prefixes */
-    if (       !WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+    if (!WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_close(&pkt)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
@@ -236,7 +236,7 @@ static int test_WPACKET_set_flags(void)
     size_t written;
 
     /* Set packet to be non-zero length */
-    if (       !WPACKET_init(&pkt, buf)
+    if (!WPACKET_init(&pkt, buf)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
                 /* Should fail because of zero length */
             ||  WPACKET_finish(&pkt)
@@ -250,7 +250,7 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* Repeat above test in a sub-packet */
-    if (       !WPACKET_init(&pkt, buf)
+    if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet(&pkt)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
                 /* Should fail because of zero length */
@@ -266,7 +266,7 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* Set packet to abandon non-zero length */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -276,8 +276,8 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* Repeat above test but only abandon a sub-packet */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
@@ -289,8 +289,8 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* And repeat with a non empty sub-packet */
-    if (       !WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+    if (!WPACKET_init(&pkt, buf)
+            || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
             || !WPACKET_put_bytes(&pkt, 0xff, 1)
             || !WPACKET_close(&pkt)
@@ -310,14 +310,14 @@ static int test_WPACKET_allocate_bytes(void)
     size_t written;
     unsigned char *bytes;
 
-    if (       !WPACKET_init_len(&pkt, buf, 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
             || !WPACKET_allocate_bytes(&pkt, 2, &bytes)) {
         testfail("test_WPACKET_allocate_bytes():1 failed\n", &pkt);
         return 0;
     }
     bytes[0] = 0xfe;
     bytes[1] = 0xff;
-    if (       !WPACKET_finish(&pkt)
+    if (!WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(alloc)
             ||  memcmp(buf->data, &alloc, written) != 0) {
@@ -325,6 +325,22 @@ static int test_WPACKET_allocate_bytes(void)
         return 0;
     }
 
+    /* Repeat with WPACKET_sub_allocate_bytes */
+    if (!WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_sub_allocate_bytes_u8(&pkt, 2, &bytes)) {
+        testfail("test_WPACKET_allocate_bytes():3 failed\n", &pkt);
+        return 0;
+    }
+    bytes[0] = 0xfe;
+    bytes[1] = 0xff;
+    if (!WPACKET_finish(&pkt)
+            || !WPACKET_get_total_written(&pkt, &written)
+            ||  written != sizeof(submem)
+            ||  memcmp(buf->data, &submem, written) != 0) {
+        testfail("test_WPACKET_allocate_bytes():4 failed\n", &pkt);
+        return 0;
+    }
+
     return 1;
 }
 
@@ -334,7 +350,7 @@ static int test_WPACKET_memcpy(void)
     size_t written;
     const unsigned char bytes[] = { 0xfe, 0xff };
 
-    if (       !WPACKET_init_len(&pkt, buf, 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
             || !WPACKET_memcpy(&pkt, bytes, sizeof(bytes))
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -345,8 +361,8 @@ static int test_WPACKET_memcpy(void)
     }
 
     /* Repeat with WPACKET_sub_memcpy() */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_sub_memcpy(&pkt, bytes, sizeof(bytes), 1)
+    if (!WPACKET_init_len(&pkt, buf, 1)
+            || !WPACKET_sub_memcpy_u8(&pkt, bytes, sizeof(bytes))
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(submem)

From builds at travis-ci.org  Tue Sep 13 23:16:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 13 Sep 2016 23:16:55 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1930
	(apps-speed-rework-n-clean - 97c0bdb)
In-Reply-To: <FdaSilvaYY/openssl+159676984+broken@travis-ci.org>
Message-ID: <57d888e7a8769_33fc325a90b781899cd@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1930
Status: Broken

Duration: 1 hour, 17 minutes, and 20 seconds
Commit: 97c0bdb (apps-speed-rework-n-clean)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal.

Fix a typo.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/6431e2a11fbc...97c0bdb4f7a2

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159676984

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160913/77b01c26/attachment.html>

From builds at travis-ci.org  Wed Sep 14 00:19:37 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 00:19:37 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1931
	(oss_builds_options_check - 79d63b0)
In-Reply-To: <FdaSilvaYY/openssl+159677231+still failing@travis-ci.org>
Message-ID: <57d897956d29b_33fcdbcca1ad89289ce@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1931
Status: Still Failing

Duration: 1 hour, 17 minutes, and 19 seconds
Commit: 79d63b0 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/2c08f62c1c6b...79d63b034c8e

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159677231

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/22a5a2f0/attachment.html>

From builds at travis-ci.org  Wed Sep 14 00:45:33 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 00:45:33 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5967 (master -
	497f3bf)
In-Reply-To: <openssl/openssl+159736485+still failing@travis-ci.org>
Message-ID: <57d89dad9f998_33fcdbcca113c9451c@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5967
Status: Still Failing

Duration: 37 minutes and 11 seconds
Commit: 497f3bf (master)
Author: Richard Levitte
Message: Add a test for 'openssl passwd'

Also, enlarge test group 20 to include openssl commands that aren't
tested otherwise

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/06a79af200b5...497f3bf9a75a

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159736485

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/9bd1e9eb/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 14 01:09:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 01:09:52 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1932 (oss_constify_api
	- 0af00bc)
In-Reply-To: <FdaSilvaYY/openssl+159677566+broken@travis-ci.org>
Message-ID: <57d8a376812c0_33ffd96e9431810665e7@8aa8dca1-ef58-4d4a-b087-7b742cf8b954.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1932
Status: Broken

Duration: 1 hour, 2 minutes, and 23 seconds
Commit: 0af00bc (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack fix ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/4fd63fa00822...0af00bc55316

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159677566

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/f1870127/attachment.html>

From builds at travis-ci.org  Wed Sep 14 01:11:30 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 01:11:30 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5968
	(OpenSSL_1_1_0-stable - f735859)
In-Reply-To: <openssl/openssl+159736639+still failing@travis-ci.org>
Message-ID: <57d8a3c2799bd_33fcdbcc91cf0968918@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5968
Status: Still Failing

Duration: 37 minutes and 4 seconds
Commit: f735859 (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Add a test for 'openssl passwd'

Also, enlarge test group 20 to include openssl commands that aren't
tested otherwise

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 497f3bf9a75a2917e50b16b7985e87c89b86a39b)

View the changeset: https://github.com/openssl/openssl/compare/8ff785f4eb4f...f7358595369f

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159736639

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/f691821e/attachment.html>

From builds at travis-ci.org  Wed Sep 14 01:46:56 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 01:46:56 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5970 (master -
	869d0a3)
In-Reply-To: <openssl/openssl+159742874+still failing@travis-ci.org>
Message-ID: <57d8ac26894a8_33fcdbd0ba5c099274f@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5970
Status: Still Failing

Duration: 29 minutes and 20 seconds
Commit: 869d0a3 (master)
Author: Matt Caswell
Message: Encourage use of the macros for the various "sub" functions

Don't call WPACKET_sub_memcpy(), WPACKET_sub_allocation_bytes() and
WPACKET_start_sub_packet_len() directly.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/497f3bf9a75a...869d0a37cfa7

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159742874

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/0ea4390e/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 14 02:26:10 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 02:26:10 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1934
	(fix_set_dup_exdata - 9f86cb1)
In-Reply-To: <FdaSilvaYY/openssl+159696511+broken@travis-ci.org>
Message-ID: <57d8b54254e86_33fcdbe1bd0d41017162@7204e7b2-a920-4ff3-80b0-f739b48330a6.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1934
Status: Broken

Duration: 47 minutes and 55 seconds
Commit: 9f86cb1 (fix_set_dup_exdata)
Author: FdaSilvaYY
Message: Fix possible malloc failure inside CRYPTO_dup_ex_data()

Fix related docs.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/6c1d6efba3e8...9f86cb1835b9

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159696511

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/86f9fa7f/attachment.html>

From builds at travis-ci.org  Wed Sep 14 02:53:42 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 02:53:42 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1935
	(fix-ca-buf-usage - 297ae05)
In-Reply-To: <FdaSilvaYY/openssl+159727662+still failing@travis-ci.org>
Message-ID: <57d8bbb6a79dc_33fc325a918ac2805e3@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1935
Status: Still Failing

Duration: 41 minutes and 8 seconds
Commit: 297ae05 (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Replace a partially-used array of three strings by two local variables.

char buf[3][BSIZE] usage fixed like this:
buf[0] -> char tmp[10 + 1] = "\0";
buf[1] -> unused
buf[2] -> char new_cert[BSIZE] = { 0 };

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/ecaef9cc8f01...297ae05ae362

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159727662

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/95c96442/attachment.html>

From builds at travis-ci.org  Wed Sep 14 03:21:31 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 03:21:31 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1936
	(MFL-rebase-test - 630aa38)
In-Reply-To: <FdaSilvaYY/openssl+159732965+still failing@travis-ci.org>
Message-ID: <57d8c23b3056f_33fc325a912f8291336@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1936
Status: Still Failing

Duration: 39 minutes and 8 seconds
Commit: 630aa38 (MFL-rebase-test)
Author: FdaSilvaYY
Message: Implement Maximum Fragment Length TLS extension.

based on https://groups.google.com/forum/#!topic/mailing.openssl.dev/fQxXvCg1uQY
adapted to the new Packet API.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/d1a00f00b335...630aa3880c4c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159732965

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/96295d24/attachment-0001.html>

From matt at openssl.org  Wed Sep 14 09:22:49 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 14 Sep 2016 09:22:49 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473844969.577719.10241.nullmailer@dev.openssl.org>

The branch master has been updated
       via  73f0df8331910d6726d45ecaab12bd93cc48b4e2 (commit)
      from  869d0a37cfa7cfdbd42026d2b75d14cdc64e81e0 (commit)


- Log -----------------------------------------------------------------
commit 73f0df8331910d6726d45ecaab12bd93cc48b4e2
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 14:32:27 2016 +0100

    Add some sanity checks around usage of t_fromb64()
    
    The internal SRP function t_fromb64() converts from base64 to binary. It
    does not validate that the size of the destination is sufficiently large -
    that is up to the callers. In some places there was such a check, but not
    in others.
    
    Add an argument to t_fromb64() to provide the size of the destination
    buffer and validate that we don't write too much data. Also add some sanity
    checks to the callers where appropriate.
    
    With thanks to Shi Lei for reporting this issue.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/srp/srp_vfy.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 73ea4e6..188fad2 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -30,7 +30,7 @@ static char b64table[] =
 /*
  * Convert a base64 string into raw byte array representation.
  */
-static int t_fromb64(unsigned char *a, const char *src)
+static int t_fromb64(unsigned char *a, size_t alen, const char *src)
 {
     char *loc;
     int i, j;
@@ -39,6 +39,9 @@ static int t_fromb64(unsigned char *a, const char *src)
     while (*src && (*src == ' ' || *src == '\t' || *src == '\n'))
         ++src;
     size = strlen(src);
+    if (alen > INT_MAX || size > (int)alen)
+        return -1;
+
     i = 0;
     while (i < size) {
         loc = strchr(b64table, src[i]);
@@ -181,13 +184,25 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
     unsigned char tmp[MAX_LEN];
     int len;
 
-    if (strlen(s) > MAX_LEN || strlen(v) > MAX_LEN)
+    vinfo->v = NULL;
+    vinfo->s = NULL;
+
+    len = t_fromb64(tmp, sizeof(tmp), v);
+    if (len < 0)
         return 0;
-    len = t_fromb64(tmp, v);
     if (NULL == (vinfo->v = BN_bin2bn(tmp, len, NULL)))
         return 0;
-    len = t_fromb64(tmp, s);
-    return ((vinfo->s = BN_bin2bn(tmp, len, NULL)) != NULL);
+    len = t_fromb64(tmp, sizeof(tmp), s);
+    if (len < 0)
+        goto err;
+    vinfo->s = BN_bin2bn(tmp, len, NULL);
+    if (vinfo->s == NULL)
+        goto err;
+    return 1;
+ err:
+    BN_free(vinfo->v);
+    vinfo->v = NULL;
+    return 0;
 }
 
 static int SRP_user_pwd_set_sv_BN(SRP_user_pwd *vinfo, BIGNUM *s, BIGNUM *v)
@@ -257,10 +272,13 @@ static SRP_gN_cache *SRP_gN_new_init(const char *ch)
     if (newgN == NULL)
         return NULL;
 
+    len = t_fromb64(tmp, sizeof(tmp), ch);
+    if (len < 0)
+        goto err;
+
     if ((newgN->b64_bn = OPENSSL_strdup(ch)) == NULL)
         goto err;
 
-    len = t_fromb64(tmp, ch);
     if ((newgN->bn = BN_bin2bn(tmp, len, NULL)))
         return newgN;
 
@@ -539,11 +557,11 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
         goto err;
 
     if (N) {
-        if ((len = t_fromb64(tmp, N)) == 0)
+        if ((len = t_fromb64(tmp, sizeof(tmp), N)) <= 0)
             goto err;
         N_bn_alloc = BN_bin2bn(tmp, len, NULL);
         N_bn = N_bn_alloc;
-        if ((len = t_fromb64(tmp, g)) == 0)
+        if ((len = t_fromb64(tmp, sizeof(tmp) ,g)) <= 0)
             goto err;
         g_bn_alloc = BN_bin2bn(tmp, len, NULL);
         g_bn = g_bn_alloc;
@@ -563,7 +581,7 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     } else {
-        if ((len = t_fromb64(tmp2, *salt)) == 0)
+        if ((len = t_fromb64(tmp2, sizeof(tmp2), *salt)) <= 0)
             goto err;
         s = BN_bin2bn(tmp2, len, NULL);
     }

From matt at openssl.org  Wed Sep 14 09:23:02 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 14 Sep 2016 09:23:02 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473844982.646499.11075.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  68f11e82d9c19e104f34bd5186decc98566738ca (commit)
      from  15d81749322c3498027105f8ee44e8c25479d475 (commit)


- Log -----------------------------------------------------------------
commit 68f11e82d9c19e104f34bd5186decc98566738ca
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 14:32:27 2016 +0100

    Add some sanity checks around usage of t_fromb64()
    
    The internal SRP function t_fromb64() converts from base64 to binary. It
    does not validate that the size of the destination is sufficiently large -
    that is up to the callers. In some places there was such a check, but not
    in others.
    
    Add an argument to t_fromb64() to provide the size of the destination
    buffer and validate that we don't write too much data. Also add some sanity
    checks to the callers where appropriate.
    
    With thanks to Shi Lei for reporting this issue.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 73f0df8331910d6726d45ecaab12bd93cc48b4e2)

-----------------------------------------------------------------------

Summary of changes:
 crypto/srp/srp_vfy.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index af557a1..a8ec52a 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -80,7 +80,7 @@ static char b64table[] =
 /*
  * Convert a base64 string into raw byte array representation.
  */
-static int t_fromb64(unsigned char *a, const char *src)
+static int t_fromb64(unsigned char *a, size_t alen, const char *src)
 {
     char *loc;
     int i, j;
@@ -89,6 +89,9 @@ static int t_fromb64(unsigned char *a, const char *src)
     while (*src && (*src == ' ' || *src == '\t' || *src == '\n'))
         ++src;
     size = strlen(src);
+    if (alen > INT_MAX || size > (int)alen)
+        return -1;
+
     i = 0;
     while (i < size) {
         loc = strchr(b64table, src[i]);
@@ -231,13 +234,25 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
     unsigned char tmp[MAX_LEN];
     int len;
 
-    if (strlen(s) > MAX_LEN || strlen(v) > MAX_LEN)
+    vinfo->v = NULL;
+    vinfo->s = NULL;
+
+    len = t_fromb64(tmp, sizeof(tmp), v);
+    if (len < 0)
         return 0;
-    len = t_fromb64(tmp, v);
     if (NULL == (vinfo->v = BN_bin2bn(tmp, len, NULL)))
         return 0;
-    len = t_fromb64(tmp, s);
-    return ((vinfo->s = BN_bin2bn(tmp, len, NULL)) != NULL);
+    len = t_fromb64(tmp, sizeof(tmp), s);
+    if (len < 0)
+        goto err;
+    vinfo->s = BN_bin2bn(tmp, len, NULL);
+    if (vinfo->s == NULL)
+        goto err;
+    return 1;
+ err:
+    BN_free(vinfo->v);
+    vinfo->v = NULL;
+    return 0;
 }
 
 static int SRP_user_pwd_set_sv_BN(SRP_user_pwd *vinfo, BIGNUM *s, BIGNUM *v)
@@ -307,10 +322,13 @@ static SRP_gN_cache *SRP_gN_new_init(const char *ch)
     if (newgN == NULL)
         return NULL;
 
+    len = t_fromb64(tmp, sizeof(tmp), ch);
+    if (len < 0)
+        goto err;
+
     if ((newgN->b64_bn = BUF_strdup(ch)) == NULL)
         goto err;
 
-    len = t_fromb64(tmp, ch);
     if ((newgN->bn = BN_bin2bn(tmp, len, NULL)))
         return newgN;
 
@@ -580,10 +598,10 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
         goto err;
 
     if (N) {
-        if (!(len = t_fromb64(tmp, N)))
+        if (!(len = t_fromb64(tmp, sizeof(tmp), N)))
             goto err;
         N_bn = BN_bin2bn(tmp, len, NULL);
-        if (!(len = t_fromb64(tmp, g)))
+        if (!(len = t_fromb64(tmp, sizeof(tmp), g)))
             goto err;
         g_bn = BN_bin2bn(tmp, len, NULL);
         defgNid = "*";
@@ -602,7 +620,7 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     } else {
-        if (!(len = t_fromb64(tmp2, *salt)))
+        if (!(len = t_fromb64(tmp2, sizeof(tmp2), *salt)))
             goto err;
         s = BN_bin2bn(tmp2, len, NULL);
     }

From matt at openssl.org  Wed Sep 14 09:24:57 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 14 Sep 2016 09:24:57 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473845097.434701.12147.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  9496cf577ec4543a6db67092e784c1096a6424fc (commit)
      from  f7358595369fe08c26c95d37394f16be503524cf (commit)


- Log -----------------------------------------------------------------
commit 9496cf577ec4543a6db67092e784c1096a6424fc
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 14:32:27 2016 +0100

    Add some sanity checks around usage of t_fromb64()
    
    The internal SRP function t_fromb64() converts from base64 to binary. It
    does not validate that the size of the destination is sufficiently large -
    that is up to the callers. In some places there was such a check, but not
    in others.
    
    Add an argument to t_fromb64() to provide the size of the destination
    buffer and validate that we don't write too much data. Also add some sanity
    checks to the callers where appropriate.
    
    With thanks to Shi Lei for reporting this issue.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 73f0df8331910d6726d45ecaab12bd93cc48b4e2)

-----------------------------------------------------------------------

Summary of changes:
 crypto/srp/srp_vfy.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 73ea4e6..188fad2 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -30,7 +30,7 @@ static char b64table[] =
 /*
  * Convert a base64 string into raw byte array representation.
  */
-static int t_fromb64(unsigned char *a, const char *src)
+static int t_fromb64(unsigned char *a, size_t alen, const char *src)
 {
     char *loc;
     int i, j;
@@ -39,6 +39,9 @@ static int t_fromb64(unsigned char *a, const char *src)
     while (*src && (*src == ' ' || *src == '\t' || *src == '\n'))
         ++src;
     size = strlen(src);
+    if (alen > INT_MAX || size > (int)alen)
+        return -1;
+
     i = 0;
     while (i < size) {
         loc = strchr(b64table, src[i]);
@@ -181,13 +184,25 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
     unsigned char tmp[MAX_LEN];
     int len;
 
-    if (strlen(s) > MAX_LEN || strlen(v) > MAX_LEN)
+    vinfo->v = NULL;
+    vinfo->s = NULL;
+
+    len = t_fromb64(tmp, sizeof(tmp), v);
+    if (len < 0)
         return 0;
-    len = t_fromb64(tmp, v);
     if (NULL == (vinfo->v = BN_bin2bn(tmp, len, NULL)))
         return 0;
-    len = t_fromb64(tmp, s);
-    return ((vinfo->s = BN_bin2bn(tmp, len, NULL)) != NULL);
+    len = t_fromb64(tmp, sizeof(tmp), s);
+    if (len < 0)
+        goto err;
+    vinfo->s = BN_bin2bn(tmp, len, NULL);
+    if (vinfo->s == NULL)
+        goto err;
+    return 1;
+ err:
+    BN_free(vinfo->v);
+    vinfo->v = NULL;
+    return 0;
 }
 
 static int SRP_user_pwd_set_sv_BN(SRP_user_pwd *vinfo, BIGNUM *s, BIGNUM *v)
@@ -257,10 +272,13 @@ static SRP_gN_cache *SRP_gN_new_init(const char *ch)
     if (newgN == NULL)
         return NULL;
 
+    len = t_fromb64(tmp, sizeof(tmp), ch);
+    if (len < 0)
+        goto err;
+
     if ((newgN->b64_bn = OPENSSL_strdup(ch)) == NULL)
         goto err;
 
-    len = t_fromb64(tmp, ch);
     if ((newgN->bn = BN_bin2bn(tmp, len, NULL)))
         return newgN;
 
@@ -539,11 +557,11 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
         goto err;
 
     if (N) {
-        if ((len = t_fromb64(tmp, N)) == 0)
+        if ((len = t_fromb64(tmp, sizeof(tmp), N)) <= 0)
             goto err;
         N_bn_alloc = BN_bin2bn(tmp, len, NULL);
         N_bn = N_bn_alloc;
-        if ((len = t_fromb64(tmp, g)) == 0)
+        if ((len = t_fromb64(tmp, sizeof(tmp) ,g)) <= 0)
             goto err;
         g_bn_alloc = BN_bin2bn(tmp, len, NULL);
         g_bn = g_bn_alloc;
@@ -563,7 +581,7 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
     } else {
-        if ((len = t_fromb64(tmp2, *salt)) == 0)
+        if ((len = t_fromb64(tmp2, sizeof(tmp2), *salt)) <= 0)
             goto err;
         s = BN_bin2bn(tmp2, len, NULL);
     }

From matt at openssl.org  Wed Sep 14 09:29:16 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 14 Sep 2016 09:29:16 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473845356.864074.14158.nullmailer@dev.openssl.org>

The branch master has been updated
       via  dd8710dc54f5123d0fa54b5c90fc2c3a9dae43fe (commit)
      from  73f0df8331910d6726d45ecaab12bd93cc48b4e2 (commit)


- Log -----------------------------------------------------------------
commit dd8710dc54f5123d0fa54b5c90fc2c3a9dae43fe
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 23:59:11 2016 +0100

    Fix OCSP_RESPID processing bug introduced by WPACKET changes
    
    An OCSP_RESPID in a status request extension has 2 bytes for the length
    not 1.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 696998f..4f5ea42 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1209,7 +1209,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             idlen = i2d_OCSP_RESPID(id, NULL);
             if (idlen <= 0
                        /* Sub-packet for an individual id */
-                    || !WPACKET_sub_allocate_bytes_u8(pkt, idlen, &idbytes)
+                    || !WPACKET_sub_allocate_bytes_u16(pkt, idlen, &idbytes)
                     || i2d_OCSP_RESPID(id, &idbytes) != idlen) {
                 SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
                 return 0;

From builds at travis-ci.org  Wed Sep 14 09:53:20 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 09:53:20 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5977 (master - 73f0df8)
In-Reply-To: <openssl/openssl+159823552+errored@travis-ci.org>
Message-ID: <57d91e0b865cd_33fab74c90568243496@60d36709-ccd8-4f2b-ad59-c9701137505c.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5977
Status: Errored

Duration: 29 minutes and 2 seconds
Commit: 73f0df8 (master)
Author: Matt Caswell
Message: Add some sanity checks around usage of t_fromb64()

The internal SRP function t_fromb64() converts from base64 to binary. It
does not validate that the size of the destination is sufficiently large -
that is up to the callers. In some places there was such a check, but not
in others.

Add an argument to t_fromb64() to provide the size of the destination
buffer and validate that we don't write too much data. Also add some sanity
checks to the callers where appropriate.

With thanks to Shi Lei for reporting this issue.

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/869d0a37cfa7...73f0df833191

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159823552

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/ad4bf0f7/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 14 10:17:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 10:17:41 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5979
	(OpenSSL_1_1_0-stable - 9496cf5)
In-Reply-To: <openssl/openssl+159823955+still failing@travis-ci.org>
Message-ID: <57d923c455e1a_33fab74e4aaac2762ae@60d36709-ccd8-4f2b-ad59-c9701137505c.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5979
Status: Still Failing

Duration: 27 minutes and 50 seconds
Commit: 9496cf5 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Add some sanity checks around usage of t_fromb64()

The internal SRP function t_fromb64() converts from base64 to binary. It
does not validate that the size of the destination is sufficiently large -
that is up to the callers. In some places there was such a check, but not
in others.

Add an argument to t_fromb64() to provide the size of the destination
buffer and validate that we don't write too much data. Also add some sanity
checks to the callers where appropriate.

With thanks to Shi Lei for reporting this issue.

Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 73f0df8331910d6726d45ecaab12bd93cc48b4e2)

View the changeset: https://github.com/openssl/openssl/compare/f7358595369f...9496cf577ec4

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159823955

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/81bf620a/attachment.html>

From builds at travis-ci.org  Wed Sep 14 10:32:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 10:32:41 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5980 (master -
	dd8710d)
In-Reply-To: <openssl/openssl+159824880+still failing@travis-ci.org>
Message-ID: <57d927455325f_33fc32a5d234846394f@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5980
Status: Still Failing

Duration: 27 minutes and 28 seconds
Commit: dd8710d (master)
Author: Matt Caswell
Message: Fix OCSP_RESPID processing bug introduced by WPACKET changes

An OCSP_RESPID in a status request extension has 2 bytes for the length
not 1.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/73f0df833191...dd8710dc54f5

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159824880

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/0910e2d4/attachment.html>

From rsalz at openssl.org  Wed Sep 14 13:00:06 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 13:00:06 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473858006.965594.9512.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7d959c358a09244bcaea601121b276529ff437ce (commit)
      from  dd8710dc54f5123d0fa54b5c90fc2c3a9dae43fe (commit)


- Log -----------------------------------------------------------------
commit 7d959c358a09244bcaea601121b276529ff437ce
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Sep 12 11:29:22 2016 -0400

    Add -h and -help for c_rehash script and app
    
    Resolves GH1515 and GH1509.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/rehash.c       | 1 +
 doc/apps/rehash.pod | 3 ++-
 tools/c_rehash.in   | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/rehash.c b/apps/rehash.c
index aacb169..4e10ded 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -403,6 +403,7 @@ OPTIONS rehash_options[] = {
     {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"},
     {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
     {"help", OPT_HELP, '-', "Display this summary"},
+    {"h", OPT_HELP, '-', "Display this summary"},
     {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"},
     {"old", OPT_OLD, '-', "Use old-style hash to generate links"},
     {"n", OPT_N, '-', "Do not remove existing links"},
diff --git a/doc/apps/rehash.pod b/doc/apps/rehash.pod
index 62e39cf..936fda6 100644
--- a/doc/apps/rehash.pod
+++ b/doc/apps/rehash.pod
@@ -11,6 +11,7 @@ c_rehash, rehash - Create symbolic links to files named by the hash values
 
 B<openssl>
 B<rehash>
+B<[-h]>
 B<[-help]>
 B<[-old]>
 B<[-n]>
@@ -82,7 +83,7 @@ optionally prefixed with some text and an equals sign.
 
 =over 4
 
-=item B<-help>
+=item B<-help> B<-h>
 
 Display a brief usage message.
 
diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 2fef627..e658222 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -30,7 +30,7 @@ while ( $ARGV[0] =~ /^-/ ) {
     if ( $flag eq '-old') {
 	    $x509hash = "-subject_hash_old";
 	    $crlhash = "-hash_old";
-    } elsif ( $flag eq '-h') {
+    } elsif ( $flag eq '-h' || $flag eq '-help' ) {
 	    help();
     } elsif ( $flag eq '-n' ) {
 	    $removelinks = 0;
@@ -38,15 +38,15 @@ while ( $ARGV[0] =~ /^-/ ) {
 	    $verbose++;
     }
     else {
-	    print STDERR "Usage error; try -help.\n";
+	    print STDERR "Usage error; try -h.\n";
 	    exit 1;
     }
 }
 
 sub help {
-	print "Usage: c_rehash [-old] [-h] [-v] [dirs...]\n";
+	print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
 	print "   -old use old-style digest\n";
-	print "   -h print this help text\n";
+	print "   -h or -help print this help text\n";
 	print "   -v print files removed and linked\n";
 	exit 0;
 }

From rsalz at openssl.org  Wed Sep 14 13:03:55 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 13:03:55 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473858235.954651.11744.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  1850451676d0f65ef59013750ae942a5d3e7751f (commit)
      from  9496cf577ec4543a6db67092e784c1096a6424fc (commit)


- Log -----------------------------------------------------------------
commit 1850451676d0f65ef59013750ae942a5d3e7751f
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Sep 12 11:29:22 2016 -0400

    Add -h and -help for c_rehash script and app
    
    Resolves GH1515 and GH1509.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 7d959c358a09244bcaea601121b276529ff437ce)

-----------------------------------------------------------------------

Summary of changes:
 apps/rehash.c       | 1 +
 doc/apps/rehash.pod | 3 ++-
 tools/c_rehash.in   | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/rehash.c b/apps/rehash.c
index aacb169..4e10ded 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -403,6 +403,7 @@ OPTIONS rehash_options[] = {
     {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"},
     {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
     {"help", OPT_HELP, '-', "Display this summary"},
+    {"h", OPT_HELP, '-', "Display this summary"},
     {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"},
     {"old", OPT_OLD, '-', "Use old-style hash to generate links"},
     {"n", OPT_N, '-', "Do not remove existing links"},
diff --git a/doc/apps/rehash.pod b/doc/apps/rehash.pod
index 62e39cf..936fda6 100644
--- a/doc/apps/rehash.pod
+++ b/doc/apps/rehash.pod
@@ -11,6 +11,7 @@ c_rehash, rehash - Create symbolic links to files named by the hash values
 
 B<openssl>
 B<rehash>
+B<[-h]>
 B<[-help]>
 B<[-old]>
 B<[-n]>
@@ -82,7 +83,7 @@ optionally prefixed with some text and an equals sign.
 
 =over 4
 
-=item B<-help>
+=item B<-help> B<-h>
 
 Display a brief usage message.
 
diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 2fef627..e658222 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -30,7 +30,7 @@ while ( $ARGV[0] =~ /^-/ ) {
     if ( $flag eq '-old') {
 	    $x509hash = "-subject_hash_old";
 	    $crlhash = "-hash_old";
-    } elsif ( $flag eq '-h') {
+    } elsif ( $flag eq '-h' || $flag eq '-help' ) {
 	    help();
     } elsif ( $flag eq '-n' ) {
 	    $removelinks = 0;
@@ -38,15 +38,15 @@ while ( $ARGV[0] =~ /^-/ ) {
 	    $verbose++;
     }
     else {
-	    print STDERR "Usage error; try -help.\n";
+	    print STDERR "Usage error; try -h.\n";
 	    exit 1;
     }
 }
 
 sub help {
-	print "Usage: c_rehash [-old] [-h] [-v] [dirs...]\n";
+	print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
 	print "   -old use old-style digest\n";
-	print "   -h print this help text\n";
+	print "   -h or -help print this help text\n";
 	print "   -v print files removed and linked\n";
 	exit 0;
 }

From builds at travis-ci.org  Wed Sep 14 13:26:05 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 13:26:05 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5983 (master -
	7d959c3)
In-Reply-To: <openssl/openssl+159867136+still failing@travis-ci.org>
Message-ID: <57d94fef1f882_33fb8a99a4ac4898b5@e6eec000-b33d-4148-aebf-bda5d34f8fa3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5983
Status: Still Failing

Duration: 25 minutes and 21 seconds
Commit: 7d959c3 (master)
Author: Rich Salz
Message: Add -h and -help for c_rehash script and app

Resolves GH1515 and GH1509.

Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/dd8710dc54f5...7d959c358a09

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159867136

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/d68ed181/attachment.html>

From builds at travis-ci.org  Wed Sep 14 13:41:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 13:41:18 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5984
	(OpenSSL_1_1_0-stable - 1850451)
In-Reply-To: <openssl/openssl+159867972+still failing@travis-ci.org>
Message-ID: <57d9537e1bf76_33fc325a7b9f85951f3@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5984
Status: Still Failing

Duration: 28 minutes and 34 seconds
Commit: 1850451 (OpenSSL_1_1_0-stable)
Author: Rich Salz
Message: Add -h and -help for c_rehash script and app

Resolves GH1515 and GH1509.

Reviewed-by: Matt Caswell <matt at openssl.org>
(cherry picked from commit 7d959c358a09244bcaea601121b276529ff437ce)

View the changeset: https://github.com/openssl/openssl/compare/9496cf577ec4...1850451676d0

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159867972

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/57850cee/attachment-0001.html>

From levitte at openssl.org  Wed Sep 14 16:02:38 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 14 Sep 2016 16:02:38 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473868958.535658.20771.nullmailer@dev.openssl.org>

The branch master has been updated
       via  307451469434f9aba7be5f02c1a147c8e98f32bb (commit)
       via  49681ae147d691d64d640f8308dcc8e69557699c (commit)
       via  2e04d6cc9d7976f476a18a1e002d07c31d67c15c (commit)
       via  4e57a12ba73fd96254ffde00066e212c3219583e (commit)
      from  7d959c358a09244bcaea601121b276529ff437ce (commit)


- Log -----------------------------------------------------------------
commit 307451469434f9aba7be5f02c1a147c8e98f32bb
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 05:06:56 2016 +0200

    Rather than one variable for each passwd type, use one enum variable
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 49681ae147d691d64d640f8308dcc8e69557699c
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 04:07:36 2016 +0200

    Test the new SHA256 and SHA512 based password generation options
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 2e04d6cc9d7976f476a18a1e002d07c31d67c15c
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 04:07:04 2016 +0200

    Document the new SHA256 and SHA512 password generation options
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4e57a12ba73fd96254ffde00066e212c3219583e
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 03:52:40 2016 +0200

    Add SHA256 and SHA512 based output for 'openssl passwd'
    
    RT#4674 issue 2
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                       |   5 +
 apps/passwd.c                 | 375 ++++++++++++++++++++++++++++++++++++++----
 doc/apps/passwd.pod           |   9 +
 test/recipes/20-test_passwd.t | 100 ++++++++++-
 4 files changed, 450 insertions(+), 39 deletions(-)

diff --git a/CHANGES b/CHANGES
index b233c23..38b025a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
   *)
 
+  *) 'openssl passwd' can now produce SHA256 and SHA512 based output,
+     using the algorithm defined in
+     https://www.akkadia.org/drepper/SHA-crypt.txt
+     [Richard Levitte]
+
  Changes between 1.0.2h and 1.1.0  [25 Aug 2016]
 
   *) Windows command-line tool supports UTF-8 opt-in option for arguments
diff --git a/apps/passwd.c b/apps/passwd.c
index a45245c..e4fb6d3 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -11,7 +11,11 @@
 # define NO_MD5CRYPT_1
 #endif
 
-#if !defined(OPENSSL_NO_DES) || !defined(NO_MD5CRYPT_1)
+#if defined OPENSSL_NO_SHA || defined CHARSET_EBCDIC
+# define NO_SHACRYPT
+#endif
+
+#if !defined(OPENSSL_NO_DES) || !defined(NO_MD5CRYPT_1) || !defined(NO_SHACRYPT)
 
 # include <string.h>
 
@@ -27,6 +31,9 @@
 # ifndef NO_MD5CRYPT_1
 #  include <openssl/md5.h>
 # endif
+# ifndef NO_SHACRYPT
+#  include <openssl/sha.h>
+# endif
 
 static unsigned const char cov_2char[64] = {
     /* from crypto/des/fcrypt.c */
@@ -40,16 +47,24 @@ static unsigned const char cov_2char[64] = {
     0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
 };
 
+typedef enum {
+    passwd_unset = 0,
+    passwd_crypt,
+    passwd_md5,
+    passwd_apr1,
+    passwd_sha256,
+    passwd_sha512
+} passwd_modes;
+
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
                      char *passwd, BIO *out, int quiet, int table,
-                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
-                     int useapr1);
+                     int reverse, size_t pw_maxlen, passwd_modes mode);
 
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_IN,
     OPT_NOVERIFY, OPT_QUIET, OPT_TABLE, OPT_REVERSE, OPT_APR1,
-    OPT_1, OPT_CRYPT, OPT_SALT, OPT_STDIN
+    OPT_1, OPT_5, OPT_6, OPT_CRYPT, OPT_SALT, OPT_STDIN
 } OPTION_CHOICE;
 
 OPTIONS passwd_options[] = {
@@ -62,6 +77,10 @@ OPTIONS passwd_options[] = {
     {"reverse", OPT_REVERSE, '-', "Switch table columns"},
     {"salt", OPT_SALT, 's', "Use provided salt"},
     {"stdin", OPT_STDIN, '-', "Read passwords from stdin"},
+# ifndef NO_SHACRYPT
+    {"6", OPT_6, '-', "SHA512-based password algorithm"},
+    {"5", OPT_5, '-', "SHA256-based password algorithm"},
+# endif
 # ifndef NO_MD5CRYPT_1
     {"apr1", OPT_APR1, '-', "MD5-based password algorithm, Apache variant"},
     {"1", OPT_1, '-', "MD5-based password algorithm"},
@@ -83,8 +102,11 @@ int passwd_main(int argc, char **argv)
     int in_noverify = 0;
 #endif
     int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
-    int ret = 1, usecrypt = 0, use1 = 0, useapr1 = 0;
-    size_t passwd_malloc_size = 0, pw_maxlen = 256;
+    int ret = 1;
+    passwd_modes mode = passwd_unset;
+    size_t passwd_malloc_size = 0;
+    size_t pw_maxlen = 256; /* arbitrary limit, should be enough for most
+                             * passwords */
 
     prog = opt_init(argc, argv, passwd_options);
     while ((o = opt_next()) != OPT_EOF) {
@@ -119,13 +141,29 @@ int passwd_main(int argc, char **argv)
             reverse = 1;
             break;
         case OPT_1:
-            use1 = 1;
+            if (mode != passwd_unset)
+                goto opthelp;
+            mode = passwd_md5;
+            break;
+        case OPT_5:
+            if (mode != passwd_unset)
+                goto opthelp;
+            mode = passwd_sha256;
+            break;
+        case OPT_6:
+            if (mode != passwd_unset)
+                goto opthelp;
+            mode = passwd_sha512;
             break;
         case OPT_APR1:
-            useapr1 = 1;
+            if (mode != passwd_unset)
+                goto opthelp;
+            mode = passwd_apr1;
             break;
         case OPT_CRYPT:
-            usecrypt = 1;
+            if (mode != passwd_unset)
+                goto opthelp;
+            mode = passwd_crypt;
             break;
         case OPT_SALT:
             passed_salt = 1;
@@ -149,21 +187,21 @@ int passwd_main(int argc, char **argv)
         passwds = argv;
     }
 
-    if (!usecrypt && !use1 && !useapr1) {
+    if (mode == passwd_unset) {
         /* use default */
-        usecrypt = 1;
-    }
-    if (usecrypt + use1 + useapr1 > 1) {
-        /* conflict */
-        goto opthelp;
+        mode = passwd_crypt;
     }
 
 # ifdef OPENSSL_NO_DES
-    if (usecrypt)
+    if (mode == passwd_crypt)
         goto opthelp;
 # endif
 # ifdef NO_MD5CRYPT_1
-    if (use1 || useapr1)
+    if (mode == passwd_md5 || mode == passwd_apr1)
+        goto opthelp;
+# endif
+# ifdef NO_SHACRYPT
+    if (mode == passwd_sha256 || mode == passwd_sha512)
         goto opthelp;
 # endif
 
@@ -182,11 +220,8 @@ int passwd_main(int argc, char **argv)
             goto end;
     }
 
-    if (usecrypt)
+    if (mode == passwd_crypt)
         pw_maxlen = 8;
-    else if (use1 || useapr1)
-        pw_maxlen = 256;        /* arbitrary limit, should be enough for most
-                                 * passwords */
 
     if (passwds == NULL) {
         /* no passwords on the command line */
@@ -225,8 +260,7 @@ int passwd_main(int argc, char **argv)
         do {                    /* loop over list of passwords */
             passwd = *passwds++;
             if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out,
-                           quiet, table, reverse, pw_maxlen, usecrypt, use1,
-                           useapr1))
+                           quiet, table, reverse, pw_maxlen, mode))
                 goto end;
         }
         while (*passwds != NULL);
@@ -252,7 +286,7 @@ int passwd_main(int argc, char **argv)
 
                 if (!do_passwd
                     (passed_salt, &salt, &salt_malloc, passwd, bio_out, quiet,
-                     table, reverse, pw_maxlen, usecrypt, use1, useapr1))
+                     table, reverse, pw_maxlen, mode))
                     goto end;
             }
             done = (r <= 0);
@@ -419,10 +453,269 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 }
 # endif
 
+# ifndef NO_SHACRYPT
+/*
+ * SHA based password algorithm, describe by Ulrich Drepper here:
+ * https://www.akkadia.org/drepper/SHA-crypt.txt
+ * (note that it's in the public domain)
+ */
+static char *shacrypt(const char *passwd, const char *magic, const char *salt)
+{
+    /* Prefix for optional rounds specification.  */
+    static const char rounds_prefix[] = "rounds=";
+    /* Maximum salt string length.  */
+#define SALT_LEN_MAX 16
+    /* Default number of rounds if not explicitly specified.  */
+#define ROUNDS_DEFAULT 5000
+    /* Minimum number of rounds.  */
+#define ROUNDS_MIN 1000
+    /* Maximum number of rounds.  */
+#define ROUNDS_MAX 999999999
+
+    /* "$6$rounds=<N>$......salt......$...shahash(up to 86 chars)...\0" */
+    static char out_buf[3 + 17 + 17 + 86 + 1];
+    unsigned char buf[SHA512_DIGEST_LENGTH];
+    unsigned char temp_buf[SHA512_DIGEST_LENGTH];
+    size_t buf_size = 0;
+    char salt_copy[17];          /* Max 16 chars plus '\0' */
+    size_t n;
+    EVP_MD_CTX *md = NULL, *md2 = NULL;
+    const EVP_MD *sha = NULL;
+    size_t passwd_len, salt_len, magic_len;
+    size_t rounds = 5000;        /* Default */
+    char rounds_custom = 0;
+    char *p_bytes = NULL;
+    char *s_bytes = NULL;
+    char *cp = NULL;
+
+    passwd_len = strlen(passwd);
+    magic_len = strlen(magic);
+
+    /* assert it's "5" or "6" */
+    if (magic_len != 1)
+        return NULL;
+
+    switch (magic[0]) {
+    case '5':
+        sha = EVP_sha256();
+        buf_size = 32;
+        break;
+    case '6':
+        sha = EVP_sha512();
+        buf_size = 64;
+        break;
+    default:
+        return NULL;
+    }
+
+    if (strncmp(salt, rounds_prefix, sizeof(rounds_prefix) - 1) == 0) {
+        const char *num = salt + sizeof(rounds_prefix) - 1;
+        char *endp;
+        unsigned long int srounds = strtoul (num, &endp, 10);
+        if (*endp == '$') {
+            salt = endp + 1;
+            if (srounds > ROUNDS_MAX)
+                rounds = ROUNDS_MAX;
+            else if (srounds < ROUNDS_MIN)
+                rounds = ROUNDS_MIN;
+            else
+                rounds = srounds;
+            rounds_custom = 1;
+        } else {
+            return NULL;
+        }
+    }
+
+    /* The salt gets truncated to 16 chars */
+    OPENSSL_strlcpy(salt_copy, salt, sizeof salt_copy);
+    salt_len = strlen(salt_copy);
+
+    out_buf[0] = 0;
+    OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
+    OPENSSL_strlcat(out_buf, magic, sizeof out_buf);
+    OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
+    if (rounds_custom) {
+        char tmp_buf[7 + 9 + 1]; /* "rounds=999999999" */
+        sprintf(tmp_buf, "rounds=%lu", rounds);
+        OPENSSL_strlcat(out_buf, tmp_buf, sizeof out_buf);
+        OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
+    }
+    OPENSSL_strlcat(out_buf, salt_copy, sizeof out_buf);
+
+    /* assert "$5$rounds=999999999$......salt......" */
+    if (strlen(out_buf) > 3 + 17 * rounds_custom + salt_len )
+        return NULL;
+
+    md = EVP_MD_CTX_new();
+    if (md == NULL
+        || !EVP_DigestInit_ex(md, sha, NULL)
+        || !EVP_DigestUpdate(md, passwd, passwd_len)
+        || !EVP_DigestUpdate(md, salt_copy, salt_len))
+        goto err;
+
+    md2 = EVP_MD_CTX_new();
+    if (md2 == NULL
+        || !EVP_DigestInit_ex(md2, sha, NULL)
+        || !EVP_DigestUpdate(md2, passwd, passwd_len)
+        || !EVP_DigestUpdate(md2, salt_copy, salt_len)
+        || !EVP_DigestUpdate(md2, passwd, passwd_len)
+        || !EVP_DigestFinal_ex(md2, buf, NULL))
+        goto err;
+
+    for (n = passwd_len; n > buf_size; n -= buf_size) {
+        if (!EVP_DigestUpdate(md, buf, buf_size))
+            goto err;
+    }
+    if (!EVP_DigestUpdate(md, buf, n))
+        goto err;
+
+    n = passwd_len;
+    while (n) {
+        if (!EVP_DigestUpdate(md,
+                              (n & 1) ? buf : (unsigned const char *)passwd,
+                              (n & 1) ? buf_size : passwd_len))
+            goto err;
+        n >>= 1;
+    }
+    if (!EVP_DigestFinal_ex(md, buf, NULL))
+        return NULL;
+
+    /* P sequence */
+    if (!EVP_DigestInit_ex(md2, sha, NULL))
+        goto err;
+
+    for (n = passwd_len; n > 0; n--)
+        if (!EVP_DigestUpdate(md2, passwd, passwd_len))
+            goto err;
+
+    if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
+        return NULL;
+
+    if ((p_bytes = OPENSSL_zalloc(passwd_len)) == NULL)
+        goto err;
+    for (cp = p_bytes, n = passwd_len; n > buf_size; n -= buf_size, cp += buf_size)
+        memcpy(cp, temp_buf, buf_size);
+    memcpy(cp, temp_buf, n);
+
+    /* S sequence */
+    if (!EVP_DigestInit_ex(md2, sha, NULL))
+        goto err;
+
+    for (n = 16 + buf[0]; n > 0; n--)
+        if (!EVP_DigestUpdate(md2, salt, salt_len))
+            goto err;
+
+    if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
+        return NULL;
+
+    if ((s_bytes = OPENSSL_zalloc(salt_len)) == NULL)
+        goto err;
+    for (cp = s_bytes, n = salt_len; n > buf_size; n -= buf_size, cp += buf_size)
+        memcpy(cp, temp_buf, buf_size);
+    memcpy(cp, temp_buf, n);
+
+    for (n = 0; n < rounds; n++) {
+        if (!EVP_DigestInit_ex(md2, sha, NULL))
+            goto err;
+        if (!EVP_DigestUpdate(md2,
+                              (n & 1) ? (unsigned const char *)p_bytes : buf,
+                              (n & 1) ? passwd_len : buf_size))
+            goto err;
+        if (n % 3) {
+            if (!EVP_DigestUpdate(md2, s_bytes, salt_len))
+                goto err;
+        }
+        if (n % 7) {
+            if (!EVP_DigestUpdate(md2, p_bytes, passwd_len))
+                goto err;
+        }
+        if (!EVP_DigestUpdate(md2,
+                              (n & 1) ? buf : (unsigned const char *)p_bytes,
+                              (n & 1) ? buf_size : passwd_len))
+                goto err;
+        if (!EVP_DigestFinal_ex(md2, buf, NULL))
+                goto err;
+    }
+    EVP_MD_CTX_free(md2);
+    EVP_MD_CTX_free(md);
+    md2 = NULL;
+    md = NULL;
+    OPENSSL_free(p_bytes);
+    OPENSSL_free(s_bytes);
+    p_bytes = NULL;
+    s_bytes = NULL;
+
+    cp = out_buf + strlen(out_buf);
+    *cp++ = '$';
+
+#define b64_from_24bit(B2, B1, B0, N)                                   \
+    do {                                                                \
+        unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0);             \
+        int i = (N);                                                    \
+        while (i-- > 0)                                                 \
+            {                                                           \
+                *cp++ = cov_2char[w & 0x3f];                            \
+                w >>= 6;                                                \
+            }                                                           \
+    } while (0)
+
+    switch (*magic) {
+    case '5':
+        b64_from_24bit (buf[0], buf[10], buf[20], 4);
+        b64_from_24bit (buf[21], buf[1], buf[11], 4);
+        b64_from_24bit (buf[12], buf[22], buf[2], 4);
+        b64_from_24bit (buf[3], buf[13], buf[23], 4);
+        b64_from_24bit (buf[24], buf[4], buf[14], 4);
+        b64_from_24bit (buf[15], buf[25], buf[5], 4);
+        b64_from_24bit (buf[6], buf[16], buf[26], 4);
+        b64_from_24bit (buf[27], buf[7], buf[17], 4);
+        b64_from_24bit (buf[18], buf[28], buf[8], 4);
+        b64_from_24bit (buf[9], buf[19], buf[29], 4);
+        b64_from_24bit (0, buf[31], buf[30], 3);
+        break;
+    case '6':
+        b64_from_24bit (buf[0], buf[21], buf[42], 4);
+        b64_from_24bit (buf[22], buf[43], buf[1], 4);
+        b64_from_24bit (buf[44], buf[2], buf[23], 4);
+        b64_from_24bit (buf[3], buf[24], buf[45], 4);
+        b64_from_24bit (buf[25], buf[46], buf[4], 4);
+        b64_from_24bit (buf[47], buf[5], buf[26], 4);
+        b64_from_24bit (buf[6], buf[27], buf[48], 4);
+        b64_from_24bit (buf[28], buf[49], buf[7], 4);
+        b64_from_24bit (buf[50], buf[8], buf[29], 4);
+        b64_from_24bit (buf[9], buf[30], buf[51], 4);
+        b64_from_24bit (buf[31], buf[52], buf[10], 4);
+        b64_from_24bit (buf[53], buf[11], buf[32], 4);
+        b64_from_24bit (buf[12], buf[33], buf[54], 4);
+        b64_from_24bit (buf[34], buf[55], buf[13], 4);
+        b64_from_24bit (buf[56], buf[14], buf[35], 4);
+        b64_from_24bit (buf[15], buf[36], buf[57], 4);
+        b64_from_24bit (buf[37], buf[58], buf[16], 4);
+        b64_from_24bit (buf[59], buf[17], buf[38], 4);
+        b64_from_24bit (buf[18], buf[39], buf[60], 4);
+        b64_from_24bit (buf[40], buf[61], buf[19], 4);
+        b64_from_24bit (buf[62], buf[20], buf[41], 4);
+        b64_from_24bit (0, 0, buf[63], 2);
+        break;
+    default:
+        goto err;
+    }
+    *cp = '\0';
+
+    return out_buf;
+
+ err:
+    EVP_MD_CTX_free(md2);
+    EVP_MD_CTX_free(md);
+    OPENSSL_free(p_bytes);
+    OPENSSL_free(s_bytes);
+    return NULL;
+}
+# endif
+
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
                      char *passwd, BIO *out, int quiet, int table,
-                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
-                     int useapr1)
+                     int reverse, size_t pw_maxlen, passwd_modes mode)
 {
     char *hash = NULL;
 
@@ -432,7 +725,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     /* first make sure we have a salt */
     if (!passed_salt) {
 # ifndef OPENSSL_NO_DES
-        if (usecrypt) {
+        if (mode == passwd_crypt) {
             if (*salt_malloc_p == NULL) {
                 *salt_p = *salt_malloc_p = app_malloc(3, "salt buffer");
             }
@@ -449,7 +742,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 # endif                         /* !OPENSSL_NO_DES */
 
 # ifndef NO_MD5CRYPT_1
-        if (use1 || useapr1) {
+        if (mode == passwd_md5 || mode == passwd_apr1) {
             int i;
 
             if (*salt_malloc_p == NULL) {
@@ -463,6 +756,22 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
             (*salt_p)[8] = 0;
         }
 # endif                         /* !NO_MD5CRYPT_1 */
+
+# ifndef NO_SHACRYPT
+        if (mode == passwd_sha256 || mode == passwd_sha512) {
+            int i;
+
+            if (*salt_malloc_p == NULL) {
+                *salt_p = *salt_malloc_p = app_malloc(17, "salt buffer");
+            }
+            if (RAND_bytes((unsigned char *)*salt_p, 16) <= 0)
+                goto end;
+
+            for (i = 0; i < 16; i++)
+                (*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
+            (*salt_p)[16] = 0;
+        }
+# endif                         /* !NO_SHACRYPT */
     }
 
     assert(*salt_p != NULL);
@@ -482,12 +791,16 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 
     /* now compute password hash */
 # ifndef OPENSSL_NO_DES
-    if (usecrypt)
+    if (mode == passwd_crypt)
         hash = DES_crypt(passwd, *salt_p);
 # endif
 # ifndef NO_MD5CRYPT_1
-    if (use1 || useapr1)
-        hash = md5crypt(passwd, (use1 ? "1" : "apr1"), *salt_p);
+    if (mode == passwd_md5 || mode == passwd_apr1)
+        hash = md5crypt(passwd, (mode == passwd_md5 ? "1" : "apr1"), *salt_p);
+# endif
+# ifndef NO_SHACRYPT
+    if (mode == passwd_sha256 || mode == passwd_sha512)
+        hash = shacrypt(passwd, (mode == passwd_sha256 ? "5" : "6"), *salt_p);
 # endif
     assert(hash != NULL);
 
diff --git a/doc/apps/passwd.pod b/doc/apps/passwd.pod
index 87dd8d8..fa11f63 100644
--- a/doc/apps/passwd.pod
+++ b/doc/apps/passwd.pod
@@ -11,6 +11,8 @@ B<openssl passwd>
 [B<-crypt>]
 [B<-1>]
 [B<-apr1>]
+[B<-5>]
+[B<-6>]
 [B<-salt> I<string>]
 [B<-in> I<file>]
 [B<-stdin>]
@@ -48,6 +50,13 @@ Use the MD5 based BSD password algorithm B<1>.
 
 Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
 
+=item B<-5>
+
+=item B<-6>
+
+Use the B<SHA256> / B<SHA512> based algorithms defined by Ulrich Drepper.
+See L<https://www.akkadia.org/drepper/SHA-crypt.txt>.
+
 =item B<-salt> I<string>
 
 Use the specified salt.
diff --git a/test/recipes/20-test_passwd.t b/test/recipes/20-test_passwd.t
index 68169ac..f6bcef8 100644
--- a/test/recipes/20-test_passwd.t
+++ b/test/recipes/20-test_passwd.t
@@ -14,25 +14,109 @@ use OpenSSL::Test;
 
 setup("test_passwd");
 
-plan tests => 6;
+# The following tests are an adaptation of those in
+# https://www.akkadia.org/drepper/SHA-crypt.txt
+my @sha_tests =
+    ({ type => '5',
+       salt => 'saltstring',
+       key => 'Hello world!',
+       expected => '$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5' },
+     { type => '5',
+       salt => 'rounds=10000$saltstringsaltstring',
+       key => 'Hello world!',
+       expected => '$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA' },
+     { type => '5',
+       salt => 'rounds=5000$toolongsaltstring',
+       key => 'This is just a test',
+       expected => '$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5' },
+     { type => '5',
+       salt => 'rounds=1400$anotherlongsaltstring',
+       key => 'a very much longer text to encrypt.  This one even stretches over morethan one line.',
+       expected => '$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1' },
+     { type => '5',
+       salt => 'rounds=77777$short',
+       key => 'we have a short salt string but not a short password',
+       expected => '$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/' },
+     { type => '5',
+       salt => 'rounds=123456$asaltof16chars..',
+       key => 'a short string',
+       expected => '$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD' },
+     { type => '5',
+       salt => 'rounds=10$roundstoolow',
+       key => 'the minimum number is still observed',
+       expected => '$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC' },
+     { type => '6',
+       salt => 'saltstring',
+       key => 'Hello world!',
+       expected => '$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1' },
+     { type => '6',
+       salt => 'rounds=10000$saltstringsaltstring',
+       key => 'Hello world!',
+       expected => '$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.' },
+     { type => '6',
+       salt => 'rounds=5000$toolongsaltstring',
+       key => 'This is just a test',
+       expected => '$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0' },
+     { type => '6',
+       salt => 'rounds=1400$anotherlongsaltstring',
+       key => 'a very much longer text to encrypt.  This one even stretches over morethan one line.',
+       expected => '$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1' },
+     { type => '6',
+       salt => 'rounds=77777$short',
+       key => 'we have a short salt string but not a short password',
+       expected => '$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0' },
+     { type => '6',
+       salt => 'rounds=123456$asaltof16chars..',
+       key => 'a short string',
+       expected => '$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1' },
+     { type => '6',
+       salt => 'rounds=10$roundstoolow',
+       key => 'the minimum number is still observed',
+       expected => '$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.' }
+    );
 
-ok(compare1stline([qw{openssl passwd password}], '^.{13}\R$'),
+plan tests => 10 + scalar @sha_tests;
+
+
+ok(compare1stline_re([qw{openssl passwd password}], '^.{13}\R$'),
    'crypt password with random salt');
-ok(compare1stline([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'),
+ok(compare1stline_re([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'),
    'BSD style MD5 password with random salt');
-ok(compare1stline([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'),
+ok(compare1stline_re([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'),
    'Apache style MD5 password with random salt');
-ok(compare1stline([qw{openssl passwd -salt xx password}], '^xxj31ZMTZzkVA\R$'),
+ok(compare1stline_re([qw{openssl passwd -5 password}], '^\$5\$.{16}\$.{43}\R$'),
+   'SHA256 password with random salt');
+ok(compare1stline_re([qw{openssl passwd -6 password}], '^\$6\$.{16}\$.{86}\R$'),
+   'Apache SHA512 password with random salt');
+
+ok(compare1stline([qw{openssl passwd -salt xx password}], 'xxj31ZMTZzkVA'),
    'crypt password with salt xx');
-ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -1 password}], '^\$1\$xxxxxxxx\$UYCIxa628\.9qXjpQCjM4a\.\R$'),
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -1 password}], '$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.'),
    'BSD style MD5 password with salt xxxxxxxx');
-ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '^\$apr1\$xxxxxxxx\$dxHfLAsjHkDRmG83UXe8K0\R$'),
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0'),
    'Apache style MD5 password with salt xxxxxxxx');
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxxxxxxxxxx -5 password}], '$5$xxxxxxxxxxxxxxxx$fHytsM.wVD..zPN/h3i40WJRggt/1f73XkAC/gkelkB'),
+   'SHA256 password with salt xxxxxxxxxxxxxxxx');
+ok(compare1stline([qw{openssl passwd -salt xxxxxxxxxxxxxxxx -6 password}], '$6$xxxxxxxxxxxxxxxx$VjGUrXBG6/8yW0f6ikBJVOb/lK/Tm9LxHJmFfwMvT7cpk64N9BW7ZQhNeMXAYFbOJ6HDG7wb0QpxJyYQn0rh81'),
+   'SHA512 password with salt xxxxxxxxxxxxxxxx');
 
+foreach (@sha_tests) {
+    ok(compare1stline([qw{openssl passwd}, '-'.$_->{type}, '-salt', $_->{salt},
+                       $_->{key}], $_->{expected}),
+       { 5 => 'SHA256', 6 => 'SHA512' }->{$_->{type}} . ' password with salt ' . $_->{salt});
+}
 
-sub compare1stline {
+
+sub compare1stline_re {
     my ($cmdarray, $regexp) = @_;
     my @lines = run(app($cmdarray), capture => 1);
 
     return $lines[0] =~ m|$regexp|;
 }
+
+sub compare1stline {
+    my ($cmdarray, $str) = @_;
+    my @lines = run(app($cmdarray), capture => 1);
+
+    return $lines[0] =~ m|^\Q${str}\E\R$|;
+}

From levitte at openssl.org  Wed Sep 14 16:07:46 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 14 Sep 2016 16:07:46 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473869266.823946.23600.nullmailer@dev.openssl.org>

The branch master has been updated
       via  554b4019f55d1698363dea8de79655712688f849 (commit)
      from  307451469434f9aba7be5f02c1a147c8e98f32bb (commit)


- Log -----------------------------------------------------------------
commit 554b4019f55d1698363dea8de79655712688f849
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 17:49:21 2016 +0200

    VMS: Really don't force symbol mixed case when building DSOs
    
    This is an amendment to the september 8 commit titled "VMS: Don't
    force symbol mixed case when building DSOs"
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 7cb4451..846a6c8 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1767,7 +1767,6 @@ sub vms_info {
                                    debug   => "/DEBUG/TRACEBACK",
                                    release => "/NODEBUG/NOTRACEBACK"),
         lib_cflags       => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"),
-        dso_cflags       => add("/NAMES=(AS_IS,SHORTENED)"),
         # no_inst_bin_cflags is used instead of bin_cflags by descrip.mms.tmpl
         # for object files belonging to selected internal programs
         no_inst_bin_cflags => "/NAMES=(AS_IS,SHORTENED)",

From builds at travis-ci.org  Wed Sep 14 16:39:26 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 16:39:26 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5986 (master - 3074514)
In-Reply-To: <openssl/openssl+159919998+errored@travis-ci.org>
Message-ID: <57d97d3e4992_33fb8a99a52083746fe@e6eec000-b33d-4148-aebf-bda5d34f8fa3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5986
Status: Errored

Duration: 35 minutes and 2 seconds
Commit: 3074514 (master)
Author: Richard Levitte
Message: Rather than one variable for each passwd type, use one enum variable

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/7d959c358a09...307451469434

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159919998

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/475a3e7c/attachment.html>

From builds at travis-ci.org  Wed Sep 14 17:15:33 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 17:15:33 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5987 (master -
	554b401)
In-Reply-To: <openssl/openssl+159921620+still failing@travis-ci.org>
Message-ID: <57d985b52598f_33fc326697ad4821162@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5987
Status: Still Failing

Duration: 52 minutes and 43 seconds
Commit: 554b401 (master)
Author: Richard Levitte
Message: VMS: Really don't force symbol mixed case when building DSOs

This is an amendment to the september 8 commit titled "VMS: Don't
force symbol mixed case when building DSOs"

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/307451469434...554b4019f55d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/159921620

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/43cb7c8e/attachment.html>

From builds at travis-ci.org  Wed Sep 14 18:36:00 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 14 Sep 2016 18:36:00 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1937 (master -
	6c5cccf)
In-Reply-To: <FdaSilvaYY/openssl+159943472+still failing@travis-ci.org>
Message-ID: <57d9988fdd777_33fc325a905d8893582@75521c1e-754d-4a4a-a3e8-e488414321df.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1937
Status: Still Failing

Duration: 14 minutes and 13 seconds
Commit: 6c5cccf (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/08b050c957a9...6c5cccf143ec

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/159943472

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160914/4a1c8986/attachment-0001.html>

From rsalz at openssl.org  Wed Sep 14 21:59:35 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 21:59:35 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473890375.177559.3531.nullmailer@dev.openssl.org>

The branch master has been updated
       via  1520c8a1ce226c44e9e744219bcfa0f85eb26221 (commit)
      from  5587c46721853723471058cb8bb13e287b3f83e0 (commit)


- Log -----------------------------------------------------------------
commit 1520c8a1ce226c44e9e744219bcfa0f85eb26221
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Sep 14 17:59:07 2016 -0400

    Remove ftp references (except for snapshots)

-----------------------------------------------------------------------

Summary of changes:
 docs/faq.txt           |  2 +-
 source/index.html      | 11 +++++------
 source/snapshot/README |  2 ++
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 source/snapshot/README

diff --git a/docs/faq.txt b/docs/faq.txt
index 8bbabcb..0af0e9c 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -89,7 +89,7 @@ The current version is available from <URL: https://www.openssl.org>.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
-ftp://ftp.openssl.org/snapshot/>, or get it by anonymous Git access.
+https://www.openssl.org/source/snapshot/>, or get it by anonymous Git access.
 
 
 * Where is the documentation?
diff --git a/source/index.html b/source/index.html
index c88e451..6fbdadc 100644
--- a/source/index.html
+++ b/source/index.html
@@ -23,9 +23,7 @@
 	    <p>The table below lists the latest releases for every branch.
             (For an explanation of the numbering, see our
             <a href="/policies/releasestrat.html">release strategy</a>.)
-	    The most recent previous releases can be found at
-	    <a href="ftp://ftp.openssl.org/source/">ftp://ftp.openssl.org/source/</a>
-	    and all releases can be found at
+	    All releases can be found at
 	    <a href="old">/source/old</a>.
 	    A list of mirror sites can be found <a href="mirror.html">here</a>.
 	    </p>
@@ -57,9 +55,10 @@
 	    Each day we make a snapshot of each development branch.
 	    They can be found at
 	    <a href="ftp://ftp.openssl.org/snapshot/">ftp://ftp.openssl.org/snapshot/</a>.
-	    These snapshots are provided for convenience only. When you really
-	    want to keep yourself up-to-date please clone the git repository
-	    instead.</p>
+	    These snapshots are provided for convenience only. Note that
+            keeping a local repository and updating it every 24 hours is
+            equivalent and will often be faster and more efficient.
+	    </p>
 
 	  <!--#include virtual="/inc/legalities.shtml" -->
 	  </div>
diff --git a/source/snapshot/README b/source/snapshot/README
new file mode 100644
index 0000000..205365e
--- /dev/null
+++ b/source/snapshot/README
@@ -0,0 +1,2 @@
+These are daily snapshots of the source tree. They are provided
+for convenience only and not evewn guaranteed to compile.

From rsalz at openssl.org  Wed Sep 14 22:22:45 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 22:22:45 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473891765.215004.13895.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c7af65c7b28db13d39bb24f44730bf0293355e94 (commit)
      from  554b4019f55d1698363dea8de79655712688f849 (commit)


- Log -----------------------------------------------------------------
commit c7af65c7b28db13d39bb24f44730bf0293355e94
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 9 18:05:41 2016 -0400

    GH1536: Install empty CT log list
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      |  6 +++++
 Configurations/unix-Makefile.tmpl    | 11 ++++++++-
 Configurations/windows-makefile.tmpl |  5 +++++
 apps/ct_log_list.cnf                 | 43 ++++++++----------------------------
 4 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 108ab5d..cac804a 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -383,6 +383,12 @@ install_ssldirs : check_INSTALLTOP
         IF F$SEARCH("OSSL_DATAROOT:[000000]openssl.cnf") .EQS. "" THEN -
                 COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} -
                         ossl_dataroot:[000000]openssl.cnf
+        @ ! Install CTLOG configuration file
+        COPY/PROT=W:R {- sourcefile("apps", "ct_log_list.cnf") -} -
+                ossl_dataroot:[000000]ct_log_list.cnf-dist
+        IF F$SEARCH("OSSL_DATAROOT:[000000]ct_log_list.cnf") .EQS. "" THEN -
+                COPY/PROT=W:R {- sourcefile("apps", "ct_log_list.cnf") -} -
+                        ossl_dataroot:[000000]ct_log_list.cnf
 
 install_shared : check_INSTALLTOP
         @ {- output_off() if $disabled{shared}; "" -} !
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index f5a0274..a4c30e7 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -350,11 +350,20 @@ install_ssldirs:
 	@cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
 	@chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
 	@mv -f  $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist
-	@if ! [ -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
+	@if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
 		echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
 		cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
 		chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
 	fi
+	@echo "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
+	@cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
+	@chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
+	@mv -f  $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist
+	@if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf" ]; then \
+		echo "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
+		cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
+		chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
+	fi
 
 install_dev:
 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index cbb9116..3a6426f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -263,6 +263,11 @@ install_ssldirs:
                                         "$(OPENSSLDIR)\openssl.cnf"
 	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \
                                         "$(OPENSSLDIR)\misc"
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\ct_log_list.cnf" \
+                                        "$(OPENSSLDIR)\ct_log_list.cnf.dist"
+	@IF NOT EXIST "$(OPENSSLDIR)\ct_log_list.cnf" \
+         "$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\ct_log_list.cnf" \
+                                        "$(OPENSSLDIR)\ct_log_list.cnf"
 
 install_dev:
 	@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
diff --git a/apps/ct_log_list.cnf b/apps/ct_log_list.cnf
index 2434874..650aa22 100644
--- a/apps/ct_log_list.cnf
+++ b/apps/ct_log_list.cnf
@@ -1,34 +1,9 @@
-enabled_logs=pilot,aviator,rocketeer,digicert,certly,izempe,symantec,venafi
-
-[pilot]
-description = Google Pilot Log
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTDM0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==
-
-[aviator]
-description = Google Aviator log
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1/TMabLkDpCjiupacAlP7xNi0I1JYP8bQFAHDG1xhtolSY1l4QgNRzRrvSe8liE+NPWHdjGxfx3JhTsN9x8/6Q==
-
-[rocketeer]
-description = Google Rocketeer log
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIFsYyDzBi7MxCAC/oJBXK7dHjG+1aLCOkHjpoHPqTyghLpzA9BYbqvnV16mAw04vUjyYASVGJCUoI3ctBcJAeg==
-
-[digicert]
-description = DigiCert Log Server
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAkbFvhu7gkAW6MHSrBlpE1n4+HCFRkC5OLAjgqhkTH+/uzSfSl8ois8ZxAD2NgaTZe1M9akhYlrYkes4JECs6A==
-
-[certly]
-description = Certly.IO log
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECyPLhWKYYUgEc+tUXfPQB4wtGS2MNvXrjwFCCnyYJifBtd2Sk7Cu+Js9DNhMTh35FftHaHu6ZrclnNBKwmbbSA==
-
-[izempe]
-description = Izempe log
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJ2Q5DC3cUBj4IQCiDu0s6j51up+TZAkAEcQRF6tczw90rLWXkJMAW7jr9yc92bIKgV8vDXU4lDeZHvYHduDuvg==
-
-[symantec]
-description = Symantec log
-key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEluqsHEYMG1XcDfy1lCdGV0JwOmkY4r87xNuroPS2bMBTP01CEDPwWJePa75y9CrsHEKqAy8afig1dpkIPSEUhg==
-
-[venafi]
-description = Venafi log
-key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolpIHxdSlTXLo1s6H1OCdpSj/4DyHDc8wLG9wVmLqy1lk9fz4ATVmm+/1iN2Nk8jmctUKK2MFUtlWXZBSpym97M7frGlSaQXUWyA3CqQUEuIJOmlEjKTBEiQAvpfDjCHjlV2Be4qTM6jamkJbiWtgnYPhJL6ONaGTiSPm7Byy57iaz/hbckldSOIoRhYBiMzeNoA0DiRZ9KmfSeXZ1rB8y8X5urSW+iBzf2SaOfzBvDpcoTuAaWx2DPazoOl28fP1hZ+kHUYvxbcMjttjauCFx+JII0dmuZNIwjfeG/GBb9frpSX219k1O4Wi6OEbHEr8at/XQ0y7gTikOxBn/s5wQIDAQAB
-
+# This file specifies the Certificate Transparency logs
+# that are to be trusted.
+
+# Google's list of logs can be found here:
+#       www.certificate-transparency.org/known-logs 
+# A Python program to convert the log list to OpenSSL's format can be
+# found here:
+#       https://github.com/google/certificate-transparency/blob/master/python/utilities/log_list/print_log_list.py 
+# Use the "--openssl_output" flag.

From rsalz at openssl.org  Wed Sep 14 22:25:28 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 22:25:28 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473891928.369608.15689.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  03a8bf079c1b727d79230f0ffd2d0ff343c1fc9d (commit)
      from  1850451676d0f65ef59013750ae942a5d3e7751f (commit)


- Log -----------------------------------------------------------------
commit 03a8bf079c1b727d79230f0ffd2d0ff343c1fc9d
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 14 11:13:57 2016 -0400

    Make reference to other manpage more explicit
    
    Where -curves, etc., are defined: SSL_CONF_cmd
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit ddb30bde105a50d6a79a9662eeaf27e8cb29c606)

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 3 ++-
 doc/apps/s_server.pod | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 11b4a98..34dcd29 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -109,7 +109,7 @@ SSL servers.
 
 In addition to the options below the B<s_client> utility also supports the
 common and client only options documented in the
-in the L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)/SUPPORTED COMMAND LINE COMMANDS>
+in the "Supported Command Line Commands" section of the L<SSL_CONF_cmd(3)>
 manual page.
 
 =over 4
@@ -562,6 +562,7 @@ information whenever a session is renegotiated.
 
 =head1 SEE ALSO
 
+L<SSL_CONF_cmd(3)>,
 L<sess_id(1)>, L<s_server(1)>, L<ciphers(1)>
 
 =head1 HISTORY
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index 8e0ff78..bf4a4ab 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -111,8 +111,8 @@ for connections on a given port using SSL/TLS.
 
 In addition to the options below the B<s_server> utility also supports the
 common and server only options documented in the
-L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)/SUPPORTED COMMAND LINE COMMANDS> manual
-page.
+in the "Supported Command Line Commands" section of the L<SSL_CONF_cmd(3)>
+manual page.
 
 =over 4
 
@@ -553,6 +553,7 @@ unknown cipher suites a client says it supports.
 
 =head1 SEE ALSO
 
+L<SSL_CONF_cmd(3)>,
 L<sess_id(1)>, L<s_client(1)>, L<ciphers(1)>
 
 =head1 HISTORY

From rsalz at openssl.org  Wed Sep 14 22:25:54 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 22:25:54 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473891954.968857.16271.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6f0ac0e2f27d9240516edb9a23b7863e7ad02898 (commit)
      from  c7af65c7b28db13d39bb24f44730bf0293355e94 (commit)


- Log -----------------------------------------------------------------
commit 6f0ac0e2f27d9240516edb9a23b7863e7ad02898
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 14 11:13:57 2016 -0400

    Make reference to other manpage more explicit
    
    Where -curves, etc., are defined: SSL_CONF_cmd
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 3 ++-
 doc/apps/s_server.pod | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 11b4a98..34dcd29 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -109,7 +109,7 @@ SSL servers.
 
 In addition to the options below the B<s_client> utility also supports the
 common and client only options documented in the
-in the L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)/SUPPORTED COMMAND LINE COMMANDS>
+in the "Supported Command Line Commands" section of the L<SSL_CONF_cmd(3)>
 manual page.
 
 =over 4
@@ -562,6 +562,7 @@ information whenever a session is renegotiated.
 
 =head1 SEE ALSO
 
+L<SSL_CONF_cmd(3)>,
 L<sess_id(1)>, L<s_server(1)>, L<ciphers(1)>
 
 =head1 HISTORY
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index 8e0ff78..bf4a4ab 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -111,8 +111,8 @@ for connections on a given port using SSL/TLS.
 
 In addition to the options below the B<s_server> utility also supports the
 common and server only options documented in the
-L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)/SUPPORTED COMMAND LINE COMMANDS> manual
-page.
+in the "Supported Command Line Commands" section of the L<SSL_CONF_cmd(3)>
+manual page.
 
 =over 4
 
@@ -553,6 +553,7 @@ unknown cipher suites a client says it supports.
 
 =head1 SEE ALSO
 
+L<SSL_CONF_cmd(3)>,
 L<sess_id(1)>, L<s_client(1)>, L<ciphers(1)>
 
 =head1 HISTORY

From rsalz at openssl.org  Wed Sep 14 22:29:36 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 14 Sep 2016 22:29:36 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473892176.722215.18820.nullmailer@dev.openssl.org>

The branch master has been updated
       via  63c7d7cef9575202fb4afcf49c1b6234c5f29d40 (commit)
      from  1520c8a1ce226c44e9e744219bcfa0f85eb26221 (commit)


- Log -----------------------------------------------------------------
commit 63c7d7cef9575202fb4afcf49c1b6234c5f29d40
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Sep 14 18:29:33 2016 -0400

    fix typo

-----------------------------------------------------------------------

Summary of changes:
 source/snapshot/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/snapshot/README b/source/snapshot/README
index 205365e..e32d608 100644
--- a/source/snapshot/README
+++ b/source/snapshot/README
@@ -1,2 +1,2 @@
 These are daily snapshots of the source tree. They are provided
-for convenience only and not evewn guaranteed to compile.
+for convenience only and not even guaranteed to compile.

From builds at travis-ci.org  Thu Sep 15 00:02:48 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 00:02:48 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#5998 (master -
	c7af65c)
In-Reply-To: <openssl/openssl+160020300+still failing@travis-ci.org>
Message-ID: <57d9e528724d6_33fb8a97f57f0832061@e6eec000-b33d-4148-aebf-bda5d34f8fa3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5998
Status: Still Failing

Duration: 30 minutes and 22 seconds
Commit: c7af65c (master)
Author: Rich Salz
Message: GH1536: Install empty CT log list

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/554b4019f55d...c7af65c7b28d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160020300

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/ab57cf00/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 15 00:20:25 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 00:20:25 +0000
Subject: [openssl-commits] Errored: openssl/openssl#5999
	(OpenSSL_1_1_0-stable - 03a8bf0)
In-Reply-To: <openssl/openssl+160021149+errored@travis-ci.org>
Message-ID: <57d9e949c6c99_33fb6ab5901a43798da@2afd6d4f-9552-4c70-b997-4ba173789f3f.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #5999
Status: Errored

Duration: 28 minutes and 40 seconds
Commit: 03a8bf0 (OpenSSL_1_1_0-stable)
Author: Rich Salz
Message: Make reference to other manpage more explicit

Where -curves, etc., are defined: SSL_CONF_cmd

Reviewed-by: Andy Polyakov <appro at openssl.org>
(cherry picked from commit ddb30bde105a50d6a79a9662eeaf27e8cb29c606)

View the changeset: https://github.com/openssl/openssl/compare/1850451676d0...03a8bf079c1b

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160021149

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/54d2ad3f/attachment.html>

From builds at travis-ci.org  Thu Sep 15 00:45:22 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 00:45:22 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6000 (master -
	6f0ac0e)
In-Reply-To: <openssl/openssl+160021311+still failing@travis-ci.org>
Message-ID: <57d9ef2262937_33fb6ab6c65503994cb@2afd6d4f-9552-4c70-b997-4ba173789f3f.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6000
Status: Still Failing

Duration: 19 minutes and 2 seconds
Commit: 6f0ac0e (master)
Author: Rich Salz
Message: Make reference to other manpage more explicit

Where -curves, etc., are defined: SSL_CONF_cmd

Reviewed-by: Andy Polyakov <appro at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/c7af65c7b28d...6f0ac0e2f27d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160021311

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/7f3bb6b3/attachment.html>

From levitte at openssl.org  Thu Sep 15 08:33:46 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 15 Sep 2016 08:33:46 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473928426.041214.17786.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  b05f231cd97d80a2a46b6f4d0b145e84c729c39b (commit)
      from  68f11e82d9c19e104f34bd5186decc98566738ca (commit)


- Log -----------------------------------------------------------------
commit b05f231cd97d80a2a46b6f4d0b145e84c729c39b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 17:39:35 2016 +0200

    VMS: only use _realloc32 with /POINTER_SIZE=32
    
    This fixes the following error when building with no particular pointer size
    is specified (implied 32 bit):
    
        static void *(*realloc_func) (void *, size_t) = realloc;
        ................................................^
        %CC-E-UNDECLARED, In the initializer for realloc_func, "_realloc32" is not declared.
        at line number 93 in file DEV:[OPENSSL102.crypto]mem.c;1
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/mem.c b/crypto/mem.c
index 9c45135..06c3960 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -85,7 +85,7 @@ static void *(*malloc_ex_func) (size_t, const char *file, int line)
 #ifdef OPENSSL_SYS_VMS
 # if __INITIAL_POINTER_SIZE == 64
 #  define realloc _realloc64
-# else
+# elif __INITIAL_POINTER_SIZE == 32
 #  define realloc _realloc32
 # endif
 #endif

From steve at openssl.org  Thu Sep 15 11:52:54 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 15 Sep 2016 11:52:54 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473940374.398561.3524.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  d69247598991c61dfb68d4fe3b08346b02644812 (commit)
       via  ea060e026dd29ea0eaf66ad8686f966c8c81eb7f (commit)
      from  b05f231cd97d80a2a46b6f4d0b145e84c729c39b (commit)


- Log -----------------------------------------------------------------
commit d69247598991c61dfb68d4fe3b08346b02644812
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 14 23:42:55 2016 +0100

    Fix memory leak on realloc error.
    
    Backport leak fix from master branch.
    
    Thanks to Shi Lei (Gear Team, Qihoo 360 Inc.) for reporting this bug.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ea060e026dd29ea0eaf66ad8686f966c8c81eb7f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 14 23:54:12 2016 +0100

    Fix memory leak on error.
    
    Thanks to Shi Lei (Gear Team, Qihoo 360 Inc.) for reporting this bug.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_asn1.c | 3 +++
 ssl/ssl_rsa.c  | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 35cc27c..499f0e8 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -527,6 +527,9 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
         if (os.length > SSL_MAX_SID_CTX_LENGTH) {
             c.error = SSL_R_BAD_LENGTH;
             c.line = __LINE__;
+            OPENSSL_free(os.data);
+            os.data = NULL;
+            os.length = 0;
             goto err;
         } else {
             ret->sid_ctx_length = os.length;
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 8202247..f679801 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -912,6 +912,8 @@ static int serverinfo_process_buffer(const unsigned char *serverinfo,
 int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
                            size_t serverinfo_length)
 {
+    unsigned char *new_serverinfo;
+
     if (ctx == NULL || serverinfo == NULL || serverinfo_length == 0) {
         SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
@@ -928,12 +930,13 @@ int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
         SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_INTERNAL_ERROR);
         return 0;
     }
-    ctx->cert->key->serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo,
-                                                 serverinfo_length);
-    if (ctx->cert->key->serverinfo == NULL) {
+    new_serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo,
+                                     serverinfo_length);
+    if (new_serverinfo == NULL) {
         SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_MALLOC_FAILURE);
         return 0;
     }
+    ctx->cert->key->serverinfo = new_serverinfo;
     memcpy(ctx->cert->key->serverinfo, serverinfo, serverinfo_length);
     ctx->cert->key->serverinfo_length = serverinfo_length;
 

From levitte at openssl.org  Thu Sep 15 13:09:46 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 15 Sep 2016 13:09:46 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473944986.748638.3607.nullmailer@dev.openssl.org>

The branch master has been updated
       via  69149e8db98a2c3c41954009da75f8789a56139f (commit)
      from  63c7d7cef9575202fb4afcf49c1b6234c5f29d40 (commit)


- Log -----------------------------------------------------------------
commit 69149e8db98a2c3c41954009da75f8789a56139f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 15:09:29 2016 +0200

    Redirect /snapshot to /source/snapshot

-----------------------------------------------------------------------

Summary of changes:
 .htaccess | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.htaccess b/.htaccess
index 05912c5..717f682 100644
--- a/.htaccess
+++ b/.htaccess
@@ -11,6 +11,7 @@ Redirect permanent /licenses /policies/cla.html
 Redirect permanent /licenses/ /policies/cla.html
 Redirect permanent  /.well-known/acme-challenge/MX5CvUJNvymcKf22SNORcfjGk4oGQyIWJiBc_johfYo http://dcv.akamai.com/.well-known/acme-challenge/MX5CvUJNvymcKf22SNORcfjGk4oGQyIWJiBc_johfYo
 
+Redirect permanent /snapshot /source/snapshot
 
 <Files *.md5>
 ForceType application/binary

From rsalz at openssl.org  Thu Sep 15 14:56:57 2016
From: rsalz at openssl.org (Rich Salz)
Date: Thu, 15 Sep 2016 14:56:57 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1473951417.123948.16871.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7257962abfb8d49deb3b9831fa6eeb7068284246 (commit)
      from  69149e8db98a2c3c41954009da75f8789a56139f (commit)


- Log -----------------------------------------------------------------
commit 7257962abfb8d49deb3b9831fa6eeb7068284246
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Sep 15 10:56:21 2016 -0400

    Update text about snapshots

-----------------------------------------------------------------------

Summary of changes:
 source/index.html      | 10 +++++-----
 source/snapshot/README |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/index.html b/source/index.html
index 6fbdadc..d010f9e 100644
--- a/source/index.html
+++ b/source/index.html
@@ -54,11 +54,11 @@
 	    <p>
 	    Each day we make a snapshot of each development branch.
 	    They can be found at
-	    <a href="ftp://ftp.openssl.org/snapshot/">ftp://ftp.openssl.org/snapshot/</a>.
-	    These snapshots are provided for convenience only. Note that
-            keeping a local repository and updating it every 24 hours is
-            equivalent and will often be faster and more efficient.
-	    </p>
+	    <a href="https://www.openssl.org/source/snapshot/">https://www.openssl.org/source/snapshot/</a>.
+            These daily snapshots of the source tree are provided for
+            convenience only and not even guaranteed to compile.  Note that
+            keeping a git local repository and updating it every 24 hours
+            is equivalent and will often be faster and more efficient.</p>
 
 	  <!--#include virtual="/inc/legalities.shtml" -->
 	  </div>
diff --git a/source/snapshot/README b/source/snapshot/README
index e32d608..c8fddfb 100644
--- a/source/snapshot/README
+++ b/source/snapshot/README
@@ -1,2 +1,4 @@
-These are daily snapshots of the source tree. They are provided
-for convenience only and not even guaranteed to compile.
+These daily snapshots of the source tree are provided for convenience
+only and not even guaranteed to compile.  Note that keeping a git local
+repository and updating it every 24 hours is equivalent and will often be
+faster and more efficient.

From no-reply at appveyor.com  Thu Sep 15 18:47:58 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 15 Sep 2016 18:47:58 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1216
Message-ID: <20160915184757.117340.95296.988720C8@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/6ef46366/attachment.html>

From builds at travis-ci.org  Thu Sep 15 18:46:51 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 18:46:51 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1938
	(fix-install-typo - f5f062e)
In-Reply-To: <FdaSilvaYY/openssl+160250147+errored@travis-ci.org>
Message-ID: <57daec9b62416_33fb6ab6c68ac14892b4@2afd6d4f-9552-4c70-b997-4ba173789f3f.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1938
Status: Errored

Duration: 15 minutes and 39 seconds
Commit: f5f062e (fix-install-typo)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal

Fix a typo

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/69f3366ec80b^...f5f062e2e4f0

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160250147

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/d40fb77d/attachment.html>

From builds at travis-ci.org  Thu Sep 15 19:44:22 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 19:44:22 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1940 (fix-install-typo
	- bdbd014)
In-Reply-To: <FdaSilvaYY/openssl+160252568+failed@travis-ci.org>
Message-ID: <57dafa2d30715_33fb6ab650ef415604d8@2afd6d4f-9552-4c70-b997-4ba173789f3f.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1940
Status: Failed

Duration: 45 minutes and 47 seconds
Commit: bdbd014 (fix-install-typo)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal

Fix a typo

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/f5f062e2e4f0...bdbd014ed6bf

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160252568

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/ce9dcd02/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 15 20:15:51 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 20:15:51 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1941
	(apps-speed-rework-n-clean - fb95974)
In-Reply-To: <FdaSilvaYY/openssl+160254100+still failing@travis-ci.org>
Message-ID: <57db017743ab7_33fc87708fbf436276a@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1941
Status: Still Failing

Duration: 44 minutes and 11 seconds
Commit: fb95974 (apps-speed-rework-n-clean)
Author: FdaSilvaYY
Message: Remove some OPENSSL_NO_RSA guards in prog(.h|.pl)

no-rsa is no longer an option since 7ec8de16fe23e207d3e1bbb95d53843dbc9c06c8
so remove some remaining OPENSSL_NO_RSA guards.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/97c0bdb4f7a2...fb9597446b0c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160254100

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/7179ec6d/attachment.html>

From no-reply at appveyor.com  Thu Sep 15 20:31:11 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 15 Sep 2016 20:31:11 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1222
Message-ID: <20160915203110.117357.75362.E0F6E618@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/8c8e7345/attachment.html>

From builds at travis-ci.org  Thu Sep 15 20:42:10 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 20:42:10 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1944 (oss-dead-code -
	44eeef3)
In-Reply-To: <FdaSilvaYY/openssl+160257024+errored@travis-ci.org>
Message-ID: <57db07b893cf2_33fc87708f1904009d7@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1944
Status: Errored

Duration: 7 minutes and 43 seconds
Commit: 44eeef3 (oss-dead-code)
Author: FdaSilvaYY
Message: Remove useless definition

APP_INFO is currently a field of MEM struct

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/92e18ce42376...44eeef3bbab8

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160257024

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/f92437f1/attachment.html>

From no-reply at appveyor.com  Thu Sep 15 21:01:02 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 15 Sep 2016 21:01:02 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1223
Message-ID: <20160915210101.32006.32837.E059240F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/225873b6/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 15 20:46:20 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 20:46:20 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1942 (master -
	5d0c0f1)
In-Reply-To: <FdaSilvaYY/openssl+160254594+still failing@travis-ci.org>
Message-ID: <57db089c6f699_33fc8770cfac4408553@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1942
Status: Still Failing

Duration: 25 minutes and 14 seconds
Commit: 5d0c0f1 (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/6c5cccf143ec...5d0c0f11e8c3

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160254594

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/b8a27f50/attachment.html>

From no-reply at appveyor.com  Thu Sep 15 21:13:25 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 15 Sep 2016 21:13:25 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1224
Message-ID: <20160915211324.82624.73718.A67A06EB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/04a4ff41/attachment.html>

From levitte at openssl.org  Thu Sep 15 21:24:07 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 15 Sep 2016 21:24:07 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473974647.154018.12672.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  15c088e4cf8411ffcb2f3187942aea178cc0919c (commit)
       via  d6d04b64f5a98ebc07b3f529830724e4fb443708 (commit)
       via  b50826727e77f2736fc2cf5b4a4f646ee0d67182 (commit)
       via  a2d2120033dcee7f9697815cf4a36a3ef8f517bb (commit)
       via  45852545470b36cf1a4eef5b574fa29f9cd55bf4 (commit)
       via  1015609ac0eecb2914b15e8579917625ca43219d (commit)
      from  d69247598991c61dfb68d4fe3b08346b02644812 (commit)


- Log -----------------------------------------------------------------
commit 15c088e4cf8411ffcb2f3187942aea178cc0919c
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 23:37:53 2016 +0200

    Finally, make sure vms_term_sock.c is built
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit d6d04b64f5a98ebc07b3f529830724e4fb443708
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 09:45:57 2016 +0200

    Refactor to avoid unnecessary preprocessor logic
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b50826727e77f2736fc2cf5b4a4f646ee0d67182
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:54:30 2016 +0200

    Reformat to fit OpenSSL source code standards
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit a2d2120033dcee7f9697815cf4a36a3ef8f517bb
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:53:06 2016 +0200

    Remove entirely unnecessary pointer size guards
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 45852545470b36cf1a4eef5b574fa29f9cd55bf4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:52:03 2016 +0200

    Add copyright and license on apps/vms_term_sock.[ch]
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1015609ac0eecb2914b15e8579917625ca43219d
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 3 21:16:43 2016 +0200

    VSI submission: redirect terminal input through socket
    
    This is needed, because on VMS, select() can only be used on sockets.  being
    able to use select() on all kinds of file descriptors is unique to Unix.
    
    So, the solution for VMS is to create a layer that translates input from
    standard input to socket communication.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c          |  39 +++-
 apps/apps.h          |   2 +
 apps/makeapps.com    |   2 +-
 apps/s_client.c      |  23 +-
 apps/s_server.c      |  18 +-
 apps/vms_term_sock.c | 590 +++++++++++++++++++++++++++++++++++++++++++++++++++
 apps/vms_term_sock.h |  30 +++
 7 files changed, 685 insertions(+), 19 deletions(-)
 create mode 100755 apps/vms_term_sock.c
 create mode 100755 apps/vms_term_sock.h

diff --git a/apps/apps.c b/apps/apps.c
index 08ddbc4..44d8afa 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -3198,6 +3198,36 @@ int app_isdir(const char *name)
 #endif
 
 /* raw_read|write section */
+#if defined(__VMS)
+# include "vms_term_sock.h"
+static int stdin_sock = -1;
+
+static void close_stdin_sock(void)
+{
+    TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
+}
+
+int fileno_stdin(void)
+{
+    if (stdin_sock == -1) {
+        TerminalSocket(TERM_SOCK_CREATE, &stdin_sock);
+        atexit(close_stdin_sock);
+    }
+
+    return stdin_sock;
+}
+#else
+int fileno_stdin(void)
+{
+    return fileno(stdin);
+}
+#endif
+
+int fileno_stdout(void)
+{
+    return fileno(stdout);
+}
+
 #if defined(_WIN32) && defined(STD_INPUT_HANDLE)
 int raw_read_stdin(void *buf, int siz)
 {
@@ -3207,10 +3237,15 @@ int raw_read_stdin(void *buf, int siz)
     else
         return (-1);
 }
+#elif defined(__VMS)
+int raw_read_stdin(void *buf, int siz)
+{
+    return recv(fileno_stdin(), buf, siz, 0);
+}
 #else
 int raw_read_stdin(void *buf, int siz)
 {
-    return read(fileno(stdin), buf, siz);
+    return read(fileno_stdin(), buf, siz);
 }
 #endif
 
@@ -3226,6 +3261,6 @@ int raw_write_stdout(const void *buf, int siz)
 #else
 int raw_write_stdout(const void *buf, int siz)
 {
-    return write(fileno(stdout), buf, siz);
+    return write(fileno_stdout(), buf, siz);
 }
 #endif
diff --git a/apps/apps.h b/apps/apps.h
index 19bf5cc..c6c3881 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -375,6 +375,8 @@ void store_setup_crl_download(X509_STORE *st);
 # define SERIAL_RAND_BITS        64
 
 int app_isdir(const char *);
+int fileno_stdin(void);
+int fileno_stdout(void);
 int raw_read_stdin(void *, int);
 int raw_write_stdout(const void *, int);
 
diff --git a/apps/makeapps.com b/apps/makeapps.com
index 47457af..97dff41 100644
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -186,7 +186,7 @@ $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
 	      	"CIPHERS,NSEQ,PKCS12,PKCS8,PKEY,PKEYPARAM,PKEYUTL,"+ -
 	      	"SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS,SRP"
 $!
-$ LIB_OPENSSL = LIB_OPENSSL+ ",VMS_DECC_INIT"
+$ LIB_OPENSSL = LIB_OPENSSL+ ",VMS_DECC_INIT,VMS_TERM_SOCK"
 $!
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
diff --git a/apps/s_client.c b/apps/s_client.c
index b909c9a..41a326f 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1561,7 +1561,10 @@ int MAIN(int argc, char **argv)
     SSL_set_connect_state(con);
 
     /* ok, lets connect */
-    width = SSL_get_fd(con) + 1;
+    if (fileno_stdin() > SSL_get_fd(con))
+        width = fileno_stdin() + 1;
+    else
+        width = SSL_get_fd(con) + 1;
 
     read_tty = 1;
     write_tty = 0;
@@ -1744,9 +1747,11 @@ int MAIN(int argc, char **argv)
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined (OPENSSL_SYS_BEOS_R5)
             if (tty_on) {
                 if (read_tty)
-                    openssl_fdset(fileno(stdin), &readfds);
+                    openssl_fdset(fileno_stdin(), &readfds);
+#if !defined(OPENSSL_SYS_VMS)
                 if (write_tty)
-                    openssl_fdset(fileno(stdout), &writefds);
+                    openssl_fdset(fileno_stdout(), &writefds);
+#endif
             }
             if (read_ssl)
                 openssl_fdset(SSL_get_fd(con), &readfds);
@@ -1816,14 +1821,14 @@ int MAIN(int argc, char **argv)
             /* Under BeOS-R5 the situation is similar to DOS */
             i = 0;
             stdin_set = 0;
-            (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
+            (void)fcntl(fileno_stdin(), F_SETFL, O_NONBLOCK);
             if (!write_tty) {
                 if (read_tty) {
                     tv.tv_sec = 1;
                     tv.tv_usec = 0;
                     i = select(width, (void *)&readfds, (void *)&writefds,
                                NULL, &tv);
-                    if (read(fileno(stdin), sbuf, 0) >= 0)
+                    if (read(fileno_stdin(), sbuf, 0) >= 0)
                         stdin_set = 1;
                     if (!i && (stdin_set != 1 || !read_tty))
                         continue;
@@ -1831,7 +1836,7 @@ int MAIN(int argc, char **argv)
                     i = select(width, (void *)&readfds, (void *)&writefds,
                                NULL, timeoutp);
             }
-            (void)fcntl(fileno(stdin), F_SETFL, 0);
+            (void)fcntl(fileno_stdin(), F_SETFL, 0);
 #else
             i = select(width, (void *)&readfds, (void *)&writefds,
                        NULL, timeoutp);
@@ -1907,11 +1912,11 @@ int MAIN(int argc, char **argv)
                 goto shut;
             }
         }
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5) || defined(OPENSSL_SYS_VMS)
         /* Assume Windows/DOS/BeOS can always write */
         else if (!ssl_pending && write_tty)
 #else
-        else if (!ssl_pending && FD_ISSET(fileno(stdout), &writefds))
+        else if (!ssl_pending && FD_ISSET(fileno_stdout(), &writefds))
 #endif
         {
 #ifdef CHARSET_EBCDIC
@@ -2009,7 +2014,7 @@ int MAIN(int argc, char **argv)
 #elif defined(OPENSSL_SYS_BEOS_R5)
         else if (stdin_set)
 #else
-        else if (FD_ISSET(fileno(stdin), &readfds))
+        else if (FD_ISSET(fileno_stdin(), &readfds))
 #endif
         {
             if (crlf) {
diff --git a/apps/s_server.c b/apps/s_server.c
index 7038998..857a70e 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2307,7 +2307,10 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
     }
 #endif
 
-    width = s + 1;
+    if (fileno_stdin() > s)
+        width = fileno_stdin() + 1;
+    else
+        width = s + 1;
     for (;;) {
         int read_from_terminal;
         int read_from_sslcon;
@@ -2318,7 +2321,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
         if (!read_from_sslcon) {
             FD_ZERO(&readfds);
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_BEOS_R5)
-            openssl_fdset(fileno(stdin), &readfds);
+            openssl_fdset(fileno_stdin(), &readfds);
 #endif
             openssl_fdset(s, &readfds);
             /*
@@ -2346,13 +2349,13 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
             /* Under BeOS-R5 the situation is similar to DOS */
             tv.tv_sec = 1;
             tv.tv_usec = 0;
-            (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
+            (void)fcntl(fileno_stdin(), F_SETFL, O_NONBLOCK);
             i = select(width, (void *)&readfds, NULL, NULL, &tv);
-            if ((i < 0) || (!i && read(fileno(stdin), buf, 0) < 0))
+            if ((i < 0) || (!i && read(fileno_stdin(), buf, 0) < 0))
                 continue;
-            if (read(fileno(stdin), buf, 0) >= 0)
+            if (read(fileno_stdin(), buf, 0) >= 0)
                 read_from_terminal = 1;
-            (void)fcntl(fileno(stdin), F_SETFL, 0);
+            (void)fcntl(fileno_stdin(), F_SETFL, 0);
 #else
             if ((SSL_version(con) == DTLS1_VERSION) &&
                 DTLSv1_get_timeout(con, &timeout))
@@ -2369,7 +2372,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
 
             if (i <= 0)
                 continue;
-            if (FD_ISSET(fileno(stdin), &readfds))
+            if (FD_ISSET(fileno_stdin(), &readfds))
                 read_from_terminal = 1;
 #endif
             if (FD_ISSET(s, &readfds))
@@ -2396,6 +2399,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
                 assert(lf_num == 0);
             } else
                 i = raw_read_stdin(buf, bufsize);
+
             if (!s_quiet && !s_brief) {
                 if ((i <= 0) || (buf[0] == 'Q')) {
                     BIO_printf(bio_s_out, "DONE\n");
diff --git a/apps/vms_term_sock.c b/apps/vms_term_sock.c
new file mode 100755
index 0000000..a7d87ff
--- /dev/null
+++ b/apps/vms_term_sock.c
@@ -0,0 +1,590 @@
+/*
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifdef __VMS
+# define OPENSSL_SYS_VMS
+# pragma message disable DOLLARID
+
+
+# include <openssl/opensslconf.h>
+
+# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+/*
+ * On VMS, you need to define this to get the declaration of fileno().  The
+ * value 2 is to make sure no function defined in POSIX-2 is left undefined.
+ */
+#  define _POSIX_C_SOURCE 2
+# endif
+
+# include <stdio.h>
+
+# undef _POSIX_C_SOURCE
+
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <inet.h>
+# include <unistd.h>
+# include <string.h>
+# include <errno.h>
+# include <starlet.h>
+# include <iodef.h>
+# ifdef __alpha
+#  include <iosbdef.h>
+# else
+typedef struct _iosb {           /* Copied from IOSBDEF.H for Alpha  */
+#  pragma __nomember_alignment
+    __union  {
+        __struct  {
+            unsigned short int iosb$w_status; /* Final I/O status           */
+            __union  {
+                __struct  {             /* 16-bit byte count variant        */
+                    unsigned short int iosb$w_bcnt; /* 16-bit byte count    */
+                    __union  {
+                        unsigned int iosb$l_dev_depend; /* 32-bit device dependent info */
+                        unsigned int iosb$l_pid; /* 32-bit pid              */
+                    } iosb$r_l;
+                } iosb$r_bcnt_16;
+                __struct  {             /* 32-bit byte count variant        */
+                    unsigned int iosb$l_bcnt; /* 32-bit byte count (unaligned) */
+                    unsigned short int iosb$w_dev_depend_high; /* 16-bit device dependent info */
+                } iosb$r_bcnt_32;
+            } iosb$r_devdepend;
+        } iosb$r_io_64;
+        __struct  {
+            __union  {
+                unsigned int iosb$l_getxxi_status; /* Final GETxxI status   */
+                unsigned int iosb$l_reg_status; /* Final $Registry status   */
+            } iosb$r_l_status;
+            unsigned int iosb$l_reserved; /* Reserved field                 */
+        } iosb$r_get_64;
+    } iosb$r_io_get;
+} IOSB;
+
+#  if !defined(__VAXC)
+#   define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
+#   define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
+#   define iosb$r_l        iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
+#   define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
+#   define iosb$l_pid iosb$r_l.iosb$l_pid
+#   define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
+#   define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
+#   define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
+#   define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
+#  endif          /* #if !defined(__VAXC) */
+
+# endif  /* End of IOSBDEF */
+
+# include <efndef.h>
+# include <stdlib.h>
+# include <ssdef.h>
+# include <time.h>
+# include <stdarg.h>
+# include <descrip.h>
+
+# include "vms_term_sock.h"
+
+# ifdef __alpha
+static struct _iosb TerminalDeviceIosb;
+# else
+IOSB TerminalDeviceIosb;
+# endif
+
+static char TerminalDeviceBuff[255 + 2];
+static int TerminalSocketPair[2] = {0, 0};
+static unsigned short TerminalDeviceChan = 0;
+
+static int CreateSocketPair (int, int, int, int *);
+static void SocketPairTimeoutAst (int);
+static int TerminalDeviceAst (int);
+static void LogMessage (char *, ...);
+
+/*
+** Socket Pair Timeout Value (must be 0-59 seconds)
+*/
+# define SOCKET_PAIR_TIMEOUT_VALUE 20
+
+/*
+** Socket Pair Timeout Block which is passed to timeout AST
+*/
+typedef struct _SocketPairTimeoutBlock {
+    unsigned short SockChan1;
+    unsigned short SockChan2;
+} SPTB;
+
+# ifdef TERM_SOCK_TEST
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int main (int argc, char *argv[], char *envp[])
+{
+    char TermBuff[80];
+    int TermSock,
+        status,
+        len;
+
+    LogMessage ("Enter 'q' or 'Q' to quit ...");
+    while (strcasecmp (TermBuff, "Q")) {
+        /*
+        ** Create the terminal socket
+        */
+        status = TerminalSocket (TERM_SOCK_CREATE, &TermSock);
+        if (status != TERM_SOCK_SUCCESS)
+            exit (1);
+
+        /*
+        ** Process the terminal input
+        */
+        LogMessage ("Waiting on terminal I/O ...\n");
+        len = recv (TermSock, TermBuff, sizeof (TermBuff), 0) ;
+        TermBuff[len] = '\0';
+        LogMessage ("Received terminal I/O [%s]", TermBuff);
+
+        /*
+        ** Delete the terminal socket
+        */
+        status = TerminalSocket (TERM_SOCK_DELETE, &TermSock);
+        if (status != TERM_SOCK_SUCCESS)
+            exit (1);
+    }
+
+    return 1;
+
+}
+# endif
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket)
+{
+    int status;
+    $DESCRIPTOR (TerminalDeviceDesc, "SYS$COMMAND");
+
+    /*
+    ** Process the requested function code
+    */
+    switch (FunctionCode) {
+    case TERM_SOCK_CREATE:
+        /*
+        ** Create a socket pair
+        */
+        status = CreateSocketPair (AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
+        if (status == -1) {
+            LogMessage ("TerminalSocket: CreateSocketPair () - %08X", status);
+            if (TerminalSocketPair[0])
+                close (TerminalSocketPair[0]);
+            if (TerminalSocketPair[1])
+                close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Assign a channel to the terminal device
+        */
+        status = sys$assign (&TerminalDeviceDesc,
+                             &TerminalDeviceChan,
+                             0, 0, 0);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Queue an async IO to the terminal device
+        */
+        status = sys$qio (EFN$C_ENF,
+                          TerminalDeviceChan,
+                          IO$_READVBLK,
+                          &TerminalDeviceIosb,
+                          TerminalDeviceAst,
+                          0,
+                          TerminalDeviceBuff,
+                          sizeof (TerminalDeviceBuff) - 2,
+                          0, 0, 0, 0);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Return the input side of the socket pair
+        */
+        *ReturnSocket = TerminalSocketPair[1];
+        break;
+
+    case TERM_SOCK_DELETE:
+        /*
+        ** Cancel any pending IO on the terminal channel
+        */
+        status = sys$cancel (TerminalDeviceChan);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+	** Deassign the terminal channel
+	*/
+        status = sys$dassgn (TerminalDeviceChan);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Close the terminal socket pair
+        */
+        close (TerminalSocketPair[0]);
+        close (TerminalSocketPair[1]);
+
+        /*
+	** Return the initialized socket
+	*/
+        *ReturnSocket = 0;
+        break;
+
+    default:
+        /*
+	** Invalid function code
+	*/
+        LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
+        return (TERM_SOCK_FAILURE);
+        break;
+    }
+
+    /*
+    ** Return success
+    */
+    return (TERM_SOCK_SUCCESS);
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int CreateSocketPair (int SocketFamily,
+                             int SocketType,
+                             int SocketProtocol,
+                             int *SocketPair)
+{
+    struct dsc$descriptor AscTimeDesc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL};
+    static const char* LocalHostAddr = {"127.0.0.1"};
+    unsigned short TcpAcceptChan = 0,
+        TcpDeviceChan = 0;
+    unsigned long BinTimeBuff[2];
+    struct sockaddr_in sin;
+    char AscTimeBuff[32];
+    short LocalHostPort;
+    int status;
+    unsigned int slen;
+
+# ifdef __alpha
+    struct _iosb iosb;
+# else
+    IOSB iosb;
+# endif
+
+    int SockDesc1 = 0,
+        SockDesc2 = 0;
+    SPTB sptb;
+    $DESCRIPTOR (TcpDeviceDesc, "TCPIP$DEVICE");
+
+    /*
+    ** Create a socket
+    */
+    SockDesc1 = socket (SocketFamily, SocketType, 0);
+    if (SockDesc1 < 0) {
+        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        return (-1);
+    }
+
+    /*
+    ** Initialize the socket information
+    */
+    slen = sizeof (sin);
+    memset ((char *) &sin, 0, slen);
+    sin.sin_family = SocketFamily;
+    sin.sin_addr.s_addr = inet_addr (LocalHostAddr);
+    sin.sin_port = 0;
+
+    /*
+    ** Bind the socket to the local IP
+    */
+    status = bind (SockDesc1, (struct sockaddr *) &sin, slen);
+    if (status < 0) {
+        LogMessage ("CreateSocketPair: bind () - %d", errno);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Get the socket name so we can save the port number
+    */
+    status = getsockname (SockDesc1, (struct sockaddr *) &sin, &slen);
+    if (status < 0) {
+        LogMessage ("CreateSocketPair: getsockname () - %d", errno);
+        close (SockDesc1);
+        return (-1);
+    } else
+        LocalHostPort = sin.sin_port;
+
+    /*
+    ** Setup a listen for the socket
+    */
+    listen (SockDesc1, 5);
+
+    /*
+    ** Get the binary (64-bit) time of the specified timeout value
+    */
+    sprintf (AscTimeBuff, "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE);
+    AscTimeDesc.dsc$w_length = strlen (AscTimeBuff);
+    AscTimeDesc.dsc$a_pointer = AscTimeBuff;
+    status = sys$bintim (&AscTimeDesc, BinTimeBuff);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Assign another channel to the TCP/IP device for the accept.
+    ** This is the channel that ends up being connected to.
+    */
+    status = sys$assign (&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Get the channel of the first socket for the accept
+    */
+    TcpAcceptChan = decc$get_sdc (SockDesc1);
+
+    /*
+    ** Perform the accept using $QIO so we can do this asynchronously
+    */
+    status = sys$qio (EFN$C_ENF,
+                      TcpAcceptChan,
+                      IO$_ACCESS | IO$M_ACCEPT,
+                      &iosb,
+                      0, 0, 0, 0, 0,
+                      &TcpDeviceChan,
+                      0, 0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
+        close (SockDesc1);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Create the second socket to do the connect
+    */
+    SockDesc2 = socket (SocketFamily, SocketType, 0);
+    if (SockDesc2 < 0) {
+        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        sys$dassgn (TcpDeviceChan);
+        return (-1) ;
+    }
+
+    /*
+    ** Setup the Socket Pair Timeout Block
+    */
+    sptb.SockChan1 = TcpAcceptChan;
+    sptb.SockChan2 = decc$get_sdc (SockDesc2);
+
+    /*
+    ** Before we block on the connect, set a timer that can cancel I/O on our
+    ** two sockets if it never connects.
+    */
+    status = sys$setimr (EFN$C_ENF,
+                         BinTimeBuff,
+                         SocketPairTimeoutAst,
+                         &sptb,
+                         0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$SETIMR () - %08X", status);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Now issue the connect
+    */
+    memset ((char *) &sin, 0, sizeof (sin)) ;
+    sin.sin_family = SocketFamily;
+    sin.sin_addr.s_addr = inet_addr (LocalHostAddr) ;
+    sin.sin_port = LocalHostPort ;
+
+    status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof (sin));
+    if (status < 0 ) {
+        LogMessage ("CreateSocketPair: connect () - %d", errno);
+        sys$cantim (&sptb, 0);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Wait for the asynch $QIO to finish.  Note that if the I/O was aborted
+    ** (SS$_ABORT), then we probably canceled it from the AST routine - so log
+    ** a timeout.
+    */
+    status = sys$synch (EFN$C_ENF, &iosb);
+    if (! (iosb.iosb$w_status & 1)) {
+        if (iosb.iosb$w_status == SS$_ABORT)
+            LogMessage ("CreateSocketPair: SYS$QIO(iosb) timeout");
+        else {
+            LogMessage ("CreateSocketPair: SYS$QIO(iosb) - %d",
+                        iosb.iosb$w_status);
+            sys$cantim (&sptb, 0);
+        }
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Here we're successfully connected, so cancel the timer, convert the
+    ** I/O channel to a socket fd, close the listener socket and return the
+    ** connected pair.
+    */
+    sys$cantim (&sptb, 0);
+
+    close (SockDesc1) ;
+    SocketPair[0] = SockDesc2 ;
+    SocketPair[1] = socket_fd (TcpDeviceChan);
+
+    return (0) ;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void SocketPairTimeoutAst (int astparm)
+{
+    SPTB *sptb = (SPTB *) astparm;
+
+    sys$cancel (sptb->SockChan2); /* Cancel the connect() */
+    sys$cancel (sptb->SockChan1); /* Cancel the accept() */
+
+    return;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int TerminalDeviceAst (int astparm)
+{
+    int status;
+
+    /*
+    ** Terminate the terminal buffer
+    */
+    TerminalDeviceBuff[TerminalDeviceIosb.iosb$w_bcnt] = '\0';
+    strcat (TerminalDeviceBuff, "\n");
+
+    /*
+    ** Send the data read from the terminal device throught the socket pair
+    */
+    send (TerminalSocketPair[0], TerminalDeviceBuff,
+          TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
+
+    /*
+    ** Queue another async IO to the terminal device
+    */
+    status = sys$qio (EFN$C_ENF,
+                      TerminalDeviceChan,
+                      IO$_READVBLK,
+                      &TerminalDeviceIosb,
+                      TerminalDeviceAst,
+                      0,
+                      TerminalDeviceBuff,
+                      sizeof (TerminalDeviceBuff) - 1,
+                      0, 0, 0, 0);
+
+    /*
+    ** Return status
+    */
+    return status;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void LogMessage (char *msg, ...)
+{
+    char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    static unsigned int pid = 0;
+    va_list args;
+    time_t CurTime;
+    struct tm *LocTime;
+    char MsgBuff[256];
+
+    /*
+    ** Get the process pid
+    */
+    if (pid == 0)
+        pid = getpid ();
+
+    /*
+    ** Convert the current time into local time
+    */
+    CurTime = time (NULL);
+    LocTime = localtime (&CurTime);
+
+    /*
+    ** Format the message buffer
+    */
+    sprintf (MsgBuff, "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n",
+             LocTime->tm_mday, Month[LocTime->tm_mon],
+             (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
+             LocTime->tm_sec, pid, msg);
+
+    /*
+    ** Get any variable arguments and add them to the print of the message
+    ** buffer
+    */
+    va_start (args, msg);
+    vfprintf (stderr, MsgBuff, args);
+    va_end (args);
+
+    /*
+    ** Flush standard error output
+    */
+    fsync (fileno (stderr));
+
+    return;
+
+}
+#endif
diff --git a/apps/vms_term_sock.h b/apps/vms_term_sock.h
new file mode 100755
index 0000000..662fa0a
--- /dev/null
+++ b/apps/vms_term_sock.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef TERM_SOCK_H
+# define TERM_SOCK_H
+
+/*
+** Terminal Socket Function Codes
+*/
+# define TERM_SOCK_CREATE       1
+# define TERM_SOCK_DELETE       2
+
+/*
+** Terminal Socket Status Codes
+*/
+# define TERM_SOCK_FAILURE      0
+# define TERM_SOCK_SUCCESS      1
+
+/*
+** Terminal Socket Prototype
+*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket);
+
+#endif

From levitte at openssl.org  Thu Sep 15 21:24:11 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 15 Sep 2016 21:24:11 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473974651.138847.13060.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d602c2b680aefd3e0d00d090783ef5f912caf06a (commit)
       via  51e5133d551b4c132f72fc2ff5bbe076f5a3e052 (commit)
       via  c7bdb6a31ff0fcae66b451d3f80a684ad77f4966 (commit)
       via  0d0723e813870c2e7a009ec47e933668a1548531 (commit)
       via  0d3b65832c6fa94c1d1cfa2f99335f323e3227c1 (commit)
      from  6f0ac0e2f27d9240516edb9a23b7863e7ad02898 (commit)


- Log -----------------------------------------------------------------
commit d602c2b680aefd3e0d00d090783ef5f912caf06a
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 23:40:27 2016 +0200

    Finally, make sure vms_term_sock.c is built on VMS
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 51e5133d551b4c132f72fc2ff5bbe076f5a3e052
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 11:20:18 2016 +0200

    Refactor to avoid unnecessary preprocessor logic
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit c7bdb6a31ff0fcae66b451d3f80a684ad77f4966
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:54:30 2016 +0200

    Reformat to fit OpenSSL source code standards
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0d0723e813870c2e7a009ec47e933668a1548531
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:52:03 2016 +0200

    Add copyright and license on apps/vms_term_sock.[ch]
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0d3b65832c6fa94c1d1cfa2f99335f323e3227c1
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 3 21:16:43 2016 +0200

    VSI submission: redirect terminal input through socket
    
    This is needed, because on VMS, select() can only be used on sockets.  being
    able to use select() on all kinds of file descriptors is unique to Unix.
    
    So, the solution for VMS is to create a layer that translates input from
    standard input to socket communication.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf |   2 +-
 apps/apps.c                 |  39 ++-
 apps/apps.h                 |   2 +
 apps/s_client.c             |  18 +-
 apps/s_server.c             |  10 +-
 apps/vms_term_sock.c        | 590 ++++++++++++++++++++++++++++++++++++++++++++
 apps/vms_term_sock.h        |  30 +++
 7 files changed, 678 insertions(+), 13 deletions(-)
 create mode 100644 apps/vms_term_sock.c
 create mode 100644 apps/vms_term_sock.h

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 846a6c8..fc673a1 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1774,7 +1774,7 @@ sub vms_info {
         dso_scheme       => "vms",
         thread_scheme    => "pthreads",
 
-        apps_aux_src     => "vms_decc_init.c",
+        apps_aux_src     => "vms_decc_init.c vms_term_sock.c",
     },
 
     "vms-alpha" => {
diff --git a/apps/apps.c b/apps/apps.c
index 522db71..6ca0f2b 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2300,6 +2300,36 @@ int app_isdir(const char *name)
 #endif
 
 /* raw_read|write section */
+#if defined(__VMS)
+# include "vms_term_sock.h"
+static int stdin_sock = -1;
+
+static void close_stdin_sock(void)
+{
+    TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
+}
+
+int fileno_stdin(void)
+{
+    if (stdin_sock == -1) {
+        TerminalSocket(TERM_SOCK_CREATE, &stdin_sock);
+        atexit(close_stdin_sock);
+    }
+
+    return stdin_sock;
+}
+#else
+int fileno_stdin(void)
+{
+    return fileno(stdin);
+}
+#endif
+
+int fileno_stdout(void)
+{
+    return fileno(stdout);
+}
+
 #if defined(_WIN32) && defined(STD_INPUT_HANDLE)
 int raw_read_stdin(void *buf, int siz)
 {
@@ -2309,10 +2339,15 @@ int raw_read_stdin(void *buf, int siz)
     else
         return (-1);
 }
+#elif defined(__VMS)
+int raw_read_stdin(void *buf, int siz)
+{
+    return recv(fileno_stdin(), buf, siz, 0);
+}
 #else
 int raw_read_stdin(void *buf, int siz)
 {
-    return read(fileno(stdin), buf, siz);
+    return read(fileno_stdin(), buf, siz);
 }
 #endif
 
@@ -2328,7 +2363,7 @@ int raw_write_stdout(const void *buf, int siz)
 #else
 int raw_write_stdout(const void *buf, int siz)
 {
-    return write(fileno(stdout), buf, siz);
+    return write(fileno_stdout(), buf, siz);
 }
 #endif
 
diff --git a/apps/apps.h b/apps/apps.h
index 1761501..6083780 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -549,6 +549,8 @@ void store_setup_crl_download(X509_STORE *st);
 
 int app_isdir(const char *);
 int app_access(const char *, int flag);
+int fileno_stdin(void);
+int fileno_stdout(void);
 int raw_read_stdin(void *, int);
 int raw_write_stdout(const void *, int);
 
diff --git a/apps/s_client.c b/apps/s_client.c
index 9c83d64..0627ae8 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1821,7 +1821,10 @@ int s_client_main(int argc, char **argv)
     SSL_set_connect_state(con);
 
     /* ok, lets connect */
-    width = SSL_get_fd(con) + 1;
+    if (fileno_stdin() > SSL_get_fd(con))
+        width = fileno_stdin() + 1;
+    else
+        width = SSL_get_fd(con) + 1;
 
     read_tty = 1;
     write_tty = 0;
@@ -2150,9 +2153,11 @@ int s_client_main(int argc, char **argv)
                  * set the flag so we exit.
                  */
                 if (read_tty && !at_eof)
-                    openssl_fdset(fileno(stdin), &readfds);
+                    openssl_fdset(fileno_stdin(), &readfds);
+#if !defined(OPENSSL_SYS_VMS)
                 if (write_tty)
-                    openssl_fdset(fileno(stdout), &writefds);
+                    openssl_fdset(fileno_stdout(), &writefds);
+#endif
             }
             if (read_ssl)
                 openssl_fdset(SSL_get_fd(con), &readfds);
@@ -2278,11 +2283,11 @@ int s_client_main(int argc, char **argv)
                 goto shut;
             }
         }
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VMS)
         /* Assume Windows/DOS/BeOS can always write */
         else if (!ssl_pending && write_tty)
 #else
-        else if (!ssl_pending && FD_ISSET(fileno(stdout), &writefds))
+        else if (!ssl_pending && FD_ISSET(fileno_stdout(), &writefds))
 #endif
         {
 #ifdef CHARSET_EBCDIC
@@ -2371,7 +2376,7 @@ int s_client_main(int argc, char **argv)
 #if defined(OPENSSL_SYS_MSDOS)
         else if (has_stdin_waiting())
 #else
-        else if (FD_ISSET(fileno(stdin), &readfds))
+        else if (FD_ISSET(fileno_stdin(), &readfds))
 #endif
         {
             if (crlf) {
@@ -2394,7 +2399,6 @@ int s_client_main(int argc, char **argv)
                 assert(lf_num == 0);
             } else
                 i = raw_read_stdin(cbuf, BUFSIZZ);
-
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
             if (i == 0)
                 at_eof = 1;
diff --git a/apps/s_server.c b/apps/s_server.c
index 742cb83..ebab7a2 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2107,7 +2107,10 @@ static int sv_body(int s, int stype, unsigned char *context)
         SSL_set_tlsext_debug_arg(con, bio_s_out);
     }
 
-    width = s + 1;
+    if (fileno_stdin() > s)
+        width = fileno_stdin() + 1;
+    else
+        width = s + 1;
     for (;;) {
         int read_from_terminal;
         int read_from_sslcon;
@@ -2119,7 +2122,7 @@ static int sv_body(int s, int stype, unsigned char *context)
         if (!read_from_sslcon) {
             FD_ZERO(&readfds);
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
-            openssl_fdset(fileno(stdin), &readfds);
+            openssl_fdset(fileno_stdin(), &readfds);
 #endif
             openssl_fdset(s, &readfds);
             /*
@@ -2159,7 +2162,7 @@ static int sv_body(int s, int stype, unsigned char *context)
 
             if (i <= 0)
                 continue;
-            if (FD_ISSET(fileno(stdin), &readfds))
+            if (FD_ISSET(fileno_stdin(), &readfds))
                 read_from_terminal = 1;
 #endif
             if (FD_ISSET(s, &readfds))
@@ -2186,6 +2189,7 @@ static int sv_body(int s, int stype, unsigned char *context)
                 assert(lf_num == 0);
             } else
                 i = raw_read_stdin(buf, bufsize);
+
             if (!s_quiet && !s_brief) {
                 if ((i <= 0) || (buf[0] == 'Q')) {
                     BIO_printf(bio_s_out, "DONE\n");
diff --git a/apps/vms_term_sock.c b/apps/vms_term_sock.c
new file mode 100644
index 0000000..a7d87ff
--- /dev/null
+++ b/apps/vms_term_sock.c
@@ -0,0 +1,590 @@
+/*
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifdef __VMS
+# define OPENSSL_SYS_VMS
+# pragma message disable DOLLARID
+
+
+# include <openssl/opensslconf.h>
+
+# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+/*
+ * On VMS, you need to define this to get the declaration of fileno().  The
+ * value 2 is to make sure no function defined in POSIX-2 is left undefined.
+ */
+#  define _POSIX_C_SOURCE 2
+# endif
+
+# include <stdio.h>
+
+# undef _POSIX_C_SOURCE
+
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <inet.h>
+# include <unistd.h>
+# include <string.h>
+# include <errno.h>
+# include <starlet.h>
+# include <iodef.h>
+# ifdef __alpha
+#  include <iosbdef.h>
+# else
+typedef struct _iosb {           /* Copied from IOSBDEF.H for Alpha  */
+#  pragma __nomember_alignment
+    __union  {
+        __struct  {
+            unsigned short int iosb$w_status; /* Final I/O status           */
+            __union  {
+                __struct  {             /* 16-bit byte count variant        */
+                    unsigned short int iosb$w_bcnt; /* 16-bit byte count    */
+                    __union  {
+                        unsigned int iosb$l_dev_depend; /* 32-bit device dependent info */
+                        unsigned int iosb$l_pid; /* 32-bit pid              */
+                    } iosb$r_l;
+                } iosb$r_bcnt_16;
+                __struct  {             /* 32-bit byte count variant        */
+                    unsigned int iosb$l_bcnt; /* 32-bit byte count (unaligned) */
+                    unsigned short int iosb$w_dev_depend_high; /* 16-bit device dependent info */
+                } iosb$r_bcnt_32;
+            } iosb$r_devdepend;
+        } iosb$r_io_64;
+        __struct  {
+            __union  {
+                unsigned int iosb$l_getxxi_status; /* Final GETxxI status   */
+                unsigned int iosb$l_reg_status; /* Final $Registry status   */
+            } iosb$r_l_status;
+            unsigned int iosb$l_reserved; /* Reserved field                 */
+        } iosb$r_get_64;
+    } iosb$r_io_get;
+} IOSB;
+
+#  if !defined(__VAXC)
+#   define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
+#   define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
+#   define iosb$r_l        iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
+#   define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
+#   define iosb$l_pid iosb$r_l.iosb$l_pid
+#   define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
+#   define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
+#   define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
+#   define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
+#  endif          /* #if !defined(__VAXC) */
+
+# endif  /* End of IOSBDEF */
+
+# include <efndef.h>
+# include <stdlib.h>
+# include <ssdef.h>
+# include <time.h>
+# include <stdarg.h>
+# include <descrip.h>
+
+# include "vms_term_sock.h"
+
+# ifdef __alpha
+static struct _iosb TerminalDeviceIosb;
+# else
+IOSB TerminalDeviceIosb;
+# endif
+
+static char TerminalDeviceBuff[255 + 2];
+static int TerminalSocketPair[2] = {0, 0};
+static unsigned short TerminalDeviceChan = 0;
+
+static int CreateSocketPair (int, int, int, int *);
+static void SocketPairTimeoutAst (int);
+static int TerminalDeviceAst (int);
+static void LogMessage (char *, ...);
+
+/*
+** Socket Pair Timeout Value (must be 0-59 seconds)
+*/
+# define SOCKET_PAIR_TIMEOUT_VALUE 20
+
+/*
+** Socket Pair Timeout Block which is passed to timeout AST
+*/
+typedef struct _SocketPairTimeoutBlock {
+    unsigned short SockChan1;
+    unsigned short SockChan2;
+} SPTB;
+
+# ifdef TERM_SOCK_TEST
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int main (int argc, char *argv[], char *envp[])
+{
+    char TermBuff[80];
+    int TermSock,
+        status,
+        len;
+
+    LogMessage ("Enter 'q' or 'Q' to quit ...");
+    while (strcasecmp (TermBuff, "Q")) {
+        /*
+        ** Create the terminal socket
+        */
+        status = TerminalSocket (TERM_SOCK_CREATE, &TermSock);
+        if (status != TERM_SOCK_SUCCESS)
+            exit (1);
+
+        /*
+        ** Process the terminal input
+        */
+        LogMessage ("Waiting on terminal I/O ...\n");
+        len = recv (TermSock, TermBuff, sizeof (TermBuff), 0) ;
+        TermBuff[len] = '\0';
+        LogMessage ("Received terminal I/O [%s]", TermBuff);
+
+        /*
+        ** Delete the terminal socket
+        */
+        status = TerminalSocket (TERM_SOCK_DELETE, &TermSock);
+        if (status != TERM_SOCK_SUCCESS)
+            exit (1);
+    }
+
+    return 1;
+
+}
+# endif
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket)
+{
+    int status;
+    $DESCRIPTOR (TerminalDeviceDesc, "SYS$COMMAND");
+
+    /*
+    ** Process the requested function code
+    */
+    switch (FunctionCode) {
+    case TERM_SOCK_CREATE:
+        /*
+        ** Create a socket pair
+        */
+        status = CreateSocketPair (AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
+        if (status == -1) {
+            LogMessage ("TerminalSocket: CreateSocketPair () - %08X", status);
+            if (TerminalSocketPair[0])
+                close (TerminalSocketPair[0]);
+            if (TerminalSocketPair[1])
+                close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Assign a channel to the terminal device
+        */
+        status = sys$assign (&TerminalDeviceDesc,
+                             &TerminalDeviceChan,
+                             0, 0, 0);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Queue an async IO to the terminal device
+        */
+        status = sys$qio (EFN$C_ENF,
+                          TerminalDeviceChan,
+                          IO$_READVBLK,
+                          &TerminalDeviceIosb,
+                          TerminalDeviceAst,
+                          0,
+                          TerminalDeviceBuff,
+                          sizeof (TerminalDeviceBuff) - 2,
+                          0, 0, 0, 0);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Return the input side of the socket pair
+        */
+        *ReturnSocket = TerminalSocketPair[1];
+        break;
+
+    case TERM_SOCK_DELETE:
+        /*
+        ** Cancel any pending IO on the terminal channel
+        */
+        status = sys$cancel (TerminalDeviceChan);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+	** Deassign the terminal channel
+	*/
+        status = sys$dassgn (TerminalDeviceChan);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Close the terminal socket pair
+        */
+        close (TerminalSocketPair[0]);
+        close (TerminalSocketPair[1]);
+
+        /*
+	** Return the initialized socket
+	*/
+        *ReturnSocket = 0;
+        break;
+
+    default:
+        /*
+	** Invalid function code
+	*/
+        LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
+        return (TERM_SOCK_FAILURE);
+        break;
+    }
+
+    /*
+    ** Return success
+    */
+    return (TERM_SOCK_SUCCESS);
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int CreateSocketPair (int SocketFamily,
+                             int SocketType,
+                             int SocketProtocol,
+                             int *SocketPair)
+{
+    struct dsc$descriptor AscTimeDesc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL};
+    static const char* LocalHostAddr = {"127.0.0.1"};
+    unsigned short TcpAcceptChan = 0,
+        TcpDeviceChan = 0;
+    unsigned long BinTimeBuff[2];
+    struct sockaddr_in sin;
+    char AscTimeBuff[32];
+    short LocalHostPort;
+    int status;
+    unsigned int slen;
+
+# ifdef __alpha
+    struct _iosb iosb;
+# else
+    IOSB iosb;
+# endif
+
+    int SockDesc1 = 0,
+        SockDesc2 = 0;
+    SPTB sptb;
+    $DESCRIPTOR (TcpDeviceDesc, "TCPIP$DEVICE");
+
+    /*
+    ** Create a socket
+    */
+    SockDesc1 = socket (SocketFamily, SocketType, 0);
+    if (SockDesc1 < 0) {
+        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        return (-1);
+    }
+
+    /*
+    ** Initialize the socket information
+    */
+    slen = sizeof (sin);
+    memset ((char *) &sin, 0, slen);
+    sin.sin_family = SocketFamily;
+    sin.sin_addr.s_addr = inet_addr (LocalHostAddr);
+    sin.sin_port = 0;
+
+    /*
+    ** Bind the socket to the local IP
+    */
+    status = bind (SockDesc1, (struct sockaddr *) &sin, slen);
+    if (status < 0) {
+        LogMessage ("CreateSocketPair: bind () - %d", errno);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Get the socket name so we can save the port number
+    */
+    status = getsockname (SockDesc1, (struct sockaddr *) &sin, &slen);
+    if (status < 0) {
+        LogMessage ("CreateSocketPair: getsockname () - %d", errno);
+        close (SockDesc1);
+        return (-1);
+    } else
+        LocalHostPort = sin.sin_port;
+
+    /*
+    ** Setup a listen for the socket
+    */
+    listen (SockDesc1, 5);
+
+    /*
+    ** Get the binary (64-bit) time of the specified timeout value
+    */
+    sprintf (AscTimeBuff, "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE);
+    AscTimeDesc.dsc$w_length = strlen (AscTimeBuff);
+    AscTimeDesc.dsc$a_pointer = AscTimeBuff;
+    status = sys$bintim (&AscTimeDesc, BinTimeBuff);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Assign another channel to the TCP/IP device for the accept.
+    ** This is the channel that ends up being connected to.
+    */
+    status = sys$assign (&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Get the channel of the first socket for the accept
+    */
+    TcpAcceptChan = decc$get_sdc (SockDesc1);
+
+    /*
+    ** Perform the accept using $QIO so we can do this asynchronously
+    */
+    status = sys$qio (EFN$C_ENF,
+                      TcpAcceptChan,
+                      IO$_ACCESS | IO$M_ACCEPT,
+                      &iosb,
+                      0, 0, 0, 0, 0,
+                      &TcpDeviceChan,
+                      0, 0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
+        close (SockDesc1);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Create the second socket to do the connect
+    */
+    SockDesc2 = socket (SocketFamily, SocketType, 0);
+    if (SockDesc2 < 0) {
+        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        sys$dassgn (TcpDeviceChan);
+        return (-1) ;
+    }
+
+    /*
+    ** Setup the Socket Pair Timeout Block
+    */
+    sptb.SockChan1 = TcpAcceptChan;
+    sptb.SockChan2 = decc$get_sdc (SockDesc2);
+
+    /*
+    ** Before we block on the connect, set a timer that can cancel I/O on our
+    ** two sockets if it never connects.
+    */
+    status = sys$setimr (EFN$C_ENF,
+                         BinTimeBuff,
+                         SocketPairTimeoutAst,
+                         &sptb,
+                         0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$SETIMR () - %08X", status);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Now issue the connect
+    */
+    memset ((char *) &sin, 0, sizeof (sin)) ;
+    sin.sin_family = SocketFamily;
+    sin.sin_addr.s_addr = inet_addr (LocalHostAddr) ;
+    sin.sin_port = LocalHostPort ;
+
+    status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof (sin));
+    if (status < 0 ) {
+        LogMessage ("CreateSocketPair: connect () - %d", errno);
+        sys$cantim (&sptb, 0);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Wait for the asynch $QIO to finish.  Note that if the I/O was aborted
+    ** (SS$_ABORT), then we probably canceled it from the AST routine - so log
+    ** a timeout.
+    */
+    status = sys$synch (EFN$C_ENF, &iosb);
+    if (! (iosb.iosb$w_status & 1)) {
+        if (iosb.iosb$w_status == SS$_ABORT)
+            LogMessage ("CreateSocketPair: SYS$QIO(iosb) timeout");
+        else {
+            LogMessage ("CreateSocketPair: SYS$QIO(iosb) - %d",
+                        iosb.iosb$w_status);
+            sys$cantim (&sptb, 0);
+        }
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Here we're successfully connected, so cancel the timer, convert the
+    ** I/O channel to a socket fd, close the listener socket and return the
+    ** connected pair.
+    */
+    sys$cantim (&sptb, 0);
+
+    close (SockDesc1) ;
+    SocketPair[0] = SockDesc2 ;
+    SocketPair[1] = socket_fd (TcpDeviceChan);
+
+    return (0) ;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void SocketPairTimeoutAst (int astparm)
+{
+    SPTB *sptb = (SPTB *) astparm;
+
+    sys$cancel (sptb->SockChan2); /* Cancel the connect() */
+    sys$cancel (sptb->SockChan1); /* Cancel the accept() */
+
+    return;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int TerminalDeviceAst (int astparm)
+{
+    int status;
+
+    /*
+    ** Terminate the terminal buffer
+    */
+    TerminalDeviceBuff[TerminalDeviceIosb.iosb$w_bcnt] = '\0';
+    strcat (TerminalDeviceBuff, "\n");
+
+    /*
+    ** Send the data read from the terminal device throught the socket pair
+    */
+    send (TerminalSocketPair[0], TerminalDeviceBuff,
+          TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
+
+    /*
+    ** Queue another async IO to the terminal device
+    */
+    status = sys$qio (EFN$C_ENF,
+                      TerminalDeviceChan,
+                      IO$_READVBLK,
+                      &TerminalDeviceIosb,
+                      TerminalDeviceAst,
+                      0,
+                      TerminalDeviceBuff,
+                      sizeof (TerminalDeviceBuff) - 1,
+                      0, 0, 0, 0);
+
+    /*
+    ** Return status
+    */
+    return status;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void LogMessage (char *msg, ...)
+{
+    char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    static unsigned int pid = 0;
+    va_list args;
+    time_t CurTime;
+    struct tm *LocTime;
+    char MsgBuff[256];
+
+    /*
+    ** Get the process pid
+    */
+    if (pid == 0)
+        pid = getpid ();
+
+    /*
+    ** Convert the current time into local time
+    */
+    CurTime = time (NULL);
+    LocTime = localtime (&CurTime);
+
+    /*
+    ** Format the message buffer
+    */
+    sprintf (MsgBuff, "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n",
+             LocTime->tm_mday, Month[LocTime->tm_mon],
+             (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
+             LocTime->tm_sec, pid, msg);
+
+    /*
+    ** Get any variable arguments and add them to the print of the message
+    ** buffer
+    */
+    va_start (args, msg);
+    vfprintf (stderr, MsgBuff, args);
+    va_end (args);
+
+    /*
+    ** Flush standard error output
+    */
+    fsync (fileno (stderr));
+
+    return;
+
+}
+#endif
diff --git a/apps/vms_term_sock.h b/apps/vms_term_sock.h
new file mode 100644
index 0000000..662fa0a
--- /dev/null
+++ b/apps/vms_term_sock.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef TERM_SOCK_H
+# define TERM_SOCK_H
+
+/*
+** Terminal Socket Function Codes
+*/
+# define TERM_SOCK_CREATE       1
+# define TERM_SOCK_DELETE       2
+
+/*
+** Terminal Socket Status Codes
+*/
+# define TERM_SOCK_FAILURE      0
+# define TERM_SOCK_SUCCESS      1
+
+/*
+** Terminal Socket Prototype
+*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket);
+
+#endif

From levitte at openssl.org  Thu Sep 15 21:28:45 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 15 Sep 2016 21:28:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473974925.738011.15923.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  2abbe94828351178220b7e284504cfb5eb1dabbb (commit)
       via  9b498c9f0fc4faf6314a8c48125aa0afac26c2ba (commit)
       via  34b3563243d49ba6f551adb39038695b9fb66b49 (commit)
       via  07ebdfab079d1efc2d65e15f9f541fa1861ed4ff (commit)
       via  ae6e317e322451c7ecc4aacc75f9fb43fd73f764 (commit)
      from  03a8bf079c1b727d79230f0ffd2d0ff343c1fc9d (commit)


- Log -----------------------------------------------------------------
commit 2abbe94828351178220b7e284504cfb5eb1dabbb
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 23:40:27 2016 +0200

    Finally, make sure vms_term_sock.c is built on VMS
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit d602c2b680aefd3e0d00d090783ef5f912caf06a)

commit 9b498c9f0fc4faf6314a8c48125aa0afac26c2ba
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 11:20:18 2016 +0200

    Refactor to avoid unnecessary preprocessor logic
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 51e5133d551b4c132f72fc2ff5bbe076f5a3e052)

commit 34b3563243d49ba6f551adb39038695b9fb66b49
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:54:30 2016 +0200

    Reformat to fit OpenSSL source code standards
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit c7bdb6a31ff0fcae66b451d3f80a684ad77f4966)

commit 07ebdfab079d1efc2d65e15f9f541fa1861ed4ff
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 20:52:03 2016 +0200

    Add copyright and license on apps/vms_term_sock.[ch]
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 0d0723e813870c2e7a009ec47e933668a1548531)

commit ae6e317e322451c7ecc4aacc75f9fb43fd73f764
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 3 21:16:43 2016 +0200

    VSI submission: redirect terminal input through socket
    
    This is needed, because on VMS, select() can only be used on sockets.  being
    able to use select() on all kinds of file descriptors is unique to Unix.
    
    So, the solution for VMS is to create a layer that translates input from
    standard input to socket communication.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 0d3b65832c6fa94c1d1cfa2f99335f323e3227c1)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf |   2 +-
 apps/apps.c                 |  39 ++-
 apps/apps.h                 |   2 +
 apps/s_client.c             |  18 +-
 apps/s_server.c             |  10 +-
 apps/vms_term_sock.c        | 590 ++++++++++++++++++++++++++++++++++++++++++++
 apps/vms_term_sock.h        |  30 +++
 7 files changed, 678 insertions(+), 13 deletions(-)
 create mode 100644 apps/vms_term_sock.c
 create mode 100644 apps/vms_term_sock.h

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index cde1bdb..96f5434 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1755,7 +1755,7 @@ sub vms_info {
         dso_scheme       => "vms",
         thread_scheme    => "pthreads",
 
-        apps_aux_src     => "vms_decc_init.c",
+        apps_aux_src     => "vms_decc_init.c vms_term_sock.c",
     },
 
     "vms-alpha" => {
diff --git a/apps/apps.c b/apps/apps.c
index 522db71..6ca0f2b 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2300,6 +2300,36 @@ int app_isdir(const char *name)
 #endif
 
 /* raw_read|write section */
+#if defined(__VMS)
+# include "vms_term_sock.h"
+static int stdin_sock = -1;
+
+static void close_stdin_sock(void)
+{
+    TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
+}
+
+int fileno_stdin(void)
+{
+    if (stdin_sock == -1) {
+        TerminalSocket(TERM_SOCK_CREATE, &stdin_sock);
+        atexit(close_stdin_sock);
+    }
+
+    return stdin_sock;
+}
+#else
+int fileno_stdin(void)
+{
+    return fileno(stdin);
+}
+#endif
+
+int fileno_stdout(void)
+{
+    return fileno(stdout);
+}
+
 #if defined(_WIN32) && defined(STD_INPUT_HANDLE)
 int raw_read_stdin(void *buf, int siz)
 {
@@ -2309,10 +2339,15 @@ int raw_read_stdin(void *buf, int siz)
     else
         return (-1);
 }
+#elif defined(__VMS)
+int raw_read_stdin(void *buf, int siz)
+{
+    return recv(fileno_stdin(), buf, siz, 0);
+}
 #else
 int raw_read_stdin(void *buf, int siz)
 {
-    return read(fileno(stdin), buf, siz);
+    return read(fileno_stdin(), buf, siz);
 }
 #endif
 
@@ -2328,7 +2363,7 @@ int raw_write_stdout(const void *buf, int siz)
 #else
 int raw_write_stdout(const void *buf, int siz)
 {
-    return write(fileno(stdout), buf, siz);
+    return write(fileno_stdout(), buf, siz);
 }
 #endif
 
diff --git a/apps/apps.h b/apps/apps.h
index 85b6519..27e182c 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -548,6 +548,8 @@ void store_setup_crl_download(X509_STORE *st);
 
 int app_isdir(const char *);
 int app_access(const char *, int flag);
+int fileno_stdin(void);
+int fileno_stdout(void);
 int raw_read_stdin(void *, int);
 int raw_write_stdout(const void *, int);
 
diff --git a/apps/s_client.c b/apps/s_client.c
index 9c83d64..0627ae8 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1821,7 +1821,10 @@ int s_client_main(int argc, char **argv)
     SSL_set_connect_state(con);
 
     /* ok, lets connect */
-    width = SSL_get_fd(con) + 1;
+    if (fileno_stdin() > SSL_get_fd(con))
+        width = fileno_stdin() + 1;
+    else
+        width = SSL_get_fd(con) + 1;
 
     read_tty = 1;
     write_tty = 0;
@@ -2150,9 +2153,11 @@ int s_client_main(int argc, char **argv)
                  * set the flag so we exit.
                  */
                 if (read_tty && !at_eof)
-                    openssl_fdset(fileno(stdin), &readfds);
+                    openssl_fdset(fileno_stdin(), &readfds);
+#if !defined(OPENSSL_SYS_VMS)
                 if (write_tty)
-                    openssl_fdset(fileno(stdout), &writefds);
+                    openssl_fdset(fileno_stdout(), &writefds);
+#endif
             }
             if (read_ssl)
                 openssl_fdset(SSL_get_fd(con), &readfds);
@@ -2278,11 +2283,11 @@ int s_client_main(int argc, char **argv)
                 goto shut;
             }
         }
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VMS)
         /* Assume Windows/DOS/BeOS can always write */
         else if (!ssl_pending && write_tty)
 #else
-        else if (!ssl_pending && FD_ISSET(fileno(stdout), &writefds))
+        else if (!ssl_pending && FD_ISSET(fileno_stdout(), &writefds))
 #endif
         {
 #ifdef CHARSET_EBCDIC
@@ -2371,7 +2376,7 @@ int s_client_main(int argc, char **argv)
 #if defined(OPENSSL_SYS_MSDOS)
         else if (has_stdin_waiting())
 #else
-        else if (FD_ISSET(fileno(stdin), &readfds))
+        else if (FD_ISSET(fileno_stdin(), &readfds))
 #endif
         {
             if (crlf) {
@@ -2394,7 +2399,6 @@ int s_client_main(int argc, char **argv)
                 assert(lf_num == 0);
             } else
                 i = raw_read_stdin(cbuf, BUFSIZZ);
-
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
             if (i == 0)
                 at_eof = 1;
diff --git a/apps/s_server.c b/apps/s_server.c
index 742cb83..ebab7a2 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2107,7 +2107,10 @@ static int sv_body(int s, int stype, unsigned char *context)
         SSL_set_tlsext_debug_arg(con, bio_s_out);
     }
 
-    width = s + 1;
+    if (fileno_stdin() > s)
+        width = fileno_stdin() + 1;
+    else
+        width = s + 1;
     for (;;) {
         int read_from_terminal;
         int read_from_sslcon;
@@ -2119,7 +2122,7 @@ static int sv_body(int s, int stype, unsigned char *context)
         if (!read_from_sslcon) {
             FD_ZERO(&readfds);
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
-            openssl_fdset(fileno(stdin), &readfds);
+            openssl_fdset(fileno_stdin(), &readfds);
 #endif
             openssl_fdset(s, &readfds);
             /*
@@ -2159,7 +2162,7 @@ static int sv_body(int s, int stype, unsigned char *context)
 
             if (i <= 0)
                 continue;
-            if (FD_ISSET(fileno(stdin), &readfds))
+            if (FD_ISSET(fileno_stdin(), &readfds))
                 read_from_terminal = 1;
 #endif
             if (FD_ISSET(s, &readfds))
@@ -2186,6 +2189,7 @@ static int sv_body(int s, int stype, unsigned char *context)
                 assert(lf_num == 0);
             } else
                 i = raw_read_stdin(buf, bufsize);
+
             if (!s_quiet && !s_brief) {
                 if ((i <= 0) || (buf[0] == 'Q')) {
                     BIO_printf(bio_s_out, "DONE\n");
diff --git a/apps/vms_term_sock.c b/apps/vms_term_sock.c
new file mode 100644
index 0000000..a7d87ff
--- /dev/null
+++ b/apps/vms_term_sock.c
@@ -0,0 +1,590 @@
+/*
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifdef __VMS
+# define OPENSSL_SYS_VMS
+# pragma message disable DOLLARID
+
+
+# include <openssl/opensslconf.h>
+
+# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+/*
+ * On VMS, you need to define this to get the declaration of fileno().  The
+ * value 2 is to make sure no function defined in POSIX-2 is left undefined.
+ */
+#  define _POSIX_C_SOURCE 2
+# endif
+
+# include <stdio.h>
+
+# undef _POSIX_C_SOURCE
+
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <inet.h>
+# include <unistd.h>
+# include <string.h>
+# include <errno.h>
+# include <starlet.h>
+# include <iodef.h>
+# ifdef __alpha
+#  include <iosbdef.h>
+# else
+typedef struct _iosb {           /* Copied from IOSBDEF.H for Alpha  */
+#  pragma __nomember_alignment
+    __union  {
+        __struct  {
+            unsigned short int iosb$w_status; /* Final I/O status           */
+            __union  {
+                __struct  {             /* 16-bit byte count variant        */
+                    unsigned short int iosb$w_bcnt; /* 16-bit byte count    */
+                    __union  {
+                        unsigned int iosb$l_dev_depend; /* 32-bit device dependent info */
+                        unsigned int iosb$l_pid; /* 32-bit pid              */
+                    } iosb$r_l;
+                } iosb$r_bcnt_16;
+                __struct  {             /* 32-bit byte count variant        */
+                    unsigned int iosb$l_bcnt; /* 32-bit byte count (unaligned) */
+                    unsigned short int iosb$w_dev_depend_high; /* 16-bit device dependent info */
+                } iosb$r_bcnt_32;
+            } iosb$r_devdepend;
+        } iosb$r_io_64;
+        __struct  {
+            __union  {
+                unsigned int iosb$l_getxxi_status; /* Final GETxxI status   */
+                unsigned int iosb$l_reg_status; /* Final $Registry status   */
+            } iosb$r_l_status;
+            unsigned int iosb$l_reserved; /* Reserved field                 */
+        } iosb$r_get_64;
+    } iosb$r_io_get;
+} IOSB;
+
+#  if !defined(__VAXC)
+#   define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
+#   define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
+#   define iosb$r_l        iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
+#   define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
+#   define iosb$l_pid iosb$r_l.iosb$l_pid
+#   define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
+#   define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
+#   define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
+#   define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
+#  endif          /* #if !defined(__VAXC) */
+
+# endif  /* End of IOSBDEF */
+
+# include <efndef.h>
+# include <stdlib.h>
+# include <ssdef.h>
+# include <time.h>
+# include <stdarg.h>
+# include <descrip.h>
+
+# include "vms_term_sock.h"
+
+# ifdef __alpha
+static struct _iosb TerminalDeviceIosb;
+# else
+IOSB TerminalDeviceIosb;
+# endif
+
+static char TerminalDeviceBuff[255 + 2];
+static int TerminalSocketPair[2] = {0, 0};
+static unsigned short TerminalDeviceChan = 0;
+
+static int CreateSocketPair (int, int, int, int *);
+static void SocketPairTimeoutAst (int);
+static int TerminalDeviceAst (int);
+static void LogMessage (char *, ...);
+
+/*
+** Socket Pair Timeout Value (must be 0-59 seconds)
+*/
+# define SOCKET_PAIR_TIMEOUT_VALUE 20
+
+/*
+** Socket Pair Timeout Block which is passed to timeout AST
+*/
+typedef struct _SocketPairTimeoutBlock {
+    unsigned short SockChan1;
+    unsigned short SockChan2;
+} SPTB;
+
+# ifdef TERM_SOCK_TEST
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int main (int argc, char *argv[], char *envp[])
+{
+    char TermBuff[80];
+    int TermSock,
+        status,
+        len;
+
+    LogMessage ("Enter 'q' or 'Q' to quit ...");
+    while (strcasecmp (TermBuff, "Q")) {
+        /*
+        ** Create the terminal socket
+        */
+        status = TerminalSocket (TERM_SOCK_CREATE, &TermSock);
+        if (status != TERM_SOCK_SUCCESS)
+            exit (1);
+
+        /*
+        ** Process the terminal input
+        */
+        LogMessage ("Waiting on terminal I/O ...\n");
+        len = recv (TermSock, TermBuff, sizeof (TermBuff), 0) ;
+        TermBuff[len] = '\0';
+        LogMessage ("Received terminal I/O [%s]", TermBuff);
+
+        /*
+        ** Delete the terminal socket
+        */
+        status = TerminalSocket (TERM_SOCK_DELETE, &TermSock);
+        if (status != TERM_SOCK_SUCCESS)
+            exit (1);
+    }
+
+    return 1;
+
+}
+# endif
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket)
+{
+    int status;
+    $DESCRIPTOR (TerminalDeviceDesc, "SYS$COMMAND");
+
+    /*
+    ** Process the requested function code
+    */
+    switch (FunctionCode) {
+    case TERM_SOCK_CREATE:
+        /*
+        ** Create a socket pair
+        */
+        status = CreateSocketPair (AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
+        if (status == -1) {
+            LogMessage ("TerminalSocket: CreateSocketPair () - %08X", status);
+            if (TerminalSocketPair[0])
+                close (TerminalSocketPair[0]);
+            if (TerminalSocketPair[1])
+                close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Assign a channel to the terminal device
+        */
+        status = sys$assign (&TerminalDeviceDesc,
+                             &TerminalDeviceChan,
+                             0, 0, 0);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Queue an async IO to the terminal device
+        */
+        status = sys$qio (EFN$C_ENF,
+                          TerminalDeviceChan,
+                          IO$_READVBLK,
+                          &TerminalDeviceIosb,
+                          TerminalDeviceAst,
+                          0,
+                          TerminalDeviceBuff,
+                          sizeof (TerminalDeviceBuff) - 2,
+                          0, 0, 0, 0);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Return the input side of the socket pair
+        */
+        *ReturnSocket = TerminalSocketPair[1];
+        break;
+
+    case TERM_SOCK_DELETE:
+        /*
+        ** Cancel any pending IO on the terminal channel
+        */
+        status = sys$cancel (TerminalDeviceChan);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+	** Deassign the terminal channel
+	*/
+        status = sys$dassgn (TerminalDeviceChan);
+        if (! (status & 1)) {
+            LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
+            close (TerminalSocketPair[0]);
+            close (TerminalSocketPair[1]);
+            return (TERM_SOCK_FAILURE);
+        }
+
+        /*
+        ** Close the terminal socket pair
+        */
+        close (TerminalSocketPair[0]);
+        close (TerminalSocketPair[1]);
+
+        /*
+	** Return the initialized socket
+	*/
+        *ReturnSocket = 0;
+        break;
+
+    default:
+        /*
+	** Invalid function code
+	*/
+        LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
+        return (TERM_SOCK_FAILURE);
+        break;
+    }
+
+    /*
+    ** Return success
+    */
+    return (TERM_SOCK_SUCCESS);
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int CreateSocketPair (int SocketFamily,
+                             int SocketType,
+                             int SocketProtocol,
+                             int *SocketPair)
+{
+    struct dsc$descriptor AscTimeDesc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL};
+    static const char* LocalHostAddr = {"127.0.0.1"};
+    unsigned short TcpAcceptChan = 0,
+        TcpDeviceChan = 0;
+    unsigned long BinTimeBuff[2];
+    struct sockaddr_in sin;
+    char AscTimeBuff[32];
+    short LocalHostPort;
+    int status;
+    unsigned int slen;
+
+# ifdef __alpha
+    struct _iosb iosb;
+# else
+    IOSB iosb;
+# endif
+
+    int SockDesc1 = 0,
+        SockDesc2 = 0;
+    SPTB sptb;
+    $DESCRIPTOR (TcpDeviceDesc, "TCPIP$DEVICE");
+
+    /*
+    ** Create a socket
+    */
+    SockDesc1 = socket (SocketFamily, SocketType, 0);
+    if (SockDesc1 < 0) {
+        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        return (-1);
+    }
+
+    /*
+    ** Initialize the socket information
+    */
+    slen = sizeof (sin);
+    memset ((char *) &sin, 0, slen);
+    sin.sin_family = SocketFamily;
+    sin.sin_addr.s_addr = inet_addr (LocalHostAddr);
+    sin.sin_port = 0;
+
+    /*
+    ** Bind the socket to the local IP
+    */
+    status = bind (SockDesc1, (struct sockaddr *) &sin, slen);
+    if (status < 0) {
+        LogMessage ("CreateSocketPair: bind () - %d", errno);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Get the socket name so we can save the port number
+    */
+    status = getsockname (SockDesc1, (struct sockaddr *) &sin, &slen);
+    if (status < 0) {
+        LogMessage ("CreateSocketPair: getsockname () - %d", errno);
+        close (SockDesc1);
+        return (-1);
+    } else
+        LocalHostPort = sin.sin_port;
+
+    /*
+    ** Setup a listen for the socket
+    */
+    listen (SockDesc1, 5);
+
+    /*
+    ** Get the binary (64-bit) time of the specified timeout value
+    */
+    sprintf (AscTimeBuff, "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE);
+    AscTimeDesc.dsc$w_length = strlen (AscTimeBuff);
+    AscTimeDesc.dsc$a_pointer = AscTimeBuff;
+    status = sys$bintim (&AscTimeDesc, BinTimeBuff);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Assign another channel to the TCP/IP device for the accept.
+    ** This is the channel that ends up being connected to.
+    */
+    status = sys$assign (&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
+        close (SockDesc1);
+        return (-1);
+    }
+
+    /*
+    ** Get the channel of the first socket for the accept
+    */
+    TcpAcceptChan = decc$get_sdc (SockDesc1);
+
+    /*
+    ** Perform the accept using $QIO so we can do this asynchronously
+    */
+    status = sys$qio (EFN$C_ENF,
+                      TcpAcceptChan,
+                      IO$_ACCESS | IO$M_ACCEPT,
+                      &iosb,
+                      0, 0, 0, 0, 0,
+                      &TcpDeviceChan,
+                      0, 0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
+        close (SockDesc1);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Create the second socket to do the connect
+    */
+    SockDesc2 = socket (SocketFamily, SocketType, 0);
+    if (SockDesc2 < 0) {
+        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        sys$dassgn (TcpDeviceChan);
+        return (-1) ;
+    }
+
+    /*
+    ** Setup the Socket Pair Timeout Block
+    */
+    sptb.SockChan1 = TcpAcceptChan;
+    sptb.SockChan2 = decc$get_sdc (SockDesc2);
+
+    /*
+    ** Before we block on the connect, set a timer that can cancel I/O on our
+    ** two sockets if it never connects.
+    */
+    status = sys$setimr (EFN$C_ENF,
+                         BinTimeBuff,
+                         SocketPairTimeoutAst,
+                         &sptb,
+                         0);
+    if (! (status & 1)) {
+        LogMessage ("CreateSocketPair: SYS$SETIMR () - %08X", status);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Now issue the connect
+    */
+    memset ((char *) &sin, 0, sizeof (sin)) ;
+    sin.sin_family = SocketFamily;
+    sin.sin_addr.s_addr = inet_addr (LocalHostAddr) ;
+    sin.sin_port = LocalHostPort ;
+
+    status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof (sin));
+    if (status < 0 ) {
+        LogMessage ("CreateSocketPair: connect () - %d", errno);
+        sys$cantim (&sptb, 0);
+        sys$cancel (TcpAcceptChan);
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Wait for the asynch $QIO to finish.  Note that if the I/O was aborted
+    ** (SS$_ABORT), then we probably canceled it from the AST routine - so log
+    ** a timeout.
+    */
+    status = sys$synch (EFN$C_ENF, &iosb);
+    if (! (iosb.iosb$w_status & 1)) {
+        if (iosb.iosb$w_status == SS$_ABORT)
+            LogMessage ("CreateSocketPair: SYS$QIO(iosb) timeout");
+        else {
+            LogMessage ("CreateSocketPair: SYS$QIO(iosb) - %d",
+                        iosb.iosb$w_status);
+            sys$cantim (&sptb, 0);
+        }
+        close (SockDesc1);
+        close (SockDesc2);
+        sys$dassgn (TcpDeviceChan);
+        return (-1);
+    }
+
+    /*
+    ** Here we're successfully connected, so cancel the timer, convert the
+    ** I/O channel to a socket fd, close the listener socket and return the
+    ** connected pair.
+    */
+    sys$cantim (&sptb, 0);
+
+    close (SockDesc1) ;
+    SocketPair[0] = SockDesc2 ;
+    SocketPair[1] = socket_fd (TcpDeviceChan);
+
+    return (0) ;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void SocketPairTimeoutAst (int astparm)
+{
+    SPTB *sptb = (SPTB *) astparm;
+
+    sys$cancel (sptb->SockChan2); /* Cancel the connect() */
+    sys$cancel (sptb->SockChan1); /* Cancel the accept() */
+
+    return;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int TerminalDeviceAst (int astparm)
+{
+    int status;
+
+    /*
+    ** Terminate the terminal buffer
+    */
+    TerminalDeviceBuff[TerminalDeviceIosb.iosb$w_bcnt] = '\0';
+    strcat (TerminalDeviceBuff, "\n");
+
+    /*
+    ** Send the data read from the terminal device throught the socket pair
+    */
+    send (TerminalSocketPair[0], TerminalDeviceBuff,
+          TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
+
+    /*
+    ** Queue another async IO to the terminal device
+    */
+    status = sys$qio (EFN$C_ENF,
+                      TerminalDeviceChan,
+                      IO$_READVBLK,
+                      &TerminalDeviceIosb,
+                      TerminalDeviceAst,
+                      0,
+                      TerminalDeviceBuff,
+                      sizeof (TerminalDeviceBuff) - 1,
+                      0, 0, 0, 0);
+
+    /*
+    ** Return status
+    */
+    return status;
+
+}
+

+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void LogMessage (char *msg, ...)
+{
+    char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    static unsigned int pid = 0;
+    va_list args;
+    time_t CurTime;
+    struct tm *LocTime;
+    char MsgBuff[256];
+
+    /*
+    ** Get the process pid
+    */
+    if (pid == 0)
+        pid = getpid ();
+
+    /*
+    ** Convert the current time into local time
+    */
+    CurTime = time (NULL);
+    LocTime = localtime (&CurTime);
+
+    /*
+    ** Format the message buffer
+    */
+    sprintf (MsgBuff, "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n",
+             LocTime->tm_mday, Month[LocTime->tm_mon],
+             (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
+             LocTime->tm_sec, pid, msg);
+
+    /*
+    ** Get any variable arguments and add them to the print of the message
+    ** buffer
+    */
+    va_start (args, msg);
+    vfprintf (stderr, MsgBuff, args);
+    va_end (args);
+
+    /*
+    ** Flush standard error output
+    */
+    fsync (fileno (stderr));
+
+    return;
+
+}
+#endif
diff --git a/apps/vms_term_sock.h b/apps/vms_term_sock.h
new file mode 100644
index 0000000..662fa0a
--- /dev/null
+++ b/apps/vms_term_sock.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef TERM_SOCK_H
+# define TERM_SOCK_H
+
+/*
+** Terminal Socket Function Codes
+*/
+# define TERM_SOCK_CREATE       1
+# define TERM_SOCK_DELETE       2
+
+/*
+** Terminal Socket Status Codes
+*/
+# define TERM_SOCK_FAILURE      0
+# define TERM_SOCK_SUCCESS      1
+
+/*
+** Terminal Socket Prototype
+*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket);
+
+#endif

From builds at travis-ci.org  Thu Sep 15 21:24:42 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 21:24:42 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1945 (oss-dead-code -
	4403088)
In-Reply-To: <FdaSilvaYY/openssl+160259567+failed@travis-ci.org>
Message-ID: <57db119ab6e4_33f943198b9941171f0@006eee68-8e0c-4980-8912-5eb31ab16aec.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1945
Status: Failed

Duration: 42 minutes and 14 seconds
Commit: 4403088 (oss-dead-code)
Author: FdaSilvaYY
Message: Remove an useless definition.

APP_INFO is currently a field of MEM struct.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/44eeef3bbab8...440308828de5

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160259567

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/a49c30ca/attachment.html>

From no-reply at appveyor.com  Thu Sep 15 21:42:02 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 15 Sep 2016 21:42:02 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1225
Message-ID: <20160915214202.70959.94055.72D8AFC8@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/5221efd0/attachment.html>

From matt at openssl.org  Thu Sep 15 21:56:01 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 15 Sep 2016 21:56:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1473976561.137766.27328.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3c0c68ae460e947aaae5702bda6258fb812e1029 (commit)
      from  d602c2b680aefd3e0d00d090783ef5f912caf06a (commit)


- Log -----------------------------------------------------------------
commit 3c0c68ae460e947aaae5702bda6258fb812e1029
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 15 20:43:16 2016 +0100

    Revert "Abort on unrecognised warning alerts"
    
    This reverts commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533.
    
    There were some unexpected side effects to this commit, e.g. in SSLv3 a
    warning alert gets sent "no_certificate" if a client does not send a
    Certificate during Client Auth. With the above commit this causes the
    connection to abort, which is incorrect. There may be some other edge cases
    like this so we need to have a rethink on this.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_s3.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index aa148ba..46870c0 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1351,15 +1351,9 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
                 goto f_err;
             }
 #ifdef SSL_AD_MISSING_SRP_USERNAME
-            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME) {
-                return 0;
-            }
+            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
+                return (0);
 #endif
-            else {
-                al = SSL_AD_HANDSHAKE_FAILURE;
-                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNKNOWN_ALERT_TYPE);
-                goto f_err;
-            }
         } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 

From matt at openssl.org  Thu Sep 15 21:56:13 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 15 Sep 2016 21:56:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1473976573.139730.28184.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  ea6e2d543653196cb6d095f72b35073404c8ae33 (commit)
      from  2abbe94828351178220b7e284504cfb5eb1dabbb (commit)


- Log -----------------------------------------------------------------
commit ea6e2d543653196cb6d095f72b35073404c8ae33
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 15 20:43:16 2016 +0100

    Revert "Abort on unrecognised warning alerts"
    
    This reverts commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533.
    
    There were some unexpected side effects to this commit, e.g. in SSLv3 a
    warning alert gets sent "no_certificate" if a client does not send a
    Certificate during Client Auth. With the above commit this causes the
    connection to abort, which is incorrect. There may be some other edge cases
    like this so we need to have a rethink on this.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_s3.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index aa148ba..46870c0 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1351,15 +1351,9 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
                 goto f_err;
             }
 #ifdef SSL_AD_MISSING_SRP_USERNAME
-            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME) {
-                return 0;
-            }
+            else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
+                return (0);
 #endif
-            else {
-                al = SSL_AD_HANDSHAKE_FAILURE;
-                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNKNOWN_ALERT_TYPE);
-                goto f_err;
-            }
         } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 

From matt at openssl.org  Thu Sep 15 21:56:24 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 15 Sep 2016 21:56:24 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1473976584.842677.28563.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  502fcc67cccda4d997fc121eae4f2789f50adae6 (commit)
      from  15c088e4cf8411ffcb2f3187942aea178cc0919c (commit)


- Log -----------------------------------------------------------------
commit 502fcc67cccda4d997fc121eae4f2789f50adae6
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 15 20:53:09 2016 +0100

    Revert "Abort on unrecognised warning alerts"
    
    This reverts commit 15d81749322c3498027105f8ee44e8c25479d475.
    
    There were some unexpected side effects to this commit, e.g. in SSLv3 a
    warning alert gets sent "no_certificate" if a client does not send a
    Certificate during Client Auth. With the above commit this causes the
    connection to abort, which is incorrect. There may be some other edge cases
    like this so we need to have a rethink on this.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_pkt.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 91f0c58..df124cf 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1462,13 +1462,8 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             }
 #ifdef SSL_AD_MISSING_SRP_USERNAME
             else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
-                return 0;
+                return (0);
 #endif
-            else {
-                al = SSL_AD_HANDSHAKE_FAILURE;
-                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNKNOWN_ALERT_TYPE);
-                goto f_err;
-            }
         } else if (alert_level == SSL3_AL_FATAL) {
             char tmp[16];
 

From builds at travis-ci.org  Thu Sep 15 22:02:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 22:02:40 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1947 (constify_vpm -
	c1fedd8)
In-Reply-To: <FdaSilvaYY/openssl+160266514+failed@travis-ci.org>
Message-ID: <57db1a8077cc3_33fc8770cfbf054113e@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1947
Status: Failed

Duration: 12 minutes and 19 seconds
Commit: c1fedd8 (constify_vpm)
Author: FdaSilvaYY
Message: Constify code about X509_VERIFY_PARAM

View the changeset: https://github.com/FdaSilvaYY/openssl/commit/c1fedd8da369

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160266514

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/204e3596/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 15 22:27:25 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 22:27:25 +0000
Subject: [openssl-commits] Failed: openssl/openssl#6021
	(OpenSSL_1_1_0-stable - 2abbe94)
In-Reply-To: <openssl/openssl+160294564+failed@travis-ci.org>
Message-ID: <57db204d581e5_33fc87708f0a05789f3@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6021
Status: Failed

Duration: 30 minutes and 6 seconds
Commit: 2abbe94 (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Finally, make sure vms_term_sock.c is built on VMS

Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit d602c2b680aefd3e0d00d090783ef5f912caf06a)

View the changeset: https://github.com/openssl/openssl/compare/03a8bf079c1b...2abbe9482835

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160294564

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/4ffd3cdb/attachment.html>

From builds at travis-ci.org  Thu Sep 15 22:18:09 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 22:18:09 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6018 (master -
	d602c2b)
In-Reply-To: <openssl/openssl+160293324+still failing@travis-ci.org>
Message-ID: <57db1e213e627_33fc877092458566794@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6018
Status: Still Failing

Duration: 53 minutes and 23 seconds
Commit: d602c2b (master)
Author: Richard Levitte
Message: Finally, make sure vms_term_sock.c is built on VMS

Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/6f0ac0e2f27d...d602c2b680ae

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160293324

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/0c13e874/attachment.html>

From builds at travis-ci.org  Thu Sep 15 22:35:12 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 22:35:12 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1948
	(pack_argv_options - 42362db)
In-Reply-To: <FdaSilvaYY/openssl+160292309+broken@travis-ci.org>
Message-ID: <57db22207682b_33fe6e1c99d6892032f@6368bcff-666b-4d27-94d4-4013a32c2095.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1948
Status: Broken

Duration: 45 minutes and 19 seconds
Commit: 42362db (pack_argv_options)
Author: FdaSilvaYY
Message: Use PATH_MAX and NAME_MAX

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/1bc9bbef8bc1...42362db45fdd

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160292309

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/e868bd1d/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 15 23:01:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 23:01:50 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6022 (master - 3c0c68a)
In-Reply-To: <openssl/openssl+160300890+fixed@travis-ci.org>
Message-ID: <57db285e8f2dd_33fc87708e2a4618172@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6022
Status: Fixed

Duration: 47 minutes and 49 seconds
Commit: 3c0c68a (master)
Author: Matt Caswell
Message: Revert "Abort on unrecognised warning alerts"

This reverts commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533.

There were some unexpected side effects to this commit, e.g. in SSLv3 a
warning alert gets sent "no_certificate" if a client does not send a
Certificate during Client Auth. With the above commit this causes the
connection to abort, which is incorrect. There may be some other edge cases
like this so we need to have a rethink on this.

Reviewed-by: Tim Hudson <tjh at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/d602c2b680ae...3c0c68ae460e

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160300890

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/f81d7412/attachment.html>

From builds at travis-ci.org  Thu Sep 15 22:55:27 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 22:55:27 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6023
	(OpenSSL_1_1_0-stable - ea6e2d5)
In-Reply-To: <openssl/openssl+160300927+passed@travis-ci.org>
Message-ID: <57db26ded609c_33fe6e1c987749399f2@6368bcff-666b-4d27-94d4-4013a32c2095.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6023
Status: Passed

Duration: 27 minutes and 51 seconds
Commit: ea6e2d5 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Revert "Abort on unrecognised warning alerts"

This reverts commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533.

There were some unexpected side effects to this commit, e.g. in SSLv3 a
warning alert gets sent "no_certificate" if a client does not send a
Certificate during Client Auth. With the above commit this causes the
connection to abort, which is incorrect. There may be some other edge cases
like this so we need to have a rethink on this.

Reviewed-by: Tim Hudson <tjh at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/2abbe9482835...ea6e2d543653

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160300927

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/e800a34f/attachment.html>

From builds at travis-ci.org  Thu Sep 15 23:03:32 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 15 Sep 2016 23:03:32 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1949
	(fix-ca-buf-usage - bd9927e)
In-Reply-To: <FdaSilvaYY/openssl+160294140+still failing@travis-ci.org>
Message-ID: <57db28dae7102_33f943198a38c17051d@006eee68-8e0c-4980-8912-5eb31ab16aec.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1949
Status: Still Failing

Duration: 40 minutes and 49 seconds
Commit: bd9927e (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Simplify and fix usage of three string array variable...

 using two separated local variables.

buf[1] was unused.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/297ae05ae362...bd9927e725f1

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160294140

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160915/c21ca82a/attachment-0001.html>

From no-reply at appveyor.com  Fri Sep 16 00:41:53 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 00:41:53 +0000
Subject: [openssl-commits] Build failed: openssl master.5355
Message-ID: <20160916004153.15105.67127.28738BFC@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/a2e64e0f/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 01:31:25 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 01:31:25 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_0_2-stable.5356
Message-ID: <20160916013125.7565.27054.29A3E864@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/02bba218/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 06:37:12 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 06:37:12 +0000
Subject: [openssl-commits] Build completed: openssl master.5357
Message-ID: <20160916063711.14580.25659.3BCD6AA8@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/7331f771/attachment.html>

From builds at travis-ci.org  Fri Sep 16 06:51:39 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 06:51:39 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1950 (master -
	5bc80d7)
In-Reply-To: <FdaSilvaYY/openssl+160364951+still failing@travis-ci.org>
Message-ID: <57db9688cf42b_33fc8770938f89303dd@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1950
Status: Still Failing

Duration: 37 minutes and 56 seconds
Commit: 5bc80d7 (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5d0c0f11e8c3...5bc80d7ddc69

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160364951

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/abde7d52/attachment.html>

From builds at travis-ci.org  Fri Sep 16 07:21:29 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 07:21:29 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1951 (constify_vpm -
	7936010)
In-Reply-To: <FdaSilvaYY/openssl+160365964+fixed@travis-ci.org>
Message-ID: <57db9d86d14ce_33fc87708f1909463ad@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1951
Status: Fixed

Duration: 18 minutes and 14 seconds
Commit: 7936010 (constify_vpm)
Author: FdaSilvaYY
Message: Constify code about X509_VERIFY_PARAM

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/c1fedd8da369...7936010268ac

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160365964

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/11f57ddb/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 16 07:54:51 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 07:54:51 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1952
	(apps-speed-rework - 0f540fb)
In-Reply-To: <FdaSilvaYY/openssl+160366002+failed@travis-ci.org>
Message-ID: <57dba54b99526_33fb2b3c9403c1284e5@5a305e9d-ca5c-4a1d-8b30-0ff7b5957e2c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1952
Status: Failed

Duration: 45 minutes and 25 seconds
Commit: 0f540fb (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/d29af1367134^...0f540fb231f5

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160366002

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/1d4d1912/attachment.html>

From builds at travis-ci.org  Fri Sep 16 08:41:43 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 08:41:43 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1953 (oss-dead-code -
	ef0936b)
In-Reply-To: <FdaSilvaYY/openssl+160366097+fixed@travis-ci.org>
Message-ID: <57dbb0477a5c5_33fb2b3c94348176092@5a305e9d-ca5c-4a1d-8b30-0ff7b5957e2c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1953
Status: Fixed

Duration: 1 hour, 1 minute, and 36 seconds
Commit: ef0936b (oss-dead-code)
Author: FdaSilvaYY
Message: Remove an useless definition.

APP_INFO is currently a field of MEM struct.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/440308828de5...ef0936bd70fa

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160366097

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/d9ae46ad/attachment.html>

From builds at travis-ci.org  Fri Sep 16 09:00:30 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 09:00:30 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1954 (fix-ca-buf-usage
	- be4653b)
In-Reply-To: <FdaSilvaYY/openssl+160366292+fixed@travis-ci.org>
Message-ID: <57dbb4add4f5e_33fc87708efb099916b@ba63fab2-bc8c-4770-a698-602a6a9d5918.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1954
Status: Fixed

Duration: 47 minutes and 11 seconds
Commit: be4653b (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Simplify and fix usage of three string array variable...

 using two separated local variables.

buf[1] was unused.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/bd9927e725f1...be4653b19370

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160366292

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/223aa459/attachment-0001.html>

From levitte at openssl.org  Fri Sep 16 09:52:58 2016
From: levitte at openssl.org (Richard Levitte)
Date: Fri, 16 Sep 2016 09:52:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474019578.928067.31187.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c5ad3076a6c076ac9f8449c393dd14c16b737560 (commit)
       via  1967a42eb5192efc552287f78850420082caba7c (commit)
       via  dc660c70b52c552aa4eb9659963bfbe6ab18bec0 (commit)
       via  ee9b0bbb4c66812da18939ea96c4625cb001f3bd (commit)
      from  3c0c68ae460e947aaae5702bda6258fb812e1029 (commit)


- Log -----------------------------------------------------------------
commit c5ad3076a6c076ac9f8449c393dd14c16b737560
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 23:56:03 2016 +0200

    Simplify the dependencies for remaking configdata.pm
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 1967a42eb5192efc552287f78850420082caba7c
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 23:55:24 2016 +0200

    Rearrange the storage of build file template names in %config
    
    They are now relative paths as well
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit dc660c70b52c552aa4eb9659963bfbe6ab18bec0
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 22:22:20 2016 +0200

    Use the registered conf file names as dependencies to build configdata.pm
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit ee9b0bbb4c66812da18939ea96c4625cb001f3bd
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 22:21:41 2016 +0200

    Register the name of the config file each config target was found in
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      |  2 +-
 Configurations/unix-Makefile.tmpl    |  2 +-
 Configurations/windows-makefile.tmpl |  2 +-
 Configure                            | 91 +++++++++++++++++++-----------------
 4 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index cac804a..ba80365 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -517,7 +517,7 @@ debug_logicals :
 
 # Building targets ###################################################
 
-configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -}
+configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
         @ WRITE SYS$OUTPUT "Reconfiguring..."
         perl $(SRCDIR)Configure reconf
         @ WRITE SYS$OUTPUT "*************************************************"
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index a4c30e7..b448421 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -836,7 +836,7 @@ openssl.pc:
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: libssl libcrypto' ) > openssl.pc
 
-configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}
+configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	$(SRCDIR)/Configure reconf
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 3a6426f..931d4df 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -327,7 +327,7 @@ uninstall_html_docs:
 
 # Building targets ###################################################
 
-configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configurations\common.tmpl" "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}) -}
+configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	"$(PERL)" "$(SRCDIR)\Configure" reconf
diff --git a/Configure b/Configure
index 36734d3..d78ab7a 100755
--- a/Configure
+++ b/Configure
@@ -921,6 +921,8 @@ my %target = resolve_config($target);
 
 &usage if (!%target || $target{template});
 
+my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}});
+$config{conf_files} = [ sort keys %conf_files ];
 %target = ( %{$table{DEFAULTS}}, %target );
 
 $target{exe_extension}="";
@@ -1314,44 +1316,6 @@ my %unified_info = ();
 
 my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO});
 if ($builder eq "unified") {
-    # Store the name of the template file we will build the build file from
-    # in %config.  This may be useful for the build file itself.
-    my @build_file_template_names =
-	( $builder_platform."-".$target{build_file}.".tmpl",
-	  $target{build_file}.".tmpl" );
-    my @build_file_templates = ();
-
-    # First, look in the user provided directory, if given
-    if (defined $ENV{$local_config_envname}) {
-	@build_file_templates =
-	    map {
-		if ($^O eq 'VMS') {
-		    # VMS environment variables are logical names,
-		    # which can be used as is
-		    $local_config_envname . ':' . $_;
-		} else {
-		    catfile($ENV{$local_config_envname}, $_);
-		}
-	    }
-	    @build_file_template_names;
-    }
-    # Then, look in our standard directory
-    push @build_file_templates,
-	( map { catfile($srcdir, "Configurations", $_) }
-	  @build_file_template_names );
-
-    my $build_file_template;
-    for $_ (@build_file_templates) {
-	$build_file_template = $_;
-        last if -f $build_file_template;
-
-        $build_file_template = undef;
-    }
-    if (!defined $build_file_template) {
-	die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
-    }
-    $config{build_file_template} = $build_file_template;
-
     use lib catdir(dirname(__FILE__),"util");
     use with_fallback qw(Text::Template);
 
@@ -1388,6 +1352,47 @@ if ($builder eq "unified") {
         return $res;
     }
 
+    # Store the name of the template file we will build the build file from
+    # in %config.  This may be useful for the build file itself.
+    my @build_file_template_names =
+	( $builder_platform."-".$target{build_file}.".tmpl",
+	  $target{build_file}.".tmpl" );
+    my @build_file_templates = ();
+
+    # First, look in the user provided directory, if given
+    if (defined $ENV{$local_config_envname}) {
+	@build_file_templates =
+	    map {
+		if ($^O eq 'VMS') {
+		    # VMS environment variables are logical names,
+		    # which can be used as is
+		    $local_config_envname . ':' . $_;
+		} else {
+		    catfile($ENV{$local_config_envname}, $_);
+		}
+	    }
+	    @build_file_template_names;
+    }
+    # Then, look in our standard directory
+    push @build_file_templates,
+	( map { cleanfile($srcdir, catfile("Configurations", $_), $blddir) }
+	  @build_file_template_names );
+
+    my $build_file_template;
+    for $_ (@build_file_templates) {
+	$build_file_template = $_;
+        last if -f $build_file_template;
+
+        $build_file_template = undef;
+    }
+    if (!defined $build_file_template) {
+	die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
+    }
+    $config{build_file_templates}
+      = [ $build_file_template,
+          cleanfile($srcdir, catfile("Configurations", "common.tmpl"),
+                    $blddir) ];
+
     my @build_infos = ( [ ".", "build.info" ] );
     foreach (@{$config{dirs}}) {
         push @build_infos, [ $_, "build.info" ]
@@ -2035,8 +2040,7 @@ print "EX_LIBS       =$target{ex_libs} $config{ex_libs}\n";
 my %builders = (
     unified => sub {
         run_dofile(catfile($blddir, $target{build_file}),
-                   $config{build_file_template},
-                   catfile($srcdir, "Configurations", "common.tmpl"));
+                   @{$config{build_file_templates}});
     },
     );
 
@@ -2209,7 +2213,8 @@ sub read_config {
     close(CONFFILE);
     my %targets = ();
     {
-	local %table = %::table;    # Protect %table from tampering
+	# Protect certain tables from tampering
+	local %table = %::table;
 
 	eval $content;
 	warn $@ if $@;
@@ -2224,7 +2229,9 @@ sub read_config {
 		warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";
 	    }
 	    delete $targets{$_};
-	}
+	} else {
+            $targets{$_}->{_conf_fname_int} = add([ $fname ]);
+        }
     }
 
     %table = (%table, %targets);

From levitte at openssl.org  Fri Sep 16 09:53:36 2016
From: levitte at openssl.org (Richard Levitte)
Date: Fri, 16 Sep 2016 09:53:36 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474019616.161052.32372.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  21729930885528d6d61b44520a97636b0a4d0398 (commit)
       via  5dab48340ecce1ff33f267ff07c6a7b485dce32f (commit)
       via  b5edd178ca6895fd0e263eacef83e48e374669e5 (commit)
       via  efd23794121520fb1526616af2784ddc9d078280 (commit)
      from  ea6e2d543653196cb6d095f72b35073404c8ae33 (commit)


- Log -----------------------------------------------------------------
commit 21729930885528d6d61b44520a97636b0a4d0398
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 23:56:03 2016 +0200

    Simplify the dependencies for remaking configdata.pm
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit c5ad3076a6c076ac9f8449c393dd14c16b737560)

commit 5dab48340ecce1ff33f267ff07c6a7b485dce32f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 15 23:55:24 2016 +0200

    Rearrange the storage of build file template names in %config
    
    They are now relative paths as well
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 1967a42eb5192efc552287f78850420082caba7c)

commit b5edd178ca6895fd0e263eacef83e48e374669e5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 22:22:20 2016 +0200

    Use the registered conf file names as dependencies to build configdata.pm
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit dc660c70b52c552aa4eb9659963bfbe6ab18bec0)

commit efd23794121520fb1526616af2784ddc9d078280
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 14 22:21:41 2016 +0200

    Register the name of the config file each config target was found in
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit ee9b0bbb4c66812da18939ea96c4625cb001f3bd)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      |  2 +-
 Configurations/unix-Makefile.tmpl    |  2 +-
 Configurations/windows-makefile.tmpl |  2 +-
 Configure                            | 91 +++++++++++++++++++-----------------
 4 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index ce96778..41f52aa 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -508,7 +508,7 @@ debug_logicals :
 
 # Building targets ###################################################
 
-configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -}
+configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
         @ WRITE SYS$OUTPUT "Reconfiguring..."
         perl $(SRCDIR)Configure reconf
         @ WRITE SYS$OUTPUT "*************************************************"
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index f5a0274..7973e10 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -827,7 +827,7 @@ openssl.pc:
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: libssl libcrypto' ) > openssl.pc
 
-configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}
+configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	$(SRCDIR)/Configure reconf
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index cbb9116..988dc93 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -322,7 +322,7 @@ uninstall_html_docs:
 
 # Building targets ###################################################
 
-configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configurations\common.tmpl" "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}) -}
+configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	"$(PERL)" "$(SRCDIR)\Configure" reconf
diff --git a/Configure b/Configure
index 9c183da..dcc317a 100755
--- a/Configure
+++ b/Configure
@@ -904,6 +904,8 @@ my %target = resolve_config($target);
 
 &usage if (!%target || $target{template});
 
+my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}});
+$config{conf_files} = [ sort keys %conf_files ];
 %target = ( %{$table{DEFAULTS}}, %target );
 
 $target{exe_extension}="";
@@ -1297,44 +1299,6 @@ my %unified_info = ();
 
 my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO});
 if ($builder eq "unified") {
-    # Store the name of the template file we will build the build file from
-    # in %config.  This may be useful for the build file itself.
-    my @build_file_template_names =
-	( $builder_platform."-".$target{build_file}.".tmpl",
-	  $target{build_file}.".tmpl" );
-    my @build_file_templates = ();
-
-    # First, look in the user provided directory, if given
-    if (defined $ENV{$local_config_envname}) {
-	@build_file_templates =
-	    map {
-		if ($^O eq 'VMS') {
-		    # VMS environment variables are logical names,
-		    # which can be used as is
-		    $local_config_envname . ':' . $_;
-		} else {
-		    catfile($ENV{$local_config_envname}, $_);
-		}
-	    }
-	    @build_file_template_names;
-    }
-    # Then, look in our standard directory
-    push @build_file_templates,
-	( map { catfile($srcdir, "Configurations", $_) }
-	  @build_file_template_names );
-
-    my $build_file_template;
-    for $_ (@build_file_templates) {
-	$build_file_template = $_;
-        last if -f $build_file_template;
-
-        $build_file_template = undef;
-    }
-    if (!defined $build_file_template) {
-	die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
-    }
-    $config{build_file_template} = $build_file_template;
-
     use lib catdir(dirname(__FILE__),"util");
     use with_fallback qw(Text::Template);
 
@@ -1371,6 +1335,47 @@ if ($builder eq "unified") {
         return $res;
     }
 
+    # Store the name of the template file we will build the build file from
+    # in %config.  This may be useful for the build file itself.
+    my @build_file_template_names =
+	( $builder_platform."-".$target{build_file}.".tmpl",
+	  $target{build_file}.".tmpl" );
+    my @build_file_templates = ();
+
+    # First, look in the user provided directory, if given
+    if (defined $ENV{$local_config_envname}) {
+	@build_file_templates =
+	    map {
+		if ($^O eq 'VMS') {
+		    # VMS environment variables are logical names,
+		    # which can be used as is
+		    $local_config_envname . ':' . $_;
+		} else {
+		    catfile($ENV{$local_config_envname}, $_);
+		}
+	    }
+	    @build_file_template_names;
+    }
+    # Then, look in our standard directory
+    push @build_file_templates,
+	( map { cleanfile($srcdir, catfile("Configurations", $_), $blddir) }
+	  @build_file_template_names );
+
+    my $build_file_template;
+    for $_ (@build_file_templates) {
+	$build_file_template = $_;
+        last if -f $build_file_template;
+
+        $build_file_template = undef;
+    }
+    if (!defined $build_file_template) {
+	die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
+    }
+    $config{build_file_templates}
+      = [ $build_file_template,
+          cleanfile($srcdir, catfile("Configurations", "common.tmpl"),
+                    $blddir) ];
+
     my @build_infos = ( [ ".", "build.info" ] );
     foreach (@{$config{dirs}}) {
         push @build_infos, [ $_, "build.info" ]
@@ -2046,8 +2051,7 @@ print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} ne $def_int;
 my %builders = (
     unified => sub {
         run_dofile(catfile($blddir, $target{build_file}),
-                   $config{build_file_template},
-                   catfile($srcdir, "Configurations", "common.tmpl"));
+                   @{$config{build_file_templates}});
     },
     );
 
@@ -2225,7 +2229,8 @@ sub read_config {
     close(CONFFILE);
     my %targets = ();
     {
-	local %table = %::table;    # Protect %table from tampering
+	# Protect certain tables from tampering
+	local %table = %::table;
 
 	eval $content;
 	warn $@ if $@;
@@ -2240,7 +2245,9 @@ sub read_config {
 		warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";
 	    }
 	    delete $targets{$_};
-	}
+	} else {
+            $targets{$_}->{_conf_fname_int} = add([ $fname ]);
+        }
     }
 
     %table = (%table, %targets);

From no-reply at appveyor.com  Fri Sep 16 09:57:08 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 09:57:08 +0000
Subject: [openssl-commits] Build failed: openssl master.5360
Message-ID: <20160916095705.99680.35626.7A3D66A5@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/2a308966/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 10:00:40 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 10:00:40 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_1_0-stable.5361
Message-ID: <20160916100031.31517.23024.8166E6B5@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/364de36a/attachment.html>

From builds at travis-ci.org  Fri Sep 16 10:06:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 10:06:52 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1956 (pack_argv_options
	- 92475aa)
In-Reply-To: <FdaSilvaYY/openssl+160366453+fixed@travis-ci.org>
Message-ID: <57dbc43ac9298_33fb2b3cc9bc4266820@5a305e9d-ca5c-4a1d-8b30-0ff7b5957e2c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1956
Status: Fixed

Duration: 46 minutes and 38 seconds
Commit: 92475aa (pack_argv_options)
Author: FdaSilvaYY
Message: Use PATH_MAX and NAME_MAX

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/42362db45fdd...92475aa0115a

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160366453

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/eb24a36d/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 16 10:33:09 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 10:33:09 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1957
	(oss_constify_api - 33269d7)
In-Reply-To: <FdaSilvaYY/openssl+160366550+still failing@travis-ci.org>
Message-ID: <57dbca651f540_33fb2b3c954a02982c4@5a305e9d-ca5c-4a1d-8b30-0ff7b5957e2c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1957
Status: Still Failing

Duration: 41 minutes and 23 seconds
Commit: 33269d7 (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack fix ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0af00bc55316...33269d7e2ae5

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160366550

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/bffaf460/attachment.html>

From builds at travis-ci.org  Fri Sep 16 11:17:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 11:17:18 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1958
	(fix_set_dup_exdata - 3cd1a05)
In-Reply-To: <FdaSilvaYY/openssl+160369850+fixed@travis-ci.org>
Message-ID: <57dbd4be58c2e_33f943198ad78429252@006eee68-8e0c-4980-8912-5eb31ab16aec.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1958
Status: Fixed

Duration: 12 minutes and 20 seconds
Commit: 3cd1a05 (fix_set_dup_exdata)
Author: FdaSilvaYY
Message: Fix possible malloc failure inside CRYPTO_dup_ex_data()

Fix related docs.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/9f86cb1835b9...3cd1a053965e

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160369850

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/a505e25f/attachment.html>

From builds at travis-ci.org  Fri Sep 16 11:44:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 11:44:50 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1957 (oss_constify_api
	- 33269d7)
In-Reply-To: <FdaSilvaYY/openssl+160366550+fixed@travis-ci.org>
Message-ID: <57dbdb31c14a7_33fb2bb6bbc483822b@5a305e9d-ca5c-4a1d-8b30-0ff7b5957e2c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1957
Status: Fixed

Duration: 8 minutes and 14 seconds
Commit: 33269d7 (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack fix ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0af00bc55316...33269d7e2ae5

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160366550

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/13333fd6/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 16 11:45:20 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 11:45:20 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1959
	(oss_builds_options_check - 119640c)
In-Reply-To: <FdaSilvaYY/openssl+160369989+still failing@travis-ci.org>
Message-ID: <57dbdb5072431_33fb2b3c9568038287c@5a305e9d-ca5c-4a1d-8b30-0ff7b5957e2c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1959
Status: Still Failing

Duration: 50 minutes and 31 seconds
Commit: 119640c (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/79d63b034c8e...119640c43b41

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160369989

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/870dbadc/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 13:55:42 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 13:55:42 +0000
Subject: [openssl-commits] Build failed: openssl master.5362
Message-ID: <20160916135540.70834.11088.380A2BDB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/b718ae6c/attachment.html>

From rsalz at openssl.org  Fri Sep 16 15:12:53 2016
From: rsalz at openssl.org (Rich Salz)
Date: Fri, 16 Sep 2016 15:12:53 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474038773.552856.14742.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4f8a5f4da94bb70e06cf709beb1ddfa57a218c3d (commit)
      from  c5ad3076a6c076ac9f8449c393dd14c16b737560 (commit)


- Log -----------------------------------------------------------------
commit 4f8a5f4da94bb70e06cf709beb1ddfa57a218c3d
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Sep 14 00:51:02 2016 +0100

    Use switch instead of multiple ifs
    
    Makes the logic a little bit clearer.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1571)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 3df4ce6..df30085 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -566,22 +566,24 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
             /* Discard the packet data */
             s->init_num = 0;
 
-            if (ret == MSG_PROCESS_ERROR) {
+            switch (ret) {
+            case MSG_PROCESS_ERROR:
                 return SUB_STATE_ERROR;
-            }
 
-            if (ret == MSG_PROCESS_FINISHED_READING) {
+            case MSG_PROCESS_FINISHED_READING:
                 if (SSL_IS_DTLS(s)) {
                     dtls1_stop_timer(s);
                 }
                 return SUB_STATE_FINISHED;
-            }
 
-            if (ret == MSG_PROCESS_CONTINUE_PROCESSING) {
+            case MSG_PROCESS_CONTINUE_PROCESSING:
                 st->read_state = READ_STATE_POST_PROCESS;
                 st->read_state_work = WORK_MORE_A;
-            } else {
+                break;
+
+            default:
                 st->read_state = READ_STATE_HEADER;
+                break;
             }
             break;
 

From no-reply at appveyor.com  Fri Sep 16 15:17:33 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 15:17:33 +0000
Subject: [openssl-commits] Build failed: openssl master.5363
Message-ID: <20160916151731.82629.42105.FC8427EF@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/e87f25ca/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 16:14:15 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 16:14:15 +0000
Subject: [openssl-commits] Build failed: openssl master.5364
Message-ID: <20160916161415.117044.25905.54F98682@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/bae1710c/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:27:38 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:27:38 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1238
Message-ID: <20160916212738.14531.24777.B59D2708@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/640f2db7/attachment-0001.html>

From no-reply at appveyor.com  Fri Sep 16 21:30:59 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:30:59 +0000
Subject: [openssl-commits] Build failed: openssl master.5365
Message-ID: <20160916213059.81331.63498.B0746ABB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/fdbc8ef0/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:31:03 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:31:03 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1239
Message-ID: <20160916213103.19786.88318.07F35971@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/00f93d54/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:36:14 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:36:14 +0000
Subject: [openssl-commits] Build failed: openssl master.5366
Message-ID: <20160916213614.19686.65683.380FE90B@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/fb908c54/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:45:52 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:45:52 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1240
Message-ID: <20160916214552.2581.66818.F0906BDA@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/f99883e4/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:46:47 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:46:47 +0000
Subject: [openssl-commits] Build failed: openssl master.5367
Message-ID: <20160916214647.4510.98308.B3DBFE2A@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/1afd6dba/attachment.html>

From builds at travis-ci.org  Fri Sep 16 21:49:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 21:49:55 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1960
	(fix-missing-opt-help - 2364cf2)
In-Reply-To: <FdaSilvaYY/openssl+160562221+errored@travis-ci.org>
Message-ID: <57dc69033e185_33ff5cefeebc05759cd@d9f3ac9e-5931-4976-a5d6-4bea424b1300.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1960
Status: Errored

Duration: 24 minutes and 59 seconds
Commit: 2364cf2 (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Fix various missing option help messages ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/ee9b0bbb4c66^...2364cf2a6a87

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160562221

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/215dea44/attachment-0001.html>

From no-reply at appveyor.com  Fri Sep 16 21:54:00 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:54:00 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1241
Message-ID: <20160916215400.4451.22922.206BA040@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/66fdf1d4/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:54:27 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:54:27 +0000
Subject: [openssl-commits] Build failed: openssl master.5368
Message-ID: <20160916215426.4714.69428.F9D27C4D@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/33d6e2ac/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:57:54 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:57:54 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1242
Message-ID: <20160916215754.19709.80604.98F2277C@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/55fe7719/attachment.html>

From no-reply at appveyor.com  Fri Sep 16 21:58:12 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 16 Sep 2016 21:58:12 +0000
Subject: [openssl-commits] Build failed: openssl master.5369
Message-ID: <20160916215812.2505.78632.DE0CD707@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/f1e0a4a1/attachment.html>

From builds at travis-ci.org  Fri Sep 16 22:20:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 22:20:03 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1962
	(fix-missing-opt-help - 2e2d823)
In-Reply-To: <FdaSilvaYY/openssl+160566104+errored@travis-ci.org>
Message-ID: <57dc7013b70d1_33ff5cf196e786101e1@d9f3ac9e-5931-4976-a5d6-4bea424b1300.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1962
Status: Errored

Duration: 8 minutes and 6 seconds
Commit: 2e2d823 (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Fix various missing option help messages ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/2364cf2a6a87...2e2d823faabf

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160566104

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/29fc968f/attachment.html>

From builds at travis-ci.org  Fri Sep 16 22:24:31 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 22:24:31 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1961 (fix-install-typo
	- 5df5a1f)
In-Reply-To: <FdaSilvaYY/openssl+160562758+fixed@travis-ci.org>
Message-ID: <57dc711e24b0c_33ff5cefeee68615588@d9f3ac9e-5931-4976-a5d6-4bea424b1300.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1961
Status: Fixed

Duration: 38 minutes and 46 seconds
Commit: 5df5a1f (fix-install-typo)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal

Fix a typo

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/bdbd014ed6bf...5df5a1f05f42

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160562758

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/d51f81af/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 16 22:24:48 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 22:24:48 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1963
	(fix-missing-opt-help - 63ba8ca)
In-Reply-To: <FdaSilvaYY/openssl+160567494+errored@travis-ci.org>
Message-ID: <57dc71309c5ac_33ffbe07d3cfc15555d@25246249-7c3f-41a1-9137-9f3d33190334.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1963
Status: Errored

Duration: 5 minutes and 10 seconds
Commit: 63ba8ca (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Fix various missing option help messages ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/2e2d823faabf...63ba8cacf77d

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160567494

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/8754d2ca/attachment.html>

From builds at travis-ci.org  Fri Sep 16 23:00:13 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 16 Sep 2016 23:00:13 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#1964
	(fix-missing-opt-help - 5a7e5ec)
In-Reply-To: <FdaSilvaYY/openssl+160567602+passed@travis-ci.org>
Message-ID: <57dc7993ae420_33ff5cefeed5064978b@d9f3ac9e-5931-4976-a5d6-4bea424b1300.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1964
Status: Passed

Duration: 17 minutes and 30 seconds
Commit: 5a7e5ec (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Fix various missing option help messages ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/63ba8cacf77d...5a7e5ecbcefc

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160567602

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160916/3fefcdea/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 13:14:23 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 13:14:23 +0000
Subject: [openssl-commits] Build failed: openssl 174
Message-ID: <20160917131423.34134.40510.759CFFF6@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/0b42e1bb/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 13:24:09 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 13:24:09 +0000
Subject: [openssl-commits] Build failed: openssl 175
Message-ID: <20160917132408.24835.68690.4A0A0535@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/86abf07d/attachment-0001.html>

From no-reply at appveyor.com  Sat Sep 17 13:29:36 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 13:29:36 +0000
Subject: [openssl-commits] Build failed: openssl 176
Message-ID: <20160917132935.19834.49386.C34CC326@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/7794d682/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 13:32:04 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 13:32:04 +0000
Subject: [openssl-commits] Build failed: openssl master.5370
Message-ID: <20160917133203.14496.42426.CC96E5BA@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/c9c1af3c/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 13:32:46 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 13:32:46 +0000
Subject: [openssl-commits] Build failed: openssl 177
Message-ID: <20160917133246.14420.55016.26A9F0F9@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/f698e188/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 15:56:19 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 15:56:19 +0000
Subject: [openssl-commits] Build failed: openssl master.5371
Message-ID: <20160917155619.4749.34185.8B7A57AE@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/fa18e097/attachment.html>

From rsalz at openssl.org  Sat Sep 17 16:36:29 2016
From: rsalz at openssl.org (Rich Salz)
Date: Sat, 17 Sep 2016 16:36:29 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474130189.796535.3348.nullmailer@dev.openssl.org>

The branch master has been updated
       via  76dc356384b3d8f93f04be05f320a878e4bced52 (commit)
      from  4f8a5f4da94bb70e06cf709beb1ddfa57a218c3d (commit)


- Log -----------------------------------------------------------------
commit 76dc356384b3d8f93f04be05f320a878e4bced52
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Thu Sep 15 20:33:18 2016 +0200

    Remove an useless definition.
    
    APP_INFO is currently a field of MEM struct.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1583)

-----------------------------------------------------------------------

Summary of changes:
 crypto/include/internal/cryptlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index 91267b7..f3ec9b6 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -35,7 +35,7 @@ typedef struct ex_callback_st EX_CALLBACK;
 DEFINE_STACK_OF(EX_CALLBACK)
 
 typedef struct app_mem_info_st APP_INFO;
-DEFINE_LHASH_OF(APP_INFO);
+
 typedef struct mem_st MEM;
 DEFINE_LHASH_OF(MEM);
 

From rsalz at openssl.org  Sat Sep 17 16:36:51 2016
From: rsalz at openssl.org (Rich Salz)
Date: Sat, 17 Sep 2016 16:36:51 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474130211.584028.4221.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  f0d0e783dffcd7b659b0962bf68cde24bfa733bc (commit)
      from  21729930885528d6d61b44520a97636b0a4d0398 (commit)


- Log -----------------------------------------------------------------
commit f0d0e783dffcd7b659b0962bf68cde24bfa733bc
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Thu Sep 15 20:33:18 2016 +0200

    Remove an useless definition.
    
    APP_INFO is currently a field of MEM struct.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1583)
    (cherry picked from commit 76dc356384b3d8f93f04be05f320a878e4bced52)

-----------------------------------------------------------------------

Summary of changes:
 crypto/include/internal/cryptlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index 91267b7..f3ec9b6 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -35,7 +35,7 @@ typedef struct ex_callback_st EX_CALLBACK;
 DEFINE_STACK_OF(EX_CALLBACK)
 
 typedef struct app_mem_info_st APP_INFO;
-DEFINE_LHASH_OF(APP_INFO);
+
 typedef struct mem_st MEM;
 DEFINE_LHASH_OF(MEM);
 

From no-reply at appveyor.com  Sat Sep 17 16:39:37 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 16:39:37 +0000
Subject: [openssl-commits] Build failed: openssl master.5372
Message-ID: <20160917163937.19858.98973.C3220DDC@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/42b373e2/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 16:42:19 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 16:42:19 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_1_0-stable.5373
Message-ID: <20160917164219.14585.40651.002CCBCB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/16b047cb/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 19:15:33 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 19:15:33 +0000
Subject: [openssl-commits] Build completed: openssl master.5374
Message-ID: <20160917191532.12944.39535.6AB7AA44@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/15309347/attachment-0001.html>

From levitte at openssl.org  Sat Sep 17 19:15:57 2016
From: levitte at openssl.org (Richard Levitte)
Date: Sat, 17 Sep 2016 19:15:57 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474139757.482223.27209.nullmailer@dev.openssl.org>

The branch master has been updated
       via  41240e68d745972d56dd037caf439d9c5032813f (commit)
      from  76dc356384b3d8f93f04be05f320a878e4bced52 (commit)


- Log -----------------------------------------------------------------
commit 41240e68d745972d56dd037caf439d9c5032813f
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Sep 17 20:50:56 2016 +0200

    Simplify configudata.pm dependency generation
    
    While we're at it, correct the fault in windows-makefile.tmpl
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      | 2 +-
 Configurations/unix-Makefile.tmpl    | 2 +-
 Configurations/windows-makefile.tmpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index ba80365..0e3e620 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -517,7 +517,7 @@ debug_logicals :
 
 # Building targets ###################################################
 
-configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
         @ WRITE SYS$OUTPUT "Reconfiguring..."
         perl $(SRCDIR)Configure reconf
         @ WRITE SYS$OUTPUT "*************************************************"
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b448421..bb7ce1c 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -836,7 +836,7 @@ openssl.pc:
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: libssl libcrypto' ) > openssl.pc
 
-configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	$(SRCDIR)/Configure reconf
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 931d4df..4c8e89f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -327,7 +327,7 @@ uninstall_html_docs:
 
 # Building targets ###################################################
 
-configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	"$(PERL)" "$(SRCDIR)\Configure" reconf

From levitte at openssl.org  Sat Sep 17 19:22:27 2016
From: levitte at openssl.org (Richard Levitte)
Date: Sat, 17 Sep 2016 19:22:27 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474140147.202695.30219.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  ebae51f4900af1fbc1e024bab44412b74fc46fa7 (commit)
      from  f0d0e783dffcd7b659b0962bf68cde24bfa733bc (commit)


- Log -----------------------------------------------------------------
commit ebae51f4900af1fbc1e024bab44412b74fc46fa7
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Sep 17 20:50:56 2016 +0200

    Simplify configudata.pm dependency generation
    
    While we're at it, correct the fault in windows-makefile.tmpl
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit 41240e68d745972d56dd037caf439d9c5032813f)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      | 2 +-
 Configurations/unix-Makefile.tmpl    | 2 +-
 Configurations/windows-makefile.tmpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 41f52aa..48b3476 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -508,7 +508,7 @@ debug_logicals :
 
 # Building targets ###################################################
 
-configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
         @ WRITE SYS$OUTPUT "Reconfiguring..."
         perl $(SRCDIR)Configure reconf
         @ WRITE SYS$OUTPUT "*************************************************"
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7973e10..5e21e7f 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -827,7 +827,7 @@ openssl.pc:
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: libssl libcrypto' ) > openssl.pc
 
-configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	$(SRCDIR)/Configure reconf
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 988dc93..77fceec 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -322,7 +322,7 @@ uninstall_html_docs:
 
 # Building targets ###################################################
 
-configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	"$(PERL)" "$(SRCDIR)\Configure" reconf

From builds at travis-ci.org  Sat Sep 17 19:42:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 17 Sep 2016 19:42:44 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1965
	(fix-missing-opt-help - 9c439b3)
In-Reply-To: <FdaSilvaYY/openssl+160713759+errored@travis-ci.org>
Message-ID: <57dd9caf5d5c4_33f8df558ef2c5151ce@c088a74e-471d-499d-9831-58f9dff010cf.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1965
Status: Errored

Duration: 11 minutes and 58 seconds
Commit: 9c439b3 (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Remove an option related to a deprecated flag

CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE  are unused in pkcs7/cms code.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5a7e5ecbcefc...9c439b3f6be9

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160713759

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/566186a1/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 19:45:27 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 19:45:27 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1243
Message-ID: <20160917194527.13089.2386.49E32CE8@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/69bd7a07/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 20:12:05 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 20:12:05 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1244
Message-ID: <20160917201205.4571.5992.18D312DD@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/8ec2900a/attachment.html>

From builds at travis-ci.org  Sat Sep 17 20:14:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 17 Sep 2016 20:14:41 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1967
	(fix-missing-opt-help - 41ace4c)
In-Reply-To: <FdaSilvaYY/openssl+160715021+errored@travis-ci.org>
Message-ID: <57dda43155864_33f8df55cfdc45459c4@c088a74e-471d-499d-9831-58f9dff010cf.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1967
Status: Errored

Duration: 9 minutes and 58 seconds
Commit: 41ace4c (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Remove an option related to a deprecated flag

CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE  are unused in pkcs7/cms code.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/9c439b3f6be9...41ace4cf329d

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160715021

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/e581abf5/attachment-0001.html>

From no-reply at appveyor.com  Sat Sep 17 20:14:51 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 20:14:51 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1245
Message-ID: <20160917201451.19806.24823.2644998F@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/6f9ccdb6/attachment.html>

From builds at travis-ci.org  Sat Sep 17 20:16:32 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 17 Sep 2016 20:16:32 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1966 (master - ce38f8b)
In-Reply-To: <FdaSilvaYY/openssl+160713979+fixed@travis-ci.org>
Message-ID: <57dda4a028ab_33ffbe0795c0466130@25246249-7c3f-41a1-9137-9f3d33190334.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1966
Status: Fixed

Duration: 34 minutes and 49 seconds
Commit: ce38f8b (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5bc80d7ddc69...ce38f8b3bbde

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160713979

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/4c522ebc/attachment.html>

From no-reply at appveyor.com  Sat Sep 17 20:41:55 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 17 Sep 2016 20:41:55 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1246
Message-ID: <20160917204154.4451.55878.A46666C5@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/f04492cc/attachment.html>

From levitte at openssl.org  Sat Sep 17 21:21:50 2016
From: levitte at openssl.org (Richard Levitte)
Date: Sat, 17 Sep 2016 21:21:50 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474147310.028087.6840.nullmailer@dev.openssl.org>

The branch master has been updated
       via  66fe388aa410820d80ab1d99730b64b1b56a89d4 (commit)
      from  41240e68d745972d56dd037caf439d9c5032813f (commit)


- Log -----------------------------------------------------------------
commit 66fe388aa410820d80ab1d99730b64b1b56a89d4
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Sep 17 21:57:29 2016 +0200

    Have the configuration options 'no-err' and 'no-async' work again
    
    In an earlier attempt to simplify the processing of disabled options,
    'no-err' and 'no-async' stopped working properly.  'err' and 'async'
    are directories under 'crypto/', but they are special insofar that
    they can't be simply skipped, like all the algorithm directories can,
    so they need special treatment among the disablable things.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index d78ab7a..0cfc3ea 100755
--- a/Configure
+++ b/Configure
@@ -886,7 +886,8 @@ foreach (sort (keys %disabled))
 		$what = "ripemd" if $what eq "rmd160";
 		$what = "whrlpool" if $what eq "whirlpool";
 
-		if (grep { $_ eq $what } @{$config{sdirs}})
+		if ($what ne "async" && $what ne "err"
+		    && grep { $_ eq $what } @{$config{sdirs}})
 			{
 			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$WHAT";
 			@{$config{sdirs}} = grep { $_ ne $what} @{$config{sdirs}};

From levitte at openssl.org  Sat Sep 17 21:22:21 2016
From: levitte at openssl.org (Richard Levitte)
Date: Sat, 17 Sep 2016 21:22:21 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474147341.085828.7914.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  11bb654c60dee6fdfe30eba43e8310437b4b8ab0 (commit)
      from  ebae51f4900af1fbc1e024bab44412b74fc46fa7 (commit)


- Log -----------------------------------------------------------------
commit 11bb654c60dee6fdfe30eba43e8310437b4b8ab0
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Sep 17 21:57:29 2016 +0200

    Have the configuration options 'no-err' and 'no-async' work again
    
    In an earlier attempt to simplify the processing of disabled options,
    'no-err' and 'no-async' stopped working properly.  'err' and 'async'
    are directories under 'crypto/', but they are special insofar that
    they can't be simply skipped, like all the algorithm directories can,
    so they need special treatment among the disablable things.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 66fe388aa410820d80ab1d99730b64b1b56a89d4)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index dcc317a..e919066 100755
--- a/Configure
+++ b/Configure
@@ -868,7 +868,8 @@ foreach (sort (keys %disabled))
 		$what = "ripemd" if $what eq "rmd160";
 		$what = "whrlpool" if $what eq "whirlpool";
 
-		if (grep { $_ eq $what } @{$config{sdirs}})
+		if ($what ne "async" && $what ne "err"
+		    && grep { $_ eq $what } @{$config{sdirs}})
 			{
 			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$WHAT";
 			@{$config{sdirs}} = grep { $_ ne $what} @{$config{sdirs}};

From builds at travis-ci.org  Sat Sep 17 21:23:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 17 Sep 2016 21:23:50 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#1969
	(fix-missing-opt-help - ff8146f)
In-Reply-To: <FdaSilvaYY/openssl+160718811+passed@travis-ci.org>
Message-ID: <57ddb4668575f_33f8dfcfb31406117fa@c088a74e-471d-499d-9831-58f9dff010cf.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1969
Status: Passed

Duration: 42 minutes and 57 seconds
Commit: ff8146f (fix-missing-opt-help)
Author: FdaSilvaYY
Message: Remove an option related to a deprecated flag

CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE  are unused in pkcs7/cms code.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/41ace4cf329d...ff8146fc8ed1

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160718811

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/ab69c619/attachment-0001.html>

From builds at travis-ci.org  Sat Sep 17 21:53:32 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 17 Sep 2016 21:53:32 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#1970 (fix-install-typo
	- bbb82d3)
In-Reply-To: <FdaSilvaYY/openssl+160719104+broken@travis-ci.org>
Message-ID: <57ddbb586fb12_33f8df558fe7c631538@c088a74e-471d-499d-9831-58f9dff010cf.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1970
Status: Broken

Duration: 42 minutes and 13 seconds
Commit: bbb82d3 (fix-install-typo)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal

Fix a typo

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5df5a1f05f42...bbb82d3e0a02

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160719104

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/fe5e8654/attachment.html>

From builds at travis-ci.org  Sat Sep 17 23:27:10 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 17 Sep 2016 23:27:10 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1973
	(apps-speed-rework - 5b6a0aa)
In-Reply-To: <FdaSilvaYY/openssl+160723646+still failing@travis-ci.org>
Message-ID: <57ddd14c90e7e_33f8b2f29cdc83266b5@521cbaa7-e84b-4559-a3fe-a8a8a048b1a4.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1973
Status: Still Failing

Duration: 45 minutes and 3 seconds
Commit: 5b6a0aa (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0f540fb231f5...5b6a0aa6b496

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160723646

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160917/8ac65bae/attachment.html>

From rsalz at openssl.org  Sun Sep 18 04:26:08 2016
From: rsalz at openssl.org (Rich Salz)
Date: Sun, 18 Sep 2016 04:26:08 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474172768.086634.5023.nullmailer@dev.openssl.org>

The branch master has been updated
       via  81f9ce1e1965e0e33db6d2391285c4c1b6af0434 (commit)
      from  66fe388aa410820d80ab1d99730b64b1b56a89d4 (commit)


- Log -----------------------------------------------------------------
commit 81f9ce1e1965e0e33db6d2391285c4c1b6af0434
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Thu Sep 15 21:37:14 2016 +0200

    Constify code about X509_VERIFY_PARAM
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1594)

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_vpm.c                     | 4 ++--
 doc/crypto/X509_VERIFY_PARAM_set_flags.pod | 4 ++--
 doc/ssl/SSL_set1_host.pod                  | 2 +-
 include/openssl/ssl.h                      | 2 +-
 include/openssl/x509_vfy.h                 | 4 ++--
 ssl/ssl_lib.c                              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 05c7852..2ea39c8 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -301,7 +301,7 @@ int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
     return 1;
 }
 
-unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param)
+unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param)
 {
     return param->flags;
 }
@@ -396,7 +396,7 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
     param->hostflags = flags;
 }
 
-char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param)
+const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param)
 {
     return param->peername;
 }
diff --git a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
index 2800cd4..528a53a 100644
--- a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
+++ b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
@@ -12,7 +12,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge
                                         unsigned long flags);
  int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
                                         unsigned long flags);
- unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
+ unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);
 
  int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
  int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
@@ -37,7 +37,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge
                                  const char *name, size_t namelen);
  void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
                                       unsigned int flags);
- char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param);
+ const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param);
  int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
                                  const char *email, size_t emaillen);
  int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
diff --git a/doc/ssl/SSL_set1_host.pod b/doc/ssl/SSL_set1_host.pod
index 3339a0e..d254fe7 100644
--- a/doc/ssl/SSL_set1_host.pod
+++ b/doc/ssl/SSL_set1_host.pod
@@ -12,7 +12,7 @@ SSL server verification parameters
  int SSL_set1_host(SSL *s, const char *hostname);
  int SSL_add1_host(SSL *s, const char *hostname);
  void SSL_set_hostflags(SSL *s, unsigned int flags);
- const char *SSL_get0_peername(SSL *s);
+ const char *SSL_get0_peername(const SSL *s);
 
 =head1 DESCRIPTION
 
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index af6d9b5..1fcdbd2 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1493,7 +1493,7 @@ __owur int SSL_set_trust(SSL *s, int trust);
 
 __owur int SSL_set1_host(SSL *s, const char *hostname);
 __owur int SSL_add1_host(SSL *s, const char *hostname);
-__owur const char *SSL_get0_peername(SSL *s);
+__owur const char *SSL_get0_peername(const SSL *s);
 void SSL_set_hostflags(SSL *s, unsigned int flags);
 
 __owur int SSL_CTX_dane_enable(SSL_CTX *ctx);
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index cab8005..12984f0 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -453,7 +453,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
                                 unsigned long flags);
 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
                                   unsigned long flags);
-unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
+unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
 int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
 void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
@@ -470,7 +470,7 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
                                 const char *name, size_t namelen);
 void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
                                      unsigned int flags);
-char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *);
+const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *);
 void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);
 int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
                                  const char *email, size_t emaillen);
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index bd0fbf8..27a16ef 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -795,7 +795,7 @@ void SSL_set_hostflags(SSL *s, unsigned int flags)
     X509_VERIFY_PARAM_set_hostflags(s->param, flags);
 }
 
-const char *SSL_get0_peername(SSL *s)
+const char *SSL_get0_peername(const SSL *s)
 {
     return X509_VERIFY_PARAM_get0_peername(s->param);
 }

From builds at travis-ci.org  Sun Sep 18 04:52:12 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 04:52:12 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6055 (master - 81f9ce1)
In-Reply-To: <openssl/openssl+160771224+errored@travis-ci.org>
Message-ID: <57de1d7c195f2_33f8df558ee3c79699c@c088a74e-471d-499d-9831-58f9dff010cf.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6055
Status: Errored

Duration: 25 minutes and 38 seconds
Commit: 81f9ce1 (master)
Author: FdaSilvaYY
Message: Constify code about X509_VERIFY_PARAM

Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1594)

View the changeset: https://github.com/openssl/openssl/compare/66fe388aa410...81f9ce1e1965

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/160771224

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/37416e6a/attachment.html>

From builds at travis-ci.org  Sun Sep 18 08:43:59 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 08:43:59 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1978
	(apps-speed-rework - 0f87289)
In-Reply-To: <FdaSilvaYY/openssl+160786894+still failing@travis-ci.org>
Message-ID: <57de53cf1b361_33f88a088ce2c11127b@0720281b-c86e-4d43-923e-3872c0ea3713.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1978
Status: Still Failing

Duration: 42 minutes and 32 seconds
Commit: 0f87289 (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5b6a0aa6b496...0f872893aaba

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160786894

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/c5771bd9/attachment.html>

From builds at travis-ci.org  Sun Sep 18 09:09:43 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 09:09:43 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1978 (apps-speed-rework
	- 0f87289)
In-Reply-To: <FdaSilvaYY/openssl+160786894+fixed@travis-ci.org>
Message-ID: <57de59d31fe7e_33f8b2f2dfcb845485a@521cbaa7-e84b-4559-a3fe-a8a8a048b1a4.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1978
Status: Fixed

Duration: 8 minutes and 6 seconds
Commit: 0f87289 (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5b6a0aa6b496...0f872893aaba

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160786894

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/cbb83dbf/attachment-0001.html>

From builds at travis-ci.org  Sun Sep 18 10:16:08 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 10:16:08 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1982 (fix-install-typo
	- 0522b75)
In-Reply-To: <FdaSilvaYY/openssl+160787472+fixed@travis-ci.org>
Message-ID: <57de69684ab3_33fe8729fb2b81276a6@068a932e-f0db-471d-b29b-cddcdd539d67.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1982
Status: Fixed

Duration: 42 minutes and 36 seconds
Commit: 0522b75 (fix-install-typo)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal

no-rsa is no longer an option since 7ec8de1

Fix a typo about poly1305

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/1f203f392fb1...0522b75bf33b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160787472

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/6ef8c721/attachment.html>

From builds at travis-ci.org  Sun Sep 18 10:49:34 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 10:49:34 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1983
	(oss_builds_options_check - 8799683)
In-Reply-To: <FdaSilvaYY/openssl+160787794+errored@travis-ci.org>
Message-ID: <57de713e6cc2f_33f88a088d2dc16502c@0720281b-c86e-4d43-923e-3872c0ea3713.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1983
Status: Errored

Duration: 47 minutes and 12 seconds
Commit: 8799683 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/119640c43b41...879968396046

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160787794

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/edc0bc95/attachment.html>

From builds at travis-ci.org  Sun Sep 18 14:27:05 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 14:27:05 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1983
	(oss_builds_options_check - 8799683)
In-Reply-To: <FdaSilvaYY/openssl+160787794+fixed@travis-ci.org>
Message-ID: <57dea439a8309_33fe4550d99307697@5d2f35f3-ef9b-42c1-8af4-9ae9a8bfec5d.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1983
Status: Fixed

Duration: 3 minutes and 29 seconds
Commit: 8799683 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/119640c43b41...879968396046

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160787794

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/847fe465/attachment-0001.html>

From builds at travis-ci.org  Sun Sep 18 15:00:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 15:00:18 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1986
	(check_bn_wexpand_retcode - 9c391cc)
In-Reply-To: <FdaSilvaYY/openssl+160833513+failed@travis-ci.org>
Message-ID: <57deac02469ff_33fe4550a4c44981b8@5d2f35f3-ef9b-42c1-8af4-9ae9a8bfec5d.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1986
Status: Failed

Duration: 35 minutes and 48 seconds
Commit: 9c391cc (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5bc80d7ddc69^...9c391cc1819b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160833513

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/d72fc223/attachment.html>

From no-reply at appveyor.com  Sun Sep 18 15:01:35 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 18 Sep 2016 15:01:35 +0000
Subject: [openssl-commits] Build failed: openssl master.5393
Message-ID: <20160918150133.34269.16407.99BFC3EA@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/26c7bf5f/attachment.html>

From builds at travis-ci.org  Sun Sep 18 15:44:13 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 15:44:13 +0000
Subject: [openssl-commits] Failed: degustaf/openssl#2
	(increase_b_print_coverage - dda6a4e)
In-Reply-To: <degustaf/openssl+160840699+failed@travis-ci.org>
Message-ID: <57deb64d25e3f_33fe8729facf04076d8@068a932e-f0db-471d-b29b-cddcdd539d67.mail>

Build Update for degustaf/openssl
-------------------------------------

Build: #2
Status: Failed

Duration: 34 minutes and 42 seconds
Commit: dda6a4e (increase_b_print_coverage)
Author: Derek Gustafson
Message: Added Integer tests to bio_print

View the changeset: https://github.com/degustaf/openssl/commit/dda6a4eab561

View the full build log and details: https://travis-ci.org/degustaf/openssl/builds/160840699

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/74407818/attachment.html>

From steve at openssl.org  Sun Sep 18 19:57:36 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Sun, 18 Sep 2016 19:57:36 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474228656.409257.9506.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  32cc4c2627e8f582d906b03abf763f682c7f96dd (commit)
      from  502fcc67cccda4d997fc121eae4f2789f50adae6 (commit)


- Log -----------------------------------------------------------------
commit 32cc4c2627e8f582d906b03abf763f682c7f96dd
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Sep 15 23:49:41 2016 +0100

    update default dependencies
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 684e9dc..c39f71a 100755
--- a/Configure
+++ b/Configure
@@ -799,7 +799,7 @@ my @experimental = ();
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST";
+my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_SSL2 -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DOPENSSL_NO_WEAK_SSL_CIPHERS";
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).

From builds at travis-ci.org  Sun Sep 18 20:08:06 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 20:08:06 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#1986
	(check_bn_wexpand_retcode - 9c391cc)
In-Reply-To: <FdaSilvaYY/openssl+160833513+failed@travis-ci.org>
Message-ID: <57def426235e1_33fe4550a514427075@5d2f35f3-ef9b-42c1-8af4-9ae9a8bfec5d.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1986
Status: Failed

Duration: 8 minutes and 47 seconds
Commit: 9c391cc (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5bc80d7ddc69^...9c391cc1819b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160833513

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/df9c7b59/attachment.html>

From no-reply at appveyor.com  Sun Sep 18 20:58:13 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 18 Sep 2016 20:58:13 +0000
Subject: [openssl-commits] Build completed: openssl OpenSSL_1_0_2-stable.5394
Message-ID: <20160918205813.19751.24841.629B4CC1@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/23632d3c/attachment.html>

From builds at travis-ci.org  Sun Sep 18 22:04:23 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 22:04:23 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#1988
	(check_bn_wexpand_retcode - 97667f6)
In-Reply-To: <FdaSilvaYY/openssl+160896387+still failing@travis-ci.org>
Message-ID: <57df0f66dbd9b_33fe8729facf084668e@068a932e-f0db-471d-b29b-cddcdd539d67.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1988
Status: Still Failing

Duration: 35 minutes and 23 seconds
Commit: 97667f6 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/9c391cc1819b...97667f6025ed

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/160896387

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/0e5b48cc/attachment.html>

From no-reply at appveyor.com  Sun Sep 18 22:27:30 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 18 Sep 2016 22:27:30 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.4
Message-ID: <20160918222729.19786.54449.B0248B75@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/640c240b/attachment-0001.html>

From builds at travis-ci.org  Sun Sep 18 22:42:06 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 22:42:06 +0000
Subject: [openssl-commits] Still Failing: degustaf/openssl#4
	(increase_b_print_coverage - 696851a)
In-Reply-To: <degustaf/openssl+160901813+still failing@travis-ci.org>
Message-ID: <57df184051776_33f88a088cc105034c4@0720281b-c86e-4d43-923e-3872c0ea3713.mail>

Build Update for degustaf/openssl
-------------------------------------

Build: #4
Status: Still Failing

Duration: 37 minutes and 58 seconds
Commit: 696851a (increase_b_print_coverage)
Author: Derek Gustafson
Message: Added Integer tests to bio_print

View the changeset: https://github.com/degustaf/openssl/compare/7180080afba4...696851aa2d77

View the full build log and details: https://travis-ci.org/degustaf/openssl/builds/160901813

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/06e6a241/attachment.html>

From builds at travis-ci.org  Sun Sep 18 23:39:48 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 18 Sep 2016 23:39:48 +0000
Subject: [openssl-commits] Errored: degustaf/openssl#6
	(increase_b_print_coverage - b9f5957)
In-Reply-To: <degustaf/openssl+160909631+errored@travis-ci.org>
Message-ID: <57df25c4c35c4_33f88a088d58452362e@0720281b-c86e-4d43-923e-3872c0ea3713.mail>

Build Update for degustaf/openssl
-------------------------------------

Build: #6
Status: Errored

Duration: 34 minutes and 58 seconds
Commit: b9f5957 (increase_b_print_coverage)
Author: Derek Gustafson
Message: Added Integer tests to bio_print

View the changeset: https://github.com/degustaf/openssl/compare/a51bbaad266b...b9f595761682

View the full build log and details: https://travis-ci.org/degustaf/openssl/builds/160909631

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160918/fcf3329a/attachment.html>

From mark at openssl.org  Mon Sep 19 13:01:12 2016
From: mark at openssl.org (Mark J. Cox)
Date: Mon, 19 Sep 2016 13:01:12 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1474290072.209237.9463.nullmailer@dev.openssl.org>

The branch master has been updated
       via  08e980caee8d6252b0838e9924498db12083203b (commit)
      from  7257962abfb8d49deb3b9831fa6eeb7068284246 (commit)


- Log -----------------------------------------------------------------
commit 08e980caee8d6252b0838e9924498db12083203b
Author: Mark J. Cox <mark at awe.com>
Date:   Mon Sep 19 14:00:52 2016 +0100

    Add link to upcoming releases

-----------------------------------------------------------------------

Summary of changes:
 news/newsflash.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/news/newsflash.txt b/news/newsflash.txt
index 4cad2ef..0a90069 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -4,6 +4,7 @@
 # Format is two fields, colon-separated; the first line is the column
 # headings.  URL paths must all be absolute.
 Date: Item
+19-Sep-2016: OpenSSL 1.1.0a, 1.0.2i, 1.0.1u <a href="https://mta.openssl.org/pipermail/openssl-announce/2016-September/000076.html">security releases due 22nd Sep 2016</a>
 25-Aug-2016: OpenSSL 1.1.0 is now available
 04-Aug-2016: Beta 3 (pre-release 6) of OpenSSL 1.1.0 is now available: please download and test it
 03-May-2016: <a href="/news/secadv/20160503.txt">Security Advisory</a>: several security fixes

From levitte at openssl.org  Mon Sep 19 14:29:10 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 19 Sep 2016 14:29:10 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474295350.151690.15586.nullmailer@dev.openssl.org>

The branch master has been updated
       via  057c676afb2a69b7d2bb9cf6e895e720a2a62b78 (commit)
      from  81f9ce1e1965e0e33db6d2391285c4c1b6af0434 (commit)


- Log -----------------------------------------------------------------
commit 057c676afb2a69b7d2bb9cf6e895e720a2a62b78
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 19 15:08:58 2016 +0200

    Fix no-ocsp
    
    Some compilers complain about unused variables, and some tests do
    not run well without OCSP.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c                |  7 ++++++-
 apps/s_server.c                | 11 ++++++++++-
 test/recipes/80-test_ssl_new.t |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 0627ae8..41f6d48 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -856,7 +856,10 @@ int s_client_main(int argc, char **argv)
     enum { use_inet, use_unix, use_unknown } connect_type = use_unknown;
     int count4or6 = 0;
     int c_nbio = 0, c_msg = 0, c_ign_eof = 0, c_brief = 0;
-    int c_tlsextdebug = 0, c_status_req = 0;
+    int c_tlsextdebug = 0;
+#ifndef OPENSSL_NO_OCSP
+    int c_status_req = 0;
+#endif
     BIO *bio_c_msg = NULL;
 
     FD_ZERO(&readfds);
@@ -1067,7 +1070,9 @@ int s_client_main(int argc, char **argv)
             c_tlsextdebug = 1;
             break;
         case OPT_STATUS:
+#ifndef OPENSSL_NO_OCSP
             c_status_req = 1;
+#endif
             break;
         case OPT_WDEBUG:
 #ifdef WATT32
diff --git a/apps/s_server.c b/apps/s_server.c
index ebab7a2..2051459 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -932,7 +932,10 @@ int s_server_main(int argc, char *argv[])
     const char *s_cert_file = TEST_CERT, *s_key_file = NULL, *s_chain_file = NULL;
     const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;
     char *s_dcert_file = NULL, *s_dkey_file = NULL, *s_dchain_file = NULL;
-    int s_tlsextstatus = 0, no_resume_ephemeral = 0;
+#ifndef OPENSSL_NO_OCSP
+    int s_tlsextstatus = 0;
+#endif
+    int no_resume_ephemeral = 0;
     unsigned int split_send_fragment = 0, max_pipelines = 0;
     const char *s_serverinfo_file = NULL;
 
@@ -1206,14 +1209,20 @@ int s_server_main(int argc, char *argv[])
             s_tlsextdebug = 1;
             break;
         case OPT_STATUS:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
+#endif
             break;
         case OPT_STATUS_VERBOSE:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = tlscstatp.verbose = 1;
+#endif
             break;
         case OPT_STATUS_TIMEOUT:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
             tlscstatp.timeout = atoi(opt_arg());
+#endif
             break;
         case OPT_STATUS_URL:
 #ifndef OPENSSL_NO_OCSP
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 46c2f42..47eab18 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -44,6 +44,7 @@ my $no_npn = disabled("nextprotoneg");
 my $no_ct = disabled("ct");
 my $no_ec = disabled("ec");
 my $no_ec2m = disabled("ec2m");
+my $no_ocsp = disabled("ocsp");
 
 # Add your test here if the test conf.in generates test cases and/or
 # expectations dynamically based on the OpenSSL compile-time config.
@@ -70,7 +71,8 @@ my %skip = (
   # We should review this once we have TLS 1.3.
   "13-fragmentation.conf" => disabled("tls1_2"),
   "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
-  "16-dtls-certstatus.conf" => $no_dtls
+  "15-certstatus.conf" => $no_ocsp,
+  "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
 );
 
 foreach my $conf (@conf_files) {

From levitte at openssl.org  Mon Sep 19 14:29:36 2016
From: levitte at openssl.org (Richard Levitte)
Date: Mon, 19 Sep 2016 14:29:36 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474295376.987096.16608.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  6f99d9c22faf528f174303f997ecbd853d88ffe0 (commit)
      from  11bb654c60dee6fdfe30eba43e8310437b4b8ab0 (commit)


- Log -----------------------------------------------------------------
commit 6f99d9c22faf528f174303f997ecbd853d88ffe0
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 19 15:08:58 2016 +0200

    Fix no-ocsp
    
    Some compilers complain about unused variables, and some tests do
    not run well without OCSP.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 057c676afb2a69b7d2bb9cf6e895e720a2a62b78)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c                |  7 ++++++-
 apps/s_server.c                | 11 ++++++++++-
 test/recipes/80-test_ssl_new.t |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 0627ae8..41f6d48 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -856,7 +856,10 @@ int s_client_main(int argc, char **argv)
     enum { use_inet, use_unix, use_unknown } connect_type = use_unknown;
     int count4or6 = 0;
     int c_nbio = 0, c_msg = 0, c_ign_eof = 0, c_brief = 0;
-    int c_tlsextdebug = 0, c_status_req = 0;
+    int c_tlsextdebug = 0;
+#ifndef OPENSSL_NO_OCSP
+    int c_status_req = 0;
+#endif
     BIO *bio_c_msg = NULL;
 
     FD_ZERO(&readfds);
@@ -1067,7 +1070,9 @@ int s_client_main(int argc, char **argv)
             c_tlsextdebug = 1;
             break;
         case OPT_STATUS:
+#ifndef OPENSSL_NO_OCSP
             c_status_req = 1;
+#endif
             break;
         case OPT_WDEBUG:
 #ifdef WATT32
diff --git a/apps/s_server.c b/apps/s_server.c
index ebab7a2..2051459 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -932,7 +932,10 @@ int s_server_main(int argc, char *argv[])
     const char *s_cert_file = TEST_CERT, *s_key_file = NULL, *s_chain_file = NULL;
     const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;
     char *s_dcert_file = NULL, *s_dkey_file = NULL, *s_dchain_file = NULL;
-    int s_tlsextstatus = 0, no_resume_ephemeral = 0;
+#ifndef OPENSSL_NO_OCSP
+    int s_tlsextstatus = 0;
+#endif
+    int no_resume_ephemeral = 0;
     unsigned int split_send_fragment = 0, max_pipelines = 0;
     const char *s_serverinfo_file = NULL;
 
@@ -1206,14 +1209,20 @@ int s_server_main(int argc, char *argv[])
             s_tlsextdebug = 1;
             break;
         case OPT_STATUS:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
+#endif
             break;
         case OPT_STATUS_VERBOSE:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = tlscstatp.verbose = 1;
+#endif
             break;
         case OPT_STATUS_TIMEOUT:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
             tlscstatp.timeout = atoi(opt_arg());
+#endif
             break;
         case OPT_STATUS_URL:
 #ifndef OPENSSL_NO_OCSP
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 46c2f42..47eab18 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -44,6 +44,7 @@ my $no_npn = disabled("nextprotoneg");
 my $no_ct = disabled("ct");
 my $no_ec = disabled("ec");
 my $no_ec2m = disabled("ec2m");
+my $no_ocsp = disabled("ocsp");
 
 # Add your test here if the test conf.in generates test cases and/or
 # expectations dynamically based on the OpenSSL compile-time config.
@@ -70,7 +71,8 @@ my %skip = (
   # We should review this once we have TLS 1.3.
   "13-fragmentation.conf" => disabled("tls1_2"),
   "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
-  "16-dtls-certstatus.conf" => $no_dtls
+  "15-certstatus.conf" => $no_ocsp,
+  "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
 );
 
 foreach my $conf (@conf_files) {

From builds at travis-ci.org  Mon Sep 19 15:04:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 19 Sep 2016 15:04:35 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6065 (master - 057c676)
In-Reply-To: <openssl/openssl+161048933+passed@travis-ci.org>
Message-ID: <57dffe82a2408_33fb7c009d4381604fd@33d10f0c-348b-4061-bb00-45068d36a442.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6065
Status: Passed

Duration: 31 minutes and 10 seconds
Commit: 057c676 (master)
Author: Richard Levitte
Message: Fix no-ocsp

Some compilers complain about unused variables, and some tests do
not run well without OCSP.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/81f9ce1e1965...057c676afb2a

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161048933

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160919/a82863eb/attachment.html>

From builds at travis-ci.org  Mon Sep 19 20:24:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 19 Sep 2016 20:24:18 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#1991
	(check_bn_wexpand_retcode - 2c5e455)
In-Reply-To: <FdaSilvaYY/openssl+161111935+fixed@travis-ci.org>
Message-ID: <57e04973ee0df_33fd0b979e33860046b@be70f50f-e650-41fa-b133-0d04fdca1724.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1991
Status: Fixed

Duration: 50 minutes and 22 seconds
Commit: 2c5e455 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/97667f6025ed...2c5e4556165c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161111935

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160919/014b4636/attachment-0001.html>

From rsalz at openssl.org  Mon Sep 19 21:11:11 2016
From: rsalz at openssl.org (Rich Salz)
Date: Mon, 19 Sep 2016 21:11:11 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474319471.456140.1705.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e2562bbbe1e1c68ec5a3e02c1f151fd6149ee2ae (commit)
      from  057c676afb2a69b7d2bb9cf6e895e720a2a62b78 (commit)


- Log -----------------------------------------------------------------
commit e2562bbbe1e1c68ec5a3e02c1f151fd6149ee2ae
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Mon Sep 12 22:42:37 2016 +0200

    Update INSTALL about no-md5 removal
    
    no-rsa is no longer an option since 7ec8de1
    
    Fix a typo about poly1305
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1582)

-----------------------------------------------------------------------

Summary of changes:
 INSTALL | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index e3f47db..a6e8ea6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -479,10 +479,9 @@
   no-<alg>
                    Build without support for the specified algorithm, where
                    <alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
-                   des, dh, dsa, ecdh, ecdsa, idea, md4, md5, mdc2, ocb,
-                   ploy1305, rc2, rc4, rmd160, scrypt, seed or whirlpool. The
-                   "ripemd" algorithm is deprecated and if used is synonymous
-                   with rmd160.
+                   des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305,
+                   rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
+                   algorithm is deprecated and if used is synonymous with rmd160.
 
   -Dxxx, -lxxx, -Lxxx, -fxxx, -mXXX, -Kxxx
                    These system specific options will be passed through to the

From rsalz at openssl.org  Mon Sep 19 21:11:29 2016
From: rsalz at openssl.org (Rich Salz)
Date: Mon, 19 Sep 2016 21:11:29 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474319489.675577.2558.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  322b739be5cae8b6cfb55e51d59c2f828ae3a993 (commit)
      from  6f99d9c22faf528f174303f997ecbd853d88ffe0 (commit)


- Log -----------------------------------------------------------------
commit 322b739be5cae8b6cfb55e51d59c2f828ae3a993
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Mon Sep 12 22:42:37 2016 +0200

    Update INSTALL about no-md5 removal
    
    no-rsa is no longer an option since 7ec8de1
    
    Fix a typo about poly1305
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1582)
    (cherry picked from commit e2562bbbe1e1c68ec5a3e02c1f151fd6149ee2ae)

-----------------------------------------------------------------------

Summary of changes:
 INSTALL | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 132b2aa..8107623 100644
--- a/INSTALL
+++ b/INSTALL
@@ -479,10 +479,9 @@
   no-<alg>
                    Build without support for the specified algorithm, where
                    <alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
-                   des, dh, dsa, ecdh, ecdsa, idea, md4, md5, mdc2, ocb,
-                   ploy1305, rc2, rc4, rmd160, scrypt, seed or whirlpool. The
-                   "ripemd" algorithm is deprecated and if used is synonymous
-                   with rmd160.
+                   des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305,
+                   rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
+                   algorithm is deprecated and if used is synonymous with rmd160.
 
   -Dxxx, -lxxx, -Lxxx, -fxxx, -mXXX, -Kxxx
                    These system specific options will be passed through to the

From no-reply at appveyor.com  Mon Sep 19 22:06:26 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 19 Sep 2016 22:06:26 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1276
Message-ID: <20160919220624.34134.41744.08352298@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160919/b76c7cca/attachment.html>

From matt at openssl.org  Mon Sep 19 22:33:08 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 19 Sep 2016 22:33:08 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474324388.886140.31348.nullmailer@dev.openssl.org>

The branch master has been updated
       via  9205ebeb8e448b2d6948b9e5d78ecf309c0ed33c (commit)
       via  9731a9ce7d0f404d21ed418f9bc983b174e130cb (commit)
      from  e2562bbbe1e1c68ec5a3e02c1f151fd6149ee2ae (commit)


- Log -----------------------------------------------------------------
commit 9205ebeb8e448b2d6948b9e5d78ecf309c0ed33c
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 11:06:29 2016 +0100

    Convert num_alloc to a size_t in stack.c and tweak style
    
    We were casting num_alloc to size_t in lots of places, or just using it in
    a context where size_t makes more sense - so convert it. This simplifies
    the code a bit.
    
    Also tweak the style in stack.c a bit following on from the previous
    commit
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 9731a9ce7d0f404d21ed418f9bc983b174e130cb
Author: Guido Vranken <guidovranken at gmail.com>
Date:   Thu Sep 8 10:43:37 2016 +0100

    Prevent overflows in stack API
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/stack/stack.c | 53 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index acd350a..1d01936 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "internal/numbers.h"
 #include <openssl/stack.h>
 #include <openssl/objects.h>
 
@@ -16,7 +17,7 @@ struct stack_st {
     int num;
     const char **data;
     int sorted;
-    int num_alloc;
+    size_t num_alloc;
     OPENSSL_sk_compfunc comp;
 };
 
@@ -40,6 +41,9 @@ OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk)
 {
     OPENSSL_STACK *ret;
 
+    if (sk->num < 0)
+        return NULL;
+
     if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL)
         return NULL;
 
@@ -62,13 +66,16 @@ OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk,
     OPENSSL_STACK *ret;
     int i;
 
+    if (sk->num < 0)
+        return NULL;
+
     if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL)
         return NULL;
 
     /* direct structure assignment */
     *ret = *sk;
 
-    ret->num_alloc = sk->num > MIN_NODES ? sk->num : MIN_NODES;
+    ret->num_alloc = sk->num > MIN_NODES ? (size_t)sk->num : MIN_NODES;
     ret->data = OPENSSL_zalloc(sizeof(*ret->data) * ret->num_alloc);
     if (ret->data == NULL) {
         OPENSSL_free(ret);
@@ -113,28 +120,44 @@ OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_compfunc c)
 
 int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
 {
-    const char **s;
-
-    if (st == NULL)
+    if (st == NULL || st->num < 0 || st->num == INT_MAX) {
         return 0;
-    if (st->num_alloc <= st->num + 1) {
-        s = OPENSSL_realloc((char *)st->data,
-                            (unsigned int)sizeof(char *) * st->num_alloc * 2);
-        if (s == NULL)
-            return (0);
-        st->data = s;
-        st->num_alloc *= 2;
     }
-    if ((loc >= (int)st->num) || (loc < 0))
+
+    if (st->num_alloc <= (size_t)(st->num + 1)) {
+        size_t doub_num_alloc = st->num_alloc * 2;
+
+        /* Overflow checks */
+        if (doub_num_alloc < st->num_alloc)
+            return 0;
+
+        /* Avoid overflow due to multiplication by sizeof(char *) */
+        if (doub_num_alloc > SIZE_MAX / sizeof(char *))
+            return 0;
+
+        st->data = OPENSSL_realloc((char *)st->data,
+                                   sizeof(char *) * doub_num_alloc);
+        if (st->data == NULL) {
+            /*
+             * Reset these counters to prevent subsequent operations on
+             * (now non-existing) heap memory
+             */
+            st->num_alloc = 0;
+            st->num = 0;
+            return 0;
+        }
+        st->num_alloc = doub_num_alloc;
+    }
+    if ((loc >= st->num) || (loc < 0)) {
         st->data[st->num] = data;
-    else {
+    } else {
         memmove(&st->data[loc + 1], &st->data[loc],
                 sizeof(st->data[0]) * (st->num - loc));
         st->data[loc] = data;
     }
     st->num++;
     st->sorted = 0;
-    return (st->num);
+    return st->num;
 }
 
 void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p)

From matt at openssl.org  Mon Sep 19 22:33:19 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 19 Sep 2016 22:33:19 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474324399.193085.32132.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  57106f55a5de6186af4ff78484d99528a6935be4 (commit)
       via  05f754f6a6a2aaceef18069a6ce11aacdb86c84c (commit)
      from  322b739be5cae8b6cfb55e51d59c2f828ae3a993 (commit)


- Log -----------------------------------------------------------------
commit 57106f55a5de6186af4ff78484d99528a6935be4
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 8 11:06:29 2016 +0100

    Convert num_alloc to a size_t in stack.c and tweak style
    
    We were casting num_alloc to size_t in lots of places, or just using it in
    a context where size_t makes more sense - so convert it. This simplifies
    the code a bit.
    
    Also tweak the style in stack.c a bit following on from the previous
    commit
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 9205ebeb8e448b2d6948b9e5d78ecf309c0ed33c)

commit 05f754f6a6a2aaceef18069a6ce11aacdb86c84c
Author: Guido Vranken <guidovranken at gmail.com>
Date:   Thu Sep 8 10:43:37 2016 +0100

    Prevent overflows in stack API
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 9731a9ce7d0f404d21ed418f9bc983b174e130cb)

-----------------------------------------------------------------------

Summary of changes:
 crypto/stack/stack.c | 53 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index acd350a..1d01936 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "internal/numbers.h"
 #include <openssl/stack.h>
 #include <openssl/objects.h>
 
@@ -16,7 +17,7 @@ struct stack_st {
     int num;
     const char **data;
     int sorted;
-    int num_alloc;
+    size_t num_alloc;
     OPENSSL_sk_compfunc comp;
 };
 
@@ -40,6 +41,9 @@ OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk)
 {
     OPENSSL_STACK *ret;
 
+    if (sk->num < 0)
+        return NULL;
+
     if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL)
         return NULL;
 
@@ -62,13 +66,16 @@ OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk,
     OPENSSL_STACK *ret;
     int i;
 
+    if (sk->num < 0)
+        return NULL;
+
     if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL)
         return NULL;
 
     /* direct structure assignment */
     *ret = *sk;
 
-    ret->num_alloc = sk->num > MIN_NODES ? sk->num : MIN_NODES;
+    ret->num_alloc = sk->num > MIN_NODES ? (size_t)sk->num : MIN_NODES;
     ret->data = OPENSSL_zalloc(sizeof(*ret->data) * ret->num_alloc);
     if (ret->data == NULL) {
         OPENSSL_free(ret);
@@ -113,28 +120,44 @@ OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_compfunc c)
 
 int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
 {
-    const char **s;
-
-    if (st == NULL)
+    if (st == NULL || st->num < 0 || st->num == INT_MAX) {
         return 0;
-    if (st->num_alloc <= st->num + 1) {
-        s = OPENSSL_realloc((char *)st->data,
-                            (unsigned int)sizeof(char *) * st->num_alloc * 2);
-        if (s == NULL)
-            return (0);
-        st->data = s;
-        st->num_alloc *= 2;
     }
-    if ((loc >= (int)st->num) || (loc < 0))
+
+    if (st->num_alloc <= (size_t)(st->num + 1)) {
+        size_t doub_num_alloc = st->num_alloc * 2;
+
+        /* Overflow checks */
+        if (doub_num_alloc < st->num_alloc)
+            return 0;
+
+        /* Avoid overflow due to multiplication by sizeof(char *) */
+        if (doub_num_alloc > SIZE_MAX / sizeof(char *))
+            return 0;
+
+        st->data = OPENSSL_realloc((char *)st->data,
+                                   sizeof(char *) * doub_num_alloc);
+        if (st->data == NULL) {
+            /*
+             * Reset these counters to prevent subsequent operations on
+             * (now non-existing) heap memory
+             */
+            st->num_alloc = 0;
+            st->num = 0;
+            return 0;
+        }
+        st->num_alloc = doub_num_alloc;
+    }
+    if ((loc >= st->num) || (loc < 0)) {
         st->data[st->num] = data;
-    else {
+    } else {
         memmove(&st->data[loc + 1], &st->data[loc],
                 sizeof(st->data[0]) * (st->num - loc));
         st->data[loc] = data;
     }
     st->num++;
     st->sorted = 0;
-    return (st->num);
+    return st->num;
 }
 
 void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p)

From no-reply at appveyor.com  Mon Sep 19 22:35:47 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Mon, 19 Sep 2016 22:35:47 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1277
Message-ID: <20160919223546.20323.85064.F826101E@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160919/7f4c1dbc/attachment.html>

From builds at travis-ci.org  Mon Sep 19 23:36:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 19 Sep 2016 23:36:40 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#1997
	(fix-install-typo - 6e80e6c)
In-Reply-To: <FdaSilvaYY/openssl+161114017+errored@travis-ci.org>
Message-ID: <57e07687d87a2_33fb7c44cc7f8793252@33d10f0c-348b-4061-bb00-45068d36a442.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #1997
Status: Errored

Duration: 6 minutes and 39 seconds
Commit: 6e80e6c (fix-install-typo)
Author: FdaSilvaYY
Message: Update INSTALL about no-md5 removal

no-rsa is no longer an option since 7ec8de1

Fix a typo about poly1305

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0522b75bf33b...6e80e6c37625

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161114017

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160919/9b54ff09/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 20 00:14:17 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 00:14:17 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6076 (master - 9205ebe)
In-Reply-To: <openssl/openssl+161179526+broken@travis-ci.org>
Message-ID: <57e07f5985d9_33fd0b979f3dc8148c8@be70f50f-e650-41fa-b133-0d04fdca1724.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6076
Status: Broken

Duration: 37 minutes and 46 seconds
Commit: 9205ebe (master)
Author: Matt Caswell
Message: Convert num_alloc to a size_t in stack.c and tweak style

We were casting num_alloc to size_t in lots of places, or just using it in
a context where size_t makes more sense - so convert it. This simplifies
the code a bit.

Also tweak the style in stack.c a bit following on from the previous
commit

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/e2562bbbe1e1...9205ebeb8e44

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161179526

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/14a759bc/attachment.html>

From rsalz at openssl.org  Tue Sep 20 01:27:01 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 20 Sep 2016 01:27:01 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474334821.309902.31282.nullmailer@dev.openssl.org>

The branch master has been updated
       via  28aef3d9558dc2e11ba56576b3a4d3faaef8a9d3 (commit)
       via  12d56b2992ebd61e1b30c99ca1898dde42345cf7 (commit)
      from  9205ebeb8e448b2d6948b9e5d78ecf309c0ed33c (commit)


- Log -----------------------------------------------------------------
commit 28aef3d9558dc2e11ba56576b3a4d3faaef8a9d3
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sat Sep 17 21:29:48 2016 +0200

    Remove an option related to a deprecated flag
    
    CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE  are unused in pkcs7/cms code.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1585)

commit 12d56b2992ebd61e1b30c99ca1898dde42345cf7
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sun Jul 31 19:02:50 2016 +0200

    Fix various missing option help messages ...
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1585)

-----------------------------------------------------------------------

Summary of changes:
 apps/cms.c    | 25 +++++++++++--------------
 apps/crl.c    |  2 +-
 apps/gendsa.c |  2 +-
 apps/ocsp.c   |  6 ++++--
 apps/pkcs7.c  |  2 +-
 apps/pkcs8.c  |  2 +-
 apps/smime.c  | 21 +++++++++------------
 apps/spkac.c  |  3 ++-
 apps/ts.c     |  2 +-
 apps/x509.c   | 16 ++++++++--------
 10 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/apps/cms.c b/apps/cms.c
index b9eec24..133dc02 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -72,7 +72,7 @@ typedef enum OPTION_choice {
     OPT_ASCIICRLF, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCERTS,
     OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP, OPT_BINARY, OPT_KEYID,
     OPT_NOSIGS, OPT_NO_CONTENT_VERIFY, OPT_NO_ATTR_VERIFY, OPT_INDEF,
-    OPT_NOINDEF, OPT_NOOLDMIME, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT,
+    OPT_NOINDEF, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT,
     OPT_RR_ALL, OPT_RR_FIRST, OPT_RCTFORM, OPT_CERTFILE, OPT_CAFILE,
     OPT_CAPATH, OPT_NOCAPATH, OPT_NOCAFILE,OPT_CONTENT, OPT_PRINT,
     OPT_SECRETKEY, OPT_SECRETKEYID, OPT_PWRI_PASSWORD, OPT_ECONTENT_TYPE,
@@ -99,7 +99,7 @@ OPTIONS cms_options[] = {
     {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},
     {"sign", OPT_SIGN, '-', "Sign message"},
     {"sign_receipt", OPT_SIGN_RECEIPT, '-', "Generate a signed receipt for the message"},
-    {"resign", OPT_RESIGN, '-'},
+    {"resign", OPT_RESIGN, '-', "Resign a signed message"},
     {"verify", OPT_VERIFY, '-', "Verify signed message"},
     {"verify_retcode", OPT_VERIFY_RETCODE, '-'},
     {"verify_receipt", OPT_VERIFY_RECEIPT, '<'},
@@ -122,22 +122,21 @@ OPTIONS cms_options[] = {
      "Don't include signers certificate when signing"},
     {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},
     {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},
-    {"nosmimecap", OPT_NOSMIMECAP, '-'},
+    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
     {"binary", OPT_BINARY, '-', "Don't translate message to text"},
     {"keyid", OPT_KEYID, '-', "Use subject key identifier"},
     {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},
     {"no_content_verify", OPT_NO_CONTENT_VERIFY, '-'},
     {"no_attr_verify", OPT_NO_ATTR_VERIFY, '-'},
-    {"stream", OPT_INDEF, '-'},
-    {"indef", OPT_INDEF, '-'},
-    {"noindef", OPT_NOINDEF, '-'},
-    {"nooldmime", OPT_NOOLDMIME, '-'},
-    {"crlfeol", OPT_CRLFEOL, '-'},
+    {"stream", OPT_INDEF, '-', "Enable CMS streaming"},
+    {"indef", OPT_INDEF, '-', "Same as -stream"},
+    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
+    {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only" },
     {"noout", OPT_NOOUT, '-', "For the -cmsout operation do not output the parsed CMS structure"},
-    {"receipt_request_print", OPT_RR_PRINT, '-'},
+    {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
     {"receipt_request_all", OPT_RR_ALL, '-'},
     {"receipt_request_first", OPT_RR_FIRST, '-'},
-    {"rctform", OPT_RCTFORM, 'F'},
+    {"rctform", OPT_RCTFORM, 'F', "Receipt file format"},
     {"certfile", OPT_CERTFILE, '<', "Other certificates file"},
     {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
     {"CApath", OPT_CAPATH, '/', "trusted certificates directory"},
@@ -147,7 +146,8 @@ OPTIONS cms_options[] = {
      "Do not load certificates from the default certificates directory"},
     {"content", OPT_CONTENT, '<',
      "Supply or override content for detached signature"},
-    {"print", OPT_PRINT, '-', "For the -cmsout operation print out all fields of the CMS structure"},
+    {"print", OPT_PRINT, '-', 
+     "For the -cmsout operation print out all fields of the CMS structure"},
     {"secretkey", OPT_SECRETKEY, 's'},
     {"secretkeyid", OPT_SECRETKEYID, 's'},
     {"pwri_password", OPT_PWRI_PASSWORD, 's'},
@@ -346,9 +346,6 @@ int cms_main(int argc, char **argv)
         case OPT_NOINDEF:
             flags &= ~CMS_STREAM;
             break;
-        case OPT_NOOLDMIME:
-            flags |= CMS_NOOLDMIMETYPE;
-            break;
         case OPT_CRLFEOL:
             mime_eol = "\r\n";
             flags |= CMS_CRLFEOL;
diff --git a/apps/crl.c b/apps/crl.c
index 5e0fbe5..06b6e5b 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -41,7 +41,7 @@ OPTIONS crl_options[] = {
     {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},
     {"crlnumber", OPT_CRLNUMBER, '-', "Print CRL number"},
     {"badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },
-    {"gendelta", OPT_GENDELTA, '<'},
+    {"gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one"},
     {"CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir"},
     {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},
     {"no-CAfile", OPT_NOCAFILE, '-',
diff --git a/apps/gendsa.c b/apps/gendsa.c
index 5dacf1b..4c05493 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -34,7 +34,7 @@ OPTIONS gendsa_options[] = {
     {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
     {"help", OPT_HELP, '-', "Display this summary"},
     {"out", OPT_OUT, '>', "Output the key to the specified file"},
-    {"passout", OPT_PASSOUT, 's'},
+    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
     {"rand", OPT_RAND, 's',
      "Load the file(s) into the random number generator"},
     {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
diff --git a/apps/ocsp.c b/apps/ocsp.c
index cfc06a9..41ea970 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -107,7 +107,8 @@ OPTIONS ocsp_options[] = {
     {"url", OPT_URL, 's', "Responder URL"},
     {"host", OPT_HOST, 's', "TCP/IP hostname:port to connect to"},
     {"port", OPT_PORT, 'p', "Port to run responder on"},
-    {"ignore_err", OPT_IGNORE_ERR, '-'},
+    {"ignore_err", OPT_IGNORE_ERR, '-',
+     "Ignore Error response from OCSP responder, and retry "},
     {"noverify", OPT_NOVERIFY, '-', "Don't verify response at all"},
     {"nonce", OPT_NONCE, '-', "Add OCSP nonce to request"},
     {"no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request"},
@@ -124,7 +125,8 @@ OPTIONS ocsp_options[] = {
     {"no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response"},
     {"no_cert_checks", OPT_NO_CERT_CHECKS, '-',
      "Don't do additional checks on signing certificate"},
-    {"no_explicit", OPT_NO_EXPLICIT, '-'},
+    {"no_explicit", OPT_NO_EXPLICIT, '-',
+     "Do not explicitly check the chain, just verify the root"},
     {"trust_other", OPT_TRUST_OTHER, '-',
      "Don't verify additional certificates"},
     {"no_intern", OPT_NO_INTERN, '-',
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 8763df0..85994cd 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -33,7 +33,7 @@ OPTIONS pkcs7_options[] = {
     {"out", OPT_OUT, '>', "Output file"},
     {"noout", OPT_NOOUT, '-', "Don't output encoded data"},
     {"text", OPT_TEXT, '-', "Print full details of certificates"},
-    {"print", OPT_PRINT, '-'},
+    {"print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure"},
     {"print_certs", OPT_PRINT_CERTS, '-',
      "Print_certs  print any certs or crl in the input"},
 #ifndef OPENSSL_NO_ENGINE
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 22b5866..3592a0f 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -38,7 +38,7 @@ OPTIONS pkcs8_options[] = {
     {"nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key"},
     {"v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher"},
     {"v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher"},
-    {"v2prf", OPT_V2PRF, 's'},
+    {"v2prf", OPT_V2PRF, 's', "Set the PRF algorithm to use with PKCS#5 v2.0"},
     {"iter", OPT_ITER, 'p', "Specify the iteration count"},
     {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
     {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
diff --git a/apps/smime.c b/apps/smime.c
index b98c583..1f4091f 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -37,7 +37,7 @@ typedef enum OPTION_choice {
     OPT_PK7OUT, OPT_TEXT, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCHAIN,
     OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP,
     OPT_BINARY, OPT_NOSIGS, OPT_STREAM, OPT_INDEF, OPT_NOINDEF,
-    OPT_NOOLDMIME, OPT_CRLFEOL, OPT_RAND, OPT_ENGINE, OPT_PASSIN,
+    OPT_CRLFEOL, OPT_RAND, OPT_ENGINE, OPT_PASSIN,
     OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP, OPT_MD,
     OPT_CIPHER, OPT_INKEY, OPT_KEYFORM, OPT_CERTFILE, OPT_CAFILE,
     OPT_V_ENUM,
@@ -88,14 +88,14 @@ OPTIONS smime_options[] = {
      "Do not load the default certificates file"},
     {"no-CApath", OPT_NOCAPATH, '-',
      "Do not load certificates from the default certificates directory"},
-    {"resign", OPT_RESIGN, '-'},
-    {"nochain", OPT_NOCHAIN, '-'},
-    {"nosmimecap", OPT_NOSMIMECAP, '-'},
-    {"stream", OPT_STREAM, '-'},
-    {"indef", OPT_INDEF, '-'},
-    {"noindef", OPT_NOINDEF, '-'},
-    {"nooldmime", OPT_NOOLDMIME, '-'},
-    {"crlfeol", OPT_CRLFEOL, '-'},
+    {"resign", OPT_RESIGN, '-', "Resign a signed message"},
+    {"nochain", OPT_NOCHAIN, '-', 
+     "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" },
+    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
+    {"stream", OPT_STREAM, '-', "Enable CMS streaming" },
+    {"indef", OPT_INDEF, '-', "Same as -stream" },
+    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
+    {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only"},
     {"rand", OPT_RAND, 's',
      "Load the file(s) into the random number generator"},
     {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
@@ -220,9 +220,6 @@ int smime_main(int argc, char **argv)
         case OPT_NOINDEF:
             indef = 0;
             break;
-        case OPT_NOOLDMIME:
-            flags |= PKCS7_NOOLDMIMETYPE;
-            break;
         case OPT_CRLFEOL:
             flags |= PKCS7_CRLFEOL;
             mime_eol = "\r\n";
diff --git a/apps/spkac.c b/apps/spkac.c
index a365406..c65103d 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -38,7 +38,8 @@ OPTIONS spkac_options[] = {
     {"noout", OPT_NOOUT, '-', "Don't print SPKAC"},
     {"pubkey", OPT_PUBKEY, '-', "Output public key"},
     {"verify", OPT_VERIFY, '-', "Verify SPKAC signature"},
-    {"spksect", OPT_SPKSECT, 's'},
+    {"spksect", OPT_SPKSECT, 's',
+     "Specify the name of an SPKAC-dedicated section of configuration"},
 #ifndef OPENSSL_NO_ENGINE
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 #endif
diff --git a/apps/ts.c b/apps/ts.c
index 924108f..eda5297 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -107,7 +107,7 @@ OPTIONS ts_options[] = {
     {"queryfile", OPT_QUERYFILE, '<', "File containing a TS query"},
     {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
     {"inkey", OPT_INKEY, '<', "File with private key for reply"},
-    {"signer", OPT_SIGNER, 's'},
+    {"signer", OPT_SIGNER, 's', "Signer certificate file"},
     {"chain", OPT_CHAIN, '<', "File with signer CA chain"},
     {"verify", OPT_VERIFY, '-', "Verify a TS response"},
     {"CApath", OPT_CAPATH, '/', "Path to trusted CA files"},
diff --git a/apps/x509.c b/apps/x509.c
index 20db458..3539602 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -92,7 +92,7 @@ OPTIONS x509_options[] = {
     {"ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)"},
     {"trustout", OPT_TRUSTOUT, '-', "Output a trusted certificate"},
     {"clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes"},
-    {"clrext", OPT_CLREXT, '-', "Clear all rejected purposes"},
+    {"clrext", OPT_CLREXT, '-', "Clear all certificate extensions"},
     {"addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose"},
     {"addreject", OPT_ADDREJECT, 's',
      "Reject certificate for a given purpose"},
@@ -125,9 +125,10 @@ OPTIONS x509_options[] = {
     {"CAform", OPT_CAFORM, 'F', "CA format - default PEM"},
     {"CAkeyform", OPT_CAKEYFORM, 'F', "CA key format - default PEM"},
     {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
-    {"force_pubkey", OPT_FORCE_PUBKEY, '<'},
-    {"next_serial", OPT_NEXT_SERIAL, '-'},
-    {"clrreject", OPT_CLRREJECT, '-'},
+    {"force_pubkey", OPT_FORCE_PUBKEY, '<', "Force the Key to put inside certificate"},
+    {"next_serial", OPT_NEXT_SERIAL, '-', "Increment current certificate serial number"},
+    {"clrreject", OPT_CLRREJECT, '-',
+     "Clears all the prohibited or rejected uses of the certificate"},
     {"badsig", OPT_BADSIG, '-', "Corrupt last byte of certificate signature (for test)"},
     {"", OPT_MD, '-', "Any supported digest"},
 #ifndef OPENSSL_NO_MD5
@@ -626,10 +627,9 @@ int x509_main(int argc, char **argv)
                 i2a_ASN1_INTEGER(out, X509_get_serialNumber(x));
                 BIO_printf(out, "\n");
             } else if (next_serial == i) {
-                BIGNUM *bnser;
-                ASN1_INTEGER *ser;
-                ser = X509_get_serialNumber(x);
-                bnser = ASN1_INTEGER_to_BN(ser, NULL);
+                ASN1_INTEGER *ser = X509_get_serialNumber(x);
+                BIGNUM *bnser = ASN1_INTEGER_to_BN(ser, NULL);
+
                 if (!bnser)
                     goto end;
                 if (!BN_add_word(bnser, 1))

From rsalz at openssl.org  Tue Sep 20 01:27:38 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 20 Sep 2016 01:27:38 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474334858.127445.32274.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  90edd7ad0fb0d8b1eb5bb6d587a6359f17a39230 (commit)
      from  57106f55a5de6186af4ff78484d99528a6935be4 (commit)


- Log -----------------------------------------------------------------
commit 90edd7ad0fb0d8b1eb5bb6d587a6359f17a39230
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sun Jul 31 19:02:50 2016 +0200

    Fix various missing option help messages ...
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1585)
    (cherry picked from commit 12d56b2992ebd61e1b30c99ca1898dde42345cf7)

-----------------------------------------------------------------------

Summary of changes:
 apps/cms.c    | 19 ++++++++++---------
 apps/crl.c    |  2 +-
 apps/gendsa.c |  2 +-
 apps/ocsp.c   |  6 ++++--
 apps/pkcs7.c  |  2 +-
 apps/pkcs8.c  |  2 +-
 apps/smime.c  | 17 +++++++++--------
 apps/spkac.c  |  3 ++-
 apps/ts.c     |  2 +-
 apps/x509.c   | 16 ++++++++--------
 10 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/apps/cms.c b/apps/cms.c
index b9eec24..ad292f5 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -99,7 +99,7 @@ OPTIONS cms_options[] = {
     {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},
     {"sign", OPT_SIGN, '-', "Sign message"},
     {"sign_receipt", OPT_SIGN_RECEIPT, '-', "Generate a signed receipt for the message"},
-    {"resign", OPT_RESIGN, '-'},
+    {"resign", OPT_RESIGN, '-', "Resign a signed message"},
     {"verify", OPT_VERIFY, '-', "Verify signed message"},
     {"verify_retcode", OPT_VERIFY_RETCODE, '-'},
     {"verify_receipt", OPT_VERIFY_RECEIPT, '<'},
@@ -122,22 +122,22 @@ OPTIONS cms_options[] = {
      "Don't include signers certificate when signing"},
     {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},
     {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},
-    {"nosmimecap", OPT_NOSMIMECAP, '-'},
+    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
     {"binary", OPT_BINARY, '-', "Don't translate message to text"},
     {"keyid", OPT_KEYID, '-', "Use subject key identifier"},
     {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},
     {"no_content_verify", OPT_NO_CONTENT_VERIFY, '-'},
     {"no_attr_verify", OPT_NO_ATTR_VERIFY, '-'},
-    {"stream", OPT_INDEF, '-'},
-    {"indef", OPT_INDEF, '-'},
-    {"noindef", OPT_NOINDEF, '-'},
+    {"stream", OPT_INDEF, '-', "Enable CMS streaming"},
+    {"indef", OPT_INDEF, '-', "Same as -stream"},
+    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
     {"nooldmime", OPT_NOOLDMIME, '-'},
-    {"crlfeol", OPT_CRLFEOL, '-'},
+    {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only" },
     {"noout", OPT_NOOUT, '-', "For the -cmsout operation do not output the parsed CMS structure"},
-    {"receipt_request_print", OPT_RR_PRINT, '-'},
+    {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
     {"receipt_request_all", OPT_RR_ALL, '-'},
     {"receipt_request_first", OPT_RR_FIRST, '-'},
-    {"rctform", OPT_RCTFORM, 'F'},
+    {"rctform", OPT_RCTFORM, 'F', "Receipt file format"},
     {"certfile", OPT_CERTFILE, '<', "Other certificates file"},
     {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
     {"CApath", OPT_CAPATH, '/', "trusted certificates directory"},
@@ -147,7 +147,8 @@ OPTIONS cms_options[] = {
      "Do not load certificates from the default certificates directory"},
     {"content", OPT_CONTENT, '<',
      "Supply or override content for detached signature"},
-    {"print", OPT_PRINT, '-', "For the -cmsout operation print out all fields of the CMS structure"},
+    {"print", OPT_PRINT, '-', 
+     "For the -cmsout operation print out all fields of the CMS structure"},
     {"secretkey", OPT_SECRETKEY, 's'},
     {"secretkeyid", OPT_SECRETKEYID, 's'},
     {"pwri_password", OPT_PWRI_PASSWORD, 's'},
diff --git a/apps/crl.c b/apps/crl.c
index 5e0fbe5..06b6e5b 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -41,7 +41,7 @@ OPTIONS crl_options[] = {
     {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},
     {"crlnumber", OPT_CRLNUMBER, '-', "Print CRL number"},
     {"badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },
-    {"gendelta", OPT_GENDELTA, '<'},
+    {"gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one"},
     {"CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir"},
     {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},
     {"no-CAfile", OPT_NOCAFILE, '-',
diff --git a/apps/gendsa.c b/apps/gendsa.c
index 5dacf1b..4c05493 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -34,7 +34,7 @@ OPTIONS gendsa_options[] = {
     {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
     {"help", OPT_HELP, '-', "Display this summary"},
     {"out", OPT_OUT, '>', "Output the key to the specified file"},
-    {"passout", OPT_PASSOUT, 's'},
+    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
     {"rand", OPT_RAND, 's',
      "Load the file(s) into the random number generator"},
     {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
diff --git a/apps/ocsp.c b/apps/ocsp.c
index cfc06a9..41ea970 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -107,7 +107,8 @@ OPTIONS ocsp_options[] = {
     {"url", OPT_URL, 's', "Responder URL"},
     {"host", OPT_HOST, 's', "TCP/IP hostname:port to connect to"},
     {"port", OPT_PORT, 'p', "Port to run responder on"},
-    {"ignore_err", OPT_IGNORE_ERR, '-'},
+    {"ignore_err", OPT_IGNORE_ERR, '-',
+     "Ignore Error response from OCSP responder, and retry "},
     {"noverify", OPT_NOVERIFY, '-', "Don't verify response at all"},
     {"nonce", OPT_NONCE, '-', "Add OCSP nonce to request"},
     {"no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request"},
@@ -124,7 +125,8 @@ OPTIONS ocsp_options[] = {
     {"no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response"},
     {"no_cert_checks", OPT_NO_CERT_CHECKS, '-',
      "Don't do additional checks on signing certificate"},
-    {"no_explicit", OPT_NO_EXPLICIT, '-'},
+    {"no_explicit", OPT_NO_EXPLICIT, '-',
+     "Do not explicitly check the chain, just verify the root"},
     {"trust_other", OPT_TRUST_OTHER, '-',
      "Don't verify additional certificates"},
     {"no_intern", OPT_NO_INTERN, '-',
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 8763df0..85994cd 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -33,7 +33,7 @@ OPTIONS pkcs7_options[] = {
     {"out", OPT_OUT, '>', "Output file"},
     {"noout", OPT_NOOUT, '-', "Don't output encoded data"},
     {"text", OPT_TEXT, '-', "Print full details of certificates"},
-    {"print", OPT_PRINT, '-'},
+    {"print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure"},
     {"print_certs", OPT_PRINT_CERTS, '-',
      "Print_certs  print any certs or crl in the input"},
 #ifndef OPENSSL_NO_ENGINE
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 22b5866..3592a0f 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -38,7 +38,7 @@ OPTIONS pkcs8_options[] = {
     {"nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key"},
     {"v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher"},
     {"v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher"},
-    {"v2prf", OPT_V2PRF, 's'},
+    {"v2prf", OPT_V2PRF, 's', "Set the PRF algorithm to use with PKCS#5 v2.0"},
     {"iter", OPT_ITER, 'p', "Specify the iteration count"},
     {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
     {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
diff --git a/apps/smime.c b/apps/smime.c
index b98c583..082109b 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -88,14 +88,15 @@ OPTIONS smime_options[] = {
      "Do not load the default certificates file"},
     {"no-CApath", OPT_NOCAPATH, '-',
      "Do not load certificates from the default certificates directory"},
-    {"resign", OPT_RESIGN, '-'},
-    {"nochain", OPT_NOCHAIN, '-'},
-    {"nosmimecap", OPT_NOSMIMECAP, '-'},
-    {"stream", OPT_STREAM, '-'},
-    {"indef", OPT_INDEF, '-'},
-    {"noindef", OPT_NOINDEF, '-'},
-    {"nooldmime", OPT_NOOLDMIME, '-'},
-    {"crlfeol", OPT_CRLFEOL, '-'},
+    {"resign", OPT_RESIGN, '-', "Resign a signed message"},
+    {"nochain", OPT_NOCHAIN, '-', 
+     "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" },
+    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
+    {"stream", OPT_STREAM, '-', "Enable CMS streaming" },
+    {"indef", OPT_INDEF, '-', "Same as -stream" },
+    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
+    {"nooldmime", OPT_NOOLDMIME, '-', NULL},
+    {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only"},
     {"rand", OPT_RAND, 's',
      "Load the file(s) into the random number generator"},
     {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
diff --git a/apps/spkac.c b/apps/spkac.c
index a365406..c65103d 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -38,7 +38,8 @@ OPTIONS spkac_options[] = {
     {"noout", OPT_NOOUT, '-', "Don't print SPKAC"},
     {"pubkey", OPT_PUBKEY, '-', "Output public key"},
     {"verify", OPT_VERIFY, '-', "Verify SPKAC signature"},
-    {"spksect", OPT_SPKSECT, 's'},
+    {"spksect", OPT_SPKSECT, 's',
+     "Specify the name of an SPKAC-dedicated section of configuration"},
 #ifndef OPENSSL_NO_ENGINE
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 #endif
diff --git a/apps/ts.c b/apps/ts.c
index 924108f..eda5297 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -107,7 +107,7 @@ OPTIONS ts_options[] = {
     {"queryfile", OPT_QUERYFILE, '<', "File containing a TS query"},
     {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
     {"inkey", OPT_INKEY, '<', "File with private key for reply"},
-    {"signer", OPT_SIGNER, 's'},
+    {"signer", OPT_SIGNER, 's', "Signer certificate file"},
     {"chain", OPT_CHAIN, '<', "File with signer CA chain"},
     {"verify", OPT_VERIFY, '-', "Verify a TS response"},
     {"CApath", OPT_CAPATH, '/', "Path to trusted CA files"},
diff --git a/apps/x509.c b/apps/x509.c
index 20db458..3539602 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -92,7 +92,7 @@ OPTIONS x509_options[] = {
     {"ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)"},
     {"trustout", OPT_TRUSTOUT, '-', "Output a trusted certificate"},
     {"clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes"},
-    {"clrext", OPT_CLREXT, '-', "Clear all rejected purposes"},
+    {"clrext", OPT_CLREXT, '-', "Clear all certificate extensions"},
     {"addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose"},
     {"addreject", OPT_ADDREJECT, 's',
      "Reject certificate for a given purpose"},
@@ -125,9 +125,10 @@ OPTIONS x509_options[] = {
     {"CAform", OPT_CAFORM, 'F', "CA format - default PEM"},
     {"CAkeyform", OPT_CAKEYFORM, 'F', "CA key format - default PEM"},
     {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
-    {"force_pubkey", OPT_FORCE_PUBKEY, '<'},
-    {"next_serial", OPT_NEXT_SERIAL, '-'},
-    {"clrreject", OPT_CLRREJECT, '-'},
+    {"force_pubkey", OPT_FORCE_PUBKEY, '<', "Force the Key to put inside certificate"},
+    {"next_serial", OPT_NEXT_SERIAL, '-', "Increment current certificate serial number"},
+    {"clrreject", OPT_CLRREJECT, '-',
+     "Clears all the prohibited or rejected uses of the certificate"},
     {"badsig", OPT_BADSIG, '-', "Corrupt last byte of certificate signature (for test)"},
     {"", OPT_MD, '-', "Any supported digest"},
 #ifndef OPENSSL_NO_MD5
@@ -626,10 +627,9 @@ int x509_main(int argc, char **argv)
                 i2a_ASN1_INTEGER(out, X509_get_serialNumber(x));
                 BIO_printf(out, "\n");
             } else if (next_serial == i) {
-                BIGNUM *bnser;
-                ASN1_INTEGER *ser;
-                ser = X509_get_serialNumber(x);
-                bnser = ASN1_INTEGER_to_BN(ser, NULL);
+                ASN1_INTEGER *ser = X509_get_serialNumber(x);
+                BIGNUM *bnser = ASN1_INTEGER_to_BN(ser, NULL);
+
                 if (!bnser)
                     goto end;
                 if (!BN_add_word(bnser, 1))

From rsalz at openssl.org  Tue Sep 20 01:28:22 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 20 Sep 2016 01:28:22 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474334902.741114.404.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  3fd181a8b5b85a1f7383e82438da494a08f7d843 (commit)
      from  90edd7ad0fb0d8b1eb5bb6d587a6359f17a39230 (commit)


- Log -----------------------------------------------------------------
commit 3fd181a8b5b85a1f7383e82438da494a08f7d843
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sat Sep 17 21:29:48 2016 +0200

    Remove an option related to a deprecated flag
    
    CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE  are unused in pkcs7/cms code.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1585)
    (cherry picked from commit 28aef3d9558dc2e11ba56576b3a4d3faaef8a9d3)

-----------------------------------------------------------------------

Summary of changes:
 apps/cms.c   | 6 +-----
 apps/smime.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/cms.c b/apps/cms.c
index ad292f5..133dc02 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -72,7 +72,7 @@ typedef enum OPTION_choice {
     OPT_ASCIICRLF, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCERTS,
     OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP, OPT_BINARY, OPT_KEYID,
     OPT_NOSIGS, OPT_NO_CONTENT_VERIFY, OPT_NO_ATTR_VERIFY, OPT_INDEF,
-    OPT_NOINDEF, OPT_NOOLDMIME, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT,
+    OPT_NOINDEF, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT,
     OPT_RR_ALL, OPT_RR_FIRST, OPT_RCTFORM, OPT_CERTFILE, OPT_CAFILE,
     OPT_CAPATH, OPT_NOCAPATH, OPT_NOCAFILE,OPT_CONTENT, OPT_PRINT,
     OPT_SECRETKEY, OPT_SECRETKEYID, OPT_PWRI_PASSWORD, OPT_ECONTENT_TYPE,
@@ -131,7 +131,6 @@ OPTIONS cms_options[] = {
     {"stream", OPT_INDEF, '-', "Enable CMS streaming"},
     {"indef", OPT_INDEF, '-', "Same as -stream"},
     {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
-    {"nooldmime", OPT_NOOLDMIME, '-'},
     {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only" },
     {"noout", OPT_NOOUT, '-', "For the -cmsout operation do not output the parsed CMS structure"},
     {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
@@ -347,9 +346,6 @@ int cms_main(int argc, char **argv)
         case OPT_NOINDEF:
             flags &= ~CMS_STREAM;
             break;
-        case OPT_NOOLDMIME:
-            flags |= CMS_NOOLDMIMETYPE;
-            break;
         case OPT_CRLFEOL:
             mime_eol = "\r\n";
             flags |= CMS_CRLFEOL;
diff --git a/apps/smime.c b/apps/smime.c
index 082109b..1f4091f 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -37,7 +37,7 @@ typedef enum OPTION_choice {
     OPT_PK7OUT, OPT_TEXT, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCHAIN,
     OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP,
     OPT_BINARY, OPT_NOSIGS, OPT_STREAM, OPT_INDEF, OPT_NOINDEF,
-    OPT_NOOLDMIME, OPT_CRLFEOL, OPT_RAND, OPT_ENGINE, OPT_PASSIN,
+    OPT_CRLFEOL, OPT_RAND, OPT_ENGINE, OPT_PASSIN,
     OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP, OPT_MD,
     OPT_CIPHER, OPT_INKEY, OPT_KEYFORM, OPT_CERTFILE, OPT_CAFILE,
     OPT_V_ENUM,
@@ -95,7 +95,6 @@ OPTIONS smime_options[] = {
     {"stream", OPT_STREAM, '-', "Enable CMS streaming" },
     {"indef", OPT_INDEF, '-', "Same as -stream" },
     {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
-    {"nooldmime", OPT_NOOLDMIME, '-', NULL},
     {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only"},
     {"rand", OPT_RAND, 's',
      "Load the file(s) into the random number generator"},
@@ -221,9 +220,6 @@ int smime_main(int argc, char **argv)
         case OPT_NOINDEF:
             indef = 0;
             break;
-        case OPT_NOOLDMIME:
-            flags |= PKCS7_NOOLDMIMETYPE;
-            break;
         case OPT_CRLFEOL:
             flags |= PKCS7_CRLFEOL;
             mime_eol = "\r\n";

From builds at travis-ci.org  Tue Sep 20 01:58:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 01:58:50 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6078 (master - 28aef3d)
In-Reply-To: <openssl/openssl+161208157+fixed@travis-ci.org>
Message-ID: <57e097d9e6fa9_33fd0b979f6fc871292@be70f50f-e650-41fa-b133-0d04fdca1724.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6078
Status: Fixed

Duration: 31 minutes and 9 seconds
Commit: 28aef3d (master)
Author: FdaSilvaYY
Message: Remove an option related to a deprecated flag

CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE  are unused in pkcs7/cms code.

Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1585)

View the changeset: https://github.com/openssl/openssl/compare/9205ebeb8e44...28aef3d9558d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161208157

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/8e714d1a/attachment.html>

From rsalz at openssl.org  Tue Sep 20 02:06:49 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 20 Sep 2016 02:06:49 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474337209.135945.16994.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  6180c0ff0c34b4029bd9d1bec519c8cbc6be4808 (commit)
      from  32cc4c2627e8f582d906b03abf763f682c7f96dd (commit)


- Log -----------------------------------------------------------------
commit 6180c0ff0c34b4029bd9d1bec519c8cbc6be4808
Author: Marcus Meissner <meissner at suse.de>
Date:   Tue Sep 6 11:01:21 2016 +0200

    initialize the RSA struct to 0.
    
    This helps with program code linked against static builds accessing a uninitialized ->engine pointer.
    
    CLA: none; trivial
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1540)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rsa/rsa_lib.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index a6805de..6ea6b40 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -143,6 +143,7 @@ RSA *RSA_new_method(ENGINE *engine)
         RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
+    memset(ret,0,sizeof(RSA));
 
     ret->meth = RSA_get_default_method();
 #ifndef OPENSSL_NO_ENGINE

From matt at openssl.org  Tue Sep 20 09:19:45 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 20 Sep 2016 09:19:45 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474363185.297319.21590.nullmailer@dev.openssl.org>

The branch master has been updated
       via  418a18a2deddc0b0d6181de0008219c899ca6ddf (commit)
       via  15e6be6c5c518f3b1594a2370638d5ae4e9742d1 (commit)
       via  c49e1912300e9d4346d568e99a4908d5678d5e53 (commit)
       via  6400f338184b7acc94b8c21febdc68ec6f7fe3de (commit)
      from  28aef3d9558dc2e11ba56576b3a4d3faaef8a9d3 (commit)


- Log -----------------------------------------------------------------
commit 418a18a2deddc0b0d6181de0008219c899ca6ddf
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 20 10:16:15 2016 +0100

    Style tweaks following review feedback
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 15e6be6c5c518f3b1594a2370638d5ae4e9742d1
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 14 12:10:33 2016 +0100

    Convert NextProto message construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit c49e1912300e9d4346d568e99a4908d5678d5e53
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 14 11:41:27 2016 +0100

    Convert Certificate message construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 6400f338184b7acc94b8c21febdc68ec6f7fe3de
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 14 11:10:37 2016 +0100

    Convert ClientVerify Construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h    |  1 +
 ssl/ssl_cert.c           | 40 ++++++++-------------
 ssl/ssl_err.c            |  1 +
 ssl/ssl_locl.h           |  6 ++--
 ssl/statem/statem_clnt.c | 92 ++++++++++++++++++++++++++++++++++--------------
 ssl/statem/statem_lib.c  | 31 ++++++++++------
 ssl/statem/statem_srvr.c |  2 +-
 ssl/t1_lib.c             | 27 +++++++++++++-
 8 files changed, 132 insertions(+), 68 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 1fcdbd2..234a25e 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2232,6 +2232,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358
 # define SSL_F_TLS_CONSTRUCT_FINISHED                     359
 # define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373
+# define SSL_F_TLS_CONSTRUCT_NEXT_PROTO                   426
 # define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           374
 # define SSL_F_TLS_CONSTRUCT_SERVER_DONE                  375
 # define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 376
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 0c931db..9d35957 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -740,48 +740,36 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
     return ret;
 }
 
-/* Add a certificate to a BUF_MEM structure */
-
-static int ssl_add_cert_to_buf(BUF_MEM *buf, unsigned long *l, X509 *x)
+/* Add a certificate to the WPACKET */
+static int ssl_add_cert_to_buf(WPACKET *pkt, X509 *x)
 {
-    int n;
-    unsigned char *p;
+    int len;
+    unsigned char *outbytes;
 
-    n = i2d_X509(x, NULL);
-    if (n < 0 || !BUF_MEM_grow_clean(buf, (int)(n + (*l) + 3))) {
+    len = i2d_X509(x, NULL);
+    if (len < 0) {
         SSLerr(SSL_F_SSL_ADD_CERT_TO_BUF, ERR_R_BUF_LIB);
         return 0;
     }
-    p = (unsigned char *)&(buf->data[*l]);
-    l2n3(n, p);
-    n = i2d_X509(x, &p);
-    if (n < 0) {
-        /* Shouldn't happen */
-        SSLerr(SSL_F_SSL_ADD_CERT_TO_BUF, ERR_R_BUF_LIB);
+    if (!WPACKET_sub_allocate_bytes_u24(pkt, len, &outbytes)
+            || i2d_X509(x, &outbytes) != len) {
+        SSLerr(SSL_F_SSL_ADD_CERT_TO_BUF, ERR_R_INTERNAL_ERROR);
         return 0;
     }
-    *l += n + 3;
 
     return 1;
 }
 
 /* Add certificate chain to internal SSL BUF_MEM structure */
-int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l)
+int ssl_add_cert_chain(SSL *s, WPACKET *pkt, CERT_PKEY *cpk)
 {
-    BUF_MEM *buf = s->init_buf;
     int i, chain_count;
     X509 *x;
     STACK_OF(X509) *extra_certs;
     STACK_OF(X509) *chain = NULL;
     X509_STORE *chain_store;
 
-    /* TLSv1 sends a chain with nothing in it, instead of an alert */
-    if (!BUF_MEM_grow_clean(buf, 10)) {
-        SSLerr(SSL_F_SSL_ADD_CERT_CHAIN, ERR_R_BUF_LIB);
-        return 0;
-    }
-
-    if (!cpk || !cpk->x509)
+    if (cpk == NULL || cpk->x509 == NULL)
         return 1;
 
     x = cpk->x509;
@@ -839,7 +827,7 @@ int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l)
         for (i = 0; i < chain_count; i++) {
             x = sk_X509_value(chain, i);
 
-            if (!ssl_add_cert_to_buf(buf, l, x)) {
+            if (!ssl_add_cert_to_buf(pkt, x)) {
                 X509_STORE_CTX_free(xs_ctx);
                 return 0;
             }
@@ -851,11 +839,11 @@ int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l)
             SSLerr(SSL_F_SSL_ADD_CERT_CHAIN, i);
             return 0;
         }
-        if (!ssl_add_cert_to_buf(buf, l, x))
+        if (!ssl_add_cert_to_buf(pkt, x))
             return 0;
         for (i = 0; i < sk_X509_num(extra_certs); i++) {
             x = sk_X509_value(extra_certs, i);
-            if (!ssl_add_cert_to_buf(buf, l, x))
+            if (!ssl_add_cert_to_buf(pkt, x))
                 return 0;
         }
     }
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index f776f61..7f94ca6 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -257,6 +257,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_FINISHED), "tls_construct_finished"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_HELLO_REQUEST),
      "tls_construct_hello_request"},
+    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_NEXT_PROTO), "tls_construct_next_proto"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE),
      "tls_construct_server_certificate"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_DONE), "tls_construct_server_done"},
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 26485f6..6ad2735 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1830,7 +1830,7 @@ __owur X509 *ssl_cert_get0_next_certificate(CERT *c, int first);
 void ssl_cert_set_cert_cb(CERT *c, int (*cb) (SSL *ssl, void *arg), void *arg);
 
 __owur int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk);
-__owur int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l);
+__owur int ssl_add_cert_chain(SSL *s, WPACKET *pkt, CERT_PKEY *cpk);
 __owur int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags);
 __owur int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain,
                                    int ref);
@@ -2038,8 +2038,10 @@ __owur int tls_check_serverhello_tlsext_early(SSL *s, const PACKET *ext,
                                               const PACKET *session_id,
                                               SSL_SESSION **ret);
 
-__owur int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
+__owur int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk,
                                 const EVP_MD *md);
+__owur int tls12_get_sigandhash_old(unsigned char *p, const EVP_PKEY *pk,
+                                    const EVP_MD *md);
 __owur int tls12_get_sigid(const EVP_PKEY *pk);
 __owur const EVP_MD *tls12_get_hash(unsigned char hash_alg);
 void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op);
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 703e6a6..95af064 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2616,22 +2616,31 @@ int tls_client_key_exchange_post_work(SSL *s)
 
 int tls_construct_client_verify(SSL *s)
 {
-    unsigned char *p;
     EVP_PKEY *pkey;
     const EVP_MD *md = s->s3->tmp.md[s->cert->key - s->cert->pkeys];
     EVP_MD_CTX *mctx;
     unsigned u = 0;
-    unsigned long n = 0;
     long hdatalen = 0;
     void *hdata;
+    unsigned char *sig = NULL;
+    WPACKET pkt;
+
+    if (!WPACKET_init(&pkt, s->init_buf)) {
+        /* Should not happen */
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
+    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CERTIFICATE_VERIFY)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     mctx = EVP_MD_CTX_new();
     if (mctx == NULL) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-
-    p = ssl_handshake_start(s);
     pkey = s->cert->key->privatekey;
 
     hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
@@ -2639,24 +2648,25 @@ int tls_construct_client_verify(SSL *s)
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
         goto err;
     }
-    if (SSL_USE_SIGALGS(s)) {
-        if (!tls12_get_sigandhash(p, pkey, md)) {
-            SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
-            goto err;
-        }
-        p += 2;
-        n = 2;
+    if (SSL_USE_SIGALGS(s)&& !tls12_get_sigandhash(&pkt, pkey, md)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
     }
 #ifdef SSL_DEBUG
     fprintf(stderr, "Using client alg %s\n", EVP_MD_name(md));
 #endif
+    sig = OPENSSL_malloc(EVP_PKEY_size(pkey));
+    if (sig == NULL) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     if (!EVP_SignInit_ex(mctx, md, NULL)
         || !EVP_SignUpdate(mctx, hdata, hdatalen)
         || (s->version == SSL3_VERSION
             && !EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET,
                                 s->session->master_key_length,
                                 s->session->master_key))
-        || !EVP_SignFinal(mctx, p + 2, &u, pkey)) {
+        || !EVP_SignFinal(mctx, sig, &u, pkey)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_EVP_LIB);
         goto err;
     }
@@ -2666,24 +2676,32 @@ int tls_construct_client_verify(SSL *s)
         if (pktype == NID_id_GostR3410_2001
             || pktype == NID_id_GostR3410_2012_256
             || pktype == NID_id_GostR3410_2012_512)
-            BUF_reverse(p + 2, NULL, u);
+            BUF_reverse(sig, NULL, u);
     }
 #endif
 
-    s2n(u, p);
-    n += u + 2;
+    if (!WPACKET_sub_memcpy_u16(&pkt, sig, u)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     /* Digest cached records and discard handshake buffer */
     if (!ssl3_digest_cached_records(s, 0))
         goto err;
-    if (!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_VERIFY, n)) {
+
+    if (!ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
+    OPENSSL_free(sig);
     EVP_MD_CTX_free(mctx);
     return 1;
  err:
+    WPACKET_cleanup(&pkt);
+    OPENSSL_free(sig);
     EVP_MD_CTX_free(mctx);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
     return 0;
 }
 
@@ -2876,22 +2894,42 @@ int ssl3_check_cert_and_algorithm(SSL *s)
 #ifndef OPENSSL_NO_NEXTPROTONEG
 int tls_construct_next_proto(SSL *s)
 {
-    unsigned int len, padding_len;
-    unsigned char *d;
+    size_t len, padding_len;
+    unsigned char *padding = NULL;
+    WPACKET pkt;
+
+    if (!WPACKET_init(&pkt, s->init_buf)) {
+        /* Should not happen */
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEXT_PROTO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
+    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_NEXT_PROTO)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEXT_PROTO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     len = s->next_proto_negotiated_len;
     padding_len = 32 - ((len + 2) % 32);
-    d = (unsigned char *)s->init_buf->data;
-    d[4] = len;
-    memcpy(d + 5, s->next_proto_negotiated, len);
-    d[5 + len] = padding_len;
-    memset(d + 6 + len, 0, padding_len);
-    *(d++) = SSL3_MT_NEXT_PROTO;
-    l2n3(2 + len + padding_len, d);
-    s->init_num = 4 + 2 + len + padding_len;
-    s->init_off = 0;
+
+    if (!WPACKET_sub_memcpy_u8(&pkt, s->next_proto_negotiated, len)
+            || !WPACKET_sub_allocate_bytes_u8(&pkt, padding_len, &padding)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEXT_PROTO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
+    memset(padding, 0, padding_len);
+
+    if (!ssl_close_construct_packet(s, &pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEXT_PROTO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     return 1;
+ err:
+    WPACKET_cleanup(&pkt);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+    return 0;
 }
 #endif
 
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 4171594..882e150 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -267,22 +267,31 @@ int tls_construct_change_cipher_spec(SSL *s)
 
 unsigned long ssl3_output_cert_chain(SSL *s, CERT_PKEY *cpk)
 {
-    unsigned char *p;
-    unsigned long l = 3 + SSL_HM_HEADER_LENGTH(s);
+    WPACKET pkt;
 
-    if (!ssl_add_cert_chain(s, cpk, &l))
-        return 0;
+    if (!WPACKET_init(&pkt, s->init_buf)) {
+        /* Should not happen */
+        SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
-    l -= 3 + SSL_HM_HEADER_LENGTH(s);
-    p = ssl_handshake_start(s);
-    l2n3(l, p);
-    l += 3;
+    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CERTIFICATE)
+            || !WPACKET_start_sub_packet_u24(&pkt)) {
+        SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
+    if (!ssl_add_cert_chain(s, &pkt, cpk))
+        goto err;
 
-    if (!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE, l)) {
+    if (!WPACKET_close(&pkt) || !ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN, ERR_R_INTERNAL_ERROR);
-        return 0;
+        goto err;
     }
-    return l + SSL_HM_HEADER_LENGTH(s);
+    return 1;
+ err:
+    WPACKET_cleanup(&pkt);
+    return 0;
 }
 
 WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst)
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 818f48d..7536e6e 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1918,7 +1918,7 @@ int tls_construct_server_key_exchange(SSL *s)
         if (md) {
             /* send signature algorithm */
             if (SSL_USE_SIGALGS(s)) {
-                if (!tls12_get_sigandhash(p, pkey, md)) {
+                if (!tls12_get_sigandhash_old(p, pkey, md)) {
                     /* Should never happen */
                     al = SSL_AD_INTERNAL_ERROR;
                     SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 4f5ea42..eea7802 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3119,7 +3119,32 @@ static int tls12_find_nid(int id, const tls12_lookup *table, size_t tlen)
     return NID_undef;
 }
 
-int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, const EVP_MD *md)
+int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk, const EVP_MD *md)
+{
+    int sig_id, md_id;
+
+    if (md == NULL)
+        return 0;
+    md_id = tls12_find_id(EVP_MD_type(md), tls12_md, OSSL_NELEM(tls12_md));
+    if (md_id == -1)
+        return 0;
+    sig_id = tls12_get_sigid(pk);
+    if (sig_id == -1)
+        return 0;
+    if (!WPACKET_put_bytes(pkt, md_id, 1) || !WPACKET_put_bytes(pkt, sig_id, 1))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Old version of the tls12_get_sigandhash function used by code that has not
+ * yet been converted to WPACKET yet. It will be deleted once WPACKET conversion
+ * is complete.
+ * TODO - DELETE ME
+ */
+int tls12_get_sigandhash_old(unsigned char *p, const EVP_PKEY *pk,
+                             const EVP_MD *md)
 {
     int sig_id, md_id;
     if (!md)

From builds at travis-ci.org  Tue Sep 20 09:59:06 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 09:59:06 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6082 (master - 418a18a)
In-Reply-To: <openssl/openssl+161272733+errored@travis-ci.org>
Message-ID: <57e1086a1598d_33fb7c44ccc1c129528f@33d10f0c-348b-4061-bb00-45068d36a442.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6082
Status: Errored

Duration: 37 minutes and 12 seconds
Commit: 418a18a (master)
Author: Matt Caswell
Message: Style tweaks following review feedback

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/28aef3d9558d...418a18a2dedd

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161272733

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/965b453e/attachment.html>

From matt at openssl.org  Tue Sep 20 16:05:49 2016
From: matt at openssl.org (Matt Caswell)
Date: Tue, 20 Sep 2016 16:05:49 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474387549.871408.29051.nullmailer@dev.openssl.org>

The branch master has been updated
       via  08029dfa03c0ee3a50f373017143aaae5f87d17f (commit)
       via  85a7a5e6ef633d2b01ef9792463a36b507a35a6a (commit)
       via  4f89bfbf1538eb5ad502f646f78f4e40092bfcfe (commit)
      from  418a18a2deddc0b0d6181de0008219c899ca6ddf (commit)


- Log -----------------------------------------------------------------
commit 08029dfa03c0ee3a50f373017143aaae5f87d17f
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 20 14:47:44 2016 +0100

    Convert WPACKET_put_bytes to use convenience macros
    
    All the other functions that take an argument for the number of bytes
    use convenience macros for this purpose. We should do the same with
    WPACKET_put_bytes().
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 85a7a5e6ef633d2b01ef9792463a36b507a35a6a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 20 12:26:46 2016 +0100

    Convert CCS construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4f89bfbf1538eb5ad502f646f78f4e40092bfcfe
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 20 12:19:18 2016 +0100

    Convert Finished construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/packet.c             |  2 +-
 ssl/packet_locl.h        | 18 +++++++++++++--
 ssl/s3_lib.c             |  4 ++--
 ssl/statem/statem_clnt.c | 10 ++++----
 ssl/statem/statem_dtls.c | 30 ++++++++++++++++++++----
 ssl/statem/statem_lib.c  | 46 +++++++++++++++++++++++++++----------
 ssl/t1_ext.c             |  2 +-
 ssl/t1_lib.c             | 60 ++++++++++++++++++++++++------------------------
 test/wpackettest.c       | 32 +++++++++++++-------------
 9 files changed, 130 insertions(+), 74 deletions(-)

diff --git a/ssl/packet.c b/ssl/packet.c
index 7d80ebc..6199469 100644
--- a/ssl/packet.c
+++ b/ssl/packet.c
@@ -234,7 +234,7 @@ int WPACKET_start_sub_packet(WPACKET *pkt)
     return WPACKET_start_sub_packet_len__(pkt, 0);
 }
 
-int WPACKET_put_bytes(WPACKET *pkt, unsigned int val, size_t size)
+int WPACKET_put_bytes__(WPACKET *pkt, unsigned int val, size_t size)
 {
     unsigned char *data;
 
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 0ec5a38..c51d892 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -701,9 +701,23 @@ int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
  * Write the value stored in |val| into the WPACKET. The value will consume
  * |bytes| amount of storage. An error will occur if |val| cannot be
  * accommodated in |bytes| storage, e.g. attempting to write the value 256 into
- * 1 byte will fail.
+ * 1 byte will fail. Don't call this directly. Use the convenience macros below
+ * instead.
  */
-int WPACKET_put_bytes(WPACKET *pkt, unsigned int val, size_t bytes);
+int WPACKET_put_bytes__(WPACKET *pkt, unsigned int val, size_t bytes);
+
+/*
+ * Convenience macros for calling WPACKET_put_bytes with different
+ * lengths
+ */
+#define WPACKET_put_bytes_u8(pkt, val) \
+    WPACKET_put_bytes__((pkt), (val), 1)
+#define WPACKET_put_bytes_u16(pkt, val) \
+    WPACKET_put_bytes__((pkt), (val), 2)
+#define WPACKET_put_bytes_u24(pkt, val) \
+    WPACKET_put_bytes__((pkt), (val)), 3)
+#define WPACKET_put_bytes_u32(pkt, val) \
+    WPACKET_sub_allocate_bytes__((pkt), (val), 4)
 
 /* Set a maximum size that we will not allow the WPACKET to grow beyond */
 int WPACKET_set_max_size(WPACKET *pkt, size_t maxsize);
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 3749b2c..2a4dc6d 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2798,7 +2798,7 @@ int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len)
 int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype)
 {
     /* Set the content type and 3 bytes for the message len */
-    if (!WPACKET_put_bytes(pkt, htype, 1)
+    if (!WPACKET_put_bytes_u8(pkt, htype)
             || !WPACKET_start_sub_packet_u24(pkt))
         return 0;
 
@@ -3598,7 +3598,7 @@ int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt, size_t *len)
         return 1;
     }
 
-    if (!WPACKET_put_bytes(pkt, c->id & 0xffff, 2))
+    if (!WPACKET_put_bytes_u16(pkt, c->id & 0xffff))
         return 0;
 
     *len = 2;
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 95af064..bb7219f 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -782,7 +782,7 @@ int tls_construct_client_hello(SSL *s)
      * client_version in client hello and not resetting it to
      * the negotiated version.
      */
-    if (!WPACKET_put_bytes(&pkt, s->client_version, 2)
+    if (!WPACKET_put_bytes_u16(&pkt, s->client_version)
             || !WPACKET_memcpy(&pkt, s->s3->client_random, SSL3_RANDOM_SIZE)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -834,7 +834,7 @@ int tls_construct_client_hello(SSL *s)
         int compnum = sk_SSL_COMP_num(s->ctx->comp_methods);
         for (i = 0; i < compnum; i++) {
             comp = sk_SSL_COMP_value(s->ctx->comp_methods, i);
-            if (!WPACKET_put_bytes(&pkt, comp->id, 1)) {
+            if (!WPACKET_put_bytes_u8(&pkt, comp->id)) {
                 SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
@@ -842,7 +842,7 @@ int tls_construct_client_hello(SSL *s)
     }
 #endif
     /* Add the NULL method */
-    if (!WPACKET_put_bytes(&pkt, 0, 1) || !WPACKET_close(&pkt)) {
+    if (!WPACKET_put_bytes_u8(&pkt, 0) || !WPACKET_close(&pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -2424,8 +2424,8 @@ static int tls_construct_cke_gost(SSL *s, WPACKET *pkt, int *al)
         goto err;
     }
 
-    if (!WPACKET_put_bytes(pkt, V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED, 1)
-            || (msglen >= 0x80 && !WPACKET_put_bytes(pkt, 0x81, 1))
+    if (!WPACKET_put_bytes_u8(pkt, V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED)
+            || (msglen >= 0x80 && !WPACKET_put_bytes_u8(pkt, 0x81))
             || !WPACKET_sub_memcpy_u8(pkt, tmp, msglen)) {
         *al = SSL_AD_INTERNAL_ERROR;
         SSLerr(SSL_F_TLS_CONSTRUCT_CKE_GOST, ERR_R_INTERNAL_ERROR);
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index b9a53b0..f892f0f 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -873,19 +873,33 @@ static int dtls_get_reassembled_message(SSL *s, long *len)
  */
 int dtls_construct_change_cipher_spec(SSL *s)
 {
-    unsigned char *p;
+    WPACKET pkt;
+
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !WPACKET_put_bytes_u8(&pkt, SSL3_MT_CCS)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
-    p = (unsigned char *)s->init_buf->data;
-    *p++ = SSL3_MT_CCS;
     s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
     s->init_num = DTLS1_CCS_HEADER_LENGTH;
 
     if (s->version == DTLS1_BAD_VER) {
         s->d1->next_handshake_write_seq++;
-        s2n(s->d1->handshake_write_seq, p);
+
+        if (!WPACKET_put_bytes_u16(&pkt, s->d1->handshake_write_seq)) {
+            SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
+
         s->init_num += 2;
     }
 
+    if (!WPACKET_finish(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     s->init_off = 0;
 
     dtls1_set_message_header_int(s, SSL3_MT_CCS, 0,
@@ -894,10 +908,16 @@ int dtls_construct_change_cipher_spec(SSL *s)
     /* buffer the message to handle re-xmits */
     if (!dtls1_buffer_message(s, 1)) {
         SSLerr(SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
-        return 0;
+        goto err    ;
     }
 
     return 1;
+ err:
+    WPACKET_cleanup(&pkt);
+    ossl_statem_set_error(s);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+
+    return 0;
 }
 
 #ifndef OPENSSL_NO_SCTP
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 882e150..3ffe4e5 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -74,20 +74,29 @@ int tls_close_construct_packet(SSL *s, WPACKET *pkt)
 
 int tls_construct_finished(SSL *s, const char *sender, int slen)
 {
-    unsigned char *p;
     int i;
-    unsigned long l;
+    WPACKET pkt;
 
-    p = ssl_handshake_start(s);
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt, SSL3_MT_FINISHED)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     i = s->method->ssl3_enc->final_finish_mac(s,
                                               sender, slen,
                                               s->s3->tmp.finish_md);
-    if (i <= 0)
-        return 0;
+    if (i <= 0) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     s->s3->tmp.finish_md_len = i;
-    memcpy(p, s->s3->tmp.finish_md, i);
-    l = i;
+
+    if (!WPACKET_memcpy(&pkt, s->s3->tmp.finish_md, i)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     /*
      * Copy the finished so we can use it for renegotiation checks
@@ -102,12 +111,17 @@ int tls_construct_finished(SSL *s, const char *sender, int slen)
         s->s3->previous_server_finished_len = i;
     }
 
-    if (!ssl_set_handshake_header(s, SSL3_MT_FINISHED, l)) {
+    if (!ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
-        return 0;
+        goto err;
     }
 
     return 1;
+ err:
+    ossl_statem_set_error(s);
+    WPACKET_cleanup(&pkt);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+    return 0;
 }
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
@@ -255,10 +269,18 @@ MSG_PROCESS_RETURN tls_process_finished(SSL *s, PACKET *pkt)
 
 int tls_construct_change_cipher_spec(SSL *s)
 {
-    unsigned char *p;
+    WPACKET pkt;
+
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !WPACKET_put_bytes_u8(&pkt, SSL3_MT_CCS)
+            || !WPACKET_finish(&pkt)) {
+        WPACKET_cleanup(&pkt);
+        ossl_statem_set_error(s);
+        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+        return 0;
+    }
 
-    p = (unsigned char *)s->init_buf->data;
-    *p = SSL3_MT_CCS;
     s->init_num = 1;
     s->init_off = 0;
 
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 664906c..099a0ae 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -171,7 +171,7 @@ int custom_ext_add(SSL *s, int server, WPACKET *pkt, int *al)
                 continue;       /* skip this extension */
         }
 
-        if (!WPACKET_put_bytes(pkt, meth->ext_type, 2)
+        if (!WPACKET_put_bytes_u16(pkt, meth->ext_type)
                 || !WPACKET_start_sub_packet_u16(pkt)
                 || (outlen > 0 && !WPACKET_memcpy(pkt, out, outlen))
                 || !WPACKET_close(pkt)) {
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index eea7802..035353c 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1039,7 +1039,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
 
     /* Add RI if renegotiating */
     if (s->renegotiate) {
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_renegotiate, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_renegotiate)
                 || !WPACKET_sub_memcpy_u16(pkt, s->s3->previous_client_finished,
                                    s->s3->previous_client_finished_len)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
@@ -1052,12 +1052,12 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
 
     if (s->tlsext_hostname != NULL) {
         /* Add TLS extension servername to the Client Hello message */
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_server_name, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_server_name)
                    /* Sub-packet for server_name extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                    /* Sub-packet for servername list (always 1 hostname)*/
                 || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_put_bytes(pkt, TLSEXT_NAMETYPE_host_name, 1)
+                || !WPACKET_put_bytes_u8(pkt, TLSEXT_NAMETYPE_host_name)
                 || !WPACKET_sub_memcpy_u16(pkt, s->tlsext_hostname,
                                            strlen(s->tlsext_hostname))
                 || !WPACKET_close(pkt)
@@ -1069,7 +1069,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
 #ifndef OPENSSL_NO_SRP
     /* Add SRP username if there is one */
     if (s->srp_ctx.login != NULL) {
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_srp, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_srp)
                    /* Sub-packet for SRP extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                 || !WPACKET_start_sub_packet_u8(pkt)
@@ -1096,7 +1096,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
 
         tls1_get_formatlist(s, &pformats, &num_formats);
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_ec_point_formats, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_ec_point_formats)
                    /* Sub-packet for formats extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                 || !WPACKET_sub_memcpy_u8(pkt, pformats, num_formats)
@@ -1114,7 +1114,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             return 0;
         }
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_elliptic_curves, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_elliptic_curves)
                    /* Sub-packet for curves extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                 || !WPACKET_start_sub_packet_u16(pkt)) {
@@ -1124,8 +1124,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
         /* Copy curve ID if supported */
         for (i = 0; i < num_curves; i++, pcurves += 2) {
             if (tls_curve_allowed(s, pcurves, SSL_SECOP_CURVE_SUPPORTED)) {
-                if (!WPACKET_put_bytes(pkt, pcurves[0], 1)
-                    || !WPACKET_put_bytes(pkt, pcurves[1], 1)) {
+                if (!WPACKET_put_bytes_u8(pkt, pcurves[0])
+                    || !WPACKET_put_bytes_u8(pkt, pcurves[1])) {
                         SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT,
                                ERR_R_INTERNAL_ERROR);
                         return 0;
@@ -1160,7 +1160,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             s->tlsext_session_ticket->data == NULL)
             goto skip_ext;
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_session_ticket, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_session_ticket)
                 || !WPACKET_sub_memcpy_u16(pkt, s->session->tlsext_tick,
                                            ticklen)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
@@ -1175,7 +1175,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
 
         salglen = tls12_get_psigalgs(s, &salg);
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_signature_algorithms, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_signature_algorithms)
                    /* Sub-packet for sig-algs extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                    /* Sub-packet for the actual list */
@@ -1191,10 +1191,10 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
     if (s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp) {
         int i;
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_status_request, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_status_request)
                    /* Sub-packet for status request extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_put_bytes(pkt, TLSEXT_STATUSTYPE_ocsp, 1)
+                || !WPACKET_put_bytes_u8(pkt, TLSEXT_STATUSTYPE_ocsp)
                    /* Sub-packet for the ids */
                 || !WPACKET_start_sub_packet_u16(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
@@ -1255,10 +1255,10 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
         else
             mode = SSL_DTLSEXT_HB_ENABLED;
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_heartbeat, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_heartbeat)
                    /* Sub-packet for Hearbeat extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_put_bytes(pkt, mode, 1)
+                || !WPACKET_put_bytes_u8(pkt, mode)
                 || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -1272,8 +1272,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
          * The client advertises an empty extension to indicate its support
          * for Next Protocol Negotiation
          */
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_next_proto_neg, 2)
-                || !WPACKET_put_bytes(pkt, 0, 2)) {
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_next_proto_neg)
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1286,8 +1286,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
      * (see longer comment below)
      */
     if (s->alpn_client_proto_list && !s->s3->tmp.finish_md_len) {
-        if (!WPACKET_put_bytes(pkt,
-                    TLSEXT_TYPE_application_layer_protocol_negotiation, 2)
+        if (!WPACKET_put_bytes_u16(pkt,
+                    TLSEXT_TYPE_application_layer_protocol_negotiation)
                    /* Sub-packet ALPN extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                 || !WPACKET_sub_memcpy_u16(pkt, s->alpn_client_proto_list,
@@ -1304,7 +1304,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
         SRTP_PROTECTION_PROFILE *prof;
         int i, ct;
 
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_use_srtp, 2)
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_use_srtp)
                    /* Sub-packet for SRTP extension */
                 || !WPACKET_start_sub_packet_u16(pkt)
                    /* Sub-packet for the protection profile list */
@@ -1315,7 +1315,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
         ct = sk_SRTP_PROTECTION_PROFILE_num(clnt);
         for (i = 0; i < ct; i++) {
             prof = sk_SRTP_PROTECTION_PROFILE_value(clnt, i);
-            if (prof == NULL || !WPACKET_put_bytes(pkt, prof->id, 2)) {
+            if (prof == NULL || !WPACKET_put_bytes_u16(pkt, prof->id)) {
                 SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
                 return 0;
             }
@@ -1333,24 +1333,24 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
         return 0;
     }
 
-    if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_encrypt_then_mac, 2)
-            || !WPACKET_put_bytes(pkt, 0, 2)) {
+    if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_encrypt_then_mac)
+            || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
         return 0;
     }
 
 #ifndef OPENSSL_NO_CT
     if (s->ct_validation_callback != NULL) {
-        if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_signed_certificate_timestamp, 2)
-                || !WPACKET_put_bytes(pkt, 0, 2)) {
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_signed_certificate_timestamp)
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
         }
     }
 #endif
 
-    if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_extended_master_secret, 2)
-            || !WPACKET_put_bytes(pkt, 0, 2)) {
+    if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_extended_master_secret)
+            || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -1377,7 +1377,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             else
                 hlen = 0;
 
-            if (!WPACKET_put_bytes(pkt, TLSEXT_TYPE_padding, 2)
+            if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_padding)
                     || !WPACKET_sub_allocate_bytes_u16(pkt, hlen, &padbytes)) {
                 SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -3131,7 +3131,7 @@ int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk, const EVP_MD *md)
     sig_id = tls12_get_sigid(pk);
     if (sig_id == -1)
         return 0;
-    if (!WPACKET_put_bytes(pkt, md_id, 1) || !WPACKET_put_bytes(pkt, sig_id, 1))
+    if (!WPACKET_put_bytes_u8(pkt, md_id) || !WPACKET_put_bytes_u8(pkt, sig_id))
         return 0;
 
     return 1;
@@ -3352,8 +3352,8 @@ int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,
 
     for (i = 0; i < psiglen; i += 2, psig += 2) {
         if (tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, psig)) {
-            if (!WPACKET_put_bytes(pkt, psig[0], 1)
-                    || !WPACKET_put_bytes(pkt, psig[1], 1))
+            if (!WPACKET_put_bytes_u8(pkt, psig[0])
+                    || !WPACKET_put_bytes_u8(pkt, psig[1]))
                 return 0;
         }
     }
diff --git a/test/wpackettest.c b/test/wpackettest.c
index ac712b4..2cb9e72 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -36,7 +36,7 @@ static int test_WPACKET_init(void)
     size_t written;
 
     if (!WPACKET_init(&pkt, buf)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
                 /* Closing a top level WPACKET should fail */
             ||  WPACKET_close(&pkt)
                 /* Finishing a top level WPACKET should succeed */
@@ -56,7 +56,7 @@ static int test_WPACKET_init(void)
 
     /* Now try with a one byte length prefix */
     if (!WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(simple2)
@@ -67,7 +67,7 @@ static int test_WPACKET_init(void)
 
     /* And a longer length prefix */
     if (!WPACKET_init_len(&pkt, buf, 4)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(simple3)
@@ -85,7 +85,7 @@ static int test_WPACKET_init(void)
          * Putting more bytes in than fit for the size of the length prefix
          * should fail
          */
-        if ((!WPACKET_put_bytes(&pkt, 0xff, 1)) == (i != 256)) {
+        if ((!WPACKET_put_bytes_u8(&pkt, 0xff)) == (i != 256)) {
             testfail("test_WPACKET_init():4 failed\n", &pkt);
             return 0;
         }
@@ -136,13 +136,13 @@ static int test_WPACKET_set_max_size(void)
                 /*
                  * Should fail because packet is already filled
                  */
-            ||  WPACKET_put_bytes(&pkt, 0xff, 1)
+            ||  WPACKET_put_bytes_u8(&pkt, 0xff)
                 /*
                  * You can't put in more bytes than max size
                  */
             || !WPACKET_set_max_size(&pkt, 0x02)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
-            ||  WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
+            ||  WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(simple2)
@@ -162,7 +162,7 @@ static int test_WPACKET_start_sub_packet(void)
 
     if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
                 /* Can't finish because we have a sub packet */
             ||  WPACKET_finish(&pkt)
             || !WPACKET_close(&pkt)
@@ -180,7 +180,7 @@ static int test_WPACKET_start_sub_packet(void)
    /* Single sub-packet with length prefix */
     if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -193,9 +193,9 @@ static int test_WPACKET_start_sub_packet(void)
     /* Nested sub-packets with length prefixes */
     if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_get_length(&pkt, &len)
             || len != 1
             || !WPACKET_close(&pkt)
@@ -213,10 +213,10 @@ static int test_WPACKET_start_sub_packet(void)
     /* Sequential sub-packets with length prefixes */
     if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_close(&pkt)
             || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -240,7 +240,7 @@ static int test_WPACKET_set_flags(void)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
                 /* Should fail because of zero length */
             ||  WPACKET_finish(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(simple1)
@@ -255,7 +255,7 @@ static int test_WPACKET_set_flags(void)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
                 /* Should fail because of zero length */
             ||  WPACKET_close(&pkt)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -292,7 +292,7 @@ static int test_WPACKET_set_flags(void)
     if (!WPACKET_init(&pkt, buf)
             || !WPACKET_start_sub_packet_u8(&pkt)
             || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
-            || !WPACKET_put_bytes(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)

From levitte at openssl.org  Tue Sep 20 16:24:27 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 20 Sep 2016 16:24:27 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474388667.619389.5216.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6e836806add140fa9e56d1226d7514fdfa2c803a (commit)
       via  8c88c88b5ad43bbdf1f6e7602b6ac56c9031b153 (commit)
       via  f4566dff06d2539dd01f54c817e2b952b64452e4 (commit)
       via  ccf11f7ee49a0825caa407ed481c21b4b5933023 (commit)
       via  54d72ef0f019db383f8e98342b9b77c5da8541e5 (commit)
       via  3656ea1c2217f38d44f3f34253e7c16f1b40ba77 (commit)
       via  16c6deed2c42d4cf4a7676a32b718d6a867f482a (commit)
      from  08029dfa03c0ee3a50f373017143aaae5f87d17f (commit)


- Log -----------------------------------------------------------------
commit 6e836806add140fa9e56d1226d7514fdfa2c803a
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 18 23:52:30 2016 +0200

    Documentation fixup; no more ECDHParameters
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 8c88c88b5ad43bbdf1f6e7602b6ac56c9031b153
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 01:53:38 2016 +0200

    Crude VMS build files for demos/bio/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f4566dff06d2539dd01f54c817e2b952b64452e4
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 01:01:30 2016 +0200

    Crude Makefile for demos/bio/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ccf11f7ee49a0825caa407ed481c21b4b5933023
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 01:01:15 2016 +0200

    Don't ignore Makefiles in demos/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 54d72ef0f019db383f8e98342b9b77c5da8541e5
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 09:32:00 2016 +0200

    Fixup BIO demos for OpenSSL 1.1.x
    
    Call SSL_CTX_new() before doing any configuration.
    (or call OPENSSL_ssl_init())
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 3656ea1c2217f38d44f3f34253e7c16f1b40ba77
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 00:59:00 2016 +0200

    Fixup BIO demos for OpenSSL 1.1.x
    
    'ECDHParameters = Automatic' isn't accepted.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 16c6deed2c42d4cf4a7676a32b718d6a867f482a
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 00:58:21 2016 +0200

    Fixup BIO demos for OpenSSL 1.1.x
    
    Note: server-cmod doesn't seem to do things right...  from loading
    cmod.cnf, it tries to load libssl_conf.so.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore               |  2 ++
 demos/bio/Makefile       | 30 ++++++++++++++++++++++++++++++
 demos/bio/accept.cnf     |  2 --
 demos/bio/client-arg.c   |  4 ----
 demos/bio/client-conf.c  |  4 ----
 demos/bio/descrip.mms    | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 demos/bio/saccept.c      |  7 +------
 demos/bio/sconnect.c     |  5 -----
 demos/bio/server-arg.c   |  6 +-----
 demos/bio/server-cmod.c  |  7 +------
 demos/bio/server-conf.c  |  7 ++-----
 demos/bio/shared.opt     |  2 ++
 demos/bio/static.opt     |  2 ++
 doc/ssl/SSL_CONF_cmd.pod | 10 ----------
 14 files changed, 88 insertions(+), 47 deletions(-)
 create mode 100644 demos/bio/Makefile
 create mode 100644 demos/bio/descrip.mms
 create mode 100644 demos/bio/shared.opt
 create mode 100644 demos/bio/static.opt

diff --git a/.gitignore b/.gitignore
index 730731f..23c48be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,8 @@
 
 # *all* Makefiles
 Makefile
+# ... except in demos
+!/demos/*/Makefile
 
 # Links under apps
 /apps/CA.pl
diff --git a/demos/bio/Makefile b/demos/bio/Makefile
new file mode 100644
index 0000000..493e8a5
--- /dev/null
+++ b/demos/bio/Makefile
@@ -0,0 +1,30 @@
+# Quick instruction:
+# To build against an OpenSSL built in the source tree, do this:
+#
+#    make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../..
+#
+# To run the demos when linked with a shared library (default):
+#
+#    LD_LIBRARY_PATH=../.. ./server-arg
+#    LD_LIBRARY_PATH=../.. ./server-cmod
+#    LD_LIBRARY_PATH=../.. ./server-conf
+#    LD_LIBRARY_PATH=../.. ./client-arg
+#    LD_LIBRARY_PATH=../.. ./client-conf
+#    LD_LIBRARY_PATH=../.. ./saccept
+#    LD_LIBRARY_PATH=../.. ./sconnect
+
+CFLAGS = $(OPENSSL_INCS_LOCATION)
+LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto $(EX_LIBS)
+
+all: client-arg client-conf saccept sconnect server-arg server-cmod server-conf
+
+client-arg: client-arg.o
+client-conf: client-conf.o
+saccept: saccept.o
+sconnect: sconnect.o
+server-arg: server-arg.o
+server-cmod: server-cmod.o
+server-conf: server-conf.o
+
+client-arg client-conf saccept sconnect server-arg server-cmod server-conf:
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
diff --git a/demos/bio/accept.cnf b/demos/bio/accept.cnf
index 5a2ef45..eb69658 100644
--- a/demos/bio/accept.cnf
+++ b/demos/bio/accept.cnf
@@ -5,8 +5,6 @@ Port = 4433
 # Protocol = ALL, -TLSv1.2
 # Only support 3 curves
 Curves = P-521:P-384:P-256
-# Automatic curve selection
-ECDHParameters = Automatic
 # Restricted signature algorithms
 SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 
 Certificate=server.pem
diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index 9e136e5..e8d5e46 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -23,10 +23,6 @@ int main(int argc, char **argv)
     const char *connect_str = "localhost:4433";
     int nargs = argc - 1;
 
-    ERR_load_crypto_strings();
-    ERR_load_SSL_strings();
-    SSL_library_init();
-
     ctx = SSL_CTX_new(TLS_client_method());
     cctx = SSL_CONF_CTX_new();
     SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c
index 66b5cac..e819030 100644
--- a/demos/bio/client-conf.c
+++ b/demos/bio/client-conf.c
@@ -26,10 +26,6 @@ int main(int argc, char **argv)
     const char *connect_str = "localhost:4433";
     long errline = -1;
 
-    ERR_load_crypto_strings();
-    ERR_load_SSL_strings();
-    SSL_library_init();
-
     conf = NCONF_new(NULL);
 
     if (NCONF_load(conf, "connect.cnf", &errline) <= 0) {
diff --git a/demos/bio/descrip.mms b/demos/bio/descrip.mms
new file mode 100644
index 0000000..8e127b0
--- /dev/null
+++ b/demos/bio/descrip.mms
@@ -0,0 +1,47 @@
+# This build description trusts that the following logical names are defined:
+#
+# For compilation: OPENSSL
+# For linking with shared libraries: OSSL$LIBCRYPTO_SHR and OSSL$LIBSSL_SHR
+# For linking with static libraries: OSSL$LIBCRYPTO and OSSL$LIBSSL
+#
+# These are normally defined with the OpenSSL startup procedure
+
+# By default, we link with the shared libraries
+SHARED = TRUE
+
+# Alternative, for linking with static libraries
+#SHARED = FALSE
+
+.FIRST :
+	IF "$(SHARED)" .EQS. "TRUE" THEN DEFINE OPT []shared.opt
+	IF "$(SHARED)" .NES. "TRUE" THEN DEFINE OPT []static.opt
+
+.LAST :
+	DEASSIGN OPT
+
+.DEFAULT :
+	@ !
+
+# Because we use an option file, we need to redefine this
+.obj.exe : 
+	$(LINK) $(LINKFLAGS) $<,OPT:/OPT
+
+all : client-arg.exe client-conf.exe saccept.exe sconnect.exe -
+      server-arg.exe server-cmod.exe server-conf.exe
+
+client-arg.exe : client-arg.obj
+client-conf.exe : client-conf.obj
+saccept.exe : saccept.obj
+sconnect.exe : sconnect.obj
+server-arg.exe : server-arg.obj
+server-cmod.exe : server-cmod.obj
+server-conf.exe : server-conf.obj
+
+# Stoopid MMS doesn't infer this automatically...
+client-arg.obj : client-arg.c
+client-conf.obj : client-conf.c
+saccept.obj : saccept.c
+sconnect.obj : sconnect.c
+server-arg.obj : server-arg.c
+server-cmod.obj : server-cmod.c
+server-conf.obj : server-conf.c
diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 106a089..66c5c61 100644
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -26,7 +26,7 @@
 
 static int done = 0;
 
-void interrupt()
+void interrupt(int sig)
 {
     done = 1;
 }
@@ -58,11 +58,6 @@ int main(int argc, char *argv[])
     else
         port = argv[1];
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
-
     ctx = SSL_CTX_new(TLS_server_method());
     if (!SSL_CTX_use_certificate_chain_file(ctx, CERT_FILE))
         goto err;
diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c
index 284bc30..664a1e0 100644
--- a/demos/bio/sconnect.c
+++ b/demos/bio/sconnect.c
@@ -55,11 +55,6 @@ char *argv[];
     sock_init();
 #endif
 
-    /* Lets get nice error messages */
-    SSL_load_error_strings();
-
-    /* Setup all the global SSL stuff */
-    OpenSSL_add_ssl_algorithms();
     ssl_ctx = SSL_CTX_new(TLS_client_method());
 
     /* Enable trust chain verification */
diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index 4e9b7bd..6056969 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -14,6 +14,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -30,11 +31,6 @@ int main(int argc, char *argv[])
     char **args = argv + 1;
     int nargs = argc - 1;
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
-
     ctx = SSL_CTX_new(TLS_server_method());
 
     cctx = SSL_CONF_CTX_new();
diff --git a/demos/bio/server-cmod.c b/demos/bio/server-cmod.c
index 77b456a..9cb2463 100644
--- a/demos/bio/server-cmod.c
+++ b/demos/bio/server-cmod.c
@@ -27,18 +27,13 @@ int main(int argc, char *argv[])
     SSL_CTX *ctx;
     int ret = 1, i;
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
+    ctx = SSL_CTX_new(TLS_server_method());
 
     if (CONF_modules_load_file("cmod.cnf", "testapp", 0) <= 0) {
         fprintf(stderr, "Error processing config file\n");
         goto err;
     }
 
-    ctx = SSL_CTX_new(TLS_server_method());
-
     if (SSL_CTX_config(ctx, "server") == 0) {
         fprintf(stderr, "Error configuring server.\n");
         goto err;
diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c
index 32abefd..41b1308 100644
--- a/demos/bio/server-conf.c
+++ b/demos/bio/server-conf.c
@@ -14,6 +14,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -33,10 +34,7 @@ int main(int argc, char *argv[])
     char buf[512];
     int ret = 1, i;
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
+    ctx = SSL_CTX_new(TLS_server_method());
 
     conf = NCONF_new(NULL);
 
@@ -55,7 +53,6 @@ int main(int argc, char *argv[])
         goto err;
     }
 
-    ctx = SSL_CTX_new(TLS_server_method());
     cctx = SSL_CONF_CTX_new();
     SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
     SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
diff --git a/demos/bio/shared.opt b/demos/bio/shared.opt
new file mode 100644
index 0000000..4141b93
--- /dev/null
+++ b/demos/bio/shared.opt
@@ -0,0 +1,2 @@
+OSSL$LIBSSL_SHR/SHARE
+OSSL$LIBCRYPTO_SHR/SHARE
diff --git a/demos/bio/static.opt b/demos/bio/static.opt
new file mode 100644
index 0000000..9ca1588
--- /dev/null
+++ b/demos/bio/static.opt
@@ -0,0 +1,2 @@
+OSSL$LIBSSL/LIB
+OSSL$LIBCRYPTO/LIB
diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/ssl/SSL_CONF_cmd.pod
index 7b38489..d8c0e9b 100644
--- a/doc/ssl/SSL_CONF_cmd.pod
+++ b/doc/ssl/SSL_CONF_cmd.pod
@@ -263,16 +263,6 @@ The B<value> argument is a colon separated list of curves. The curve can be
 either the B<NIST> name (e.g. B<P-256>) or an OpenSSL OID name (e.g
 B<prime256v1>). Curve names are case sensitive.
 
-=item B<ECDHParameters>
-
-This sets the temporary curve used for ephemeral ECDH modes. Only used by
-servers
-
-The B<value> argument is a curve name or the special value B<Automatic> which
-picks an appropriate curve based on client and server preferences. The curve
-can be either the B<NIST> name (e.g. B<P-256>) or an OpenSSL OID name
-(e.g B<prime256v1>). Curve names are case sensitive.
-
 =item B<MinProtocol>
 
 This sets the minimum supported SSL, TLS or DTLS version.

From levitte at openssl.org  Tue Sep 20 16:25:21 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 20 Sep 2016 16:25:21 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474388721.143885.6564.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  435972c17211df1bc6bb5276385f2223aafe3848 (commit)
       via  9c067c8991ac450c508d04d2387d6d5f41a41a92 (commit)
       via  0430efa62fbae715a8cee56e9b2498b8a3c0fe0d (commit)
       via  3ed2d8a4b85fd361c733316883174309275f5e29 (commit)
       via  b90348c7c57f2a6ba129fd2cb9a5889401fe3f91 (commit)
       via  d57569388379c72271a0703e68a5eaffa7ffebca (commit)
       via  f506d8247709f82ec1b123819ea975afe45a55c5 (commit)
      from  3fd181a8b5b85a1f7383e82438da494a08f7d843 (commit)


- Log -----------------------------------------------------------------
commit 435972c17211df1bc6bb5276385f2223aafe3848
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 18 23:52:30 2016 +0200

    Documentation fixup; no more ECDHParameters
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 6e836806add140fa9e56d1226d7514fdfa2c803a)

commit 9c067c8991ac450c508d04d2387d6d5f41a41a92
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 01:53:38 2016 +0200

    Crude VMS build files for demos/bio/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 8c88c88b5ad43bbdf1f6e7602b6ac56c9031b153)

commit 0430efa62fbae715a8cee56e9b2498b8a3c0fe0d
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 01:01:30 2016 +0200

    Crude Makefile for demos/bio/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f4566dff06d2539dd01f54c817e2b952b64452e4)

commit 3ed2d8a4b85fd361c733316883174309275f5e29
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 01:01:15 2016 +0200

    Don't ignore Makefiles in demos/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit ccf11f7ee49a0825caa407ed481c21b4b5933023)

commit b90348c7c57f2a6ba129fd2cb9a5889401fe3f91
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 09:32:00 2016 +0200

    Fixup BIO demos for OpenSSL 1.1.x
    
    Call SSL_CTX_new() before doing any configuration.
    (or call OPENSSL_ssl_init())
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 54d72ef0f019db383f8e98342b9b77c5da8541e5)

commit d57569388379c72271a0703e68a5eaffa7ffebca
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 00:59:00 2016 +0200

    Fixup BIO demos for OpenSSL 1.1.x
    
    'ECDHParameters = Automatic' isn't accepted.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 3656ea1c2217f38d44f3f34253e7c16f1b40ba77)

commit f506d8247709f82ec1b123819ea975afe45a55c5
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 9 00:58:21 2016 +0200

    Fixup BIO demos for OpenSSL 1.1.x
    
    Note: server-cmod doesn't seem to do things right...  from loading
    cmod.cnf, it tries to load libssl_conf.so.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 16c6deed2c42d4cf4a7676a32b718d6a867f482a)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore               |  2 ++
 demos/bio/Makefile       | 30 ++++++++++++++++++++++++++++++
 demos/bio/accept.cnf     |  2 --
 demos/bio/client-arg.c   |  4 ----
 demos/bio/client-conf.c  |  4 ----
 demos/bio/descrip.mms    | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 demos/bio/saccept.c      |  7 +------
 demos/bio/sconnect.c     |  5 -----
 demos/bio/server-arg.c   |  6 +-----
 demos/bio/server-cmod.c  |  7 +------
 demos/bio/server-conf.c  |  7 ++-----
 demos/bio/shared.opt     |  2 ++
 demos/bio/static.opt     |  2 ++
 doc/ssl/SSL_CONF_cmd.pod | 10 ----------
 14 files changed, 88 insertions(+), 47 deletions(-)
 create mode 100644 demos/bio/Makefile
 create mode 100644 demos/bio/descrip.mms
 create mode 100644 demos/bio/shared.opt
 create mode 100644 demos/bio/static.opt

diff --git a/.gitignore b/.gitignore
index 730731f..23c48be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,8 @@
 
 # *all* Makefiles
 Makefile
+# ... except in demos
+!/demos/*/Makefile
 
 # Links under apps
 /apps/CA.pl
diff --git a/demos/bio/Makefile b/demos/bio/Makefile
new file mode 100644
index 0000000..493e8a5
--- /dev/null
+++ b/demos/bio/Makefile
@@ -0,0 +1,30 @@
+# Quick instruction:
+# To build against an OpenSSL built in the source tree, do this:
+#
+#    make OPENSSL_INCS_LOCATION=-I../../include OPENSSL_LIBS_LOCATION=-L../..
+#
+# To run the demos when linked with a shared library (default):
+#
+#    LD_LIBRARY_PATH=../.. ./server-arg
+#    LD_LIBRARY_PATH=../.. ./server-cmod
+#    LD_LIBRARY_PATH=../.. ./server-conf
+#    LD_LIBRARY_PATH=../.. ./client-arg
+#    LD_LIBRARY_PATH=../.. ./client-conf
+#    LD_LIBRARY_PATH=../.. ./saccept
+#    LD_LIBRARY_PATH=../.. ./sconnect
+
+CFLAGS = $(OPENSSL_INCS_LOCATION)
+LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto $(EX_LIBS)
+
+all: client-arg client-conf saccept sconnect server-arg server-cmod server-conf
+
+client-arg: client-arg.o
+client-conf: client-conf.o
+saccept: saccept.o
+sconnect: sconnect.o
+server-arg: server-arg.o
+server-cmod: server-cmod.o
+server-conf: server-conf.o
+
+client-arg client-conf saccept sconnect server-arg server-cmod server-conf:
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
diff --git a/demos/bio/accept.cnf b/demos/bio/accept.cnf
index 5a2ef45..eb69658 100644
--- a/demos/bio/accept.cnf
+++ b/demos/bio/accept.cnf
@@ -5,8 +5,6 @@ Port = 4433
 # Protocol = ALL, -TLSv1.2
 # Only support 3 curves
 Curves = P-521:P-384:P-256
-# Automatic curve selection
-ECDHParameters = Automatic
 # Restricted signature algorithms
 SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 
 Certificate=server.pem
diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index 9e136e5..e8d5e46 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -23,10 +23,6 @@ int main(int argc, char **argv)
     const char *connect_str = "localhost:4433";
     int nargs = argc - 1;
 
-    ERR_load_crypto_strings();
-    ERR_load_SSL_strings();
-    SSL_library_init();
-
     ctx = SSL_CTX_new(TLS_client_method());
     cctx = SSL_CONF_CTX_new();
     SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c
index 66b5cac..e819030 100644
--- a/demos/bio/client-conf.c
+++ b/demos/bio/client-conf.c
@@ -26,10 +26,6 @@ int main(int argc, char **argv)
     const char *connect_str = "localhost:4433";
     long errline = -1;
 
-    ERR_load_crypto_strings();
-    ERR_load_SSL_strings();
-    SSL_library_init();
-
     conf = NCONF_new(NULL);
 
     if (NCONF_load(conf, "connect.cnf", &errline) <= 0) {
diff --git a/demos/bio/descrip.mms b/demos/bio/descrip.mms
new file mode 100644
index 0000000..8e127b0
--- /dev/null
+++ b/demos/bio/descrip.mms
@@ -0,0 +1,47 @@
+# This build description trusts that the following logical names are defined:
+#
+# For compilation: OPENSSL
+# For linking with shared libraries: OSSL$LIBCRYPTO_SHR and OSSL$LIBSSL_SHR
+# For linking with static libraries: OSSL$LIBCRYPTO and OSSL$LIBSSL
+#
+# These are normally defined with the OpenSSL startup procedure
+
+# By default, we link with the shared libraries
+SHARED = TRUE
+
+# Alternative, for linking with static libraries
+#SHARED = FALSE
+
+.FIRST :
+	IF "$(SHARED)" .EQS. "TRUE" THEN DEFINE OPT []shared.opt
+	IF "$(SHARED)" .NES. "TRUE" THEN DEFINE OPT []static.opt
+
+.LAST :
+	DEASSIGN OPT
+
+.DEFAULT :
+	@ !
+
+# Because we use an option file, we need to redefine this
+.obj.exe : 
+	$(LINK) $(LINKFLAGS) $<,OPT:/OPT
+
+all : client-arg.exe client-conf.exe saccept.exe sconnect.exe -
+      server-arg.exe server-cmod.exe server-conf.exe
+
+client-arg.exe : client-arg.obj
+client-conf.exe : client-conf.obj
+saccept.exe : saccept.obj
+sconnect.exe : sconnect.obj
+server-arg.exe : server-arg.obj
+server-cmod.exe : server-cmod.obj
+server-conf.exe : server-conf.obj
+
+# Stoopid MMS doesn't infer this automatically...
+client-arg.obj : client-arg.c
+client-conf.obj : client-conf.c
+saccept.obj : saccept.c
+sconnect.obj : sconnect.c
+server-arg.obj : server-arg.c
+server-cmod.obj : server-cmod.c
+server-conf.obj : server-conf.c
diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 106a089..66c5c61 100644
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -26,7 +26,7 @@
 
 static int done = 0;
 
-void interrupt()
+void interrupt(int sig)
 {
     done = 1;
 }
@@ -58,11 +58,6 @@ int main(int argc, char *argv[])
     else
         port = argv[1];
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
-
     ctx = SSL_CTX_new(TLS_server_method());
     if (!SSL_CTX_use_certificate_chain_file(ctx, CERT_FILE))
         goto err;
diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c
index 284bc30..664a1e0 100644
--- a/demos/bio/sconnect.c
+++ b/demos/bio/sconnect.c
@@ -55,11 +55,6 @@ char *argv[];
     sock_init();
 #endif
 
-    /* Lets get nice error messages */
-    SSL_load_error_strings();
-
-    /* Setup all the global SSL stuff */
-    OpenSSL_add_ssl_algorithms();
     ssl_ctx = SSL_CTX_new(TLS_client_method());
 
     /* Enable trust chain verification */
diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index 4e9b7bd..6056969 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -14,6 +14,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -30,11 +31,6 @@ int main(int argc, char *argv[])
     char **args = argv + 1;
     int nargs = argc - 1;
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
-
     ctx = SSL_CTX_new(TLS_server_method());
 
     cctx = SSL_CONF_CTX_new();
diff --git a/demos/bio/server-cmod.c b/demos/bio/server-cmod.c
index 77b456a..9cb2463 100644
--- a/demos/bio/server-cmod.c
+++ b/demos/bio/server-cmod.c
@@ -27,18 +27,13 @@ int main(int argc, char *argv[])
     SSL_CTX *ctx;
     int ret = 1, i;
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
+    ctx = SSL_CTX_new(TLS_server_method());
 
     if (CONF_modules_load_file("cmod.cnf", "testapp", 0) <= 0) {
         fprintf(stderr, "Error processing config file\n");
         goto err;
     }
 
-    ctx = SSL_CTX_new(TLS_server_method());
-
     if (SSL_CTX_config(ctx, "server") == 0) {
         fprintf(stderr, "Error configuring server.\n");
         goto err;
diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c
index 32abefd..41b1308 100644
--- a/demos/bio/server-conf.c
+++ b/demos/bio/server-conf.c
@@ -14,6 +14,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -33,10 +34,7 @@ int main(int argc, char *argv[])
     char buf[512];
     int ret = 1, i;
 
-    SSL_load_error_strings();
-
-    /* Add ciphers and message digests */
-    OpenSSL_add_ssl_algorithms();
+    ctx = SSL_CTX_new(TLS_server_method());
 
     conf = NCONF_new(NULL);
 
@@ -55,7 +53,6 @@ int main(int argc, char *argv[])
         goto err;
     }
 
-    ctx = SSL_CTX_new(TLS_server_method());
     cctx = SSL_CONF_CTX_new();
     SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
     SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
diff --git a/demos/bio/shared.opt b/demos/bio/shared.opt
new file mode 100644
index 0000000..4141b93
--- /dev/null
+++ b/demos/bio/shared.opt
@@ -0,0 +1,2 @@
+OSSL$LIBSSL_SHR/SHARE
+OSSL$LIBCRYPTO_SHR/SHARE
diff --git a/demos/bio/static.opt b/demos/bio/static.opt
new file mode 100644
index 0000000..9ca1588
--- /dev/null
+++ b/demos/bio/static.opt
@@ -0,0 +1,2 @@
+OSSL$LIBSSL/LIB
+OSSL$LIBCRYPTO/LIB
diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/ssl/SSL_CONF_cmd.pod
index 7b38489..d8c0e9b 100644
--- a/doc/ssl/SSL_CONF_cmd.pod
+++ b/doc/ssl/SSL_CONF_cmd.pod
@@ -263,16 +263,6 @@ The B<value> argument is a colon separated list of curves. The curve can be
 either the B<NIST> name (e.g. B<P-256>) or an OpenSSL OID name (e.g
 B<prime256v1>). Curve names are case sensitive.
 
-=item B<ECDHParameters>
-
-This sets the temporary curve used for ephemeral ECDH modes. Only used by
-servers
-
-The B<value> argument is a curve name or the special value B<Automatic> which
-picks an appropriate curve based on client and server preferences. The curve
-can be either the B<NIST> name (e.g. B<P-256>) or an OpenSSL OID name
-(e.g B<prime256v1>). Curve names are case sensitive.
-
 =item B<MinProtocol>
 
 This sets the minimum supported SSL, TLS or DTLS version.

From builds at travis-ci.org  Tue Sep 20 16:49:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 16:49:18 +0000
Subject: [openssl-commits] Failed: openssl/openssl#6084 (master - 08029df)
In-Reply-To: <openssl/openssl+161372277+failed@travis-ci.org>
Message-ID: <57e1688e16d00_33f99597934983583d3@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6084
Status: Failed

Duration: 33 minutes and 12 seconds
Commit: 08029df (master)
Author: Matt Caswell
Message: Convert WPACKET_put_bytes to use convenience macros

All the other functions that take an argument for the number of bytes
use convenience macros for this purpose. We should do the same with
WPACKET_put_bytes().

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/418a18a2dedd...08029dfa03c0

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161372277

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/5be3017f/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 20 17:26:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 17:26:18 +0000
Subject: [openssl-commits] Failed: openssl/openssl#6085 (master - 6e83680)
In-Reply-To: <openssl/openssl+161377410+failed@travis-ci.org>
Message-ID: <57e1713a91c15_33fd34cb9ac4443923e@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6085
Status: Failed

Duration: 46 minutes and 53 seconds
Commit: 6e83680 (master)
Author: Richard Levitte
Message: Documentation fixup; no more ECDHParameters

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/08029dfa03c0...6e836806add1

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161377410

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/47d4cceb/attachment.html>

From levitte at openssl.org  Tue Sep 20 18:32:48 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 20 Sep 2016 18:32:48 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474396368.351412.27993.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a19228b7f4fc6fcb49713455b3caedbc24fb0b01 (commit)
      from  6e836806add140fa9e56d1226d7514fdfa2c803a (commit)


- Log -----------------------------------------------------------------
commit a19228b7f4fc6fcb49713455b3caedbc24fb0b01
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 20 18:43:24 2016 +0200

    apps/apps.c: include sys/socket.h to declare recv()
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/apps.c b/apps/apps.c
index 6ca0f2b..aa564b8 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2340,6 +2340,8 @@ int raw_read_stdin(void *buf, int siz)
         return (-1);
 }
 #elif defined(__VMS)
+#include <sys/socket.h>
+
 int raw_read_stdin(void *buf, int siz)
 {
     return recv(fileno_stdin(), buf, siz, 0);

From levitte at openssl.org  Tue Sep 20 18:33:09 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 20 Sep 2016 18:33:09 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474396389.100081.28991.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  e5cb5dbd3cc55514bb1e59a63dc8cb49221ec506 (commit)
      from  435972c17211df1bc6bb5276385f2223aafe3848 (commit)


- Log -----------------------------------------------------------------
commit e5cb5dbd3cc55514bb1e59a63dc8cb49221ec506
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 20 18:43:24 2016 +0200

    apps/apps.c: include sys/socket.h to declare recv()
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit a19228b7f4fc6fcb49713455b3caedbc24fb0b01)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/apps.c b/apps/apps.c
index 6ca0f2b..aa564b8 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2340,6 +2340,8 @@ int raw_read_stdin(void *buf, int siz)
         return (-1);
 }
 #elif defined(__VMS)
+#include <sys/socket.h>
+
 int raw_read_stdin(void *buf, int siz)
 {
     return recv(fileno_stdin(), buf, siz, 0);

From builds at travis-ci.org  Tue Sep 20 19:38:32 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 19:38:32 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6087 (master -
	a19228b)
In-Reply-To: <openssl/openssl+161415388+still failing@travis-ci.org>
Message-ID: <57e1903844e09_33f9627bc1bf8365559@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6087
Status: Still Failing

Duration: 43 minutes and 49 seconds
Commit: a19228b (master)
Author: Richard Levitte
Message: apps/apps.c: include sys/socket.h to declare recv()

Reviewed-by: Tim Hudson <tjh at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/6e836806add1...a19228b7f4fc

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161415388

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/44ad2c29/attachment-0001.html>

From rsalz at openssl.org  Tue Sep 20 19:48:12 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 20 Sep 2016 19:48:12 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474400892.291406.25916.nullmailer@dev.openssl.org>

The branch master has been updated
       via  13a461831ab85ec9f55806ebf2df5ffb7f3f357a (commit)
      from  a19228b7f4fc6fcb49713455b3caedbc24fb0b01 (commit)


- Log -----------------------------------------------------------------
commit 13a461831ab85ec9f55806ebf2df5ffb7f3f357a
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 2 17:34:31 2016 -0400

    RT3669: dgst can only sign/verify one file.
    
    Check arg count and print an error message.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/dgst.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/dgst.c b/apps/dgst.c
index e438b7c..b10b93e 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -185,6 +185,10 @@ int dgst_main(int argc, char **argv)
     }
     argc = opt_num_rest();
     argv = opt_rest();
+    if (keyfile != NULL && argc > 1) {
+        BIO_printf(bio_err, "%s: Can only sign or verify one file.\n", prog);
+        goto end;
+    }
 
     if (do_verify && !sigfile) {
         BIO_printf(bio_err,

From rsalz at openssl.org  Tue Sep 20 19:48:29 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 20 Sep 2016 19:48:29 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474400909.943775.26842.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  d6637ce17ec5b811ea06543f3b584d25bfdeaaa3 (commit)
      from  e5cb5dbd3cc55514bb1e59a63dc8cb49221ec506 (commit)


- Log -----------------------------------------------------------------
commit d6637ce17ec5b811ea06543f3b584d25bfdeaaa3
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 2 17:34:31 2016 -0400

    RT3669: dgst can only sign/verify one file.
    
    Check arg count and print an error message.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 13a461831ab85ec9f55806ebf2df5ffb7f3f357a)

-----------------------------------------------------------------------

Summary of changes:
 apps/dgst.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/dgst.c b/apps/dgst.c
index e438b7c..b10b93e 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -185,6 +185,10 @@ int dgst_main(int argc, char **argv)
     }
     argc = opt_num_rest();
     argv = opt_rest();
+    if (keyfile != NULL && argc > 1) {
+        BIO_printf(bio_err, "%s: Can only sign or verify one file.\n", prog);
+        goto end;
+    }
 
     if (do_verify && !sigfile) {
         BIO_printf(bio_err,

From levitte at openssl.org  Tue Sep 20 19:56:41 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 20 Sep 2016 19:56:41 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474401401.409657.30604.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  a5e55f62975c0f978eb348763a1de0cd923f0d77 (commit)
      from  6180c0ff0c34b4029bd9d1bec519c8cbc6be4808 (commit)


- Log -----------------------------------------------------------------
commit a5e55f62975c0f978eb348763a1de0cd923f0d77
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 20 21:41:58 2016 +0200

    RT4669: dgst can only sign/verify one file
    
    Check arg count and print an error message.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/dgst.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/dgst.c b/apps/dgst.c
index 95e5fa3..26afcd7 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -243,6 +243,11 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
+    if (keyfile != NULL && argc > 1) {
+        BIO_printf(bio_err, "Can only sign or verify one file\n");
+        goto end;
+    }
+
     if (do_verify && !sigfile) {
         BIO_printf(bio_err,
                    "No signature to verify: use the -signature option\n");

From levitte at openssl.org  Tue Sep 20 20:00:00 2016
From: levitte at openssl.org (Richard Levitte)
Date: Tue, 20 Sep 2016 20:00:00 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474401600.332591.32371.nullmailer@dev.openssl.org>

The branch master has been updated
       via  5a008ff6c559739a59188e11f32da99028302647 (commit)
      from  13a461831ab85ec9f55806ebf2df5ffb7f3f357a (commit)


- Log -----------------------------------------------------------------
commit 5a008ff6c559739a59188e11f32da99028302647
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 20 21:48:24 2016 +0200

    Quiet compiler warning about uninitialised variable
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_clnt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index bb7219f..1774f7a 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2618,7 +2618,7 @@ int tls_construct_client_verify(SSL *s)
 {
     EVP_PKEY *pkey;
     const EVP_MD *md = s->s3->tmp.md[s->cert->key - s->cert->pkeys];
-    EVP_MD_CTX *mctx;
+    EVP_MD_CTX *mctx = NULL;
     unsigned u = 0;
     long hdatalen = 0;
     void *hdata;

From builds at travis-ci.org  Tue Sep 20 20:42:13 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 20:42:13 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6088
	(OpenSSL_1_1_0-stable - e5cb5db)
In-Reply-To: <openssl/openssl+161415471+errored@travis-ci.org>
Message-ID: <57e19f216dcfb_33f96279fc4084343ee@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6088
Status: Errored

Duration: 38 minutes and 41 seconds
Commit: e5cb5db (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: apps/apps.c: include sys/socket.h to declare recv()

Reviewed-by: Tim Hudson <tjh at openssl.org>
(cherry picked from commit a19228b7f4fc6fcb49713455b3caedbc24fb0b01)

View the changeset: https://github.com/openssl/openssl/compare/435972c17211...e5cb5dbd3cc5

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161415471

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/56b5f40c/attachment.html>

From builds at travis-ci.org  Tue Sep 20 22:01:19 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 22:01:19 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2000 (master - 5182123)
In-Reply-To: <FdaSilvaYY/openssl+161452099+broken@travis-ci.org>
Message-ID: <57e1b1aedae33_33f96279fce08514552@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2000
Status: Broken

Duration: 16 minutes and 19 seconds
Commit: 5182123 (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/03aeb6a5416a...5182123cc4a1

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161452099

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/09901502/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 20 22:47:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 22:47:41 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2001 (oss_constify_api
	- 094a3dc)
In-Reply-To: <FdaSilvaYY/openssl+161452346+broken@travis-ci.org>
Message-ID: <57e1bc8c859c9_33f96279fc0fc558522@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2001
Status: Broken

Duration: 32 minutes and 23 seconds
Commit: 094a3dc (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack compilation hack...

 from previous commit.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/f3d8b6bb23c3...094a3dcc1dd5

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161452346

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/abf848c0/attachment.html>

From builds at travis-ci.org  Tue Sep 20 23:10:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 23:10:52 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6091 (master -
	13a4618)
In-Reply-To: <openssl/openssl+161435596+still failing@travis-ci.org>
Message-ID: <57e1c1f84efcb_33f9627bc19c8575551@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6091
Status: Still Failing

Duration: 22 minutes and 6 seconds
Commit: 13a4618 (master)
Author: Rich Salz
Message: RT3669: dgst can only sign/verify one file.

Check arg count and print an error message.

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/a19228b7f4fc...13a461831ab8

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161435596

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/4be1356f/attachment.html>

From no-reply at appveyor.com  Tue Sep 20 23:13:52 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 20 Sep 2016 23:13:52 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1284
Message-ID: <20160920231351.24764.8932.1D5FE8D8@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/c64deb97/attachment.html>

From builds at travis-ci.org  Tue Sep 20 23:26:48 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 23:26:48 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2002
	(ENGINE_finish_upg - ad591c9)
In-Reply-To: <FdaSilvaYY/openssl+161452443+broken@travis-ci.org>
Message-ID: <57e1c5b4c68a7_33f99597938947325e9@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2002
Status: Broken

Duration: 50 minutes and 12 seconds
Commit: ad591c9 (ENGINE_finish_upg)
Author: FdaSilvaYY
Message: Discard useless #if guard around ENGINE_finish

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/32375089e6c1...ad591c97b216

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161452443

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/7a3ba1cc/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 20 23:40:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 23:40:35 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6086
	(OpenSSL_1_1_0-stable - 435972c)
In-Reply-To: <openssl/openssl+161377581+errored@travis-ci.org>
Message-ID: <57e1c8f32edf3_33f995979686473931c@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6086
Status: Errored

Duration: 5 hours, 44 minutes, and 35 seconds
Commit: 435972c (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Documentation fixup; no more ECDHParameters

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 6e836806add140fa9e56d1226d7514fdfa2c803a)

View the changeset: https://github.com/openssl/openssl/compare/3fd181a8b5b8...435972c17211

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161377581

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/fd4b3e9e/attachment.html>

From no-reply at appveyor.com  Tue Sep 20 23:41:37 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Tue, 20 Sep 2016 23:41:37 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1285
Message-ID: <20160920234137.4472.12070.CE7D0DD4@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/59b06a0d/attachment.html>

From builds at travis-ci.org  Tue Sep 20 23:54:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 20 Sep 2016 23:54:44 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2003
	(apps-speed-rework - e69b74e)
In-Reply-To: <FdaSilvaYY/openssl+161452538+broken@travis-ci.org>
Message-ID: <57e1cc448c8a6_33f99597d1ef074916f@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2003
Status: Broken

Duration: 42 minutes and 49 seconds
Commit: e69b74e (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0f8ca847a9b7...e69b74e7367b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161452538

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160920/a39586b5/attachment.html>

From builds at travis-ci.org  Wed Sep 21 00:17:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 00:17:18 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2005
	(fix-missing-opt-help - 5a008ff)
In-Reply-To: <FdaSilvaYY/openssl+161452783+errored@travis-ci.org>
Message-ID: <57e1d18eb1bb2_33f96279fd81c61957f@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2005
Status: Errored

Duration: 6 minutes and 15 seconds
Commit: 5a008ff (fix-missing-opt-help)
Author: Richard Levitte
Message: Quiet compiler warning about uninitialised variable

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/141174214656...5a008ff6c559

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161452783

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/69bed20b/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 21 00:23:26 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 00:23:26 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2004
	(check_bn_wexpand_retcode - 239397d)
In-Reply-To: <FdaSilvaYY/openssl+161452701+broken@travis-ci.org>
Message-ID: <57e1d315d9ddc_33fd34cbddb989370cf@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2004
Status: Broken

Duration: 41 minutes and 24 seconds
Commit: 239397d (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/2c5e4556165c...239397d92ea3

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161452701

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/63315a7a/attachment.html>

From builds at travis-ci.org  Wed Sep 21 00:28:51 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 00:28:51 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6094 (master -
	5a008ff)
In-Reply-To: <openssl/openssl+161438834+still failing@travis-ci.org>
Message-ID: <57e1d44319618_33f99597968647665a3@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6094
Status: Still Failing

Duration: 34 minutes and 40 seconds
Commit: 5a008ff (master)
Author: Richard Levitte
Message: Quiet compiler warning about uninitialised variable

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/13a461831ab8...5a008ff6c559

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161438834

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/45663cbc/attachment.html>

From levitte at openssl.org  Wed Sep 21 00:39:42 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 21 Sep 2016 00:39:42 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474418382.285859.20664.nullmailer@dev.openssl.org>

The branch master has been updated
       via  47852e6ae763a40ddc3538c76a02be06fd0595a5 (commit)
       via  f6be8315cbdb4173008b5917d2b0fc80bb0bf06b (commit)
      from  5a008ff6c559739a59188e11f32da99028302647 (commit)


- Log -----------------------------------------------------------------
commit 47852e6ae763a40ddc3538c76a02be06fd0595a5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:49:53 2016 +0200

    descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f6be8315cbdb4173008b5917d2b0fc80bb0bf06b
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:49:04 2016 +0200

    util/dofile.pl: report if a template couldn't be loaded
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl | 16 ++++++++++------
 util/dofile.pl                  |  6 +++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 0e3e620..95262fe 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -693,10 +693,11 @@ EOF
       # previous line's file spec as default, so if no directory spec
       # is present in the current line and the previous line has one that
       # doesn't apply, you're in for a surprise.
-      my $write_opt =
+      my $write_opt1 =
           join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                                  "WRITE OPT_FILE \"$x" } @objs).
-          "\"\n\t".
+          "\"";
+      my $write_opt2 =
           join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                              $x =~ s|(\.EXE)|$1/SHARE|;
                              $x =~ s|(\.OLB)|$1/LIB|;
@@ -706,7 +707,8 @@ EOF
 $lib.EXE : $deps
         OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT
         TYPE $engine_opt /OUTPUT=OPT_FILE:
-        $write_opt
+        $write_opt1
+        $write_opt2
         CLOSE OPT_FILE
         LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS)
         - PURGE $lib.EXE,$lib.OPT,$lib.MAP
@@ -739,10 +741,11 @@ EOF
       # previous line's file spec as default, so if no directory spec
       # is present in the current line and the previous line has one that
       # doesn't apply, you're in for a surprise.
-      my $write_opt =
+      my $write_opt1 =
           join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                                  "WRITE OPT_FILE \"$x" } @objs).
-          "\"\n\t".
+          "\"";
+      my $write_opt2 =
           join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                              $x =~ s|(\.EXE)|$1/SHARE|;
                              $x =~ s|(\.OLB)|$1/LIB|;
@@ -751,7 +754,8 @@ EOF
       return <<"EOF";
 $bin.EXE : $deps
         OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT
-        $write_opt
+        $write_opt1
+        $write_opt2
         CLOSE OPT_FILE
         LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS)
         - PURGE $bin.EXE,$bin.OPT
diff --git a/util/dofile.pl b/util/dofile.pl
index e0333fe..8b0c7b4 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -159,7 +159,11 @@ my @autowarntext = ("WARNING: do not edit!",
 my $prev_linecount = 0;
 my $text =
     @ARGV
-    ? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
+    ? join("", map { my $x = Text::Template::_load_text($_);
+                     if (!defined($x)) {
+                         die $Text::Template::ERROR, "\n";
+                     }
+                     $x = "{- output_reset_on() -}" . $x;
                      my $linecount = $x =~ tr/\n//;
                      $prev_linecount = ($linecount += $prev_linecount);
                      $lines{$linecount} = $_;

From levitte at openssl.org  Wed Sep 21 00:40:17 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 21 Sep 2016 00:40:17 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474418417.079290.21904.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  79844cbba576098675317b95ee4fc1cfc84fa784 (commit)
       via  87030f54b23d39d9f4b1122b80adc6b7f8deab53 (commit)
      from  d6637ce17ec5b811ea06543f3b584d25bfdeaaa3 (commit)


- Log -----------------------------------------------------------------
commit 79844cbba576098675317b95ee4fc1cfc84fa784
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:49:53 2016 +0200

    descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 47852e6ae763a40ddc3538c76a02be06fd0595a5)

commit 87030f54b23d39d9f4b1122b80adc6b7f8deab53
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:49:04 2016 +0200

    util/dofile.pl: report if a template couldn't be loaded
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f6be8315cbdb4173008b5917d2b0fc80bb0bf06b)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl | 16 ++++++++++------
 util/dofile.pl                  |  6 +++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 48b3476..39709a1 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -677,10 +677,11 @@ EOF
       # previous line's file spec as default, so if no directory spec
       # is present in the current line and the previous line has one that
       # doesn't apply, you're in for a surprise.
-      my $write_opt =
+      my $write_opt1 =
           join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                                  "WRITE OPT_FILE \"$x" } @objs).
-          "\"\n\t".
+          "\"";
+      my $write_opt2 =
           join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                              $x =~ s|(\.EXE)|$1/SHARE|;
                              $x =~ s|(\.OLB)|$1/LIB|;
@@ -690,7 +691,8 @@ EOF
 $lib.EXE : $deps
         OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT
         TYPE $engine_opt /OUTPUT=OPT_FILE:
-        $write_opt
+        $write_opt1
+        $write_opt2
         CLOSE OPT_FILE
         LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS)
         - PURGE $lib.EXE,$lib.OPT,$lib.MAP
@@ -723,10 +725,11 @@ EOF
       # previous line's file spec as default, so if no directory spec
       # is present in the current line and the previous line has one that
       # doesn't apply, you're in for a surprise.
-      my $write_opt =
+      my $write_opt1 =
           join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                                  "WRITE OPT_FILE \"$x" } @objs).
-          "\"\n\t".
+          "\"";
+      my $write_opt2 =
           join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                              $x =~ s|(\.EXE)|$1/SHARE|;
                              $x =~ s|(\.OLB)|$1/LIB|;
@@ -735,7 +738,8 @@ EOF
       return <<"EOF";
 $bin.EXE : $deps
         OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT
-        $write_opt
+        $write_opt1
+        $write_opt2
         CLOSE OPT_FILE
         LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS)
         - PURGE $bin.EXE,$bin.OPT
diff --git a/util/dofile.pl b/util/dofile.pl
index e0333fe..8b0c7b4 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -159,7 +159,11 @@ my @autowarntext = ("WARNING: do not edit!",
 my $prev_linecount = 0;
 my $text =
     @ARGV
-    ? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
+    ? join("", map { my $x = Text::Template::_load_text($_);
+                     if (!defined($x)) {
+                         die $Text::Template::ERROR, "\n";
+                     }
+                     $x = "{- output_reset_on() -}" . $x;
                      my $linecount = $x =~ tr/\n//;
                      $prev_linecount = ($linecount += $prev_linecount);
                      $lines{$linecount} = $_;

From levitte at openssl.org  Wed Sep 21 00:41:23 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 21 Sep 2016 00:41:23 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474418483.792184.22724.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f3ff481f318b10a223d6157bde9645e1797487c5 (commit)
      from  47852e6ae763a40ddc3538c76a02be06fd0595a5 (commit)


- Log -----------------------------------------------------------------
commit f3ff481f318b10a223d6157bde9645e1797487c5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:47:06 2016 +0200

    VMS: add [.util]shlib_wrap.exe and its build instructions
    
    This is a program for VMS that corresponds to util/shlib_wrap.sh.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/build.info                |  10 +++-
 util/shareable_image_wrap.c.in | 113 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 util/shareable_image_wrap.c.in

diff --git a/util/build.info b/util/build.info
index 616fbd7..e044d94 100644
--- a/util/build.info
+++ b/util/build.info
@@ -1,2 +1,8 @@
-SCRIPTS_NO_INST=shlib_wrap.sh
-SOURCE[shlib_wrap.sh]=shlib_wrap.sh.in
+IF[{- $target{build_scheme}->[1] eq "VMS" -}]
+ PROGRAMS_NO_INST=shlib_wrap
+ SOURCE[shlib_wrap]=shareable_image_wrap.c
+ GENERATE[shareable_image_wrap.c]=shareable_image_wrap.c.in
+ELSIF[{- $target{build_scheme}->[1] eq "unix" -}]
+ SCRIPTS_NO_INST=shlib_wrap.sh
+ SOURCE[shlib_wrap.sh]=shlib_wrap.sh.in
+ENDIF
diff --git a/util/shareable_image_wrap.c.in b/util/shareable_image_wrap.c.in
new file mode 100644
index 0000000..567e408
--- /dev/null
+++ b/util/shareable_image_wrap.c.in
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+/*
+ * This program allows for easy execution of programs in the OpenSSL build
+ * directory, in a manner that's similar to how util/shlib_wrap.sh.  Simply
+ * take the command you want to execute and prefix that with
+ * 'mcr [.util]shlib_wrap', for example:
+ *
+ * $ mcr [.util]shlib_wrap mcr [.apps]openssl s_client -connect www.openssl.org:443
+ */
+
+#ifndef __VMS
+# error "VMS ONLY!"
+#endif
+
+#include <stdio.h>
+#include <descrip.h>
+#include <ssdef.h>
+#include <lib$routines.h>
+{-
+    use File::Spec::Functions qw(rel2abs);
+    our $sv = sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor};
+    our $pz = $config{pointer_size};
+    our $bldd = rel2abs($config{builddir});
+    ""
+-}
+/* The logical name table we check and affect */
+$DESCRIPTOR(lnm_process_table, "LNM$PROCESS_TABLE");
+
+/* The first logical name we deal with, the buffer for its old value,
+ * and its temporary new value
+ */
+const $DESCRIPTOR(lnm1, "OSSL$LIBCRYPTO{- $sv -}_SHR{- $pz -}");
+char lnm1oldbuf[256]; short lnm1oldlen = 0;
+$DESCRIPTOR(lnm1old, lnm1oldbuf);
+const $DESCRIPTOR(lnm1new, "{- $bldd -}OSSL$LIBCRYPTO{- $sv -}_SHR{- $pz -}.EXE");
+
+/* The second logical name we deal with, the buffer for its old value,
+ * and its temporary new value
+ */
+const $DESCRIPTOR(lnm2, "OSSL$LIBSSL{- $sv -}_SHR{- $pz -}");
+char lnm2oldbuf[256]; short lnm2oldlen = 0;
+$DESCRIPTOR(lnm2old, lnm2oldbuf);
+const $DESCRIPTOR(lnm2new, "{- $bldd -}OSSL$LIBSSL{- $sv -}_SHR{- $pz -}.EXE");
+
+/* The foreign command we want to run with the logical names above set
+ * to their temporary values
+ */
+char foreign_cmd_buf[4096]; short foreign_cmd_len = 0;
+$DESCRIPTOR(foreign_cmd, foreign_cmd_buf);
+
+int main()
+{
+    int status = 0;
+    int lnm1status = 0, lnm2status = 0;
+
+    /* Fetch the command line.  lib$get_foreign() is nice enough to
+     * strip away the program name, thus only returning the arguments,
+     * which is exactly what we need.
+     */
+    lib$get_foreign(&foreign_cmd, 0, &foreign_cmd_len);
+    foreign_cmd.dsc$w_length = foreign_cmd_len;
+
+#ifdef DEBUG
+    foreign_cmd_buf[foreign_cmd_len] = '\0';
+    printf("[%d] %s\n\n", foreign_cmd_len, foreign_cmd_buf);
+#endif
+
+    /* Fetch the first logical name value and save the status */
+    lnm1status = lib$get_logical(&lnm1, &lnm1old, &lnm1oldlen,
+                                 &lnm_process_table);
+    if (lnm1status == SS$_NORMAL)
+        lnm1old.dsc$w_length = lnm1oldlen;
+    else if (lnm1status != SS$_NOLOGNAM)
+        return lnm1status;
+
+    /* Fetch the first logical name value and save the status */
+    lnm2status = lib$get_logical(&lnm2, &lnm2old, &lnm2oldlen,
+                                 &lnm_process_table);
+    if (lnm2status == SS$_NORMAL)
+        lnm2old.dsc$w_length = lnm2oldlen;
+    else if (lnm2status != SS$_NOLOGNAM)
+        return lnm2status;
+
+    /* Set the temporary new values for both logical names */
+    lib$set_logical(&lnm1, &lnm1new, &lnm_process_table);
+    lib$set_logical(&lnm2, &lnm2new, &lnm_process_table);
+
+    /* Execute the arguments as a command.  The better be a command! */
+    status = lib$spawn(&foreign_cmd);
+
+    /* If the logical names we set had old values, restore them.
+     * Otherwise, simply delete their current values.
+     */
+    if (lnm1status == SS$_NORMAL)
+        lib$set_logical(&lnm1, &lnm1old, &lnm_process_table);
+    else
+        lib$delete_logical(&lnm1, &lnm_process_table);
+    if (lnm2status == SS$_NORMAL)
+        lib$set_logical(&lnm2, &lnm2old, &lnm_process_table);
+    else
+        lib$delete_logical(&lnm2, &lnm_process_table);
+
+    /* Return the status from the execution of the foreign command */
+    return status;
+}

From levitte at openssl.org  Wed Sep 21 00:41:45 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 21 Sep 2016 00:41:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474418505.376220.23628.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  cade326432099f60c08a8004ce694eedcd5c500b (commit)
      from  79844cbba576098675317b95ee4fc1cfc84fa784 (commit)


- Log -----------------------------------------------------------------
commit cade326432099f60c08a8004ce694eedcd5c500b
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:47:06 2016 +0200

    VMS: add [.util]shlib_wrap.exe and its build instructions
    
    This is a program for VMS that corresponds to util/shlib_wrap.sh.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f3ff481f318b10a223d6157bde9645e1797487c5)

-----------------------------------------------------------------------

Summary of changes:
 util/build.info                |  10 +++-
 util/shareable_image_wrap.c.in | 113 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 util/shareable_image_wrap.c.in

diff --git a/util/build.info b/util/build.info
index 616fbd7..e044d94 100644
--- a/util/build.info
+++ b/util/build.info
@@ -1,2 +1,8 @@
-SCRIPTS_NO_INST=shlib_wrap.sh
-SOURCE[shlib_wrap.sh]=shlib_wrap.sh.in
+IF[{- $target{build_scheme}->[1] eq "VMS" -}]
+ PROGRAMS_NO_INST=shlib_wrap
+ SOURCE[shlib_wrap]=shareable_image_wrap.c
+ GENERATE[shareable_image_wrap.c]=shareable_image_wrap.c.in
+ELSIF[{- $target{build_scheme}->[1] eq "unix" -}]
+ SCRIPTS_NO_INST=shlib_wrap.sh
+ SOURCE[shlib_wrap.sh]=shlib_wrap.sh.in
+ENDIF
diff --git a/util/shareable_image_wrap.c.in b/util/shareable_image_wrap.c.in
new file mode 100644
index 0000000..567e408
--- /dev/null
+++ b/util/shareable_image_wrap.c.in
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+/*
+ * This program allows for easy execution of programs in the OpenSSL build
+ * directory, in a manner that's similar to how util/shlib_wrap.sh.  Simply
+ * take the command you want to execute and prefix that with
+ * 'mcr [.util]shlib_wrap', for example:
+ *
+ * $ mcr [.util]shlib_wrap mcr [.apps]openssl s_client -connect www.openssl.org:443
+ */
+
+#ifndef __VMS
+# error "VMS ONLY!"
+#endif
+
+#include <stdio.h>
+#include <descrip.h>
+#include <ssdef.h>
+#include <lib$routines.h>
+{-
+    use File::Spec::Functions qw(rel2abs);
+    our $sv = sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor};
+    our $pz = $config{pointer_size};
+    our $bldd = rel2abs($config{builddir});
+    ""
+-}
+/* The logical name table we check and affect */
+$DESCRIPTOR(lnm_process_table, "LNM$PROCESS_TABLE");
+
+/* The first logical name we deal with, the buffer for its old value,
+ * and its temporary new value
+ */
+const $DESCRIPTOR(lnm1, "OSSL$LIBCRYPTO{- $sv -}_SHR{- $pz -}");
+char lnm1oldbuf[256]; short lnm1oldlen = 0;
+$DESCRIPTOR(lnm1old, lnm1oldbuf);
+const $DESCRIPTOR(lnm1new, "{- $bldd -}OSSL$LIBCRYPTO{- $sv -}_SHR{- $pz -}.EXE");
+
+/* The second logical name we deal with, the buffer for its old value,
+ * and its temporary new value
+ */
+const $DESCRIPTOR(lnm2, "OSSL$LIBSSL{- $sv -}_SHR{- $pz -}");
+char lnm2oldbuf[256]; short lnm2oldlen = 0;
+$DESCRIPTOR(lnm2old, lnm2oldbuf);
+const $DESCRIPTOR(lnm2new, "{- $bldd -}OSSL$LIBSSL{- $sv -}_SHR{- $pz -}.EXE");
+
+/* The foreign command we want to run with the logical names above set
+ * to their temporary values
+ */
+char foreign_cmd_buf[4096]; short foreign_cmd_len = 0;
+$DESCRIPTOR(foreign_cmd, foreign_cmd_buf);
+
+int main()
+{
+    int status = 0;
+    int lnm1status = 0, lnm2status = 0;
+
+    /* Fetch the command line.  lib$get_foreign() is nice enough to
+     * strip away the program name, thus only returning the arguments,
+     * which is exactly what we need.
+     */
+    lib$get_foreign(&foreign_cmd, 0, &foreign_cmd_len);
+    foreign_cmd.dsc$w_length = foreign_cmd_len;
+
+#ifdef DEBUG
+    foreign_cmd_buf[foreign_cmd_len] = '\0';
+    printf("[%d] %s\n\n", foreign_cmd_len, foreign_cmd_buf);
+#endif
+
+    /* Fetch the first logical name value and save the status */
+    lnm1status = lib$get_logical(&lnm1, &lnm1old, &lnm1oldlen,
+                                 &lnm_process_table);
+    if (lnm1status == SS$_NORMAL)
+        lnm1old.dsc$w_length = lnm1oldlen;
+    else if (lnm1status != SS$_NOLOGNAM)
+        return lnm1status;
+
+    /* Fetch the first logical name value and save the status */
+    lnm2status = lib$get_logical(&lnm2, &lnm2old, &lnm2oldlen,
+                                 &lnm_process_table);
+    if (lnm2status == SS$_NORMAL)
+        lnm2old.dsc$w_length = lnm2oldlen;
+    else if (lnm2status != SS$_NOLOGNAM)
+        return lnm2status;
+
+    /* Set the temporary new values for both logical names */
+    lib$set_logical(&lnm1, &lnm1new, &lnm_process_table);
+    lib$set_logical(&lnm2, &lnm2new, &lnm_process_table);
+
+    /* Execute the arguments as a command.  The better be a command! */
+    status = lib$spawn(&foreign_cmd);
+
+    /* If the logical names we set had old values, restore them.
+     * Otherwise, simply delete their current values.
+     */
+    if (lnm1status == SS$_NORMAL)
+        lib$set_logical(&lnm1, &lnm1old, &lnm_process_table);
+    else
+        lib$delete_logical(&lnm1, &lnm_process_table);
+    if (lnm2status == SS$_NORMAL)
+        lib$set_logical(&lnm2, &lnm2old, &lnm_process_table);
+    else
+        lib$delete_logical(&lnm2, &lnm_process_table);
+
+    /* Return the status from the execution of the foreign command */
+    return status;
+}

From builds at travis-ci.org  Wed Sep 21 00:53:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 00:53:03 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2006 (oss-vpm-rework -
	0512adb)
In-Reply-To: <FdaSilvaYY/openssl+161453116+failed@travis-ci.org>
Message-ID: <57e1d9f0a87dc_33f96279fc8cc64578e@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2006
Status: Failed

Duration: 35 minutes and 59 seconds
Commit: 0512adb (oss-vpm-rework)
Author: FdaSilvaYY
Message: Reduce X509_VERIFY_PARAM_new/X509_VERIFY_PARAM_free code amount

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/2f30358fdcbd^...0512adb80742

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161453116

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/1dcd0187/attachment-0001.html>

From no-reply at appveyor.com  Wed Sep 21 01:13:06 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 21 Sep 2016 01:13:06 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1289
Message-ID: <20160921011306.34378.22622.CF2819B1@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/15d68b32/attachment.html>

From builds at travis-ci.org  Wed Sep 21 01:21:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 01:21:11 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2007 (oss_add_cb_args
	- 3369472)
In-Reply-To: <FdaSilvaYY/openssl+161453284+broken@travis-ci.org>
Message-ID: <57e1e08756ecb_33fd34cbdddc8973620@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2007
Status: Broken

Duration: 39 minutes and 30 seconds
Commit: 3369472 (oss_add_cb_args)
Author: FdaSilvaYY
Message: Move global 'ctx' pointers and BIO variables into callback context ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/3c8d98997a76...336947238c17

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161453284

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/c445bf82/attachment.html>

From no-reply at appveyor.com  Wed Sep 21 01:39:49 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 21 Sep 2016 01:39:49 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1290
Message-ID: <20160921013948.81399.68557.53E98BAD@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/716c7aec/attachment.html>

From builds at travis-ci.org  Wed Sep 21 01:46:47 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 01:46:47 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2008
	(pack_argv_options - a53bfb9)
In-Reply-To: <FdaSilvaYY/openssl+161453388+broken@travis-ci.org>
Message-ID: <57e1e6875e1c1_33f9959792e58800192@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2008
Status: Broken

Duration: 38 minutes and 4 seconds
Commit: a53bfb9 (pack_argv_options)
Author: FdaSilvaYY
Message: Use PATH_MAX and NAME_MAX

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/416c8faab6e2...a53bfb922c18

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161453388

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/7b3479b7/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 21 02:13:36 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 02:13:36 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2009 (fix-ca-buf-usage
	- 349ebc5)
In-Reply-To: <FdaSilvaYY/openssl+161453681+broken@travis-ci.org>
Message-ID: <57e1eccfe27e8_33fd34cbdda941015255@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2009
Status: Broken

Duration: 38 minutes and 23 seconds
Commit: 349ebc5 (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Introduce PATH_MAX and NAME_MAX

 to define the certificate filename storage buffer.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/f62fba9ef81e...349ebc550f46

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161453681

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/15c628f2/attachment.html>

From builds at travis-ci.org  Wed Sep 21 02:14:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 02:14:03 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6098 (master -
	47852e6)
In-Reply-To: <openssl/openssl+161497306+still failing@travis-ci.org>
Message-ID: <57e1eceb5673a_33f99597d1dd8812979@1977eb35-4886-49c0-bcb7-8b3f7c78c776.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6098
Status: Still Failing

Duration: 39 minutes and 9 seconds
Commit: 47852e6 (master)
Author: Richard Levitte
Message: descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/5a008ff6c559...47852e6ae763

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161497306

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/5da3fd72/attachment.html>

From builds at travis-ci.org  Wed Sep 21 03:00:37 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 03:00:37 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2011
	(const-app-options - 7218c19)
In-Reply-To: <FdaSilvaYY/openssl+161455656+broken@travis-ci.org>
Message-ID: <57e1f7d55a739_33fd34cb9b1f81051291@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2011
Status: Broken

Duration: 41 minutes and 10 seconds
Commit: 7218c19 (const-app-options)
Author: FdaSilvaYY
Message: Constify char* input parameters in apps/ca code

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/bfb2068ead70...7218c19ee083

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161455656

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/2b8d3dd2/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 21 03:01:24 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 03:01:24 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6100 (master -
	f3ff481)
In-Reply-To: <openssl/openssl+161497509+still failing@travis-ci.org>
Message-ID: <57e1f80433381_33fd34cbdd878105209b@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6100
Status: Still Failing

Duration: 35 minutes and 1 second
Commit: f3ff481 (master)
Author: Richard Levitte
Message: VMS: add [.util]shlib_wrap.exe and its build instructions

This is a program for VMS that corresponds to util/shlib_wrap.sh.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/47852e6ae763...f3ff481f318b

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161497509

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/95c608db/attachment.html>

From builds at travis-ci.org  Wed Sep 21 03:39:58 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 03:39:58 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2012
	(fix_set_dup_exdata - 1915560)
In-Reply-To: <FdaSilvaYY/openssl+161455724+broken@travis-ci.org>
Message-ID: <57e2010ed4d3b_33fd34cb9ac44107662c@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2012
Status: Broken

Duration: 23 minutes and 54 seconds
Commit: 1915560 (fix_set_dup_exdata)
Author: FdaSilvaYY
Message: Fix possible malloc failure inside CRYPTO_dup_ex_data()

Fix related docs.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/3cd1a053965e...1915560ee060

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161455724

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/e1a6efc7/attachment.html>

From builds at travis-ci.org  Wed Sep 21 03:56:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 03:56:55 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2013 (sk_num_alloc -
	bb72804)
In-Reply-To: <FdaSilvaYY/openssl+161455839+broken@travis-ci.org>
Message-ID: <57e205074ed88_33fd3545b3fa810860fc@97cf618a-5f60-4e59-a25c-205df6739171.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2013
Status: Broken

Duration: 43 minutes and 24 seconds
Commit: bb72804 (sk_num_alloc)
Author: FdaSilvaYY
Message: Add sk_new_num & sk_new_null_num methods

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/9590070a3c4b...bb72804b39ef

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161455839

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/f42786c5/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 21 04:26:23 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 04:26:23 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2014
	(indent-ssl-header - 4ddabec)
In-Reply-To: <FdaSilvaYY/openssl+161456135+broken@travis-ci.org>
Message-ID: <57e20bef25f75_33f9627bc18b076792c@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2014
Status: Broken

Duration: 41 minutes and 15 seconds
Commit: 4ddabec (indent-ssl-header)
Author: FdaSilvaYY
Message: Add typedef on callback method pointers

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/ea41570a7403...4ddabecf16fc

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161456135

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/7d43027c/attachment.html>

From builds at travis-ci.org  Wed Sep 21 04:51:46 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 04:51:46 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2015
	(oss_builds_options_check - 667db9a)
In-Reply-To: <FdaSilvaYY/openssl+161456322+broken@travis-ci.org>
Message-ID: <57e211e1199ca_33f9627bc1bf87815dc@26808f81-9c65-4aad-a247-fc1a8be67a72.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2015
Status: Broken

Duration: 38 minutes and 40 seconds
Commit: 667db9a (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/879968396046...667db9ac412c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161456322

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/2b60f164/attachment.html>

From openssl.sanity at gmail.com  Wed Sep 21 09:14:01 2016
From: openssl.sanity at gmail.com (openssl.sanity at gmail.com)
Date: Wed, 21 Sep 2016 09:14:01 +0000 (UTC)
Subject: [openssl-commits] Build failed in Jenkins: master_make_errors #1990
Message-ID: <1432554265.54.1474449242204.JavaMail.jenkins@ossl-sanity.cisco.com>

See <https://openssl-sanity.cisco.com:8443/job/master_make_errors/1990/changes>

Changes:

[Matt Caswell] Convert Finished construction to WPACKET

[Matt Caswell] Convert CCS construction to WPACKET

[Matt Caswell] Convert WPACKET_put_bytes to use convenience macros

[Richard Levitte] Fixup BIO demos for OpenSSL 1.1.x

[Richard Levitte] Fixup BIO demos for OpenSSL 1.1.x

[Richard Levitte] Fixup BIO demos for OpenSSL 1.1.x

[Richard Levitte] Don't ignore Makefiles in demos/

[Richard Levitte] Crude Makefile for demos/bio/

[Richard Levitte] Crude VMS build files for demos/bio/

[Richard Levitte] Documentation fixup; no more ECDHParameters

[Richard Levitte] apps/apps.c: include sys/socket.h to declare recv()

[rsalz] RT3669: dgst can only sign/verify one file.

[Richard Levitte] Quiet compiler warning about uninitialised variable

[Richard Levitte] util/dofile.pl: report if a template couldn't be loaded

[Richard Levitte] descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty

[Richard Levitte] VMS: add [.util]shlib_wrap.exe and its build instructions

------------------------------------------
Started by upstream project "master_basic" build number 2106
originally caused by:
 Started by an SCM change
Building on master in workspace <https://openssl-sanity.cisco.com:8443/job/master_make_errors/ws/>
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Done
Cloning the remote Git repository
Cloning repository https://github.com/openssl/openssl.git
 > git init <https://openssl-sanity.cisco.com:8443/job/master_make_errors/ws/> # timeout=10
Fetching upstream changes from https://github.com/openssl/openssl.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress https://github.com/openssl/openssl.git +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/openssl/openssl.git # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/openssl/openssl.git # timeout=10
Fetching upstream changes from https://github.com/openssl/openssl.git
 > git -c core.askpass=true fetch --tags --progress https://github.com/openssl/openssl.git +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision f3ff481f318b10a223d6157bde9645e1797487c5 (refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f f3ff481f318b10a223d6157bde9645e1797487c5
 > git rev-list 418a18a2deddc0b0d6181de0008219c899ca6ddf # timeout=10
[master_make_errors] $ /bin/sh -xe /tmp/hudson5886687341472149298.sh
+ ./config
Operating system: x86_64-whatever-linux2
Configuring OpenSSL version 1.1.1-dev (0x0x10101000L)
    no-asan         [default]  OPENSSL_NO_ASAN
    no-crypto-mdebug [default]  OPENSSL_NO_CRYPTO_MDEBUG
    no-crypto-mdebug-backtrace [default]  OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
    no-ec_nistp_64_gcc_128 [default]  OPENSSL_NO_EC_NISTP_64_GCC_128
    no-egd          [default]  OPENSSL_NO_EGD
    no-fuzz-afl     [default]  OPENSSL_NO_FUZZ_AFL
    no-fuzz-libfuzzer [default]  OPENSSL_NO_FUZZ_LIBFUZZER
    no-heartbeats   [default]  OPENSSL_NO_HEARTBEATS
    no-md2          [default]  OPENSSL_NO_MD2 (skip dir)
    no-msan         [default]  OPENSSL_NO_MSAN
    no-rc5          [default]  OPENSSL_NO_RC5 (skip dir)
    no-sctp         [default]  OPENSSL_NO_SCTP
    no-ssl-trace    [default]  OPENSSL_NO_SSL_TRACE
    no-ssl3         [default]  OPENSSL_NO_SSL3
    no-ssl3-method  [default]  OPENSSL_NO_SSL3_METHOD
    no-ubsan        [default]  OPENSSL_NO_UBSAN
    no-unit-test    [default]  OPENSSL_NO_UNIT_TEST
    no-weak-ssl-ciphers [default]  OPENSSL_NO_WEAK_SSL_CIPHERS
    no-zlib         [default] 
    no-zlib-dynamic [default] 
Configuring for linux-x86_64

PERL          =/usr/bin/perl
PERLVERSION   =5.16.3 for x86_64-linux-thread-multi
HASHBANGPERL  =/usr/bin/env perl
CC            =gcc
CFLAG         =-Wall -O3 -pthread -m64 -DL_ENDIAN  -Wa,--noexecstack
DEFINES       =DSO_DLFCN HAVE_DLFCN_H NDEBUG OPENSSL_THREADS OPENSSL_NO_STATIC_ENGINE OPENSSL_PIC OPENSSL_IA32_SSE2 OPENSSL_BN_ASM_MONT OPENSSL_BN_ASM_MONT5 OPENSSL_BN_ASM_GF2m SHA1_ASM SHA256_ASM SHA512_ASM RC4_ASM MD5_ASM AES_ASM VPAES_ASM BSAES_ASM GHASH_ASM ECP_NISTZ256_ASM POLY1305_ASM
EX_LIBS       =-ldl 
+ make depend
+ make errors
( cd .; /usr/bin/perl util/ck_errf.pl -strict */*.c */*/*.c )
FATAL: error discrepancy
ssl/statem/statem_dtls.c:880:dtls_construct_change_cipher_spec:tls_construct_finished
ssl/statem/statem_dtls.c:891:dtls_construct_change_cipher_spec:tls_construct_finished
ssl/statem/statem_dtls.c:899:dtls_construct_change_cipher_spec:tls_construct_finished
ssl/statem/statem_lib.c:279:tls_construct_change_cipher_spec:tls_construct_finished
make: *** [errors] Error 1
Build step 'Execute shell' marked build as failure

From matt at openssl.org  Wed Sep 21 12:39:28 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 12:39:28 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474461568.492034.19893.nullmailer@dev.openssl.org>

The branch master has been updated
       via  1ff7425d6130380bb00d3e64739633a4b21b11a3 (commit)
      from  f3ff481f318b10a223d6157bde9645e1797487c5 (commit)


- Log -----------------------------------------------------------------
commit 1ff7425d6130380bb00d3e64739633a4b21b11a3
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 14 13:27:59 2016 +0100

    Fix a missing NULL check in dsa_builtin_paramgen
    
    We should check the last BN_CTX_get() call to ensure that it isn't NULL
    before we try and use any of the allocated BIGNUMs.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/dsa/dsa_gen.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 3dac550..11f422e 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -100,6 +100,9 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
     p = BN_CTX_get(ctx);
     test = BN_CTX_get(ctx);
 
+    if (test == NULL)
+        goto err;
+
     if (!BN_lshift(test, BN_value_one(), bits - 1))
         goto err;
 

From matt at openssl.org  Wed Sep 21 12:39:39 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 12:39:39 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474461579.861176.20653.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  d0cbaa2f3a36a3359ee979f0262f0ff514630509 (commit)
      from  a5e55f62975c0f978eb348763a1de0cd923f0d77 (commit)


- Log -----------------------------------------------------------------
commit d0cbaa2f3a36a3359ee979f0262f0ff514630509
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 14 13:27:59 2016 +0100

    Fix a missing NULL check in dsa_builtin_paramgen
    
    We should check the last BN_CTX_get() call to ensure that it isn't NULL
    before we try and use any of the allocated BIGNUMs.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 1ff7425d6130380bb00d3e64739633a4b21b11a3)

-----------------------------------------------------------------------

Summary of changes:
 crypto/dsa/dsa_gen.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index f6de684..1fce0f8 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -185,6 +185,9 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
     p = BN_CTX_get(ctx);
     test = BN_CTX_get(ctx);
 
+    if (test == NULL)
+        goto err;
+
     if (!BN_lshift(test, BN_value_one(), bits - 1))
         goto err;
 

From matt at openssl.org  Wed Sep 21 12:39:57 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 12:39:57 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474461597.901055.20967.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  6bdd2637daa862706598d04ae2750a920ebee0ae (commit)
      from  cade326432099f60c08a8004ce694eedcd5c500b (commit)


- Log -----------------------------------------------------------------
commit 6bdd2637daa862706598d04ae2750a920ebee0ae
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 14 13:27:59 2016 +0100

    Fix a missing NULL check in dsa_builtin_paramgen
    
    We should check the last BN_CTX_get() call to ensure that it isn't NULL
    before we try and use any of the allocated BIGNUMs.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 1ff7425d6130380bb00d3e64739633a4b21b11a3)

-----------------------------------------------------------------------

Summary of changes:
 crypto/dsa/dsa_gen.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 3dac550..11f422e 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -100,6 +100,9 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
     p = BN_CTX_get(ctx);
     test = BN_CTX_get(ctx);
 
+    if (test == NULL)
+        goto err;
+
     if (!BN_lshift(test, BN_value_one(), bits - 1))
         goto err;
 

From openssl.sanity at gmail.com  Wed Sep 21 13:13:03 2016
From: openssl.sanity at gmail.com (openssl.sanity at gmail.com)
Date: Wed, 21 Sep 2016 13:13:03 +0000 (UTC)
Subject: [openssl-commits] Build failed in Jenkins: master_make_errors #1991
In-Reply-To: <1432554265.54.1474449242204.JavaMail.jenkins@ossl-sanity.cisco.com>
References: <1432554265.54.1474449242204.JavaMail.jenkins@ossl-sanity.cisco.com>
Message-ID: <2093092233.55.1474463583986.JavaMail.jenkins@ossl-sanity.cisco.com>

See <https://openssl-sanity.cisco.com:8443/job/master_make_errors/1991/changes>

Changes:

[Matt Caswell] Fix a missing NULL check in dsa_builtin_paramgen

------------------------------------------
Started by upstream project "master_basic" build number 2107
originally caused by:
 Started by an SCM change
Building on master in workspace <https://openssl-sanity.cisco.com:8443/job/master_make_errors/ws/>
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Done
Cloning the remote Git repository
Cloning repository https://github.com/openssl/openssl.git
 > git init <https://openssl-sanity.cisco.com:8443/job/master_make_errors/ws/> # timeout=10
Fetching upstream changes from https://github.com/openssl/openssl.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress https://github.com/openssl/openssl.git +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/openssl/openssl.git # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/openssl/openssl.git # timeout=10
Fetching upstream changes from https://github.com/openssl/openssl.git
 > git -c core.askpass=true fetch --tags --progress https://github.com/openssl/openssl.git +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision 1ff7425d6130380bb00d3e64739633a4b21b11a3 (refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 1ff7425d6130380bb00d3e64739633a4b21b11a3
 > git rev-list f3ff481f318b10a223d6157bde9645e1797487c5 # timeout=10
[master_make_errors] $ /bin/sh -xe /tmp/hudson3148828734816815482.sh
+ ./config
Operating system: x86_64-whatever-linux2
Configuring OpenSSL version 1.1.1-dev (0x0x10101000L)
    no-asan         [default]  OPENSSL_NO_ASAN
    no-crypto-mdebug [default]  OPENSSL_NO_CRYPTO_MDEBUG
    no-crypto-mdebug-backtrace [default]  OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
    no-ec_nistp_64_gcc_128 [default]  OPENSSL_NO_EC_NISTP_64_GCC_128
    no-egd          [default]  OPENSSL_NO_EGD
    no-fuzz-afl     [default]  OPENSSL_NO_FUZZ_AFL
    no-fuzz-libfuzzer [default]  OPENSSL_NO_FUZZ_LIBFUZZER
    no-heartbeats   [default]  OPENSSL_NO_HEARTBEATS
    no-md2          [default]  OPENSSL_NO_MD2 (skip dir)
    no-msan         [default]  OPENSSL_NO_MSAN
    no-rc5          [default]  OPENSSL_NO_RC5 (skip dir)
    no-sctp         [default]  OPENSSL_NO_SCTP
    no-ssl-trace    [default]  OPENSSL_NO_SSL_TRACE
    no-ssl3         [default]  OPENSSL_NO_SSL3
    no-ssl3-method  [default]  OPENSSL_NO_SSL3_METHOD
    no-ubsan        [default]  OPENSSL_NO_UBSAN
    no-unit-test    [default]  OPENSSL_NO_UNIT_TEST
    no-weak-ssl-ciphers [default]  OPENSSL_NO_WEAK_SSL_CIPHERS
    no-zlib         [default] 
    no-zlib-dynamic [default] 
Configuring for linux-x86_64

PERL          =/usr/bin/perl
PERLVERSION   =5.16.3 for x86_64-linux-thread-multi
HASHBANGPERL  =/usr/bin/env perl
CC            =gcc
CFLAG         =-Wall -O3 -pthread -m64 -DL_ENDIAN  -Wa,--noexecstack
DEFINES       =DSO_DLFCN HAVE_DLFCN_H NDEBUG OPENSSL_THREADS OPENSSL_NO_STATIC_ENGINE OPENSSL_PIC OPENSSL_IA32_SSE2 OPENSSL_BN_ASM_MONT OPENSSL_BN_ASM_MONT5 OPENSSL_BN_ASM_GF2m SHA1_ASM SHA256_ASM SHA512_ASM RC4_ASM MD5_ASM AES_ASM VPAES_ASM BSAES_ASM GHASH_ASM ECP_NISTZ256_ASM POLY1305_ASM
EX_LIBS       =-ldl 
+ make depend
+ make errors
( cd .; /usr/bin/perl util/ck_errf.pl -strict */*.c */*/*.c )
FATAL: error discrepancy
ssl/statem/statem_dtls.c:880:dtls_construct_change_cipher_spec:tls_construct_finished
ssl/statem/statem_dtls.c:891:dtls_construct_change_cipher_spec:tls_construct_finished
ssl/statem/statem_dtls.c:899:dtls_construct_change_cipher_spec:tls_construct_finished
ssl/statem/statem_lib.c:279:tls_construct_change_cipher_spec:tls_construct_finished
make: *** [errors] Error 1
Build step 'Execute shell' marked build as failure

From steve at openssl.org  Wed Sep 21 13:13:44 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 21 Sep 2016 13:13:44 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474463624.211596.23517.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  ff553f837172ecb2b5c8eca257ec3c5619a4b299 (commit)
      from  d0cbaa2f3a36a3359ee979f0262f0ff514630509 (commit)


- Log -----------------------------------------------------------------
commit ff553f837172ecb2b5c8eca257ec3c5619a4b299
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Sep 17 12:36:58 2016 +0100

    Fix small OOB reads.
    
    In ssl3_get_client_certificate, ssl3_get_server_certificate and
    ssl3_get_certificate_request check we have enough room
    before reading a length.
    
    Thanks to Shi Lei (Gear Team, Qihoo 360 Inc.) for reporting these bugs.
    
    CVE-2016-6306
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_clnt.c | 11 +++++++++++
 ssl/s3_srvr.c |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 36833f7..d2afaa5 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1216,6 +1216,12 @@ int ssl3_get_server_certificate(SSL *s)
         goto f_err;
     }
     for (nc = 0; nc < llen;) {
+        if (nc + 3 > llen) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
+                   SSL_R_CERT_LENGTH_MISMATCH);
+            goto f_err;
+        }
         n2l3(p, l);
         if ((l + nc + 3) > llen) {
             al = SSL_AD_DECODE_ERROR;
@@ -2171,6 +2177,11 @@ int ssl3_get_certificate_request(SSL *s)
     }
 
     for (nc = 0; nc < llen;) {
+        if (nc + 2 > llen) {
+            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+            SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_CA_DN_TOO_LONG);
+            goto err;
+        }
         n2s(p, l);
         if ((l + nc + 2) > llen) {
             if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 7c19753..01ccd5d 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -3220,6 +3220,12 @@ int ssl3_get_client_certificate(SSL *s)
         goto f_err;
     }
     for (nc = 0; nc < llen;) {
+        if (nc + 3 > llen) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,
+                   SSL_R_CERT_LENGTH_MISMATCH);
+            goto f_err;
+        }
         n2l3(p, l);
         if ((l + nc + 3) > llen) {
             al = SSL_AD_DECODE_ERROR;

From builds at travis-ci.org  Wed Sep 21 13:22:08 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 13:22:08 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6102 (master -
	1ff7425)
In-Reply-To: <openssl/openssl+161612901+still failing@travis-ci.org>
Message-ID: <57e2897fd60ab_33feed0fab1f4108948@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6102
Status: Still Failing

Duration: 41 minutes and 2 seconds
Commit: 1ff7425 (master)
Author: Matt Caswell
Message: Fix a missing NULL check in dsa_builtin_paramgen

We should check the last BN_CTX_get() call to ensure that it isn't NULL
before we try and use any of the allocated BIGNUMs.

Issue reported by Shi Lei.

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/f3ff481f318b...1ff7425d6130

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161612901

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/a5ce2c90/attachment-0001.html>

From steve at openssl.org  Wed Sep 21 13:23:28 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 21 Sep 2016 13:23:28 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1474464208.696604.24881.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  52e623c4cb06fffa9d5e75c60b34b4bc130b12e9 (commit)
      from  515a0105652a1b84d712b4d162cf859c02bf5450 (commit)


- Log -----------------------------------------------------------------
commit 52e623c4cb06fffa9d5e75c60b34b4bc130b12e9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Sep 17 12:36:58 2016 +0100

    Fix small OOB reads.
    
    In ssl3_get_client_certificate, ssl3_get_server_certificate and
    ssl3_get_certificate_request check we have enough room
    before reading a length.
    
    Thanks to Shi Lei (Gear Team, Qihoo 360 Inc.) for reporting these bugs.
    
    CVE-2016-6306
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit ff553f837172ecb2b5c8eca257ec3c5619a4b299)

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_clnt.c | 11 +++++++++++
 ssl/s3_srvr.c |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 9e5875f..40ca13d 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1143,6 +1143,12 @@ int ssl3_get_server_certificate(SSL *s)
         goto f_err;
     }
     for (nc = 0; nc < llen;) {
+        if (nc + 3 > llen) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
+                   SSL_R_CERT_LENGTH_MISMATCH);
+            goto f_err;
+        }
         n2l3(p, l);
         if ((l + nc + 3) > llen) {
             al = SSL_AD_DECODE_ERROR;
@@ -2072,6 +2078,11 @@ int ssl3_get_certificate_request(SSL *s)
     }
 
     for (nc = 0; nc < llen;) {
+        if (nc + 2 > llen) {
+            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+            SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_CA_DN_TOO_LONG);
+            goto err;
+        }
         n2s(p, l);
         if ((l + nc + 2) > llen) {
             if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 591b13e..4f1a2e9 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -3234,6 +3234,12 @@ int ssl3_get_client_certificate(SSL *s)
         goto f_err;
     }
     for (nc = 0; nc < llen;) {
+        if (nc + 3 > llen) {
+            al = SSL_AD_DECODE_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,
+                   SSL_R_CERT_LENGTH_MISMATCH);
+            goto f_err;
+        }
         n2l3(p, l);
         if ((l + nc + 3) > llen) {
             al = SSL_AD_DECODE_ERROR;

From matt at openssl.org  Wed Sep 21 13:33:26 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 13:33:26 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474464806.324056.26030.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3c106325292d30fad32b0dd4cdf2f2ec613461b1 (commit)
      from  1ff7425d6130380bb00d3e64739633a4b21b11a3 (commit)


- Log -----------------------------------------------------------------
commit 3c106325292d30fad32b0dd4cdf2f2ec613461b1
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 14:05:42 2016 +0100

    make update and fix some associated mis-matched error codes
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h    | 1 +
 ssl/ssl_err.c            | 2 ++
 ssl/statem/statem_dtls.c | 6 +++---
 ssl/statem/statem_lib.c  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 234a25e..5355c83 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2220,6 +2220,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS1_SET_SERVER_SIGALGS                    335
 # define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          354
 # define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          372
+# define SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC           427
 # define SSL_F_TLS_CONSTRUCT_CKE_DHE                      404
 # define SSL_F_TLS_CONSTRUCT_CKE_ECDHE                    405
 # define SSL_F_TLS_CONSTRUCT_CKE_GOST                     406
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 7f94ca6..bba7cdb 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -239,6 +239,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "tls_client_key_exchange_post_work"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST),
      "tls_construct_certificate_request"},
+    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC),
+     "tls_construct_change_cipher_spec"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CKE_DHE), "tls_construct_cke_dhe"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CKE_ECDHE), "tls_construct_cke_ecdhe"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CKE_GOST), "tls_construct_cke_gost"},
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index f892f0f..7c8437a 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -877,7 +877,7 @@ int dtls_construct_change_cipher_spec(SSL *s)
 
     if (!WPACKET_init(&pkt, s->init_buf)
             || !WPACKET_put_bytes_u8(&pkt, SSL3_MT_CCS)) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        SSLerr(SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
@@ -888,7 +888,7 @@ int dtls_construct_change_cipher_spec(SSL *s)
         s->d1->next_handshake_write_seq++;
 
         if (!WPACKET_put_bytes_u16(&pkt, s->d1->handshake_write_seq)) {
-            SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+            SSLerr(SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
             goto err;
         }
 
@@ -896,7 +896,7 @@ int dtls_construct_change_cipher_spec(SSL *s)
     }
 
     if (!WPACKET_finish(&pkt)) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        SSLerr(SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 3ffe4e5..6f13ec0 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -276,7 +276,7 @@ int tls_construct_change_cipher_spec(SSL *s)
             || !WPACKET_finish(&pkt)) {
         WPACKET_cleanup(&pkt);
         ossl_statem_set_error(s);
-        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR);
+        SSLerr(SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
         ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
         return 0;
     }

From builds at travis-ci.org  Wed Sep 21 14:18:36 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 14:18:36 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6104
	(OpenSSL_1_1_0-stable - 6bdd263)
In-Reply-To: <openssl/openssl+161613036+broken@travis-ci.org>
Message-ID: <57e296bc61ed9_33feed0fe3a2c17736a@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6104
Status: Broken

Duration: 44 minutes and 4 seconds
Commit: 6bdd263 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Fix a missing NULL check in dsa_builtin_paramgen

We should check the last BN_CTX_get() call to ensure that it isn't NULL
before we try and use any of the allocated BIGNUMs.

Issue reported by Shi Lei.

Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 1ff7425d6130380bb00d3e64739633a4b21b11a3)

View the changeset: https://github.com/openssl/openssl/compare/cade32643209...6bdd2637daa8

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161613036

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/124fc404/attachment.html>

From levitte at openssl.org  Wed Sep 21 14:19:25 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 21 Sep 2016 14:19:25 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474467565.711876.30403.nullmailer@dev.openssl.org>

The branch master has been updated
       via  780bbb96bf514f0b4013e9c5725614ba5153c497 (commit)
      from  3c106325292d30fad32b0dd4cdf2f2ec613461b1 (commit)


- Log -----------------------------------------------------------------
commit 780bbb96bf514f0b4013e9c5725614ba5153c497
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 14:44:42 2016 +0200

    test/x509aux.c: Fix argv loop
    
    There are cases when argc is more trustable than proper argv termination.
    Since we trust argc in all other test programs, we might as well treat it
    the same way in this program.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/x509aux.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/x509aux.c b/test/x509aux.c
index 4f00196..2c20d6d 100644
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -180,7 +180,6 @@ static int test_certs(BIO *fp)
 int main(int argc, char *argv[])
 {
     BIO *bio_err;
-    const char *certfile;
     const char *p;
     int ret = 1;
 
@@ -197,24 +196,30 @@ int main(int argc, char *argv[])
         CRYPTO_set_mem_debug(1);
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
-    while ((certfile = *++argv) != NULL) {
-        BIO *f = BIO_new_file(certfile, "r");
+    argc--;
+    argv++;
+
+    while (argc >= 1) {
+        BIO *f = BIO_new_file(*argv, "r");
         int ok;
 
         if (f == NULL) {
             fprintf(stderr, "%s: Error opening cert file: '%s': %s\n",
-                    progname, certfile, strerror(errno));
+                    progname, *argv, strerror(errno));
             EXIT(ret);
         }
         ret = !(ok = test_certs(f));
         BIO_free(f);
 
         if (!ok) {
-            printf("%s ERROR\n", certfile);
+            printf("%s ERROR\n", *argv);
             ret = 1;
             break;
         }
-        printf("%s OK\n", certfile);
+        printf("%s OK\n", *argv);
+
+        argc--;
+        argv++;
     }
 
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG

From levitte at openssl.org  Wed Sep 21 14:21:19 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 21 Sep 2016 14:21:19 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474467679.737957.31438.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  9583e4166d02e160873daaaceb2f8dfe62e49659 (commit)
      from  ff553f837172ecb2b5c8eca257ec3c5619a4b299 (commit)


- Log -----------------------------------------------------------------
commit 9583e4166d02e160873daaaceb2f8dfe62e49659
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 20 18:43:24 2016 +0200

    apps/apps.c: include sys/socket.h to declare recv()
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit a19228b7f4fc6fcb49713455b3caedbc24fb0b01)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/apps.c b/apps/apps.c
index 44d8afa..9fdc3e0 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -3238,6 +3238,8 @@ int raw_read_stdin(void *buf, int siz)
         return (-1);
 }
 #elif defined(__VMS)
+#include <sys/socket.h>
+
 int raw_read_stdin(void *buf, int siz)
 {
     return recv(fileno_stdin(), buf, siz, 0);

From rsalz at openssl.org  Wed Sep 21 14:37:27 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 14:37:27 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474468647.608434.1939.nullmailer@dev.openssl.org>

The branch master has been updated
       via  4588cb4443552f1d251a637b48f39d891051ee1c (commit)
      from  780bbb96bf514f0b4013e9c5725614ba5153c497 (commit)


- Log -----------------------------------------------------------------
commit 4588cb4443552f1d251a637b48f39d891051ee1c
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 21 10:37:03 2016 -0400

    Revert "Constify code about X509_VERIFY_PARAM"
    
    This reverts commit 81f9ce1e1965e0e33db6d2391285c4c1b6af0434.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_vpm.c                     | 4 ++--
 doc/crypto/X509_VERIFY_PARAM_set_flags.pod | 4 ++--
 doc/ssl/SSL_set1_host.pod                  | 2 +-
 include/openssl/ssl.h                      | 2 +-
 include/openssl/x509_vfy.h                 | 4 ++--
 ssl/ssl_lib.c                              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 2ea39c8..05c7852 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -301,7 +301,7 @@ int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
     return 1;
 }
 
-unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param)
+unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param)
 {
     return param->flags;
 }
@@ -396,7 +396,7 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
     param->hostflags = flags;
 }
 
-const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param)
+char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param)
 {
     return param->peername;
 }
diff --git a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
index 528a53a..2800cd4 100644
--- a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
+++ b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
@@ -12,7 +12,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge
                                         unsigned long flags);
  int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
                                         unsigned long flags);
- unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);
+ unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
 
  int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
  int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
@@ -37,7 +37,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge
                                  const char *name, size_t namelen);
  void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
                                       unsigned int flags);
- const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param);
+ char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param);
  int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
                                  const char *email, size_t emaillen);
  int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
diff --git a/doc/ssl/SSL_set1_host.pod b/doc/ssl/SSL_set1_host.pod
index d254fe7..3339a0e 100644
--- a/doc/ssl/SSL_set1_host.pod
+++ b/doc/ssl/SSL_set1_host.pod
@@ -12,7 +12,7 @@ SSL server verification parameters
  int SSL_set1_host(SSL *s, const char *hostname);
  int SSL_add1_host(SSL *s, const char *hostname);
  void SSL_set_hostflags(SSL *s, unsigned int flags);
- const char *SSL_get0_peername(const SSL *s);
+ const char *SSL_get0_peername(SSL *s);
 
 =head1 DESCRIPTION
 
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 5355c83..183296c 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1493,7 +1493,7 @@ __owur int SSL_set_trust(SSL *s, int trust);
 
 __owur int SSL_set1_host(SSL *s, const char *hostname);
 __owur int SSL_add1_host(SSL *s, const char *hostname);
-__owur const char *SSL_get0_peername(const SSL *s);
+__owur const char *SSL_get0_peername(SSL *s);
 void SSL_set_hostflags(SSL *s, unsigned int flags);
 
 __owur int SSL_CTX_dane_enable(SSL_CTX *ctx);
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index 12984f0..cab8005 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -453,7 +453,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
                                 unsigned long flags);
 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
                                   unsigned long flags);
-unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);
+unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
 int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
 void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
@@ -470,7 +470,7 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
                                 const char *name, size_t namelen);
 void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
                                      unsigned int flags);
-const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *);
+char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *);
 void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);
 int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
                                  const char *email, size_t emaillen);
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 27a16ef..bd0fbf8 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -795,7 +795,7 @@ void SSL_set_hostflags(SSL *s, unsigned int flags)
     X509_VERIFY_PARAM_set_hostflags(s->param, flags);
 }
 
-const char *SSL_get0_peername(const SSL *s)
+const char *SSL_get0_peername(SSL *s)
 {
     return X509_VERIFY_PARAM_get0_peername(s->param);
 }

From rsalz at openssl.org  Wed Sep 21 14:39:41 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 14:39:41 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474468781.879090.3178.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  64d1cc09f912fdc92b12588cc9ad189978051a3e (commit)
      from  6bdd2637daa862706598d04ae2750a920ebee0ae (commit)


- Log -----------------------------------------------------------------
commit 64d1cc09f912fdc92b12588cc9ad189978051a3e
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Sep 14 00:51:02 2016 +0100

    Use switch instead of multiple ifs
    
    Makes the logic a little bit clearer.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1571)
    (cherry picked from commit 4f8a5f4da94bb70e06cf709beb1ddfa57a218c3d)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 3df4ce6..df30085 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -566,22 +566,24 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
             /* Discard the packet data */
             s->init_num = 0;
 
-            if (ret == MSG_PROCESS_ERROR) {
+            switch (ret) {
+            case MSG_PROCESS_ERROR:
                 return SUB_STATE_ERROR;
-            }
 
-            if (ret == MSG_PROCESS_FINISHED_READING) {
+            case MSG_PROCESS_FINISHED_READING:
                 if (SSL_IS_DTLS(s)) {
                     dtls1_stop_timer(s);
                 }
                 return SUB_STATE_FINISHED;
-            }
 
-            if (ret == MSG_PROCESS_CONTINUE_PROCESSING) {
+            case MSG_PROCESS_CONTINUE_PROCESSING:
                 st->read_state = READ_STATE_POST_PROCESS;
                 st->read_state_work = WORK_MORE_A;
-            } else {
+                break;
+
+            default:
                 st->read_state = READ_STATE_HEADER;
+                break;
             }
             break;
 

From rsalz at openssl.org  Wed Sep 21 14:40:58 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 14:40:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474468858.295384.3718.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6fcace45bda108ad4d3f95261494dd479720d92c (commit)
      from  4588cb4443552f1d251a637b48f39d891051ee1c (commit)


- Log -----------------------------------------------------------------
commit 6fcace45bda108ad4d3f95261494dd479720d92c
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 9 10:52:59 2016 -0400

    GH1555: Don't bump size on realloc failure
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/lhash/lhash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 19c6d2c..adde832 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -213,8 +213,8 @@ static int expand(OPENSSL_LHASH *lh)
         j = (int)lh->num_alloc_nodes * 2;
         n = OPENSSL_realloc(lh->b, (int)(sizeof(OPENSSL_LH_NODE *) * j));
         if (n == NULL) {
-            /* fputs("realloc error in lhash",stderr); */
             lh->error++;
+            lh->num_nodes--;
             lh->p = 0;
             return 0;
         }

From rsalz at openssl.org  Wed Sep 21 14:41:25 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 14:41:25 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474468885.030515.4561.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  bf0404fe4afe9ed1e09e11b2b8f82b9ec127de91 (commit)
      from  64d1cc09f912fdc92b12588cc9ad189978051a3e (commit)


- Log -----------------------------------------------------------------
commit bf0404fe4afe9ed1e09e11b2b8f82b9ec127de91
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 9 10:52:59 2016 -0400

    GH1555: Don't bump size on realloc failure
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 6fcace45bda108ad4d3f95261494dd479720d92c)

-----------------------------------------------------------------------

Summary of changes:
 crypto/lhash/lhash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 19c6d2c..adde832 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -213,8 +213,8 @@ static int expand(OPENSSL_LHASH *lh)
         j = (int)lh->num_alloc_nodes * 2;
         n = OPENSSL_realloc(lh->b, (int)(sizeof(OPENSSL_LH_NODE *) * j));
         if (n == NULL) {
-            /* fputs("realloc error in lhash",stderr); */
             lh->error++;
+            lh->num_nodes--;
             lh->p = 0;
             return 0;
         }

From rsalz at openssl.org  Wed Sep 21 14:42:39 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 14:42:39 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474468959.840264.5169.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  ceb7342dab3ab0827b3e13dd9a367d31c7bc3f43 (commit)
      from  9583e4166d02e160873daaaceb2f8dfe62e49659 (commit)


- Log -----------------------------------------------------------------
commit ceb7342dab3ab0827b3e13dd9a367d31c7bc3f43
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 9 10:52:59 2016 -0400

    GH1555: Don't bump size on realloc failure
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 6fcace45bda108ad4d3f95261494dd479720d92c)

-----------------------------------------------------------------------

Summary of changes:
 crypto/lhash/lhash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 53c5c13..f20353a 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -335,8 +335,8 @@ static void expand(_LHASH *lh)
         n = (LHASH_NODE **)OPENSSL_realloc(lh->b,
                                            (int)(sizeof(LHASH_NODE *) * j));
         if (n == NULL) {
-/*                      fputs("realloc error in lhash",stderr); */
             lh->error++;
+            lh->num_nodes--;
             lh->p = 0;
             return;
         }

From openssl.sanity at gmail.com  Wed Sep 21 15:12:41 2016
From: openssl.sanity at gmail.com (openssl.sanity at gmail.com)
Date: Wed, 21 Sep 2016 15:12:41 +0000 (UTC)
Subject: [openssl-commits] Jenkins build is back to normal :
	master_make_errors #1992
In-Reply-To: <2093092233.55.1474463583986.JavaMail.jenkins@ossl-sanity.cisco.com>
References: <2093092233.55.1474463583986.JavaMail.jenkins@ossl-sanity.cisco.com>
Message-ID: <283354274.56.1474470762073.JavaMail.jenkins@ossl-sanity.cisco.com>

See <https://openssl-sanity.cisco.com:8443/job/master_make_errors/1992/changes>


From rsalz at openssl.org  Wed Sep 21 15:23:36 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 15:23:36 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474471416.175785.14008.nullmailer@dev.openssl.org>

The branch master has been updated
       via  776e15f9393a9e3083bec60a8da376ce2fe1e97e (commit)
      from  6fcace45bda108ad4d3f95261494dd479720d92c (commit)


- Log -----------------------------------------------------------------
commit 776e15f9393a9e3083bec60a8da376ce2fe1e97e
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 21 10:59:15 2016 -0400

    Dcoument -alpn flag
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 9 +++++++--
 doc/apps/s_server.pod | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 34dcd29..7ad9811 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -95,6 +95,7 @@ B<openssl> B<s_client>
 [B<-rand file(s)>]
 [B<-serverinfo types>]
 [B<-status>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 [B<-ct|noct>]
 [B<-ctlogfile>]
@@ -472,9 +473,13 @@ file.
 sends a certificate status request to the server (OCSP stapling). The server
 response (if any) is printed out.
 
-=item B<-nextprotoneg protocols>
+=item B<-alpn protocols>, B<-nextprotoneg protocols>
 
-enable Next Protocol Negotiation TLS extension and provide a list of
+these flags enable the 
+Enable the Application-Layer Protocol Negotiation or Next Protocol
+Negotiation extension, respectively. ALPN is the IETF standard and
+replaces NPN.
+The B<protocols> list is a
 comma-separated protocol names that the client should advertise
 support for. The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index bf4a4ab..b0d7888 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -100,6 +100,7 @@ B<openssl> B<s_server>
 [B<-status_verbose>]
 [B<-status_timeout nsec>]
 [B<-status_url url>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 
 =head1 DESCRIPTION
@@ -471,9 +472,13 @@ Sets a fallback responder URL to use if no responder URL is present in the
 server certificate. Without this option an error is returned if the server
 certificate does not contain a responder address.
 
-=item B<-nextprotoneg protocols>
+=item B<-alpn protocols>, B<-nextprotoneg protocols>
 
-Enable Next Protocol Negotiation TLS extension and provide a
+these flags enable the 
+Enable the Application-Layer Protocol Negotiation or Next Protocol
+Negotiation extension, respectively. ALPN is the IETF standard and
+replaces NPN.
+The B<protocols> list is a
 comma-separated list of supported protocol names.
 The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or

From rsalz at openssl.org  Wed Sep 21 15:23:45 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 15:23:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474471425.651357.14918.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  7b368cd6d964da817cd1de85fc0cae74372e0966 (commit)
      from  bf0404fe4afe9ed1e09e11b2b8f82b9ec127de91 (commit)


- Log -----------------------------------------------------------------
commit 7b368cd6d964da817cd1de85fc0cae74372e0966
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 21 10:59:15 2016 -0400

    Dcoument -alpn flag
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 776e15f9393a9e3083bec60a8da376ce2fe1e97e)

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 9 +++++++--
 doc/apps/s_server.pod | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 34dcd29..7ad9811 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -95,6 +95,7 @@ B<openssl> B<s_client>
 [B<-rand file(s)>]
 [B<-serverinfo types>]
 [B<-status>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 [B<-ct|noct>]
 [B<-ctlogfile>]
@@ -472,9 +473,13 @@ file.
 sends a certificate status request to the server (OCSP stapling). The server
 response (if any) is printed out.
 
-=item B<-nextprotoneg protocols>
+=item B<-alpn protocols>, B<-nextprotoneg protocols>
 
-enable Next Protocol Negotiation TLS extension and provide a list of
+these flags enable the 
+Enable the Application-Layer Protocol Negotiation or Next Protocol
+Negotiation extension, respectively. ALPN is the IETF standard and
+replaces NPN.
+The B<protocols> list is a
 comma-separated protocol names that the client should advertise
 support for. The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index bf4a4ab..b0d7888 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -100,6 +100,7 @@ B<openssl> B<s_server>
 [B<-status_verbose>]
 [B<-status_timeout nsec>]
 [B<-status_url url>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 
 =head1 DESCRIPTION
@@ -471,9 +472,13 @@ Sets a fallback responder URL to use if no responder URL is present in the
 server certificate. Without this option an error is returned if the server
 certificate does not contain a responder address.
 
-=item B<-nextprotoneg protocols>
+=item B<-alpn protocols>, B<-nextprotoneg protocols>
 
-Enable Next Protocol Negotiation TLS extension and provide a
+these flags enable the 
+Enable the Application-Layer Protocol Negotiation or Next Protocol
+Negotiation extension, respectively. ALPN is the IETF standard and
+replaces NPN.
+The B<protocols> list is a
 comma-separated list of supported protocol names.
 The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or

From rsalz at openssl.org  Wed Sep 21 15:25:33 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 21 Sep 2016 15:25:33 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474471533.171566.16026.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  62841a2350f76a5207376d581acec319196447d7 (commit)
      from  ceb7342dab3ab0827b3e13dd9a367d31c7bc3f43 (commit)


- Log -----------------------------------------------------------------
commit 62841a2350f76a5207376d581acec319196447d7
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 21 10:59:15 2016 -0400

    Dcoument -alpn flag
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 776e15f9393a9e3083bec60a8da376ce2fe1e97e)

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 9 +++++++--
 doc/apps/s_server.pod | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 618df96..29675dd 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -53,6 +53,7 @@ B<openssl> B<s_client>
 [B<-rand file(s)>]
 [B<-serverinfo types>]
 [B<-status>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 
 =head1 DESCRIPTION
@@ -277,9 +278,13 @@ file.
 sends a certificate status request to the server (OCSP stapling). The server
 response (if any) is printed out.
 
-=item B<-nextprotoneg protocols>
+=item B<-alpn protocols>, B<-nextprotoneg protocols>
 
-enable Next Protocol Negotiation TLS extension and provide a list of
+these flags enable the 
+Enable the Application-Layer Protocol Negotiation or Next Protocol
+Negotiation extension, respectively. ALPN is the IETF standard and
+replaces NPN.
+The B<protocols> list is a
 comma-separated protocol names that the client should advertise
 support for. The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index 6f4acb7..fa17488 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -62,6 +62,7 @@ B<openssl> B<s_server>
 [B<-status_verbose>]
 [B<-status_timeout nsec>]
 [B<-status_url url>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 
 =head1 DESCRIPTION
@@ -327,9 +328,13 @@ sets a fallback responder URL to use if no responder URL is present in the
 server certificate. Without this option an error is returned if the server
 certificate does not contain a responder address.
 
-=item B<-nextprotoneg protocols>
+=item B<-alpn protocols>, B<-nextprotoneg protocols>
 
-enable Next Protocol Negotiation TLS extension and provide a
+these flags enable the 
+Enable the Application-Layer Protocol Negotiation or Next Protocol
+Negotiation extension, respectively. ALPN is the IETF standard and
+replaces NPN.
+The B<protocols> list is a
 comma-separated list of supported protocol names.
 The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or

From builds at travis-ci.org  Wed Sep 21 15:27:07 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 15:27:07 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6107 (master - 3c10632)
In-Reply-To: <openssl/openssl+161626720+fixed@travis-ci.org>
Message-ID: <57e2a6e2c237c_33f8866396100128459@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6107
Status: Fixed

Duration: 41 minutes and 14 seconds
Commit: 3c10632 (master)
Author: Matt Caswell
Message: make update and fix some associated mis-matched error codes

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/1ff7425d6130...3c106325292d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161626720

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/0a6f6917/attachment.html>

From builds at travis-ci.org  Wed Sep 21 16:07:26 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 16:07:26 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6108 (master - 780bbb9)
In-Reply-To: <openssl/openssl+161640962+fixed@travis-ci.org>
Message-ID: <57e2b03ec0004_33f8866393edc1638b6@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6108
Status: Fixed

Duration: 31 minutes and 12 seconds
Commit: 780bbb9 (master)
Author: Richard Levitte
Message: test/x509aux.c: Fix argv loop

There are cases when argc is more trustable than proper argv termination.
Since we trust argc in all other test programs, we might as well treat it
the same way in this program.

Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/3c106325292d...780bbb96bf51

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161640962

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/4f3160e0/attachment.html>

From builds at travis-ci.org  Wed Sep 21 17:57:36 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 17:57:36 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6110 (master - 4588cb4)
In-Reply-To: <openssl/openssl+161646582+fixed@travis-ci.org>
Message-ID: <57e2ca10156da_33feed0faa178384948@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6110
Status: Fixed

Duration: 4 minutes and 48 seconds
Commit: 4588cb4 (master)
Author: Rich Salz
Message: Revert "Constify code about X509_VERIFY_PARAM"

This reverts commit 81f9ce1e1965e0e33db6d2391285c4c1b6af0434.

Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/780bbb96bf51...4588cb444355

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161646582

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/6742b9c6/attachment-0001.html>

From steve at openssl.org  Wed Sep 21 18:58:18 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 21 Sep 2016 18:58:18 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474484298.814295.2725.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  006a788c84e541c8920dd2ad85fb62b52185c519 (commit)
       via  bc9563f83d28342b5ec0073ec12d9e581e4f3317 (commit)
       via  709ec8b3848e2ac201b86f49c5561debb8572ccd (commit)
      from  62841a2350f76a5207376d581acec319196447d7 (commit)


- Log -----------------------------------------------------------------
commit 006a788c84e541c8920dd2ad85fb62b52185c519
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 13:26:01 2016 +0100

    Make message buffer slightly larger than message.
    
    Grow TLS/DTLS 16 bytes more than strictly necessary as a precaution against
    OOB reads. In most cases this will have no effect because the message buffer
    will be large enough already.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit bc9563f83d28342b5ec0073ec12d9e581e4f3317
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 12:54:13 2016 +0100

    Use SSL3_HM_HEADER_LENGTH instead of 4.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 709ec8b3848e2ac201b86f49c5561debb8572ccd
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 12:57:01 2016 +0100

    Remove unnecessary check.
    
    The overflow check will never be triggered because the
    the n2l3 result is always less than 2^24.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_both.c |  5 ++++-
 ssl/s3_both.c | 35 ++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 46c70d8..9bc6153 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -581,9 +581,12 @@ static int dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr,
         /*
          * msg_len is limited to 2^24, but is effectively checked against max
          * above
+         *
+         * Make buffer slightly larger than message length as a precaution
+         * against small OOB reads e.g. CVE-2016-6306
          */
         if (!BUF_MEM_grow_clean
-            (s->init_buf, msg_len + DTLS1_HM_HEADER_LENGTH)) {
+            (s->init_buf, msg_len + DTLS1_HM_HEADER_LENGTH + 16)) {
             SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT, ERR_R_BUF_LIB);
             return SSL_AD_INTERNAL_ERROR;
         }
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 4b636b0..054ded1 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -356,21 +356,22 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
         }
         *ok = 1;
         s->state = stn;
-        s->init_msg = s->init_buf->data + 4;
+        s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
         s->init_num = (int)s->s3->tmp.message_size;
         return s->init_num;
     }
 
     p = (unsigned char *)s->init_buf->data;
 
-    if (s->state == st1) {      /* s->init_num < 4 */
+    if (s->state == st1) {      /* s->init_num < SSL3_HM_HEADER_LENGTH */
         int skip_message;
 
         do {
-            while (s->init_num < 4) {
+            while (s->init_num < SSL3_HM_HEADER_LENGTH) {
                 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
                                               &p[s->init_num],
-                                              4 - s->init_num, 0);
+                                              SSL3_HM_HEADER_LENGTH -
+                                              s->init_num, 0);
                 if (i <= 0) {
                     s->rwstate = SSL_READING;
                     *ok = 0;
@@ -394,12 +395,13 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 
                         if (s->msg_callback)
                             s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                                            p, 4, s, s->msg_callback_arg);
+                                            p, SSL3_HM_HEADER_LENGTH, s,
+                                            s->msg_callback_arg);
                     }
         }
         while (skip_message);
 
-        /* s->init_num == 4 */
+        /* s->init_num == SSL3_HM_HEADER_LENGTH */
 
         if ((mt >= 0) && (*p != mt)) {
             al = SSL_AD_UNEXPECTED_MESSAGE;
@@ -415,19 +417,20 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
             SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
             goto f_err;
         }
-        if (l > (INT_MAX - 4)) { /* BUF_MEM_grow takes an 'int' parameter */
-            al = SSL_AD_ILLEGAL_PARAMETER;
-            SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
-            goto f_err;
-        }
-        if (l && !BUF_MEM_grow_clean(s->init_buf, (int)l + 4)) {
+        /*
+         * Make buffer slightly larger than message length as a precaution
+         * against small OOB reads e.g. CVE-2016-6306
+         */
+        if (l
+            && !BUF_MEM_grow_clean(s->init_buf,
+                                   (int)l + SSL3_HM_HEADER_LENGTH + 16)) {
             SSLerr(SSL_F_SSL3_GET_MESSAGE, ERR_R_BUF_LIB);
             goto err;
         }
         s->s3->tmp.message_size = l;
         s->state = stn;
 
-        s->init_msg = s->init_buf->data + 4;
+        s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
         s->init_num = 0;
     }
 
@@ -456,10 +459,12 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 #endif
 
     /* Feed this message into MAC computation. */
-    ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4);
+    ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
+                    s->init_num + SSL3_HM_HEADER_LENGTH);
     if (s->msg_callback)
         s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data,
-                        (size_t)s->init_num + 4, s, s->msg_callback_arg);
+                        (size_t)s->init_num + SSL3_HM_HEADER_LENGTH, s,
+                        s->msg_callback_arg);
     *ok = 1;
     return s->init_num;
  f_err:

From appro at openssl.org  Wed Sep 21 19:09:30 2016
From: appro at openssl.org (Andy Polyakov)
Date: Wed, 21 Sep 2016 19:09:30 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474484970.599480.7818.nullmailer@dev.openssl.org>

The branch master has been updated
       via  7dc0ad4d6dca81a003be7fa1fbd58a55f4be8646 (commit)
       via  ba8fa4e53a35a0c46d1e0e81a4d270a026fac2b9 (commit)
       via  799c1293fcf412db64dcc8a09a6b11cc755914dc (commit)
      from  776e15f9393a9e3083bec60a8da376ce2fe1e97e (commit)


- Log -----------------------------------------------------------------
commit 7dc0ad4d6dca81a003be7fa1fbd58a55f4be8646
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Sep 20 17:08:03 2016 +0200

    rand/randfile.c: treat empty string in RAND_file_name as error.
    
    Suggested in GH#1589.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ba8fa4e53a35a0c46d1e0e81a4d270a026fac2b9
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Sep 20 17:06:58 2016 +0200

    rand/randfile.c: rationalize __OpenBSD__ code path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 799c1293fcf412db64dcc8a09a6b11cc755914dc
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Sep 20 16:59:32 2016 +0200

    rand/randfile.c: restore fallback to $HOME for non-setuid programs.
    
    Reported in GH#1589, but solution is different from suggested.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/randfile.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 7aeb871..c96383a 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -316,12 +316,14 @@ const char *RAND_file_name(char *buf, size_t size)
         }
     }
 #else
-    if (OPENSSL_issetugid() == 0) {
-        s = getenv("RANDFILE");
-    } else {
+    if (OPENSSL_issetugid() != 0) {
         use_randfile = 0;
-        if (OPENSSL_issetugid() == 0)
+    } else {
+        s = getenv("RANDFILE");
+        if (s == NULL || *s == '\0') {
+            use_randfile = 0;
             s = getenv("HOME");
+        }
     }
 #endif
 #ifdef DEFAULT_HOME
@@ -355,14 +357,10 @@ const char *RAND_file_name(char *buf, size_t size)
      * available.
      */
 
-    if (!buf[0])
-        if (OPENSSL_strlcpy(buf, "/dev/arandom", size) >= size) {
-            return NULL;
-        }
-    if (stat(buf, &sb) == -1)
+    if (!buf[0] || stat(buf, &sb) == -1)
         if (OPENSSL_strlcpy(buf, "/dev/arandom", size) >= size) {
             return NULL;
         }
 #endif
-    return buf;
+    return buf[0] ? buf : NULL;
 }

From appro at openssl.org  Wed Sep 21 19:10:38 2016
From: appro at openssl.org (Andy Polyakov)
Date: Wed, 21 Sep 2016 19:10:38 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474485038.303659.9152.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  e7498968e229a4ec27702a3703826873a279a07b (commit)
       via  13af417ba4f6b826833d4b1f6caa39c4e0013d6f (commit)
       via  098dc9be439e5bc3625e01c4092bedc072498da9 (commit)
      from  7b368cd6d964da817cd1de85fc0cae74372e0966 (commit)


- Log -----------------------------------------------------------------
commit e7498968e229a4ec27702a3703826873a279a07b
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Sep 20 17:08:03 2016 +0200

    rand/randfile.c: treat empty string in RAND_file_name as error.
    
    Suggested in GH#1589.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 7dc0ad4d6dca81a003be7fa1fbd58a55f4be8646)

commit 13af417ba4f6b826833d4b1f6caa39c4e0013d6f
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Sep 20 17:06:58 2016 +0200

    rand/randfile.c: rationalize __OpenBSD__ code path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit ba8fa4e53a35a0c46d1e0e81a4d270a026fac2b9)

commit 098dc9be439e5bc3625e01c4092bedc072498da9
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Sep 20 16:59:32 2016 +0200

    rand/randfile.c: restore fallback to $HOME for non-setuid programs.
    
    Reported in GH#1589, but solution is different from suggested.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 799c1293fcf412db64dcc8a09a6b11cc755914dc)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/randfile.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 7aeb871..c96383a 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -316,12 +316,14 @@ const char *RAND_file_name(char *buf, size_t size)
         }
     }
 #else
-    if (OPENSSL_issetugid() == 0) {
-        s = getenv("RANDFILE");
-    } else {
+    if (OPENSSL_issetugid() != 0) {
         use_randfile = 0;
-        if (OPENSSL_issetugid() == 0)
+    } else {
+        s = getenv("RANDFILE");
+        if (s == NULL || *s == '\0') {
+            use_randfile = 0;
             s = getenv("HOME");
+        }
     }
 #endif
 #ifdef DEFAULT_HOME
@@ -355,14 +357,10 @@ const char *RAND_file_name(char *buf, size_t size)
      * available.
      */
 
-    if (!buf[0])
-        if (OPENSSL_strlcpy(buf, "/dev/arandom", size) >= size) {
-            return NULL;
-        }
-    if (stat(buf, &sb) == -1)
+    if (!buf[0] || stat(buf, &sb) == -1)
         if (OPENSSL_strlcpy(buf, "/dev/arandom", size) >= size) {
             return NULL;
         }
 #endif
-    return buf;
+    return buf[0] ? buf : NULL;
 }

From steve at openssl.org  Wed Sep 21 19:12:12 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 21 Sep 2016 19:12:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1474485132.172877.10454.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  bb1a4866034255749ac578adb06a76335fc117b1 (commit)
       via  8289755d54e4cf34d502c630613d1dba60e30830 (commit)
       via  aa388af1e18988894a48b8f64ae994eaa4366d5d (commit)
      from  52e623c4cb06fffa9d5e75c60b34b4bc130b12e9 (commit)


- Log -----------------------------------------------------------------
commit bb1a4866034255749ac578adb06a76335fc117b1
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 13:26:01 2016 +0100

    Make message buffer slightly larger than message.
    
    Grow TLS/DTLS 16 bytes more than strictly necessary as a precaution against
    OOB reads. In most cases this will have no effect because the message buffer
    will be large enough already.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 006a788c84e541c8920dd2ad85fb62b52185c519)

commit 8289755d54e4cf34d502c630613d1dba60e30830
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 12:54:13 2016 +0100

    Use SSL3_HM_HEADER_LENGTH instead of 4.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit bc9563f83d28342b5ec0073ec12d9e581e4f3317)

commit aa388af1e18988894a48b8f64ae994eaa4366d5d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 12:57:01 2016 +0100

    Remove unnecessary check.
    
    The overflow check will never be triggered because the
    the n2l3 result is always less than 2^24.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 709ec8b3848e2ac201b86f49c5561debb8572ccd)

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_both.c |  5 ++++-
 ssl/s3_both.c | 35 ++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index ae292c4..0cf1e49 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -577,9 +577,12 @@ static int dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr,
         /*
          * msg_len is limited to 2^24, but is effectively checked against max
          * above
+         *
+         * Make buffer slightly larger than message length as a precaution
+         * against small OOB reads e.g. CVE-2016-6306
          */
         if (!BUF_MEM_grow_clean
-            (s->init_buf, msg_len + DTLS1_HM_HEADER_LENGTH)) {
+            (s->init_buf, msg_len + DTLS1_HM_HEADER_LENGTH + 16)) {
             SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT, ERR_R_BUF_LIB);
             return SSL_AD_INTERNAL_ERROR;
         }
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index c51fc6e..d798d83 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -427,21 +427,22 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
         }
         *ok = 1;
         s->state = stn;
-        s->init_msg = s->init_buf->data + 4;
+        s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
         s->init_num = (int)s->s3->tmp.message_size;
         return s->init_num;
     }
 
     p = (unsigned char *)s->init_buf->data;
 
-    if (s->state == st1) {      /* s->init_num < 4 */
+    if (s->state == st1) {      /* s->init_num < SSL3_HM_HEADER_LENGTH */
         int skip_message;
 
         do {
-            while (s->init_num < 4) {
+            while (s->init_num < SSL3_HM_HEADER_LENGTH) {
                 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
                                               &p[s->init_num],
-                                              4 - s->init_num, 0);
+                                              SSL3_HM_HEADER_LENGTH -
+                                              s->init_num, 0);
                 if (i <= 0) {
                     s->rwstate = SSL_READING;
                     *ok = 0;
@@ -465,12 +466,13 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 
                         if (s->msg_callback)
                             s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                                            p, 4, s, s->msg_callback_arg);
+                                            p, SSL3_HM_HEADER_LENGTH, s,
+                                            s->msg_callback_arg);
                     }
         }
         while (skip_message);
 
-        /* s->init_num == 4 */
+        /* s->init_num == SSL3_HM_HEADER_LENGTH */
 
         if ((mt >= 0) && (*p != mt)) {
             al = SSL_AD_UNEXPECTED_MESSAGE;
@@ -497,19 +499,20 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
             SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
             goto f_err;
         }
-        if (l > (INT_MAX - 4)) { /* BUF_MEM_grow takes an 'int' parameter */
-            al = SSL_AD_ILLEGAL_PARAMETER;
-            SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
-            goto f_err;
-        }
-        if (l && !BUF_MEM_grow_clean(s->init_buf, (int)l + 4)) {
+        /*
+         * Make buffer slightly larger than message length as a precaution
+         * against small OOB reads e.g. CVE-2016-6306
+         */
+        if (l
+            && !BUF_MEM_grow_clean(s->init_buf,
+                                   (int)l + SSL3_HM_HEADER_LENGTH + 16)) {
             SSLerr(SSL_F_SSL3_GET_MESSAGE, ERR_R_BUF_LIB);
             goto err;
         }
         s->s3->tmp.message_size = l;
         s->state = stn;
 
-        s->init_msg = s->init_buf->data + 4;
+        s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
         s->init_num = 0;
     }
 
@@ -538,10 +541,12 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 #endif
 
     /* Feed this message into MAC computation. */
-    ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4);
+    ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
+                    s->init_num + SSL3_HM_HEADER_LENGTH);
     if (s->msg_callback)
         s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data,
-                        (size_t)s->init_num + 4, s, s->msg_callback_arg);
+                        (size_t)s->init_num + SSL3_HM_HEADER_LENGTH, s,
+                        s->msg_callback_arg);
     *ok = 1;
     return s->init_num;
  f_err:

From matt at openssl.org  Wed Sep 21 19:23:44 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:23:44 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474485824.313253.15570.nullmailer@dev.openssl.org>

The branch master has been updated
       via  af58be768ebb690f78530f796e92b8ae5c9a4401 (commit)
      from  7dc0ad4d6dca81a003be7fa1fbd58a55f4be8646 (commit)


- Log -----------------------------------------------------------------
commit af58be768ebb690f78530f796e92b8ae5c9a4401
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 14:07:31 2016 +0100

    Don't allow too many consecutive warning alerts
    
    Certain warning alerts are ignored if they are received. This can mean that
    no progress will be made if one peer continually sends those warning alerts.
    Implement a count so that we abort the connection if we receive too many.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h     |  1 +
 ssl/record/rec_layer_d1.c | 16 ++++++++++++++++
 ssl/record/rec_layer_s3.c | 16 ++++++++++++++++
 ssl/record/record.h       |  2 ++
 ssl/record/record_locl.h  |  2 ++
 ssl/ssl_err.c             |  1 +
 6 files changed, 38 insertions(+)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 183296c..d127c76 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2485,6 +2485,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_R_TLS_HEARTBEAT_PENDING                      366
 # define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
 # define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
+# define SSL_R_TOO_MANY_WARN_ALERTS                       409
 # define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS             314
 # define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
 # define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index cd582f3..2455c2b 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -443,6 +443,14 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
         }
     }
 
+    /*
+     * Reset the count of consecutive warning alerts if we've got a non-empty
+     * record that isn't an alert.
+     */
+    if (SSL3_RECORD_get_type(rr) != SSL3_RT_ALERT
+            && SSL3_RECORD_get_length(rr) != 0)
+        s->rlayer.alert_count = 0;
+
     /* we now have a packet which can be read and processed */
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -722,6 +730,14 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
 
         if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
+
+            s->rlayer.alert_count++;
+            if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+                goto f_err;
+            }
+
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
                 /*
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 46870c0..abde9d4 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1063,6 +1063,14 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
     } while (num_recs == 0);
     rr = &rr[curr_rec];
 
+    /*
+     * Reset the count of consecutive warning alerts if we've got a non-empty
+     * record that isn't an alert.
+     */
+    if (SSL3_RECORD_get_type(rr) != SSL3_RT_ALERT
+            && SSL3_RECORD_get_length(rr) != 0)
+        s->rlayer.alert_count = 0;
+
     /* we now have a packet which can be read and processed */
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -1333,6 +1341,14 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
         if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             SSL3_RECORD_set_read(rr);
+
+            s->rlayer.alert_count++;
+            if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+                goto f_err;
+            }
+
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
                 return (0);
diff --git a/ssl/record/record.h b/ssl/record/record.h
index a093aed..3e1530f 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -178,6 +178,8 @@ typedef struct record_layer_st {
     unsigned char write_sequence[SEQ_NUM_SIZE];
     /* Set to true if this is the first record in a connection */
     unsigned int is_first_record;
+    /* Count of the number of consecutive warning alerts received */
+    unsigned int alert_count;
     DTLS_RECORD_LAYER *d;
 } RECORD_LAYER;
 
diff --git a/ssl/record/record_locl.h b/ssl/record/record_locl.h
index 52e59e4..b69afd8 100644
--- a/ssl/record/record_locl.h
+++ b/ssl/record/record_locl.h
@@ -14,6 +14,8 @@
  *                                                                           *
  *****************************************************************************/
 
+#define MAX_WARN_ALERT_COUNT    5
+
 /* Functions/macros provided by the RECORD_LAYER component */
 
 #define RECORD_LAYER_get_rbuf(rl)               (&(rl)->rbuf)
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index bba7cdb..ec550be 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -617,6 +617,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "tls illegal exporter label"},
     {ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),
      "tls invalid ecpointformat list"},
+    {ERR_REASON(SSL_R_TOO_MANY_WARN_ALERTS), "too many warn alerts"},
     {ERR_REASON(SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS),
      "unable to find ecdh parameters"},
     {ERR_REASON(SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),

From matt at openssl.org  Wed Sep 21 19:23:55 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:23:55 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474485835.349604.16383.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  6915f39e68f02ad08a635516d46e72bbf0379914 (commit)
      from  e7498968e229a4ec27702a3703826873a279a07b (commit)


- Log -----------------------------------------------------------------
commit 6915f39e68f02ad08a635516d46e72bbf0379914
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 14:07:31 2016 +0100

    Don't allow too many consecutive warning alerts
    
    Certain warning alerts are ignored if they are received. This can mean that
    no progress will be made if one peer continually sends those warning alerts.
    Implement a count so that we abort the connection if we receive too many.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit af58be768ebb690f78530f796e92b8ae5c9a4401)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h     |  1 +
 ssl/record/rec_layer_d1.c | 16 ++++++++++++++++
 ssl/record/rec_layer_s3.c | 16 ++++++++++++++++
 ssl/record/record.h       |  2 ++
 ssl/record/record_locl.h  |  2 ++
 ssl/ssl_err.c             |  1 +
 6 files changed, 38 insertions(+)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 41cb36e..440b9a0 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2482,6 +2482,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_R_TLS_HEARTBEAT_PENDING                      366
 # define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
 # define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
+# define SSL_R_TOO_MANY_WARN_ALERTS                       409
 # define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS             314
 # define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
 # define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index cd582f3..2455c2b 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -443,6 +443,14 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
         }
     }
 
+    /*
+     * Reset the count of consecutive warning alerts if we've got a non-empty
+     * record that isn't an alert.
+     */
+    if (SSL3_RECORD_get_type(rr) != SSL3_RT_ALERT
+            && SSL3_RECORD_get_length(rr) != 0)
+        s->rlayer.alert_count = 0;
+
     /* we now have a packet which can be read and processed */
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -722,6 +730,14 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
 
         if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
+
+            s->rlayer.alert_count++;
+            if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+                goto f_err;
+            }
+
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
                 /*
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 46870c0..abde9d4 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1063,6 +1063,14 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
     } while (num_recs == 0);
     rr = &rr[curr_rec];
 
+    /*
+     * Reset the count of consecutive warning alerts if we've got a non-empty
+     * record that isn't an alert.
+     */
+    if (SSL3_RECORD_get_type(rr) != SSL3_RT_ALERT
+            && SSL3_RECORD_get_length(rr) != 0)
+        s->rlayer.alert_count = 0;
+
     /* we now have a packet which can be read and processed */
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -1333,6 +1341,14 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
         if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
             SSL3_RECORD_set_read(rr);
+
+            s->rlayer.alert_count++;
+            if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+                goto f_err;
+            }
+
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
                 return (0);
diff --git a/ssl/record/record.h b/ssl/record/record.h
index a093aed..3e1530f 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -178,6 +178,8 @@ typedef struct record_layer_st {
     unsigned char write_sequence[SEQ_NUM_SIZE];
     /* Set to true if this is the first record in a connection */
     unsigned int is_first_record;
+    /* Count of the number of consecutive warning alerts received */
+    unsigned int alert_count;
     DTLS_RECORD_LAYER *d;
 } RECORD_LAYER;
 
diff --git a/ssl/record/record_locl.h b/ssl/record/record_locl.h
index 52e59e4..b69afd8 100644
--- a/ssl/record/record_locl.h
+++ b/ssl/record/record_locl.h
@@ -14,6 +14,8 @@
  *                                                                           *
  *****************************************************************************/
 
+#define MAX_WARN_ALERT_COUNT    5
+
 /* Functions/macros provided by the RECORD_LAYER component */
 
 #define RECORD_LAYER_get_rbuf(rl)               (&(rl)->rbuf)
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 1fddda6..85cb489 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -614,6 +614,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "tls illegal exporter label"},
     {ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),
      "tls invalid ecpointformat list"},
+    {ERR_REASON(SSL_R_TOO_MANY_WARN_ALERTS), "too many warn alerts"},
     {ERR_REASON(SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS),
      "unable to find ecdh parameters"},
     {ERR_REASON(SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),

From matt at openssl.org  Wed Sep 21 19:24:08 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:24:08 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474485848.963833.16752.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  22646a075e75991b4e8f5d67171e45a6aead5b48 (commit)
      from  006a788c84e541c8920dd2ad85fb62b52185c519 (commit)


- Log -----------------------------------------------------------------
commit 22646a075e75991b4e8f5d67171e45a6aead5b48
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 14:48:16 2016 +0100

    Don't allow too many consecutive warning alerts
    
    Certain warning alerts are ignored if they are received. This can mean that
    no progress will be made if one peer continually sends those warning alerts.
    Implement a count so that we abort the connection if we receive too many.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_pkt.c   | 15 +++++++++++++++
 ssl/s3_pkt.c   | 15 +++++++++++++++
 ssl/ssl.h      |  1 +
 ssl/ssl_locl.h |  4 ++++
 4 files changed, 35 insertions(+)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index df2e42e..7a02459 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -951,6 +951,13 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         goto start;
     }
 
+    /*
+     * Reset the count of consecutive warning alerts if we've got a non-empty
+     * record that isn't an alert.
+     */
+    if (rr->type != SSL3_RT_ALERT && rr->length != 0)
+        s->cert->alert_count = 0;
+
     /* we now have a packet which can be read and processed */
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -1217,6 +1224,14 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
+
+            s->cert->alert_count++;
+            if (s->cert->alert_count == MAX_WARN_ALERT_COUNT) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+                goto f_err;
+            }
+
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
                 /*
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index df124cf..be37ef0 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1229,6 +1229,13 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
             return (ret);
     }
 
+    /*
+     * Reset the count of consecutive warning alerts if we've got a non-empty
+     * record that isn't an alert.
+     */
+    if (rr->type != SSL3_RT_ALERT && rr->length != 0)
+        s->cert->alert_count = 0;
+
     /* we now have a packet which can be read and processed */
 
     if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -1443,6 +1450,14 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         if (alert_level == SSL3_AL_WARNING) {
             s->s3->warn_alert = alert_descr;
+
+            s->cert->alert_count++;
+            if (s->cert->alert_count == MAX_WARN_ALERT_COUNT) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+                goto f_err;
+            }
+
             if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
                 return (0);
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 2638755..90aeb0c 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -3107,6 +3107,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
 # define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
 # define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234
+# define SSL_R_TOO_MANY_WARN_ALERTS                       409
 # define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            235
 # define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  236
 # define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS                313
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index e358031..6df725f 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -591,6 +591,8 @@ typedef struct {
  */
 # define SSL_EXT_FLAG_SENT       0x2
 
+# define MAX_WARN_ALERT_COUNT    5
+
 typedef struct {
     custom_ext_method *meths;
     size_t meths_count;
@@ -698,6 +700,8 @@ typedef struct cert_st {
     unsigned char *alpn_proposed;   /* server */
     unsigned int alpn_proposed_len;
     int alpn_sent;                  /* client */
+    /* Count of the number of consecutive warning alerts received */
+    unsigned int alert_count;
 } CERT;
 
 typedef struct sess_cert_st {

From matt at openssl.org  Wed Sep 21 19:32:23 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:32:23 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474486343.376756.20474.nullmailer@dev.openssl.org>

The branch master has been updated
       via  41bff723c6784cc846054a4fd4add6dbec8c2c64 (commit)
      from  af58be768ebb690f78530f796e92b8ae5c9a4401 (commit)


- Log -----------------------------------------------------------------
commit 41bff723c6784cc846054a4fd4add6dbec8c2c64
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 15:49:28 2016 +0100

    Don't leak on an OPENSSL_realloc() failure
    
    If OPENSSL_sk_insert() calls OPENSSL_realloc() and it fails, it was leaking
    the originally allocated memory.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/stack/stack.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 1d01936..43ddf30 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -126,6 +126,7 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
 
     if (st->num_alloc <= (size_t)(st->num + 1)) {
         size_t doub_num_alloc = st->num_alloc * 2;
+        const char **tmpdata;
 
         /* Overflow checks */
         if (doub_num_alloc < st->num_alloc)
@@ -135,17 +136,12 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
         if (doub_num_alloc > SIZE_MAX / sizeof(char *))
             return 0;
 
-        st->data = OPENSSL_realloc((char *)st->data,
-                                   sizeof(char *) * doub_num_alloc);
-        if (st->data == NULL) {
-            /*
-             * Reset these counters to prevent subsequent operations on
-             * (now non-existing) heap memory
-             */
-            st->num_alloc = 0;
-            st->num = 0;
+        tmpdata = OPENSSL_realloc((char *)st->data,
+                                  sizeof(char *) * doub_num_alloc);
+        if (tmpdata == NULL)
             return 0;
-        }
+
+        st->data = tmpdata;
         st->num_alloc = doub_num_alloc;
     }
     if ((loc >= st->num) || (loc < 0)) {

From matt at openssl.org  Wed Sep 21 19:32:38 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:32:38 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474486358.328586.21359.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  1fdeda4cc994845998c9f017d300e6aecc7b5128 (commit)
      from  6915f39e68f02ad08a635516d46e72bbf0379914 (commit)


- Log -----------------------------------------------------------------
commit 1fdeda4cc994845998c9f017d300e6aecc7b5128
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 15:49:28 2016 +0100

    Don't leak on an OPENSSL_realloc() failure
    
    If OPENSSL_sk_insert() calls OPENSSL_realloc() and it fails, it was leaking
    the originally allocated memory.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 41bff723c6784cc846054a4fd4add6dbec8c2c64)

-----------------------------------------------------------------------

Summary of changes:
 crypto/stack/stack.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 1d01936..43ddf30 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -126,6 +126,7 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
 
     if (st->num_alloc <= (size_t)(st->num + 1)) {
         size_t doub_num_alloc = st->num_alloc * 2;
+        const char **tmpdata;
 
         /* Overflow checks */
         if (doub_num_alloc < st->num_alloc)
@@ -135,17 +136,12 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
         if (doub_num_alloc > SIZE_MAX / sizeof(char *))
             return 0;
 
-        st->data = OPENSSL_realloc((char *)st->data,
-                                   sizeof(char *) * doub_num_alloc);
-        if (st->data == NULL) {
-            /*
-             * Reset these counters to prevent subsequent operations on
-             * (now non-existing) heap memory
-             */
-            st->num_alloc = 0;
-            st->num = 0;
+        tmpdata = OPENSSL_realloc((char *)st->data,
+                                  sizeof(char *) * doub_num_alloc);
+        if (tmpdata == NULL)
             return 0;
-        }
+
+        st->data = tmpdata;
         st->num_alloc = doub_num_alloc;
     }
     if ((loc >= st->num) || (loc < 0)) {

From appro at openssl.org  Wed Sep 21 19:39:13 2016
From: appro at openssl.org (Andy Polyakov)
Date: Wed, 21 Sep 2016 19:39:13 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474486753.095011.24030.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  f757ce2a3df9c16c2ddbf83bf1725f6a89bccade (commit)
      from  1fdeda4cc994845998c9f017d300e6aecc7b5128 (commit)


- Log -----------------------------------------------------------------
commit f757ce2a3df9c16c2ddbf83bf1725f6a89bccade
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Sep 1 21:36:13 2016 +0200

    Configure: clarify and refine -static.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 047d97afd97520eae268f6d8a36fbf9a0239a994)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Configure b/Configure
index e919066..04efe67 100755
--- a/Configure
+++ b/Configure
@@ -66,6 +66,22 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx
 # no-sse2	disables IA-32 SSE2 code, above option implies no-sse2
 # no-<cipher>   build without specified algorithm (rsa, idea, rc5, ...)
 # -<xxx> +<xxx> compiler options are passed through
+# -static       while -static is also a pass-through compiler option (and
+#               as such is limited to environments where it's actually
+#               meaningful), it triggers a number configuration options,
+#               namely no-dso, no-pic, no-shared and no-threads. It is
+#               argued that the only reason to produce statically linked
+#               binaries (and in context it means executables linked with
+#               -static flag, and not just executables linked with static
+#               libcrypto.a) is to eliminate dependency on specific run-time,
+#               a.k.a. libc version. The mentioned config options are meant
+#               to achieve just that. Unfortunately on Linux it's impossible
+#               to eliminate the dependency completely for openssl executable
+#               because of getaddrinfo and gethostbyname calls, which can
+#               invoke dynamically loadable library facility anyway to meet
+#               the lookup requests. For this reason on Linux statically
+#               linked openssl executable has rather debugging value than
+#               production quality.
 #
 # DEBUG_SAFESTACK use type-safe stacks to enforce type-safety on stack items
 #		provided to stack calls. Generates unique stack functions for
@@ -715,6 +731,7 @@ foreach (@argvcopy)
 		elsif (/^-static$/)
 			{
 			$libs.=$_." ";
+			$disabled{"dso"} = "forced";
 			$disabled{"pic"} = "forced";
 			$disabled{"shared"} = "forced";
 			$disabled{"threads"} = "forced";

From matt at openssl.org  Wed Sep 21 19:45:21 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:45:21 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474487121.955413.26853.nullmailer@dev.openssl.org>

The branch master has been updated
       via  48c054fec3506417b2598837b8062aae7114c200 (commit)
       via  c1ef7c971d0bbf117c3c80f65b5875e2e7b024b1 (commit)
      from  41bff723c6784cc846054a4fd4add6dbec8c2c64 (commit)


- Log -----------------------------------------------------------------
commit 48c054fec3506417b2598837b8062aae7114c200
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 19 11:57:07 2016 +0100

    Excessive allocation of memory in dtls1_preprocess_fragment()
    
    This issue is very similar to CVE-2016-6307 described in the previous
    commit. The underlying defect is different but the security analysis and
    impacts are the same except that it impacts DTLS.
    
    A DTLS message includes 3 bytes for its length in the header for the
    message.
    This would allow for messages up to 16Mb in length. Messages of this length
    are excessive and OpenSSL includes a check to ensure that a peer is sending
    reasonably sized messages in order to avoid too much memory being consumed
    to service a connection. A flaw in the logic of version 1.1.0 means that
    memory for the message is allocated too early, prior to the excessive
    message length check. Due to way memory is allocated in OpenSSL this could
    mean an attacker could force up to 21Mb to be allocated to service a
    connection. This could lead to a Denial of Service through memory
    exhaustion. However, the excessive message length check still takes place,
    and this would cause the connection to immediately fail. Assuming that the
    application calls SSL_free() on the failed conneciton in a timely manner
    then the 21Mb of allocated memory will then be immediately freed again.
    Therefore the excessive memory allocation will be transitory in nature.
    This then means that there is only a security impact if:
    
    1) The application does not call SSL_free() in a timely manner in the
    event that the connection fails
    or
    2) The application is working in a constrained environment where there
    is very little free memory
    or
    3) The attacker initiates multiple connection attempts such that there
    are multiple connections in a state where memory has been allocated for
    the connection; SSL_free() has not yet been called; and there is
    insufficient memory to service the multiple requests.
    
    Except in the instance of (1) above any Denial Of Service is likely to
    be transitory because as soon as the connection fails the memory is
    subsequently freed again in the SSL_free() call. However there is an
    increased risk during this period of application crashes due to the lack
    of memory - which would then mean a more serious Denial of Service.
    
    This issue does not affect TLS users.
    
    Issue was reported by Shi Lei (Gear Team, Qihoo 360 Inc.).
    
    CVE-2016-6308
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c1ef7c971d0bbf117c3c80f65b5875e2e7b024b1
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 19 11:39:21 2016 +0100

    Excessive allocation of memory in tls_get_message_header()
    
    A TLS message includes 3 bytes for its length in the header for the message.
    This would allow for messages up to 16Mb in length. Messages of this length
    are excessive and OpenSSL includes a check to ensure that a peer is sending
    reasonably sized messages in order to avoid too much memory being consumed
    to service a connection. A flaw in the logic of version 1.1.0 means that
    memory for the message is allocated too early, prior to the excessive
    message length check. Due to way memory is allocated in OpenSSL this could
    mean an attacker could force up to 21Mb to be allocated to service a
    connection. This could lead to a Denial of Service through memory
    exhaustion. However, the excessive message length check still takes place,
    and this would cause the connection to immediately fail. Assuming that the
    application calls SSL_free() on the failed conneciton in a timely manner
    then the 21Mb of allocated memory will then be immediately freed again.
    Therefore the excessive memory allocation will be transitory in nature.
    This then means that there is only a security impact if:
    
    1) The application does not call SSL_free() in a timely manner in the
    event that the connection fails
    or
    2) The application is working in a constrained environment where there
    is very little free memory
    or
    3) The attacker initiates multiple connection attempts such that there
    are multiple connections in a state where memory has been allocated for
    the connection; SSL_free() has not yet been called; and there is
    insufficient memory to service the multiple requests.
    
    Except in the instance of (1) above any Denial Of Service is likely to
    be transitory because as soon as the connection fails the memory is
    subsequently freed again in the SSL_free() call. However there is an
    increased risk during this period of application crashes due to the lack
    of memory - which would then mean a more serious Denial of Service.
    
    This issue does not affect DTLS users.
    
    Issue was reported by Shi Lei (Gear Team, Qihoo 360 Inc.).
    
    CVE-2016-6307
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c      | 11 +++++++++++
 ssl/statem/statem_dtls.c | 35 ++++++++++++++++++-----------------
 ssl/statem/statem_lib.c  | 10 ----------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index df30085..8bc1feb 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -542,6 +542,17 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
                 return SUB_STATE_ERROR;
             }
 
+            /* dtls_get_message already did this */
+            if (!SSL_IS_DTLS(s)
+                    && s->s3->tmp.message_size > 0
+                    && !BUF_MEM_grow_clean(s->init_buf,
+                                           (int)s->s3->tmp.message_size
+                                           + SSL3_HM_HEADER_LENGTH)) {
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+                SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
+                return SUB_STATE_ERROR;
+            }
+
             st->read_state = READ_STATE_BODY;
             /* Fall through */
 
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 7c8437a..7e23ad9 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -388,6 +388,20 @@ int dtls_get_message(SSL *s, int *mt, unsigned long *len)
     return 1;
 }
 
+/*
+ * dtls1_max_handshake_message_len returns the maximum number of bytes
+ * permitted in a DTLS handshake message for |s|. The minimum is 16KB, but
+ * may be greater if the maximum certificate list size requires it.
+ */
+static unsigned long dtls1_max_handshake_message_len(const SSL *s)
+{
+    unsigned long max_len =
+        DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH;
+    if (max_len < (unsigned long)s->max_cert_list)
+        return s->max_cert_list;
+    return max_len;
+}
+
 static int dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr)
 {
     size_t frag_off, frag_len, msg_len;
@@ -397,15 +411,16 @@ static int dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr)
     frag_len = msg_hdr->frag_len;
 
     /* sanity checking */
-    if ((frag_off + frag_len) > msg_len) {
+    if ((frag_off + frag_len) > msg_len
+            || msg_len > dtls1_max_handshake_message_len(s)) {
         SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT, SSL_R_EXCESSIVE_MESSAGE_SIZE);
         return SSL_AD_ILLEGAL_PARAMETER;
     }
 
     if (s->d1->r_msg_hdr.frag_off == 0) { /* first fragment */
         /*
-         * msg_len is limited to 2^24, but is effectively checked against max
-         * above
+         * msg_len is limited to 2^24, but is effectively checked against
+         * dtls_max_handshake_message_len(s) above
          */
         if (!BUF_MEM_grow_clean(s->init_buf, msg_len + DTLS1_HM_HEADER_LENGTH)) {
             SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT, ERR_R_BUF_LIB);
@@ -493,20 +508,6 @@ static int dtls1_retrieve_buffered_fragment(SSL *s, int *ok)
         return 0;
 }
 
-/*
- * dtls1_max_handshake_message_len returns the maximum number of bytes
- * permitted in a DTLS handshake message for |s|. The minimum is 16KB, but
- * may be greater if the maximum certificate list size requires it.
- */
-static unsigned long dtls1_max_handshake_message_len(const SSL *s)
-{
-    unsigned long max_len =
-        DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH;
-    if (max_len < (unsigned long)s->max_cert_list)
-        return s->max_cert_list;
-    return max_len;
-}
-
 static int
 dtls1_reassemble_fragment(SSL *s, const struct hm_header_st *msg_hdr, int *ok)
 {
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 6f13ec0..0a482fd 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -460,10 +460,6 @@ int tls_get_message_header(SSL *s, int *mt)
          */
         l = RECORD_LAYER_get_rrec_length(&s->rlayer)
             + SSL3_HM_HEADER_LENGTH;
-        if (l && !BUF_MEM_grow_clean(s->init_buf, (int)l)) {
-            SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
-            goto err;
-        }
         s->s3->tmp.message_size = l;
 
         s->init_msg = s->init_buf->data;
@@ -476,11 +472,6 @@ int tls_get_message_header(SSL *s, int *mt)
             SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, SSL_R_EXCESSIVE_MESSAGE_SIZE);
             goto f_err;
         }
-        if (l && !BUF_MEM_grow_clean(s->init_buf,
-                                     (int)l + SSL3_HM_HEADER_LENGTH)) {
-            SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
-            goto err;
-        }
         s->s3->tmp.message_size = l;
 
         s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
@@ -490,7 +481,6 @@ int tls_get_message_header(SSL *s, int *mt)
     return 1;
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
     return 0;
 }
 

From matt at openssl.org  Wed Sep 21 19:47:30 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 21 Sep 2016 19:47:30 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474487250.641910.28679.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  df6b5e29ffea2d5a3e08de92fb765fdb21c7a21e (commit)
       via  4b390b6c3f8df925dc92a3dd6b022baa9a2f4650 (commit)
      from  f757ce2a3df9c16c2ddbf83bf1725f6a89bccade (commit)


- Log -----------------------------------------------------------------
commit df6b5e29ffea2d5a3e08de92fb765fdb21c7a21e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 19 11:57:07 2016 +0100

    Excessive allocation of memory in dtls1_preprocess_fragment()
    
    This issue is very similar to CVE-2016-6307 described in the previous
    commit. The underlying defect is different but the security analysis and
    impacts are the same except that it impacts DTLS.
    
    A DTLS message includes 3 bytes for its length in the header for the
    message.
    This would allow for messages up to 16Mb in length. Messages of this length
    are excessive and OpenSSL includes a check to ensure that a peer is sending
    reasonably sized messages in order to avoid too much memory being consumed
    to service a connection. A flaw in the logic of version 1.1.0 means that
    memory for the message is allocated too early, prior to the excessive
    message length check. Due to way memory is allocated in OpenSSL this could
    mean an attacker could force up to 21Mb to be allocated to service a
    connection. This could lead to a Denial of Service through memory
    exhaustion. However, the excessive message length check still takes place,
    and this would cause the connection to immediately fail. Assuming that the
    application calls SSL_free() on the failed conneciton in a timely manner
    then the 21Mb of allocated memory will then be immediately freed again.
    Therefore the excessive memory allocation will be transitory in nature.
    This then means that there is only a security impact if:
    
    1) The application does not call SSL_free() in a timely manner in the
    event that the connection fails
    or
    2) The application is working in a constrained environment where there
    is very little free memory
    or
    3) The attacker initiates multiple connection attempts such that there
    are multiple connections in a state where memory has been allocated for
    the connection; SSL_free() has not yet been called; and there is
    insufficient memory to service the multiple requests.
    
    Except in the instance of (1) above any Denial Of Service is likely to
    be transitory because as soon as the connection fails the memory is
    subsequently freed again in the SSL_free() call. However there is an
    increased risk during this period of application crashes due to the lack
    of memory - which would then mean a more serious Denial of Service.
    
    This issue does not affect TLS users.
    
    Issue was reported by Shi Lei (Gear Team, Qihoo 360 Inc.).
    
    CVE-2016-6308
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 48c054fec3506417b2598837b8062aae7114c200)

commit 4b390b6c3f8df925dc92a3dd6b022baa9a2f4650
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 19 11:39:21 2016 +0100

    Excessive allocation of memory in tls_get_message_header()
    
    A TLS message includes 3 bytes for its length in the header for the message.
    This would allow for messages up to 16Mb in length. Messages of this length
    are excessive and OpenSSL includes a check to ensure that a peer is sending
    reasonably sized messages in order to avoid too much memory being consumed
    to service a connection. A flaw in the logic of version 1.1.0 means that
    memory for the message is allocated too early, prior to the excessive
    message length check. Due to way memory is allocated in OpenSSL this could
    mean an attacker could force up to 21Mb to be allocated to service a
    connection. This could lead to a Denial of Service through memory
    exhaustion. However, the excessive message length check still takes place,
    and this would cause the connection to immediately fail. Assuming that the
    application calls SSL_free() on the failed conneciton in a timely manner
    then the 21Mb of allocated memory will then be immediately freed again.
    Therefore the excessive memory allocation will be transitory in nature.
    This then means that there is only a security impact if:
    
    1) The application does not call SSL_free() in a timely manner in the
    event that the connection fails
    or
    2) The application is working in a constrained environment where there
    is very little free memory
    or
    3) The attacker initiates multiple connection attempts such that there
    are multiple connections in a state where memory has been allocated for
    the connection; SSL_free() has not yet been called; and there is
    insufficient memory to service the multiple requests.
    
    Except in the instance of (1) above any Denial Of Service is likely to
    be transitory because as soon as the connection fails the memory is
    subsequently freed again in the SSL_free() call. However there is an
    increased risk during this period of application crashes due to the lack
    of memory - which would then mean a more serious Denial of Service.
    
    This issue does not affect DTLS users.
    
    Issue was reported by Shi Lei (Gear Team, Qihoo 360 Inc.).
    
    CVE-2016-6307
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit c1ef7c971d0bbf117c3c80f65b5875e2e7b024b1)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c      | 11 +++++++++++
 ssl/statem/statem_dtls.c | 35 ++++++++++++++++++-----------------
 ssl/statem/statem_lib.c  | 10 ----------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index df30085..8bc1feb 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -542,6 +542,17 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
                 return SUB_STATE_ERROR;
             }
 
+            /* dtls_get_message already did this */
+            if (!SSL_IS_DTLS(s)
+                    && s->s3->tmp.message_size > 0
+                    && !BUF_MEM_grow_clean(s->init_buf,
+                                           (int)s->s3->tmp.message_size
+                                           + SSL3_HM_HEADER_LENGTH)) {
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+                SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
+                return SUB_STATE_ERROR;
+            }
+
             st->read_state = READ_STATE_BODY;
             /* Fall through */
 
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index de2de09..043f41b 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -388,6 +388,20 @@ int dtls_get_message(SSL *s, int *mt, unsigned long *len)
     return 1;
 }
 
+/*
+ * dtls1_max_handshake_message_len returns the maximum number of bytes
+ * permitted in a DTLS handshake message for |s|. The minimum is 16KB, but
+ * may be greater if the maximum certificate list size requires it.
+ */
+static unsigned long dtls1_max_handshake_message_len(const SSL *s)
+{
+    unsigned long max_len =
+        DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH;
+    if (max_len < (unsigned long)s->max_cert_list)
+        return s->max_cert_list;
+    return max_len;
+}
+
 static int dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr)
 {
     size_t frag_off, frag_len, msg_len;
@@ -397,15 +411,16 @@ static int dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr)
     frag_len = msg_hdr->frag_len;
 
     /* sanity checking */
-    if ((frag_off + frag_len) > msg_len) {
+    if ((frag_off + frag_len) > msg_len
+            || msg_len > dtls1_max_handshake_message_len(s)) {
         SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT, SSL_R_EXCESSIVE_MESSAGE_SIZE);
         return SSL_AD_ILLEGAL_PARAMETER;
     }
 
     if (s->d1->r_msg_hdr.frag_off == 0) { /* first fragment */
         /*
-         * msg_len is limited to 2^24, but is effectively checked against max
-         * above
+         * msg_len is limited to 2^24, but is effectively checked against
+         * dtls_max_handshake_message_len(s) above
          */
         if (!BUF_MEM_grow_clean(s->init_buf, msg_len + DTLS1_HM_HEADER_LENGTH)) {
             SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT, ERR_R_BUF_LIB);
@@ -493,20 +508,6 @@ static int dtls1_retrieve_buffered_fragment(SSL *s, int *ok)
         return 0;
 }
 
-/*
- * dtls1_max_handshake_message_len returns the maximum number of bytes
- * permitted in a DTLS handshake message for |s|. The minimum is 16KB, but
- * may be greater if the maximum certificate list size requires it.
- */
-static unsigned long dtls1_max_handshake_message_len(const SSL *s)
-{
-    unsigned long max_len =
-        DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH;
-    if (max_len < (unsigned long)s->max_cert_list)
-        return s->max_cert_list;
-    return max_len;
-}
-
 static int
 dtls1_reassemble_fragment(SSL *s, const struct hm_header_st *msg_hdr, int *ok)
 {
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 19b75a7..31a84e4 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -414,10 +414,6 @@ int tls_get_message_header(SSL *s, int *mt)
          */
         l = RECORD_LAYER_get_rrec_length(&s->rlayer)
             + SSL3_HM_HEADER_LENGTH;
-        if (l && !BUF_MEM_grow_clean(s->init_buf, (int)l)) {
-            SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
-            goto err;
-        }
         s->s3->tmp.message_size = l;
 
         s->init_msg = s->init_buf->data;
@@ -430,11 +426,6 @@ int tls_get_message_header(SSL *s, int *mt)
             SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, SSL_R_EXCESSIVE_MESSAGE_SIZE);
             goto f_err;
         }
-        if (l && !BUF_MEM_grow_clean(s->init_buf,
-                                     (int)l + SSL3_HM_HEADER_LENGTH)) {
-            SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
-            goto err;
-        }
         s->s3->tmp.message_size = l;
 
         s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
@@ -444,7 +435,6 @@ int tls_get_message_header(SSL *s, int *mt)
     return 1;
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
     return 0;
 }
 

From no-reply at appveyor.com  Wed Sep 21 19:52:34 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 21 Sep 2016 19:52:34 +0000
Subject: [openssl-commits] Build failed: openssl OpenSSL_1_1_0-stable.5443
Message-ID: <20160921195233.2422.90833.38DF6CFF@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/22892684/attachment.html>

From no-reply at appveyor.com  Wed Sep 21 20:22:56 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 21 Sep 2016 20:22:56 +0000
Subject: [openssl-commits] Build completed: openssl master.5444
Message-ID: <20160921202256.100870.79469.DB85EE0E@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/12917fb2/attachment.html>

From builds at travis-ci.org  Wed Sep 21 20:17:30 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 20:17:30 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6111 (OpenSSL_1_1_0-stable
	- 64d1cc0)
In-Reply-To: <openssl/openssl+161647250+fixed@travis-ci.org>
Message-ID: <57e2eada5487b_33feed0fe3c0c503757@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6111
Status: Fixed

Duration: 26 minutes and 2 seconds
Commit: 64d1cc0 (OpenSSL_1_1_0-stable)
Author: Alessandro Ghedini
Message: Use switch instead of multiple ifs

Makes the logic a little bit clearer.

Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1571)
(cherry picked from commit 4f8a5f4da94bb70e06cf709beb1ddfa57a218c3d)

View the changeset: https://github.com/openssl/openssl/compare/6bdd2637daa8...64d1cc09f912

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161647250

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/e51d4e7a/attachment-0001.html>

From steve at openssl.org  Wed Sep 21 21:04:51 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Wed, 21 Sep 2016 21:04:51 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1474491891.083869.32383.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  151adf2e5cc23284a059e0f155505006a1c9fad9 (commit)
      from  bb1a4866034255749ac578adb06a76335fc117b1 (commit)


- Log -----------------------------------------------------------------
commit 151adf2e5cc23284a059e0f155505006a1c9fad9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 21 20:19:31 2016 +0100

    update default dependency options
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 93c4cc1..6a50cb1 100755
--- a/Configure
+++ b/Configure
@@ -741,7 +741,7 @@ my @experimental = ();
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST";
+my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL2 -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DOPENSSL_NO_WEAK_SSL_CIPHERS";
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).

From appro at openssl.org  Wed Sep 21 21:22:10 2016
From: appro at openssl.org (Andy Polyakov)
Date: Wed, 21 Sep 2016 21:22:10 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474492930.175518.7391.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  db610cb29cd2658c4feb60f4899856f0ac5e9dab (commit)
      from  df6b5e29ffea2d5a3e08de92fb765fdb21c7a21e (commit)


- Log -----------------------------------------------------------------
commit db610cb29cd2658c4feb60f4899856f0ac5e9dab
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Sep 21 22:05:12 2016 +0200

    CHANGES: mention removal of solaris-x86-cc.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8b0e21f..9fc7bfb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,14 @@
 
  Changes between 1.1.0 and 1.1.0a [xx XXX xxxx]
 
-  *)
+  *) solaris-x86-cc, i.e. 32-bit configuration with vendor compiler,
+     had to be removed. Primary reason is that vendor assembler can't
+     assemble our modules with -KPIC flag. As result it, assembly
+     support, was not even available as option. But its lack means
+     lack of side-channel resistant code, which is incompatible with
+     security by todays standards. Fortunately gcc is readily available
+     prepackaged option, which we firmly point at...
+     [Andy Polyakov]
 
  Changes between 1.0.2h and 1.1.0  [25 Aug 2016]
 

From builds at travis-ci.org  Wed Sep 21 21:20:58 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 21:20:58 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6112 (master - 6fcace4)
In-Reply-To: <openssl/openssl+161647739+fixed@travis-ci.org>
Message-ID: <57e2f9b8c0d70_33fdabdf89300109431f@49c41577-994a-47a4-a7b3-1931e0900f41.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6112
Status: Fixed

Duration: 17 minutes and 53 seconds
Commit: 6fcace4 (master)
Author: Rich Salz
Message: GH1555: Don't bump size on realloc failure

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/4588cb444355...6fcace45bda1

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161647739

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/a00c7456/attachment.html>

From builds at travis-ci.org  Wed Sep 21 23:38:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 21 Sep 2016 23:38:44 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6113 (OpenSSL_1_1_0-stable
	- bf0404f)
In-Reply-To: <openssl/openssl+161647874+fixed@travis-ci.org>
Message-ID: <57e31a0481d74_33f886639640c47723@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6113
Status: Fixed

Duration: 2 hours, 11 minutes, and 15 seconds
Commit: bf0404f (OpenSSL_1_1_0-stable)
Author: Rich Salz
Message: GH1555: Don't bump size on realloc failure

Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 6fcace45bda108ad4d3f95261494dd479720d92c)

View the changeset: https://github.com/openssl/openssl/compare/64d1cc09f912...bf0404fe4afe

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161647874

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/ea7dac75/attachment-0001.html>

From no-reply at appveyor.com  Wed Sep 21 23:55:39 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Wed, 21 Sep 2016 23:55:39 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1301
Message-ID: <20160921235538.34552.55512.D59073C1@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160921/bab77044/attachment.html>

From no-reply at appveyor.com  Thu Sep 22 00:23:21 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 22 Sep 2016 00:23:21 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1302
Message-ID: <20160922002321.19966.91231.F3CB589D@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/1d584905/attachment.html>

From builds at travis-ci.org  Thu Sep 22 00:20:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 00:20:11 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2016
	(oss_builds_options_check - e48d06b)
In-Reply-To: <FdaSilvaYY/openssl+161751896+still failing@travis-ci.org>
Message-ID: <57e323bb82d87_33fdabdf897ec13377e5@49c41577-994a-47a4-a7b3-1931e0900f41.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2016
Status: Still Failing

Duration: 2 hours, 19 minutes, and 52 seconds
Commit: e48d06b (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/667db9ac412c...e48d06b55fcf

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161751896

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/b3e8e47b/attachment.html>

From builds at travis-ci.org  Thu Sep 22 01:18:57 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 01:18:57 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2017 (master -
	372025c)
In-Reply-To: <FdaSilvaYY/openssl+161754077+still failing@travis-ci.org>
Message-ID: <57e331814693c_33feed0faa3a87165cb@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2017
Status: Still Failing

Duration: 34 minutes and 50 seconds
Commit: 372025c (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/5182123cc4a1...372025c54b65

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161754077

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/3455f79a/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 22 01:59:04 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 01:59:04 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2018
	(check_bn_wexpand_retcode - cad4895)
In-Reply-To: <FdaSilvaYY/openssl+161754222+still failing@travis-ci.org>
Message-ID: <57e33ae8125b2_33f886639307c572040@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2018
Status: Still Failing

Duration: 56 minutes and 15 seconds
Commit: cad4895 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/239397d92ea3...cad489529990

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161754222

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/1262a1f7/attachment.html>

From builds at travis-ci.org  Thu Sep 22 02:04:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 02:04:41 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6115 (master - 776e15f)
In-Reply-To: <openssl/openssl+161660088+fixed@travis-ci.org>
Message-ID: <57e33c38e2d7a_33fdabdf961541453546@49c41577-994a-47a4-a7b3-1931e0900f41.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6115
Status: Fixed

Duration: 1 hour, 34 minutes, and 38 seconds
Commit: 776e15f (master)
Author: Rich Salz
Message: Dcoument -alpn flag

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/6fcace45bda1...776e15f9393a

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161660088

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/d86c3064/attachment.html>

From builds at travis-ci.org  Thu Sep 22 02:28:46 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 02:28:46 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2019
	(fix-ca-buf-usage - 13aeb3d)
In-Reply-To: <FdaSilvaYY/openssl+161754474+still failing@travis-ci.org>
Message-ID: <57e341de3a49d_33fdabdf897ec1475547@49c41577-994a-47a4-a7b3-1931e0900f41.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2019
Status: Still Failing

Duration: 40 minutes and 29 seconds
Commit: 13aeb3d (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Introduce PATH_MAX and NAME_MAX

 to define the certificate filename storage buffer.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/349ebc550f46...13aeb3d6cc4e

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161754474

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/0337cf23/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 22 02:23:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 02:23:44 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6115 (OpenSSL_1_1_0-stable
	- 7b368cd)
In-Reply-To: <openssl/openssl+161660115+fixed@travis-ci.org>
Message-ID: <57e340b06c0cd_33f88663920dc585258@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6115
Status: Fixed

Duration: 44 minutes and 55 seconds
Commit: 7b368cd (OpenSSL_1_1_0-stable)
Author: Rich Salz
Message: Dcoument -alpn flag

Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 776e15f9393a9e3083bec60a8da376ce2fe1e97e)

View the changeset: https://github.com/openssl/openssl/compare/bf0404fe4afe...7b368cd6d964

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161660115

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/212f3fdf/attachment.html>

From builds at travis-ci.org  Thu Sep 22 02:58:32 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 02:58:32 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2020
	(const-app-options - a75d659)
In-Reply-To: <FdaSilvaYY/openssl+161754855+still failing@travis-ci.org>
Message-ID: <57e348d8b8f3c_33feed0faa6f0767122@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2020
Status: Still Failing

Duration: 42 minutes and 21 seconds
Commit: a75d659 (const-app-options)
Author: FdaSilvaYY
Message: Constify char* input parameters in apps/ca code

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/7218c19ee083...a75d6591bcb3

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161754855

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/55e50f56/attachment.html>

From builds at travis-ci.org  Thu Sep 22 03:17:24 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 03:17:24 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6118
	(OpenSSL_1_0_2-stable - 006a788)
In-Reply-To: <openssl/openssl+161717687+errored@travis-ci.org>
Message-ID: <57e34d43c5aa2_33f88663cfbbc61288d@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6118
Status: Errored

Duration: 22 minutes and 51 seconds
Commit: 006a788 (OpenSSL_1_0_2-stable)
Author: Dr. Stephen Henson
Message: Make message buffer slightly larger than message.

Grow TLS/DTLS 16 bytes more than strictly necessary as a precaution against
OOB reads. In most cases this will have no effect because the message buffer
will be large enough already.

Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/62841a2350f7...006a788c84e5

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161717687

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/63ebc8c7/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 22 03:22:53 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 03:22:53 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2022
	(oss_constify_api - 864c83d)
In-Reply-To: <FdaSilvaYY/openssl+161755598+errored@travis-ci.org>
Message-ID: <57e34e8d4437_33f886639253c614662@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2022
Status: Errored

Duration: 5 minutes and 59 seconds
Commit: 864c83d (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack compilation hack...

 from previous commit.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/094a3dcc1dd5...864c83d96423

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161755598

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/a9397fd5/attachment.html>

From builds at travis-ci.org  Thu Sep 22 03:31:38 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 03:31:38 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2021
	(oss-vpm-rework - e9ec483)
In-Reply-To: <FdaSilvaYY/openssl+161755102+still failing@travis-ci.org>
Message-ID: <57e3509a17b9d_33fdabdfcbde0152236a@49c41577-994a-47a4-a7b3-1931e0900f41.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2021
Status: Still Failing

Duration: 46 minutes and 37 seconds
Commit: e9ec483 (oss-vpm-rework)
Author: FdaSilvaYY
Message: Reduce X509_VERIFY_PARAM_new/X509_VERIFY_PARAM_free code amount

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0512adb80742...e9ec48303029

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161755102

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/6c7b8d5a/attachment.html>

From builds at travis-ci.org  Thu Sep 22 03:48:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 03:48:44 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6119 (master - 7dc0ad4)
In-Reply-To: <openssl/openssl+161720564+errored@travis-ci.org>
Message-ID: <57e3549c6fc5d_33f88663923486258ed@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6119
Status: Errored

Duration: 36 minutes and 24 seconds
Commit: 7dc0ad4 (master)
Author: Andy Polyakov
Message: rand/randfile.c: treat empty string in RAND_file_name as error.

Suggested in GH#1589.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/776e15f9393a...7dc0ad4d6dca

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161720564

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/9d0ac736/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 22 03:59:38 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 03:59:38 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2023
	(oss_constify_api - 6c6c097)
In-Reply-To: <FdaSilvaYY/openssl+161757807+still failing@travis-ci.org>
Message-ID: <57e3572c822ef_33f88663cfcc06312d2@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2023
Status: Still Failing

Duration: 36 minutes and 45 seconds
Commit: 6c6c097 (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack compilation hack...

 from previous commit.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/864c83d96423...6c6c097089f5

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/161757807

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/3f99eae2/attachment.html>

From builds at travis-ci.org  Thu Sep 22 04:14:49 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 04:14:49 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6120 (OpenSSL_1_1_0-stable
	- e749896)
In-Reply-To: <openssl/openssl+161720862+fixed@travis-ci.org>
Message-ID: <57e35ab9c8264_33f88663cfcc06392aa@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6120
Status: Fixed

Duration: 37 minutes and 12 seconds
Commit: e749896 (OpenSSL_1_1_0-stable)
Author: Andy Polyakov
Message: rand/randfile.c: treat empty string in RAND_file_name as error.

Suggested in GH#1589.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 7dc0ad4d6dca81a003be7fa1fbd58a55f4be8646)

View the changeset: https://github.com/openssl/openssl/compare/7b368cd6d964...e7498968e229

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161720862

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/e2518400/attachment.html>

From builds at travis-ci.org  Thu Sep 22 06:08:28 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 06:08:28 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6125 (OpenSSL_1_1_0-stable
	- 6915f39)
In-Reply-To: <openssl/openssl+161724382+fixed@travis-ci.org>
Message-ID: <57e3755bed1c8_33f88661e8c6869301e@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6125
Status: Fixed

Duration: 49 minutes and 45 seconds
Commit: 6915f39 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Don't allow too many consecutive warning alerts

Certain warning alerts are ignored if they are received. This can mean that
no progress will be made if one peer continually sends those warning alerts.
Implement a count so that we abort the connection if we receive too many.

Issue reported by Shi Lei.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit af58be768ebb690f78530f796e92b8ae5c9a4401)

View the changeset: https://github.com/openssl/openssl/compare/e7498968e229...6915f39e68f0

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161724382

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/42018d54/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 22 06:54:14 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 06:54:14 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6127 (OpenSSL_1_1_0-stable
	- 1fdeda4)
In-Reply-To: <openssl/openssl+161726513+fixed@travis-ci.org>
Message-ID: <57e3801658940_33f88663cfbbc7226a9@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6127
Status: Fixed

Duration: 39 minutes and 12 seconds
Commit: 1fdeda4 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Don't leak on an OPENSSL_realloc() failure

If OPENSSL_sk_insert() calls OPENSSL_realloc() and it fails, it was leaking
the originally allocated memory.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 41bff723c6784cc846054a4fd4add6dbec8c2c64)

View the changeset: https://github.com/openssl/openssl/compare/6915f39e68f0...1fdeda4cc994

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161726513

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/509af9c2/attachment.html>

From builds at travis-ci.org  Thu Sep 22 07:26:14 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 07:26:14 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6128 (OpenSSL_1_1_0-stable
	- f757ce2)
In-Reply-To: <openssl/openssl+161728954+fixed@travis-ci.org>
Message-ID: <57e387ae577cd_33feed0faa04c8795ec@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6128
Status: Fixed

Duration: 43 minutes and 39 seconds
Commit: f757ce2 (OpenSSL_1_1_0-stable)
Author: Andy Polyakov
Message: Configure: clarify and refine -static.

Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 047d97afd97520eae268f6d8a36fbf9a0239a994)

View the changeset: https://github.com/openssl/openssl/compare/1fdeda4cc994...f757ce2a3df9

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161728954

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/5874f55e/attachment.html>

From builds at travis-ci.org  Thu Sep 22 08:01:01 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 08:01:01 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6129 (master - 48c054f)
In-Reply-To: <openssl/openssl+161730913+broken@travis-ci.org>
Message-ID: <57e38fbd9602a_33f886ddb70ec7686c8@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6129
Status: Broken

Duration: 45 minutes and 42 seconds
Commit: 48c054f (master)
Author: Matt Caswell
Message: Excessive allocation of memory in dtls1_preprocess_fragment()

This issue is very similar to CVE-2016-6307 described in the previous
commit. The underlying defect is different but the security analysis and
impacts are the same except that it impacts DTLS.

A DTLS message includes 3 bytes for its length in the header for the
message.
This would allow for messages up to 16Mb in length. Messages of this length
are excessive and OpenSSL includes a check to ensure that a peer is sending
reasonably sized messages in order to avoid too much memory being consumed
to service a connection. A flaw in the logic of version 1.1.0 means that
memory for the message is allocated too early, prior to the excessive
message length check. Due to way memory is allocated in OpenSSL this could
mean an attacker could force up to 21Mb to be allocated to service a
connection. This could lead to a Denial of Service through memory
exhaustion. However, the excessive message length check still takes place,
and this would cause the connection to immediately fail. Assuming that the
application calls SSL_free() on the failed conneciton in a timely manner
then the 21Mb of allocated memory will then be immediately freed again.
Therefore the excessive memory allocation will be transitory in nature.
This then means that there is only a security impact if:

1) The application does not call SSL_free() in a timely manner in the
event that the connection fails
or
2) The application is working in a constrained environment where there
is very little free memory
or
3) The attacker initiates multiple connection attempts such that there
are multiple connections in a state where memory has been allocated for
the connection; SSL_free() has not yet been called; and there is
insufficient memory to service the multiple requests.

Except in the instance of (1) above any Denial Of Service is likely to
be transitory because as soon as the connection fails the memory is
subsequently freed again in the SSL_free() call. However there is an
increased risk during this period of application crashes due to the lack
of memory - which would then mean a more serious Denial of Service.

This issue does not affect TLS users.

Issue was reported by Shi Lei (Gear Team, Qihoo 360 Inc.).

CVE-2016-6308

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/41bff723c678...48c054fec350

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161730913

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/80fd3f68/attachment-0001.html>

From matt at openssl.org  Thu Sep 22 08:05:31 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 08:05:31 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474531531.582195.553.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  2178c52a8bacfd097a41f3f348fe51d8e4d1873e (commit)
      from  db610cb29cd2658c4feb60f4899856f0ac5e9dab (commit)


- Log -----------------------------------------------------------------
commit 2178c52a8bacfd097a41f3f348fe51d8e4d1873e
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 14:44:42 2016 +0200

    test/x509aux.c: Fix argv loop
    
    There are cases when argc is more trustable than proper argv termination.
    Since we trust argc in all other test programs, we might as well treat it
    the same way in this program.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 780bbb96bf514f0b4013e9c5725614ba5153c497)

-----------------------------------------------------------------------

Summary of changes:
 test/x509aux.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/x509aux.c b/test/x509aux.c
index 4f00196..2c20d6d 100644
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -180,7 +180,6 @@ static int test_certs(BIO *fp)
 int main(int argc, char *argv[])
 {
     BIO *bio_err;
-    const char *certfile;
     const char *p;
     int ret = 1;
 
@@ -197,24 +196,30 @@ int main(int argc, char *argv[])
         CRYPTO_set_mem_debug(1);
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
-    while ((certfile = *++argv) != NULL) {
-        BIO *f = BIO_new_file(certfile, "r");
+    argc--;
+    argv++;
+
+    while (argc >= 1) {
+        BIO *f = BIO_new_file(*argv, "r");
         int ok;
 
         if (f == NULL) {
             fprintf(stderr, "%s: Error opening cert file: '%s': %s\n",
-                    progname, certfile, strerror(errno));
+                    progname, *argv, strerror(errno));
             EXIT(ret);
         }
         ret = !(ok = test_certs(f));
         BIO_free(f);
 
         if (!ok) {
-            printf("%s ERROR\n", certfile);
+            printf("%s ERROR\n", *argv);
             ret = 1;
             break;
         }
-        printf("%s OK\n", certfile);
+        printf("%s OK\n", *argv);
+
+        argc--;
+        argv++;
     }
 
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG

From matt at openssl.org  Thu Sep 22 08:21:45 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 08:21:45 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474532505.886081.7767.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  90d6f35162a9515287e75248e1f880cd1cc92c1f (commit)
      from  22646a075e75991b4e8f5d67171e45a6aead5b48 (commit)


- Log -----------------------------------------------------------------
commit 90d6f35162a9515287e75248e1f880cd1cc92c1f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 22 10:01:38 2016 +0200

    mk1mf.pl: check for no-tls1 here as well
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/mk1mf.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 4eded5a..7a3ae11 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -277,6 +277,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_TLS1" if $no_tls1;
 $cflags.=" -DOPENSSL_NO_SRP" if $no_srp;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
@@ -1205,6 +1206,7 @@ sub read_options
 		"no-ssl3" => \$no_ssl3,
 		"no-ssl3-method" => 0,
 		"no-tlsext" => \$no_tlsext,
+		"no-tls1" => \$no_tls1,
 		"no-srp" => \$no_srp,
 		"no-cms" => \$no_cms,
 		"no-jpake" => \$no_jpake,

From matt at openssl.org  Thu Sep 22 08:27:23 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 08:27:23 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474532843.848988.10694.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a449b47c7d8e20efc8cc524ed695a060b11ef889 (commit)
      from  48c054fec3506417b2598837b8062aae7114c200 (commit)


- Log -----------------------------------------------------------------
commit a449b47c7d8e20efc8cc524ed695a060b11ef889
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 22 10:15:02 2016 +0200

    Fix error message typo, wrong function code
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 8bc1feb..5faf6ae 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -549,7 +549,7 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
                                            (int)s->s3->tmp.message_size
                                            + SSL3_HM_HEADER_LENGTH)) {
                 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
-                SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
+                SSLerr(SSL_F_READ_STATE_MACHINE, ERR_R_BUF_LIB);
                 return SUB_STATE_ERROR;
             }
 

From matt at openssl.org  Thu Sep 22 08:27:34 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 08:27:34 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474532854.637404.11546.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  d8e94b0d8fe412c19bc230593a960b7db73a8e7b (commit)
      from  2178c52a8bacfd097a41f3f348fe51d8e4d1873e (commit)


- Log -----------------------------------------------------------------
commit d8e94b0d8fe412c19bc230593a960b7db73a8e7b
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 22 10:15:02 2016 +0200

    Fix error message typo, wrong function code
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit a449b47c7d8e20efc8cc524ed695a060b11ef889)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 8bc1feb..5faf6ae 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -549,7 +549,7 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
                                            (int)s->s3->tmp.message_size
                                            + SSL3_HM_HEADER_LENGTH)) {
                 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
-                SSLerr(SSL_F_TLS_GET_MESSAGE_HEADER, ERR_R_BUF_LIB);
+                SSLerr(SSL_F_READ_STATE_MACHINE, ERR_R_BUF_LIB);
                 return SUB_STATE_ERROR;
             }
 

From builds at travis-ci.org  Thu Sep 22 09:30:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 09:30:35 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6140 (master - a449b47)
In-Reply-To: <openssl/openssl+161849909+fixed@travis-ci.org>
Message-ID: <57e3a4bb71abd_33f9da5cd7ef495299@256c4052-fa40-47b7-9e25-90f23ddb5ec5.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6140
Status: Fixed

Duration: 40 minutes and 44 seconds
Commit: a449b47 (master)
Author: Richard Levitte
Message: Fix error message typo, wrong function code

Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/48c054fec350...a449b47c7d8e

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161849909

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/208c716d/attachment.html>

From builds at travis-ci.org  Thu Sep 22 09:56:17 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 09:56:17 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6141
	(OpenSSL_1_1_0-stable - d8e94b0)
In-Reply-To: <openssl/openssl+161849972+errored@travis-ci.org>
Message-ID: <57e3aac37d60a_33f9da5ca06c0123648@256c4052-fa40-47b7-9e25-90f23ddb5ec5.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6141
Status: Errored

Duration: 42 minutes and 3 seconds
Commit: d8e94b0 (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Fix error message typo, wrong function code

Reviewed-by: Matt Caswell <matt at openssl.org>
(cherry picked from commit a449b47c7d8e20efc8cc524ed695a060b11ef889)

View the changeset: https://github.com/openssl/openssl/compare/2178c52a8bac...d8e94b0d8fe4

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161849972

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/343261c1/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 22 10:14:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 10:14:52 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6141
	(OpenSSL_1_1_0-stable - d8e94b0)
In-Reply-To: <openssl/openssl+161849972+passed@travis-ci.org>
Message-ID: <57e3af1ae1f04_33feed0fe393c9777c0@93bea7de-6c83-49c3-8d35-2eb63fe33fab.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6141
Status: Passed

Duration: 7 minutes and 28 seconds
Commit: d8e94b0 (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: Fix error message typo, wrong function code

Reviewed-by: Matt Caswell <matt at openssl.org>
(cherry picked from commit a449b47c7d8e20efc8cc524ed695a060b11ef889)

View the changeset: https://github.com/openssl/openssl/compare/2178c52a8bac...d8e94b0d8fe4

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161849972

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/526bfcfd/attachment.html>

From matt at openssl.org  Thu Sep 22 10:37:00 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:37:00 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474540620.836972.2757.nullmailer@dev.openssl.org>

The branch master has been updated
       via  39c136cc53d7b6fafdd1a0b52c035fd24358e01c (commit)
       via  41b42807726e340538701021cdc196672330f4db (commit)
       via  b8d243956296458d1782af0d6e7ecfe6deae038a (commit)
       via  c31dbed70c0be1578276367a1ba420ac935d0c68 (commit)
       via  ba881d3b39829d22eede8f69412d187aaab487e9 (commit)
       via  a671b3e64abe782d37c705ae51e93f2013672f9d (commit)
       via  e12c0beb5a652ba0c3a71e633a77fafbb4f86aa4 (commit)
       via  e408c09bbf7c3057bda4b8d20bec1b3a7771c15b (commit)
      from  a449b47c7d8e20efc8cc524ed695a060b11ef889 (commit)


- Log -----------------------------------------------------------------
commit 39c136cc53d7b6fafdd1a0b52c035fd24358e01c
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 21:59:49 2016 +0100

    Updates CHANGES and NEWS for new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 41b42807726e340538701021cdc196672330f4db
Author: Dmitry Belyavsky <beldmit at gmail.com>
Date:   Mon Sep 19 15:53:35 2016 +0100

    Avoid KCI attack for GOST
    
    Russian GOST ciphersuites are vulnerable to the KCI attack because they use
    long-term keys to establish the connection when ssl client authorization is
    on. This change brings the GOST implementation into line with the latest
    specs in order to avoid the attack. It should not break backwards
    compatibility.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit b8d243956296458d1782af0d6e7ecfe6deae038a
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Sep 10 21:24:40 2016 +0100

    Fix a hang with SSL_peek()
    
    If while calling SSL_peek() we read an empty record then we go into an
    infinite loop, continually trying to read data from the empty record and
    never making any progress. This could be exploited by a malicious peer in
    a Denial Of Service attack.
    
    CVE-2016-6305
    
    GitHub Issue #1563
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit c31dbed70c0be1578276367a1ba420ac935d0c68
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:53:39 2016 +0100

    Fix a mem leak in NPN handling
    
    If a server sent multiple NPN extensions in a single ClientHello then a
    mem leak can occur. This will only happen where the client has requested
    NPN in the first place. It does not occur during renegotiation. Therefore
    the maximum that could be leaked in a single connection with a malicious
    server is 64k (the maximum size of the ServerHello extensions section). As
    this is client side, only occurs if NPN has been requested and does not
    occur during renegotiation this is unlikely to be exploitable.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ba881d3b39829d22eede8f69412d187aaab487e9
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 17:02:03 2016 +0100

    Add some more OCSP testing
    
    Test that the OCSP callbacks work as expected.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit a671b3e64abe782d37c705ae51e93f2013672f9d
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 23:26:53 2016 +0100

    Add OCSP_RESPID_match()
    
    Add a function for testing whether a given OCSP_RESPID matches with a
    certificate.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit e12c0beb5a652ba0c3a71e633a77fafbb4f86aa4
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 17:39:55 2016 +0100

    Add the ability to set OCSP_RESPID fields
    
    OCSP_RESPID was made opaque in 1.1.0, but no accessors were provided for
    setting the name/key value for the OCSP_RESPID.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit e408c09bbf7c3057bda4b8d20bec1b3a7771c15b
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:08:45 2016 +0100

    Fix OCSP Status Request extension unbounded memory growth
    
    A malicious client can send an excessively large OCSP Status Request
    extension. If that client continually requests renegotiation,
    sending a large OCSP Status Request extension each time, then there will
    be unbounded memory growth on the server. This will eventually lead to a
    Denial Of Service attack through memory exhaustion. Servers with a
    default configuration are vulnerable even if they do not support OCSP.
    Builds using the "no-ocsp" build time option are not affected.
    
    I have also checked other extensions to see if they suffer from a similar
    problem but I could not find any other issues.
    
    CVE-2016-6304
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                             |  77 ++++++++++++-
 NEWS                                |  11 +-
 crypto/ocsp/ocsp_srv.c              |  73 ++++++++++--
 doc/crypto/OCSP_response_status.pod |  34 +++++-
 include/openssl/ocsp.h              |   3 +
 ssl/record/rec_layer_s3.c           |   6 +-
 ssl/statem/statem_clnt.c            |  18 ---
 ssl/t1_lib.c                        |  28 +++--
 test/sslapitest.c                   | 217 +++++++++++++++++++++++++++++++++---
 util/libcrypto.num                  |   3 +
 10 files changed, 414 insertions(+), 56 deletions(-)

diff --git a/CHANGES b/CHANGES
index 38b025a..97e70ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.1.0 and 1.1.1 [xx XXX xxxx]
+ Changes between 1.1.0a and 1.1.1 [xx XXX xxxx]
 
   *)
 
@@ -11,6 +11,81 @@
      https://www.akkadia.org/drepper/SHA-crypt.txt
      [Richard Levitte]
 
+ Changes between 1.1.0 and 1.1.0a [22 Sep 2016]
+
+  *) OCSP Status Request extension unbounded memory growth
+
+     A malicious client can send an excessively large OCSP Status Request
+     extension. If that client continually requests renegotiation, sending a
+     large OCSP Status Request extension each time, then there will be unbounded
+     memory growth on the server. This will eventually lead to a Denial Of
+     Service attack through memory exhaustion. Servers with a default
+     configuration are vulnerable even if they do not support OCSP. Builds using
+     the "no-ocsp" build time option are not affected.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6304)
+     [Matt Caswell]
+
+  *) SSL_peek() hang on empty record
+
+     OpenSSL 1.1.0 SSL/TLS will hang during a call to SSL_peek() if the peer
+     sends an empty record. This could be exploited by a malicious peer in a
+     Denial Of Service attack.
+
+     This issue was reported to OpenSSL by Alex Gaynor.
+     (CVE-2016-6305)
+     [Matt Caswell]
+
+  *) Excessive allocation of memory in tls_get_message_header() and
+     dtls1_preprocess_fragment()
+
+     A (D)TLS message includes 3 bytes for its length in the header for the
+     message. This would allow for messages up to 16Mb in length. Messages of
+     this length are excessive and OpenSSL includes a check to ensure that a
+     peer is sending reasonably sized messages in order to avoid too much memory
+     being consumed to service a connection. A flaw in the logic of version
+     1.1.0 means that memory for the message is allocated too early, prior to
+     the excessive message length check. Due to way memory is allocated in
+     OpenSSL this could mean an attacker could force up to 21Mb to be allocated
+     to service a connection. This could lead to a Denial of Service through
+     memory exhaustion. However, the excessive message length check still takes
+     place, and this would cause the connection to immediately fail. Assuming
+     that the application calls SSL_free() on the failed conneciton in a timely
+     manner then the 21Mb of allocated memory will then be immediately freed
+     again. Therefore the excessive memory allocation will be transitory in
+     nature. This then means that there is only a security impact if:
+
+     1) The application does not call SSL_free() in a timely manner in the event
+     that the connection fails
+     or
+     2) The application is working in a constrained environment where there is
+     very little free memory
+     or
+     3) The attacker initiates multiple connection attempts such that there are
+     multiple connections in a state where memory has been allocated for the
+     connection; SSL_free() has not yet been called; and there is insufficient
+     memory to service the multiple requests.
+
+     Except in the instance of (1) above any Denial Of Service is likely to be
+     transitory because as soon as the connection fails the memory is
+     subsequently freed again in the SSL_free() call. However there is an
+     increased risk during this period of application crashes due to the lack of
+     memory - which would then mean a more serious Denial of Service.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6307 and CVE-2016-6308)
+     [Matt Caswell]
+
+  *) solaris-x86-cc, i.e. 32-bit configuration with vendor compiler,
+     had to be removed. Primary reason is that vendor assembler can't
+     assemble our modules with -KPIC flag. As result it, assembly
+     support, was not even available as option. But its lack means
+     lack of side-channel resistant code, which is incompatible with
+     security by todays standards. Fortunately gcc is readily available
+     prepackaged option, which we firmly point at...
+     [Andy Polyakov]
+
  Changes between 1.0.2h and 1.1.0  [25 Aug 2016]
 
   *) Windows command-line tool supports UTF-8 opt-in option for arguments
diff --git a/NEWS b/NEWS
index ab9ea17..bdb7a4f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,19 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.1 [under development]
+  Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.1 [under development]
 
       o
 
+  Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016]
+
+      o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
+      o SSL_peek() hang on empty record (CVE-2016-6305)
+      o Excessive allocation of memory in tls_get_message_header()
+       (CVE-2016-6307)
+      o Excessive allocation of memory in dtls1_preprocess_fragment()
+       (CVE-2016-6308)
+
   Major changes between OpenSSL 1.0.2h and OpenSSL 1.1.0 [25 Aug 2016]
 
       o Copyright text was shrunk to a boilerplate that points to the license
diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index 443161c..46a4bf7 100644
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c
@@ -193,17 +193,10 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
 
     rid = &brsp->tbsResponseData.responderId;
     if (flags & OCSP_RESPID_KEY) {
-        unsigned char md[SHA_DIGEST_LENGTH];
-        X509_pubkey_digest(signer, EVP_sha1(), md, NULL);
-        if ((rid->value.byKey = ASN1_OCTET_STRING_new()) == NULL)
-            goto err;
-        if (!(ASN1_OCTET_STRING_set(rid->value.byKey, md, SHA_DIGEST_LENGTH)))
-            goto err;
-        rid->type = V_OCSP_RESPID_KEY;
-    } else {
-        if (!X509_NAME_set(&rid->value.byName, X509_get_subject_name(signer)))
+        if (!OCSP_RESPID_set_by_key(rid, signer))
             goto err;
-        rid->type = V_OCSP_RESPID_NAME;
+    } else if (!OCSP_RESPID_set_by_name(rid, signer)) {
+        goto err;
     }
 
     if (!(flags & OCSP_NOTIME) &&
@@ -222,3 +215,63 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
  err:
     return 0;
 }
+
+int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert)
+{
+    if (!X509_NAME_set(&respid->value.byName, X509_get_subject_name(cert)))
+        return 0;
+
+    respid->type = V_OCSP_RESPID_NAME;
+
+    return 1;
+}
+
+int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert)
+{
+    ASN1_OCTET_STRING *byKey = NULL;
+    unsigned char md[SHA_DIGEST_LENGTH];
+
+    /* RFC2560 requires SHA1 */
+    if (!X509_pubkey_digest(cert, EVP_sha1(), md, NULL))
+        return 0;
+
+    byKey = ASN1_OCTET_STRING_new();
+    if (byKey == NULL)
+        return 0;
+
+    if (!(ASN1_OCTET_STRING_set(byKey, md, SHA_DIGEST_LENGTH))) {
+        ASN1_OCTET_STRING_free(byKey);
+        return 0;
+    }
+
+    respid->type = V_OCSP_RESPID_KEY;
+    respid->value.byKey = byKey;
+
+    return 1;
+}
+
+int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert)
+{
+    if (respid->type == V_OCSP_RESPID_KEY) {
+        unsigned char md[SHA_DIGEST_LENGTH];
+
+        if (respid->value.byKey == NULL)
+            return 0;
+
+        /* RFC2560 requires SHA1 */
+        if (!X509_pubkey_digest(cert, EVP_sha1(), md, NULL))
+            return 0;
+
+        return (ASN1_STRING_length(respid->value.byKey) == SHA_DIGEST_LENGTH)
+            && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
+                       SHA_DIGEST_LENGTH) == 0);
+    } else if(respid->type == V_OCSP_RESPID_NAME) {
+        if (respid->value.byName == NULL)
+            return 0;
+
+        return X509_NAME_cmp(respid->value.byName,
+                             X509_get_subject_name(cert)) == 0;
+    }
+
+    return 0;
+}
diff --git a/doc/crypto/OCSP_response_status.pod b/doc/crypto/OCSP_response_status.pod
index 08738d2..81946a6 100644
--- a/doc/crypto/OCSP_response_status.pod
+++ b/doc/crypto/OCSP_response_status.pod
@@ -3,7 +3,8 @@
 =head1 NAME
 
 OCSP_response_status, OCSP_response_get1_basic, OCSP_response_create,
-OCSP_RESPONSE_free - OCSP response functions
+OCSP_RESPONSE_free, OCSP_RESPID_set_by_name,
+OCSP_RESPID_set_by_key, OCSP_RESPID_match - OCSP response functions
 
 =head1 SYNOPSIS
 
@@ -14,6 +15,10 @@ OCSP_RESPONSE_free - OCSP response functions
  OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
  void OCSP_RESPONSE_free(OCSP_RESPONSE *resp);
 
+ int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
+ int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
+ int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
+
 =head1 DESCRIPTION
 
 OCSP_response_status() returns the OCSP response status of B<resp>. It returns
@@ -30,6 +35,20 @@ B<status> and optionally including basic response B<bs>.
 
 OCSP_RESPONSE_free() frees up OCSP response B<resp>.
 
+OCSP_RESPID_set_by_name() sets the name of the OCSP_RESPID to be the same as the
+subject name in the supplied X509 certificate B<cert> for the OCSP responder.
+
+OCSP_RESPID_set_by_key() sets the key of the OCSP_RESPID to be the same as the
+key in the supplied X509 certificate B<cert> for the OCSP responder. The key is
+stored as a SHA1 hash.
+
+Note that an OCSP_RESPID can only have one of the name, or the key set. Calling
+OCSP_RESPID_set_by_name() or OCSP_RESPID_set_by_key() will clear any existing
+setting.
+
+OCSP_RESPID_match() tests whether the OCSP_RESPID given in B<respid> matches
+with the X509 certificate B<cert>.
+
 =head1 RETURN VALUES
 
 OCSP_RESPONSE_status() returns a status value.
@@ -42,6 +61,12 @@ if an error occurred.
 
 OCSP_RESPONSE_free() does not return a value.
 
+OCSP_RESPID_set_by_name() and OCSP_RESPID_set_by_key() return 1 on success or 0
+on failure.
+
+OCSP_RESPID_match() returns 1 if the OCSP_RESPID and the X509 certificate match
+or 0 otherwise.
+
 =head1 NOTES
 
 OCSP_response_get1_basic() is only called if the status of a response is
@@ -55,6 +80,13 @@ L<OCSP_request_add1_nonce(3)>
 L<OCSP_REQUEST_new(3)>
 L<OCSP_response_find_status(3)>
 L<OCSP_sendreq_new(3)>
+L<OCSP_RESPID_new(3)>
+L<OCSP_RESPID_free(3)>
+
+=head1 HISTORY
+
+The OCSP_RESPID_set_by_name(), OCSP_RESPID_set_by_key() and OCSP_RESPID_match()
+functions were added in OpenSSL version 1.1.0a.
 
 =head1 COPYRIGHT
 
diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h
index 119e591..08debc5 100644
--- a/include/openssl/ocsp.h
+++ b/include/openssl/ocsp.h
@@ -259,6 +259,9 @@ int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
 int OCSP_basic_sign(OCSP_BASICRESP *brsp,
                     X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
                     STACK_OF(X509) *certs, unsigned long flags);
+int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
+int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
+int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
 
 X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);
 
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index abde9d4..0775095 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1133,7 +1133,11 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
 
             memcpy(buf, &(rr->data[rr->off]), n);
             buf += n;
-            if (!peek) {
+            if (peek) {
+                /* Mark any zero length record as consumed CVE-2016-6305 */
+                if (SSL3_RECORD_get_length(rr) == 0)
+                    SSL3_RECORD_set_read(rr);
+            } else {
                 SSL3_RECORD_sub_length(rr, n);
                 SSL3_RECORD_add_off(rr, n);
                 if (SSL3_RECORD_get_length(rr) == 0) {
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 1774f7a..e3e593b 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2378,18 +2378,6 @@ static int tls_construct_cke_gost(SSL *s, WPACKET *pkt, int *al)
         goto err;
     };
     /*
-     * If we have client certificate, use its secret as peer key
-     */
-    if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
-        if (EVP_PKEY_derive_set_peer(pkey_ctx, s->cert->key->privatekey) <= 0) {
-            /*
-             * If there was an error - just ignore it. Ephemeral key
-             * * would be used
-             */
-            ERR_clear_error();
-        }
-    }
-    /*
      * Compute shared IV and store it in algorithm-specific context
      * data
      */
@@ -2432,12 +2420,6 @@ static int tls_construct_cke_gost(SSL *s, WPACKET *pkt, int *al)
         goto err;
     }
 
-    /* Check if pubkey from client certificate was used */
-    if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2,
-                          NULL) > 0) {
-        /* Set flag "skip certificate verify" */
-        s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
-    }
     EVP_PKEY_CTX_free(pkey_ctx);
     s->s3->tmp.pms = pms;
     s->s3->tmp.pmslen = pmslen;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 035353c..4733bff 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2019,6 +2019,22 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
                     (&extension, &responder_id_list))
                     return 0;
 
+                /*
+                 * We remove any OCSP_RESPIDs from a previous handshake
+                 * to prevent unbounded memory growth - CVE-2016-6304
+                 */
+                sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,
+                                        OCSP_RESPID_free);
+                if (PACKET_remaining(&responder_id_list) > 0) {
+                    s->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null();
+                    if (s->tlsext_ocsp_ids == NULL) {
+                        *al = SSL_AD_INTERNAL_ERROR;
+                        return 0;
+                    }
+                } else {
+                    s->tlsext_ocsp_ids = NULL;
+                }
+
                 while (PACKET_remaining(&responder_id_list) > 0) {
                     OCSP_RESPID *id;
                     PACKET responder_id;
@@ -2030,13 +2046,6 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
                         return 0;
                     }
 
-                    if (s->tlsext_ocsp_ids == NULL
-                        && (s->tlsext_ocsp_ids =
-                            sk_OCSP_RESPID_new_null()) == NULL) {
-                        *al = SSL_AD_INTERNAL_ERROR;
-                        return 0;
-                    }
-
                     id_data = PACKET_data(&responder_id);
                     id = d2i_OCSP_RESPID(NULL, &id_data,
                                          PACKET_remaining(&responder_id));
@@ -2385,6 +2394,11 @@ static int ssl_scan_serverhello_tlsext(SSL *s, PACKET *pkt, int *al)
                 *al = TLS1_AD_INTERNAL_ERROR;
                 return 0;
             }
+            /*
+             * Could be non-NULL if server has sent multiple NPN extensions in
+             * a single Serverhello
+             */
+            OPENSSL_free(s->next_proto_negotiated);
             s->next_proto_negotiated = OPENSSL_malloc(selected_len);
             if (s->next_proto_negotiated == NULL) {
                 *al = TLS1_AD_INTERNAL_ERROR;
diff --git a/test/sslapitest.c b/test/sslapitest.c
index b190145..a2b18df 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -7,10 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include <string.h>
+
 #include <openssl/opensslconf.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
+#include <openssl/ocsp.h>
 
 #include "ssltestlib.h"
 #include "testutil.h"
@@ -18,63 +21,243 @@
 static char *cert = NULL;
 static char *privkey = NULL;
 
+static const unsigned char orespder[] = "Dummy OCSP Response";
+static int ocsp_server_called = 0;
+static int ocsp_client_called = 0;
+
+static int cdummyarg = 1;
+static X509 *ocspcert = NULL;
+
+static int ocsp_server_cb(SSL *s, void *arg)
+{
+    int *argi = (int *)arg;
+    unsigned char *orespdercopy = NULL;
+    STACK_OF(OCSP_RESPID) *ids = NULL;
+    OCSP_RESPID *id = NULL;
+
+    if (*argi == 2) {
+        /* In this test we are expecting exactly 1 OCSP_RESPID */
+        SSL_get_tlsext_status_ids(s, &ids);
+        if (ids == NULL || sk_OCSP_RESPID_num(ids) != 1)
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+
+        id = sk_OCSP_RESPID_value(ids, 0);
+        if (id == NULL || !OCSP_RESPID_match(id, ocspcert))
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+    } else if (*argi != 1) {
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+
+    orespdercopy = OPENSSL_memdup(orespder, sizeof(orespder));
+    if (orespdercopy == NULL)
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+
+    SSL_set_tlsext_status_ocsp_resp(s, orespdercopy, sizeof(orespder));
+
+    ocsp_server_called = 1;
+
+    return SSL_TLSEXT_ERR_OK;
+}
+
+static int ocsp_client_cb(SSL *s, void *arg)
+{
+    int *argi = (int *)arg;
+    const unsigned char *respderin;
+    size_t len;
+
+    if (*argi != 1 && *argi != 2)
+        return 0;
+
+    len = SSL_get_tlsext_status_ocsp_resp(s, &respderin);
+
+    if (memcmp(orespder, respderin, len) != 0)
+        return 0;
+
+    ocsp_client_called = 1;
+
+    return 1;
+}
+
 static int test_tlsext_status_type(void)
 {
-    SSL_CTX *ctx = NULL;
-    SSL *con = NULL;
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL;
     int testresult = 0;
+    STACK_OF(OCSP_RESPID) *ids = NULL;
+    OCSP_RESPID *id = NULL;
+    BIO *certbio = NULL;
 
-    /* Test tlsext_status_type */
-    ctx = SSL_CTX_new(TLS_method());
+    if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), &sctx,
+                             &cctx, cert, privkey)) {
+        printf("Unable to create SSL_CTX pair\n");
+        return 0;
+    }
 
-    if (SSL_CTX_get_tlsext_status_type(ctx) != -1) {
+    if (SSL_CTX_get_tlsext_status_type(cctx) != -1) {
         printf("Unexpected initial value for "
                "SSL_CTX_get_tlsext_status_type()\n");
         goto end;
     }
 
-    con = SSL_new(ctx);
+    /* First just do various checks getting and setting tlsext_status_type */
 
-    if (SSL_get_tlsext_status_type(con) != -1) {
+    clientssl = SSL_new(cctx);
+    if (SSL_get_tlsext_status_type(clientssl) != -1) {
         printf("Unexpected initial value for SSL_get_tlsext_status_type()\n");
         goto end;
     }
 
-    if (!SSL_set_tlsext_status_type(con, TLSEXT_STATUSTYPE_ocsp)) {
+    if (!SSL_set_tlsext_status_type(clientssl, TLSEXT_STATUSTYPE_ocsp)) {
         printf("Unexpected fail for SSL_set_tlsext_status_type()\n");
         goto end;
     }
 
-    if (SSL_get_tlsext_status_type(con) != TLSEXT_STATUSTYPE_ocsp) {
+    if (SSL_get_tlsext_status_type(clientssl) != TLSEXT_STATUSTYPE_ocsp) {
         printf("Unexpected result for SSL_get_tlsext_status_type()\n");
         goto end;
     }
 
-    SSL_free(con);
-    con = NULL;
+    SSL_free(clientssl);
+    clientssl = NULL;
 
-    if (!SSL_CTX_set_tlsext_status_type(ctx, TLSEXT_STATUSTYPE_ocsp)) {
+    if (!SSL_CTX_set_tlsext_status_type(cctx, TLSEXT_STATUSTYPE_ocsp)) {
         printf("Unexpected fail for SSL_CTX_set_tlsext_status_type()\n");
         goto end;
     }
 
-    if (SSL_CTX_get_tlsext_status_type(ctx) != TLSEXT_STATUSTYPE_ocsp) {
+    if (SSL_CTX_get_tlsext_status_type(cctx) != TLSEXT_STATUSTYPE_ocsp) {
         printf("Unexpected result for SSL_CTX_get_tlsext_status_type()\n");
         goto end;
     }
 
-    con = SSL_new(ctx);
+    clientssl = SSL_new(cctx);
 
-    if (SSL_get_tlsext_status_type(con) != TLSEXT_STATUSTYPE_ocsp) {
+    if (SSL_get_tlsext_status_type(clientssl) != TLSEXT_STATUSTYPE_ocsp) {
         printf("Unexpected result for SSL_get_tlsext_status_type() (test 2)\n");
         goto end;
     }
 
+    SSL_free(clientssl);
+    clientssl = NULL;
+
+    /*
+     * Now actually do a handshake and check OCSP information is exchanged and
+     * the callbacks get called
+     */
+
+    SSL_CTX_set_tlsext_status_cb(cctx, ocsp_client_cb);
+    SSL_CTX_set_tlsext_status_arg(cctx, &cdummyarg);
+    SSL_CTX_set_tlsext_status_cb(sctx, ocsp_server_cb);
+    SSL_CTX_set_tlsext_status_arg(sctx, &cdummyarg);
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    if (!create_ssl_connection(serverssl, clientssl)) {
+        printf("Unable to create SSL connection\n");
+        goto end;
+    }
+
+    if (!ocsp_client_called || !ocsp_server_called) {
+        printf("OCSP callbacks not called\n");
+        goto end;
+    }
+
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    serverssl = NULL;
+    clientssl = NULL;
+
+    /* Try again but this time force the server side callback to fail */
+    ocsp_client_called = 0;
+    ocsp_server_called = 0;
+    cdummyarg = 0;
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    /* This should fail because the callback will fail */
+    if (create_ssl_connection(serverssl, clientssl)) {
+        printf("Unexpected success creating the connection\n");
+        goto end;
+    }
+
+    if (ocsp_client_called || ocsp_server_called) {
+        printf("OCSP callbacks successfully called unexpectedly\n");
+        goto end;
+    }
+
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    serverssl = NULL;
+    clientssl = NULL;
+
+    /*
+     * This time we'll get the client to send an OCSP_RESPID that it will
+     * accept.
+     */
+    ocsp_client_called = 0;
+    ocsp_server_called = 0;
+    cdummyarg = 2;
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    /*
+     * We'll just use any old cert for this test - it doesn't have to be an OCSP
+     * specifc one. We'll use the server cert.
+     */
+    certbio = BIO_new_file(cert, "r");
+    if (certbio == NULL) {
+        printf("Can't load the certficate file\n");
+        goto end;
+    }
+    id = OCSP_RESPID_new();
+    ids = sk_OCSP_RESPID_new_null();
+    ocspcert = PEM_read_bio_X509(certbio, NULL, NULL, NULL);
+    if (id == NULL || ids == NULL || ocspcert == NULL
+            || !OCSP_RESPID_set_by_key(id, ocspcert)
+            || !sk_OCSP_RESPID_push(ids, id)) {
+        printf("Unable to set OCSP_RESPIDs\n");
+        goto end;
+    }
+    id = NULL;
+    SSL_set_tlsext_status_ids(clientssl, ids);
+    /* Control has been transferred */
+    ids = NULL;
+
+    BIO_free(certbio);
+    certbio = NULL;
+
+    if (!create_ssl_connection(serverssl, clientssl)) {
+        printf("Unable to create SSL connection\n");
+        goto end;
+    }
+
+    if (!ocsp_client_called || !ocsp_server_called) {
+        printf("OCSP callbacks not called\n");
+        goto end;
+    }
+
     testresult = 1;
 
  end:
-    SSL_free(con);
-    SSL_CTX_free(ctx);
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+    sk_OCSP_RESPID_pop_free(ids, OCSP_RESPID_free);
+    OCSP_RESPID_free(id);
+    BIO_free(certbio);
+    X509_free(ocspcert);
+    ocspcert = NULL;
 
     return testresult;
 }
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 8f19a3a..db6732e 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4203,3 +4203,6 @@ ECPKPARAMETERS_free                     4153	1_1_0	EXIST::FUNCTION:EC
 ECPARAMETERS_free                       4154	1_1_0	EXIST::FUNCTION:EC
 ECPKPARAMETERS_new                      4155	1_1_0	EXIST::FUNCTION:EC
 ECPARAMETERS_new                        4156	1_1_0	EXIST::FUNCTION:EC
+OCSP_RESPID_set_by_name                 4157	1_1_0a	EXIST::FUNCTION:OCSP
+OCSP_RESPID_set_by_key                  4158	1_1_0a	EXIST::FUNCTION:OCSP
+OCSP_RESPID_match                       4159	1_1_0a	EXIST::FUNCTION:OCSP

From matt at openssl.org  Thu Sep 22 10:37:17 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:37:17 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474540637.004432.3877.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  5fe5914d3068128cdc6b08fe72746bb516a30b8a (commit)
       via  ac2c44c6289f9716de4c4beeb284a818eacde517 (commit)
       via  f3e189613fdbe7404bfbbca2caccf5cbd19e2ffc (commit)
       via  d3c9d6e99f075e6fbdab94db00b220cfa08b5c4b (commit)
       via  63658103d4441924f8dbfc517b99bb54758a98b9 (commit)
       via  6d32c2ae28952b5c1d7a24968e488532fcadc51a (commit)
       via  f6a7505e64d06f9d41e01b763b684e4e2df34922 (commit)
       via  7409b0aae569b5ba4476076fbea3226d606c50ba (commit)
       via  1645f3f4b9f717133ffcaf3398508ed2ddc81374 (commit)
       via  a59ab1c4dd27a4c7c6e88f3c33747532fd144412 (commit)
      from  d8e94b0d8fe412c19bc230593a960b7db73a8e7b (commit)


- Log -----------------------------------------------------------------
commit 5fe5914d3068128cdc6b08fe72746bb516a30b8a
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:15:54 2016 +0100

    Prepare for 1.1.0b-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ac2c44c6289f9716de4c4beeb284a818eacde517
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:14:50 2016 +0100

    Prepare for 1.1.0a release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit f3e189613fdbe7404bfbbca2caccf5cbd19e2ffc
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 21:59:49 2016 +0100

    Updates CHANGES and NEWS for new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d3c9d6e99f075e6fbdab94db00b220cfa08b5c4b
Author: Dmitry Belyavsky <beldmit at gmail.com>
Date:   Mon Sep 19 15:53:35 2016 +0100

    Avoid KCI attack for GOST
    
    Russian GOST ciphersuites are vulnerable to the KCI attack because they use
    long-term keys to establish the connection when ssl client authorization is
    on. This change brings the GOST implementation into line with the latest
    specs in order to avoid the attack. It should not break backwards
    compatibility.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 63658103d4441924f8dbfc517b99bb54758a98b9
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Sep 10 21:24:40 2016 +0100

    Fix a hang with SSL_peek()
    
    If while calling SSL_peek() we read an empty record then we go into an
    infinite loop, continually trying to read data from the empty record and
    never making any progress. This could be exploited by a malicious peer in
    a Denial Of Service attack.
    
    CVE-2016-6305
    
    GitHub Issue #1563
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 6d32c2ae28952b5c1d7a24968e488532fcadc51a
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:53:39 2016 +0100

    Fix a mem leak in NPN handling
    
    If a server sent multiple NPN extensions in a single ClientHello then a
    mem leak can occur. This will only happen where the client has requested
    NPN in the first place. It does not occur during renegotiation. Therefore
    the maximum that could be leaked in a single connection with a malicious
    server is 64k (the maximum size of the ServerHello extensions section). As
    this is client side, only occurs if NPN has been requested and does not
    occur during renegotiation this is unlikely to be exploitable.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f6a7505e64d06f9d41e01b763b684e4e2df34922
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 17:02:03 2016 +0100

    Add some more OCSP testing
    
    Test that the OCSP callbacks work as expected.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 7409b0aae569b5ba4476076fbea3226d606c50ba
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 23:26:53 2016 +0100

    Add OCSP_RESPID_match()
    
    Add a function for testing whether a given OCSP_RESPID matches with a
    certificate.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1645f3f4b9f717133ffcaf3398508ed2ddc81374
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 12 17:39:55 2016 +0100

    Add the ability to set OCSP_RESPID fields
    
    OCSP_RESPID was made opaque in 1.1.0, but no accessors were provided for
    setting the name/key value for the OCSP_RESPID.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit a59ab1c4dd27a4c7c6e88f3c33747532fd144412
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:08:45 2016 +0100

    Fix OCSP Status Request extension unbounded memory growth
    
    A malicious client can send an excessively large OCSP Status Request
    extension. If that client continually requests renegotiation,
    sending a large OCSP Status Request extension each time, then there will
    be unbounded memory growth on the server. This will eventually lead to a
    Denial Of Service attack through memory exhaustion. Servers with a
    default configuration are vulnerable even if they do not support OCSP.
    Builds using the "no-ocsp" build time option are not affected.
    
    I have also checked other extensions to see if they suffer from a similar
    problem but I could not find any other issues.
    
    CVE-2016-6304
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                             |  70 +++++++++++-
 NEWS                                |  11 +-
 README                              |   2 +-
 crypto/ocsp/ocsp_srv.c              |  73 ++++++++++--
 doc/crypto/OCSP_response_status.pod |  34 +++++-
 include/openssl/ocsp.h              |   3 +
 include/openssl/opensslv.h          |   6 +-
 ssl/record/rec_layer_s3.c           |   6 +-
 ssl/statem/statem_clnt.c            |  19 +---
 ssl/t1_lib.c                        |  28 +++--
 test/sslapitest.c                   | 217 +++++++++++++++++++++++++++++++++---
 util/libcrypto.num                  |   3 +
 12 files changed, 412 insertions(+), 60 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9fc7bfb..76b4974 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,75 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.1.0 and 1.1.0a [xx XXX xxxx]
+ Changes between 1.1.0a and 1.1.0b [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.1.0 and 1.1.0a [22 Sep 2016]
+
+  *) OCSP Status Request extension unbounded memory growth
+
+     A malicious client can send an excessively large OCSP Status Request
+     extension. If that client continually requests renegotiation, sending a
+     large OCSP Status Request extension each time, then there will be unbounded
+     memory growth on the server. This will eventually lead to a Denial Of
+     Service attack through memory exhaustion. Servers with a default
+     configuration are vulnerable even if they do not support OCSP. Builds using
+     the "no-ocsp" build time option are not affected.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6304)
+     [Matt Caswell]
+
+  *) SSL_peek() hang on empty record
+
+     OpenSSL 1.1.0 SSL/TLS will hang during a call to SSL_peek() if the peer
+     sends an empty record. This could be exploited by a malicious peer in a
+     Denial Of Service attack.
+
+     This issue was reported to OpenSSL by Alex Gaynor.
+     (CVE-2016-6305)
+     [Matt Caswell]
+
+  *) Excessive allocation of memory in tls_get_message_header() and
+     dtls1_preprocess_fragment()
+
+     A (D)TLS message includes 3 bytes for its length in the header for the
+     message. This would allow for messages up to 16Mb in length. Messages of
+     this length are excessive and OpenSSL includes a check to ensure that a
+     peer is sending reasonably sized messages in order to avoid too much memory
+     being consumed to service a connection. A flaw in the logic of version
+     1.1.0 means that memory for the message is allocated too early, prior to
+     the excessive message length check. Due to way memory is allocated in
+     OpenSSL this could mean an attacker could force up to 21Mb to be allocated
+     to service a connection. This could lead to a Denial of Service through
+     memory exhaustion. However, the excessive message length check still takes
+     place, and this would cause the connection to immediately fail. Assuming
+     that the application calls SSL_free() on the failed conneciton in a timely
+     manner then the 21Mb of allocated memory will then be immediately freed
+     again. Therefore the excessive memory allocation will be transitory in
+     nature. This then means that there is only a security impact if:
+
+     1) The application does not call SSL_free() in a timely manner in the event
+     that the connection fails
+     or
+     2) The application is working in a constrained environment where there is
+     very little free memory
+     or
+     3) The attacker initiates multiple connection attempts such that there are
+     multiple connections in a state where memory has been allocated for the
+     connection; SSL_free() has not yet been called; and there is insufficient
+     memory to service the multiple requests.
+
+     Except in the instance of (1) above any Denial Of Service is likely to be
+     transitory because as soon as the connection fails the memory is
+     subsequently freed again in the SSL_free() call. However there is an
+     increased risk during this period of application crashes due to the lack of
+     memory - which would then mean a more serious Denial of Service.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6307 and CVE-2016-6308)
+     [Matt Caswell]
 
   *) solaris-x86-cc, i.e. 32-bit configuration with vendor compiler,
      had to be removed. Primary reason is that vendor assembler can't
diff --git a/NEWS b/NEWS
index 0792f31..66bade1 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,19 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [under development]
+  Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.0b [under development]
 
       o
 
+  Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016]
+
+      o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
+      o SSL_peek() hang on empty record (CVE-2016-6305)
+      o Excessive allocation of memory in tls_get_message_header()
+       (CVE-2016-6307)
+      o Excessive allocation of memory in dtls1_preprocess_fragment()
+       (CVE-2016-6308)
+
   Major changes between OpenSSL 1.0.2h and OpenSSL 1.1.0 [25 Aug 2016]
 
       o Copyright text was shrunk to a boilerplate that points to the license
diff --git a/README b/README
index cac5fc6..fdf0f8f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0a-dev
+ OpenSSL 1.1.0b-dev
 
  Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index 443161c..46a4bf7 100644
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c
@@ -193,17 +193,10 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
 
     rid = &brsp->tbsResponseData.responderId;
     if (flags & OCSP_RESPID_KEY) {
-        unsigned char md[SHA_DIGEST_LENGTH];
-        X509_pubkey_digest(signer, EVP_sha1(), md, NULL);
-        if ((rid->value.byKey = ASN1_OCTET_STRING_new()) == NULL)
-            goto err;
-        if (!(ASN1_OCTET_STRING_set(rid->value.byKey, md, SHA_DIGEST_LENGTH)))
-            goto err;
-        rid->type = V_OCSP_RESPID_KEY;
-    } else {
-        if (!X509_NAME_set(&rid->value.byName, X509_get_subject_name(signer)))
+        if (!OCSP_RESPID_set_by_key(rid, signer))
             goto err;
-        rid->type = V_OCSP_RESPID_NAME;
+    } else if (!OCSP_RESPID_set_by_name(rid, signer)) {
+        goto err;
     }
 
     if (!(flags & OCSP_NOTIME) &&
@@ -222,3 +215,63 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
  err:
     return 0;
 }
+
+int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert)
+{
+    if (!X509_NAME_set(&respid->value.byName, X509_get_subject_name(cert)))
+        return 0;
+
+    respid->type = V_OCSP_RESPID_NAME;
+
+    return 1;
+}
+
+int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert)
+{
+    ASN1_OCTET_STRING *byKey = NULL;
+    unsigned char md[SHA_DIGEST_LENGTH];
+
+    /* RFC2560 requires SHA1 */
+    if (!X509_pubkey_digest(cert, EVP_sha1(), md, NULL))
+        return 0;
+
+    byKey = ASN1_OCTET_STRING_new();
+    if (byKey == NULL)
+        return 0;
+
+    if (!(ASN1_OCTET_STRING_set(byKey, md, SHA_DIGEST_LENGTH))) {
+        ASN1_OCTET_STRING_free(byKey);
+        return 0;
+    }
+
+    respid->type = V_OCSP_RESPID_KEY;
+    respid->value.byKey = byKey;
+
+    return 1;
+}
+
+int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert)
+{
+    if (respid->type == V_OCSP_RESPID_KEY) {
+        unsigned char md[SHA_DIGEST_LENGTH];
+
+        if (respid->value.byKey == NULL)
+            return 0;
+
+        /* RFC2560 requires SHA1 */
+        if (!X509_pubkey_digest(cert, EVP_sha1(), md, NULL))
+            return 0;
+
+        return (ASN1_STRING_length(respid->value.byKey) == SHA_DIGEST_LENGTH)
+            && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
+                       SHA_DIGEST_LENGTH) == 0);
+    } else if(respid->type == V_OCSP_RESPID_NAME) {
+        if (respid->value.byName == NULL)
+            return 0;
+
+        return X509_NAME_cmp(respid->value.byName,
+                             X509_get_subject_name(cert)) == 0;
+    }
+
+    return 0;
+}
diff --git a/doc/crypto/OCSP_response_status.pod b/doc/crypto/OCSP_response_status.pod
index 08738d2..81946a6 100644
--- a/doc/crypto/OCSP_response_status.pod
+++ b/doc/crypto/OCSP_response_status.pod
@@ -3,7 +3,8 @@
 =head1 NAME
 
 OCSP_response_status, OCSP_response_get1_basic, OCSP_response_create,
-OCSP_RESPONSE_free - OCSP response functions
+OCSP_RESPONSE_free, OCSP_RESPID_set_by_name,
+OCSP_RESPID_set_by_key, OCSP_RESPID_match - OCSP response functions
 
 =head1 SYNOPSIS
 
@@ -14,6 +15,10 @@ OCSP_RESPONSE_free - OCSP response functions
  OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
  void OCSP_RESPONSE_free(OCSP_RESPONSE *resp);
 
+ int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
+ int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
+ int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
+
 =head1 DESCRIPTION
 
 OCSP_response_status() returns the OCSP response status of B<resp>. It returns
@@ -30,6 +35,20 @@ B<status> and optionally including basic response B<bs>.
 
 OCSP_RESPONSE_free() frees up OCSP response B<resp>.
 
+OCSP_RESPID_set_by_name() sets the name of the OCSP_RESPID to be the same as the
+subject name in the supplied X509 certificate B<cert> for the OCSP responder.
+
+OCSP_RESPID_set_by_key() sets the key of the OCSP_RESPID to be the same as the
+key in the supplied X509 certificate B<cert> for the OCSP responder. The key is
+stored as a SHA1 hash.
+
+Note that an OCSP_RESPID can only have one of the name, or the key set. Calling
+OCSP_RESPID_set_by_name() or OCSP_RESPID_set_by_key() will clear any existing
+setting.
+
+OCSP_RESPID_match() tests whether the OCSP_RESPID given in B<respid> matches
+with the X509 certificate B<cert>.
+
 =head1 RETURN VALUES
 
 OCSP_RESPONSE_status() returns a status value.
@@ -42,6 +61,12 @@ if an error occurred.
 
 OCSP_RESPONSE_free() does not return a value.
 
+OCSP_RESPID_set_by_name() and OCSP_RESPID_set_by_key() return 1 on success or 0
+on failure.
+
+OCSP_RESPID_match() returns 1 if the OCSP_RESPID and the X509 certificate match
+or 0 otherwise.
+
 =head1 NOTES
 
 OCSP_response_get1_basic() is only called if the status of a response is
@@ -55,6 +80,13 @@ L<OCSP_request_add1_nonce(3)>
 L<OCSP_REQUEST_new(3)>
 L<OCSP_response_find_status(3)>
 L<OCSP_sendreq_new(3)>
+L<OCSP_RESPID_new(3)>
+L<OCSP_RESPID_free(3)>
+
+=head1 HISTORY
+
+The OCSP_RESPID_set_by_name(), OCSP_RESPID_set_by_key() and OCSP_RESPID_match()
+functions were added in OpenSSL version 1.1.0a.
 
 =head1 COPYRIGHT
 
diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h
index 119e591..08debc5 100644
--- a/include/openssl/ocsp.h
+++ b/include/openssl/ocsp.h
@@ -259,6 +259,9 @@ int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
 int OCSP_basic_sign(OCSP_BASICRESP *brsp,
                     X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
                     STACK_OF(X509) *certs, unsigned long flags);
+int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
+int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
+int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
 
 X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);
 
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 0d9a89d..5cc6881 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,11 +39,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10100010L
+# define OPENSSL_VERSION_NUMBER  0x10100020L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0a-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0b-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0a-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0b-dev  xx XXX xxxx"
 # endif
 
 /*-
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index abde9d4..0775095 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1133,7 +1133,11 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
 
             memcpy(buf, &(rr->data[rr->off]), n);
             buf += n;
-            if (!peek) {
+            if (peek) {
+                /* Mark any zero length record as consumed CVE-2016-6305 */
+                if (SSL3_RECORD_get_length(rr) == 0)
+                    SSL3_RECORD_set_read(rr);
+            } else {
                 SSL3_RECORD_sub_length(rr, n);
                 SSL3_RECORD_add_off(rr, n);
                 if (SSL3_RECORD_get_length(rr) == 0) {
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index ff42858..692544b 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2379,18 +2379,6 @@ static int tls_construct_cke_gost(SSL *s, unsigned char **p, int *len, int *al)
         goto err;
     };
     /*
-     * If we have client certificate, use its secret as peer key
-     */
-    if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
-        if (EVP_PKEY_derive_set_peer(pkey_ctx, s->cert->key->privatekey) <= 0) {
-            /*
-             * If there was an error - just ignore it. Ephemeral key
-             * * would be used
-             */
-            ERR_clear_error();
-        }
-    }
-    /*
      * Compute shared IV and store it in algorithm-specific context
      * data
      */
@@ -2434,12 +2422,7 @@ static int tls_construct_cke_gost(SSL *s, unsigned char **p, int *len, int *al)
         *len = msglen + 2;
     }
     memcpy(*p, tmp, msglen);
-    /* Check if pubkey from client certificate was used */
-    if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2,
-                          NULL) > 0) {
-        /* Set flag "skip certificate verify" */
-        s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
-    }
+
     EVP_PKEY_CTX_free(pkey_ctx);
     s->s3->tmp.pms = pms;
     s->s3->tmp.pmslen = pmslen;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index b8f8fd2..86833d8 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2030,6 +2030,22 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
                     (&extension, &responder_id_list))
                     return 0;
 
+                /*
+                 * We remove any OCSP_RESPIDs from a previous handshake
+                 * to prevent unbounded memory growth - CVE-2016-6304
+                 */
+                sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,
+                                        OCSP_RESPID_free);
+                if (PACKET_remaining(&responder_id_list) > 0) {
+                    s->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null();
+                    if (s->tlsext_ocsp_ids == NULL) {
+                        *al = SSL_AD_INTERNAL_ERROR;
+                        return 0;
+                    }
+                } else {
+                    s->tlsext_ocsp_ids = NULL;
+                }
+
                 while (PACKET_remaining(&responder_id_list) > 0) {
                     OCSP_RESPID *id;
                     PACKET responder_id;
@@ -2041,13 +2057,6 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
                         return 0;
                     }
 
-                    if (s->tlsext_ocsp_ids == NULL
-                        && (s->tlsext_ocsp_ids =
-                            sk_OCSP_RESPID_new_null()) == NULL) {
-                        *al = SSL_AD_INTERNAL_ERROR;
-                        return 0;
-                    }
-
                     id_data = PACKET_data(&responder_id);
                     id = d2i_OCSP_RESPID(NULL, &id_data,
                                          PACKET_remaining(&responder_id));
@@ -2396,6 +2405,11 @@ static int ssl_scan_serverhello_tlsext(SSL *s, PACKET *pkt, int *al)
                 *al = TLS1_AD_INTERNAL_ERROR;
                 return 0;
             }
+            /*
+             * Could be non-NULL if server has sent multiple NPN extensions in
+             * a single Serverhello
+             */
+            OPENSSL_free(s->next_proto_negotiated);
             s->next_proto_negotiated = OPENSSL_malloc(selected_len);
             if (s->next_proto_negotiated == NULL) {
                 *al = TLS1_AD_INTERNAL_ERROR;
diff --git a/test/sslapitest.c b/test/sslapitest.c
index b190145..a2b18df 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -7,10 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include <string.h>
+
 #include <openssl/opensslconf.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
+#include <openssl/ocsp.h>
 
 #include "ssltestlib.h"
 #include "testutil.h"
@@ -18,63 +21,243 @@
 static char *cert = NULL;
 static char *privkey = NULL;
 
+static const unsigned char orespder[] = "Dummy OCSP Response";
+static int ocsp_server_called = 0;
+static int ocsp_client_called = 0;
+
+static int cdummyarg = 1;
+static X509 *ocspcert = NULL;
+
+static int ocsp_server_cb(SSL *s, void *arg)
+{
+    int *argi = (int *)arg;
+    unsigned char *orespdercopy = NULL;
+    STACK_OF(OCSP_RESPID) *ids = NULL;
+    OCSP_RESPID *id = NULL;
+
+    if (*argi == 2) {
+        /* In this test we are expecting exactly 1 OCSP_RESPID */
+        SSL_get_tlsext_status_ids(s, &ids);
+        if (ids == NULL || sk_OCSP_RESPID_num(ids) != 1)
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+
+        id = sk_OCSP_RESPID_value(ids, 0);
+        if (id == NULL || !OCSP_RESPID_match(id, ocspcert))
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+    } else if (*argi != 1) {
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+
+    orespdercopy = OPENSSL_memdup(orespder, sizeof(orespder));
+    if (orespdercopy == NULL)
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+
+    SSL_set_tlsext_status_ocsp_resp(s, orespdercopy, sizeof(orespder));
+
+    ocsp_server_called = 1;
+
+    return SSL_TLSEXT_ERR_OK;
+}
+
+static int ocsp_client_cb(SSL *s, void *arg)
+{
+    int *argi = (int *)arg;
+    const unsigned char *respderin;
+    size_t len;
+
+    if (*argi != 1 && *argi != 2)
+        return 0;
+
+    len = SSL_get_tlsext_status_ocsp_resp(s, &respderin);
+
+    if (memcmp(orespder, respderin, len) != 0)
+        return 0;
+
+    ocsp_client_called = 1;
+
+    return 1;
+}
+
 static int test_tlsext_status_type(void)
 {
-    SSL_CTX *ctx = NULL;
-    SSL *con = NULL;
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL;
     int testresult = 0;
+    STACK_OF(OCSP_RESPID) *ids = NULL;
+    OCSP_RESPID *id = NULL;
+    BIO *certbio = NULL;
 
-    /* Test tlsext_status_type */
-    ctx = SSL_CTX_new(TLS_method());
+    if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), &sctx,
+                             &cctx, cert, privkey)) {
+        printf("Unable to create SSL_CTX pair\n");
+        return 0;
+    }
 
-    if (SSL_CTX_get_tlsext_status_type(ctx) != -1) {
+    if (SSL_CTX_get_tlsext_status_type(cctx) != -1) {
         printf("Unexpected initial value for "
                "SSL_CTX_get_tlsext_status_type()\n");
         goto end;
     }
 
-    con = SSL_new(ctx);
+    /* First just do various checks getting and setting tlsext_status_type */
 
-    if (SSL_get_tlsext_status_type(con) != -1) {
+    clientssl = SSL_new(cctx);
+    if (SSL_get_tlsext_status_type(clientssl) != -1) {
         printf("Unexpected initial value for SSL_get_tlsext_status_type()\n");
         goto end;
     }
 
-    if (!SSL_set_tlsext_status_type(con, TLSEXT_STATUSTYPE_ocsp)) {
+    if (!SSL_set_tlsext_status_type(clientssl, TLSEXT_STATUSTYPE_ocsp)) {
         printf("Unexpected fail for SSL_set_tlsext_status_type()\n");
         goto end;
     }
 
-    if (SSL_get_tlsext_status_type(con) != TLSEXT_STATUSTYPE_ocsp) {
+    if (SSL_get_tlsext_status_type(clientssl) != TLSEXT_STATUSTYPE_ocsp) {
         printf("Unexpected result for SSL_get_tlsext_status_type()\n");
         goto end;
     }
 
-    SSL_free(con);
-    con = NULL;
+    SSL_free(clientssl);
+    clientssl = NULL;
 
-    if (!SSL_CTX_set_tlsext_status_type(ctx, TLSEXT_STATUSTYPE_ocsp)) {
+    if (!SSL_CTX_set_tlsext_status_type(cctx, TLSEXT_STATUSTYPE_ocsp)) {
         printf("Unexpected fail for SSL_CTX_set_tlsext_status_type()\n");
         goto end;
     }
 
-    if (SSL_CTX_get_tlsext_status_type(ctx) != TLSEXT_STATUSTYPE_ocsp) {
+    if (SSL_CTX_get_tlsext_status_type(cctx) != TLSEXT_STATUSTYPE_ocsp) {
         printf("Unexpected result for SSL_CTX_get_tlsext_status_type()\n");
         goto end;
     }
 
-    con = SSL_new(ctx);
+    clientssl = SSL_new(cctx);
 
-    if (SSL_get_tlsext_status_type(con) != TLSEXT_STATUSTYPE_ocsp) {
+    if (SSL_get_tlsext_status_type(clientssl) != TLSEXT_STATUSTYPE_ocsp) {
         printf("Unexpected result for SSL_get_tlsext_status_type() (test 2)\n");
         goto end;
     }
 
+    SSL_free(clientssl);
+    clientssl = NULL;
+
+    /*
+     * Now actually do a handshake and check OCSP information is exchanged and
+     * the callbacks get called
+     */
+
+    SSL_CTX_set_tlsext_status_cb(cctx, ocsp_client_cb);
+    SSL_CTX_set_tlsext_status_arg(cctx, &cdummyarg);
+    SSL_CTX_set_tlsext_status_cb(sctx, ocsp_server_cb);
+    SSL_CTX_set_tlsext_status_arg(sctx, &cdummyarg);
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    if (!create_ssl_connection(serverssl, clientssl)) {
+        printf("Unable to create SSL connection\n");
+        goto end;
+    }
+
+    if (!ocsp_client_called || !ocsp_server_called) {
+        printf("OCSP callbacks not called\n");
+        goto end;
+    }
+
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    serverssl = NULL;
+    clientssl = NULL;
+
+    /* Try again but this time force the server side callback to fail */
+    ocsp_client_called = 0;
+    ocsp_server_called = 0;
+    cdummyarg = 0;
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    /* This should fail because the callback will fail */
+    if (create_ssl_connection(serverssl, clientssl)) {
+        printf("Unexpected success creating the connection\n");
+        goto end;
+    }
+
+    if (ocsp_client_called || ocsp_server_called) {
+        printf("OCSP callbacks successfully called unexpectedly\n");
+        goto end;
+    }
+
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    serverssl = NULL;
+    clientssl = NULL;
+
+    /*
+     * This time we'll get the client to send an OCSP_RESPID that it will
+     * accept.
+     */
+    ocsp_client_called = 0;
+    ocsp_server_called = 0;
+    cdummyarg = 2;
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    /*
+     * We'll just use any old cert for this test - it doesn't have to be an OCSP
+     * specifc one. We'll use the server cert.
+     */
+    certbio = BIO_new_file(cert, "r");
+    if (certbio == NULL) {
+        printf("Can't load the certficate file\n");
+        goto end;
+    }
+    id = OCSP_RESPID_new();
+    ids = sk_OCSP_RESPID_new_null();
+    ocspcert = PEM_read_bio_X509(certbio, NULL, NULL, NULL);
+    if (id == NULL || ids == NULL || ocspcert == NULL
+            || !OCSP_RESPID_set_by_key(id, ocspcert)
+            || !sk_OCSP_RESPID_push(ids, id)) {
+        printf("Unable to set OCSP_RESPIDs\n");
+        goto end;
+    }
+    id = NULL;
+    SSL_set_tlsext_status_ids(clientssl, ids);
+    /* Control has been transferred */
+    ids = NULL;
+
+    BIO_free(certbio);
+    certbio = NULL;
+
+    if (!create_ssl_connection(serverssl, clientssl)) {
+        printf("Unable to create SSL connection\n");
+        goto end;
+    }
+
+    if (!ocsp_client_called || !ocsp_server_called) {
+        printf("OCSP callbacks not called\n");
+        goto end;
+    }
+
     testresult = 1;
 
  end:
-    SSL_free(con);
-    SSL_CTX_free(ctx);
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+    sk_OCSP_RESPID_pop_free(ids, OCSP_RESPID_free);
+    OCSP_RESPID_free(id);
+    BIO_free(certbio);
+    X509_free(ocspcert);
+    ocspcert = NULL;
 
     return testresult;
 }
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 8f19a3a..db6732e 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4203,3 +4203,6 @@ ECPKPARAMETERS_free                     4153	1_1_0	EXIST::FUNCTION:EC
 ECPARAMETERS_free                       4154	1_1_0	EXIST::FUNCTION:EC
 ECPKPARAMETERS_new                      4155	1_1_0	EXIST::FUNCTION:EC
 ECPARAMETERS_new                        4156	1_1_0	EXIST::FUNCTION:EC
+OCSP_RESPID_set_by_name                 4157	1_1_0a	EXIST::FUNCTION:OCSP
+OCSP_RESPID_set_by_key                  4158	1_1_0a	EXIST::FUNCTION:OCSP
+OCSP_RESPID_match                       4159	1_1_0a	EXIST::FUNCTION:OCSP

From matt at openssl.org  Thu Sep 22 10:37:28 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:37:28 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474540648.679293.4360.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  9d264d11a93413d2724b7c8c873e56b2ddd8c53f (commit)
       via  32c130160f7dac2cef5d0e30d94b335e4a87104d (commit)
       via  35aede1cd7411aa404512facfcb22e3859966ef6 (commit)
       via  92c8d6ae0d741fdca3b72baf627d16908dae64ce (commit)
       via  38f59bd1f1da9f5ef67044b35af26528e5b183dd (commit)
       via  ea39b16b71e4e72a228a4535bd6d6a02c5edbc1f (commit)
      from  90d6f35162a9515287e75248e1f880cd1cc92c1f (commit)


- Log -----------------------------------------------------------------
commit 9d264d11a93413d2724b7c8c873e56b2ddd8c53f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:25:49 2016 +0100

    Prepare for 1.0.2j-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 32c130160f7dac2cef5d0e30d94b335e4a87104d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:24:53 2016 +0100

    Prepare for 1.0.2i release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 35aede1cd7411aa404512facfcb22e3859966ef6
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 21:59:49 2016 +0100

    Updates CHANGES and NEWS for new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 92c8d6ae0d741fdca3b72baf627d16908dae64ce
Author: Dmitry Belyavsky <beldmit at gmail.com>
Date:   Mon Sep 19 16:05:53 2016 +0100

    Avoid KCI attack for GOST
    
    Russian GOST ciphersuites are vulnerable to the KCI attack because they use
    long-term keys to establish the connection when ssl client authorization is
    on. This change brings the GOST implementation into line with the latest
    specs in order to avoid the attack. It should not break backwards
    compatibility.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 38f59bd1f1da9f5ef67044b35af26528e5b183dd
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:53:39 2016 +0100

    Fix a mem leak in NPN handling
    
    If a server sent multiple NPN extensions in a single ClientHello then a
    mem leak can occur. This will only happen where the client has requested
    NPN in the first place. It does not occur during renegotiation. Therefore
    the maximum that could be leaked in a single connection with a malicious
    server is 64k (the maximum size of the ServerHello extensions section). As
    this is client side, only occurs if NPN has been requested and does not
    occur during renegotiation this is unlikely to be exploitable.
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ea39b16b71e4e72a228a4535bd6d6a02c5edbc1f
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:08:45 2016 +0100

    Fix OCSP Status Request extension unbounded memory growth
    
    A malicious client can send an excessively large OCSP Status Request
    extension. If that client continually requests renegotiation,
    sending a large OCSP Status Request extension each time, then there will
    be unbounded memory growth on the server. This will eventually lead to a
    Denial Of Service attack through memory exhaustion. Servers with a
    default configuration are vulnerable even if they do not support OCSP.
    Builds using the "no-ocsp" build time option are not affected.
    
    I have also checked other extensions to see if they suffer from a similar
    problem but I could not find any other issues.
    
    CVE-2016-6304
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES           | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 NEWS              |  16 +++++-
 README            |   2 +-
 crypto/opensslv.h |   6 +-
 openssl.spec      |   2 +-
 ssl/s3_clnt.c     |  19 -------
 ssl/t1_lib.c      |  29 +++++++---
 7 files changed, 201 insertions(+), 35 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6502fc3..c072379 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,14 +2,170 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.2h and 1.0.2i [xx XXX xxxx]
+ Changes between 1.0.2i and 1.0.2j [xx XXX xxxx]
 
   *)
 
-  *) In order to mitigate the SWEET32 attack (CVE-2016-2183),
-     the DES ciphers were moved from HIGH to MEDIUM.
+ Changes between 1.0.2h and 1.0.2i [22 Sep 2016]
+
+  *) OCSP Status Request extension unbounded memory growth
+
+     A malicious client can send an excessively large OCSP Status Request
+     extension. If that client continually requests renegotiation, sending a
+     large OCSP Status Request extension each time, then there will be unbounded
+     memory growth on the server. This will eventually lead to a Denial Of
+     Service attack through memory exhaustion. Servers with a default
+     configuration are vulnerable even if they do not support OCSP. Builds using
+     the "no-ocsp" build time option are not affected.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6304)
+     [Matt Caswell]
+
+  *) In order to mitigate the SWEET32 attack, the DES ciphers were moved from
+     HIGH to MEDIUM.
+
+     This issue was reported to OpenSSL Karthikeyan Bhargavan and Gaetan
+     Leurent (INRIA)
+     (CVE-2016-2183)
      [Rich Salz]
 
+  *) OOB write in MDC2_Update()
+
+     An overflow can occur in MDC2_Update() either if called directly or
+     through the EVP_DigestUpdate() function using MDC2. If an attacker
+     is able to supply very large amounts of input data after a previous
+     call to EVP_EncryptUpdate() with a partial block then a length check
+     can overflow resulting in a heap corruption.
+
+     The amount of data needed is comparable to SIZE_MAX which is impractical
+     on most platforms.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6303)
+     [Stephen Henson]
+
+  *) Malformed SHA512 ticket DoS
+
+     If a server uses SHA512 for TLS session ticket HMAC it is vulnerable to a
+     DoS attack where a malformed ticket will result in an OOB read which will
+     ultimately crash.
+
+     The use of SHA512 in TLS session tickets is comparatively rare as it requires
+     a custom server callback and ticket lookup mechanism.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6302)
+     [Stephen Henson]
+
+  *) OOB write in BN_bn2dec()
+
+     The function BN_bn2dec() does not check the return value of BN_div_word().
+     This can cause an OOB write if an application uses this function with an
+     overly large BIGNUM. This could be a problem if an overly large certificate
+     or CRL is printed out from an untrusted source. TLS is not affected because
+     record limits will reject an oversized certificate before it is parsed.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-2182)
+     [Stephen Henson]
+
+  *) OOB read in TS_OBJ_print_bio()
+
+     The function TS_OBJ_print_bio() misuses OBJ_obj2txt(): the return value is
+     the total length the OID text representation would use and not the amount
+     of data written. This will result in OOB reads when large OIDs are
+     presented.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-2180)
+     [Stephen Henson]
+
+  *) Pointer arithmetic undefined behaviour
+
+     Avoid some undefined pointer arithmetic
+
+     A common idiom in the codebase is to check limits in the following manner:
+     "p + len > limit"
+
+     Where "p" points to some malloc'd data of SIZE bytes and
+     limit == p + SIZE
+
+     "len" here could be from some externally supplied data (e.g. from a TLS
+     message).
+
+     The rules of C pointer arithmetic are such that "p + len" is only well
+     defined where len <= SIZE. Therefore the above idiom is actually
+     undefined behaviour.
+
+     For example this could cause problems if some malloc implementation
+     provides an address for "p" such that "p + len" actually overflows for
+     values of len that are too big and therefore p + len < limit.
+
+     This issue was reported to OpenSSL by Guido Vranken
+     (CVE-2016-2177)
+     [Matt Caswell]
+
+  *) Constant time flag not preserved in DSA signing
+
+     Operations in the DSA signing algorithm should run in constant time in
+     order to avoid side channel attacks. A flaw in the OpenSSL DSA
+     implementation means that a non-constant time codepath is followed for
+     certain operations. This has been demonstrated through a cache-timing
+     attack to be sufficient for an attacker to recover the private DSA key.
+
+     This issue was reported by C?sar Pereida (Aalto University), Billy Brumley
+     (Tampere University of Technology), and Yuval Yarom (The University of
+     Adelaide and NICTA).
+     (CVE-2016-2178)
+     [C?sar Pereida]
+
+  *) DTLS buffered message DoS
+
+     In a DTLS connection where handshake messages are delivered out-of-order
+     those messages that OpenSSL is not yet ready to process will be buffered
+     for later use. Under certain circumstances, a flaw in the logic means that
+     those messages do not get removed from the buffer even though the handshake
+     has been completed. An attacker could force up to approx. 15 messages to
+     remain in the buffer when they are no longer required. These messages will
+     be cleared when the DTLS connection is closed. The default maximum size for
+     a message is 100k. Therefore the attacker could force an additional 1500k
+     to be consumed per connection. By opening many simulataneous connections an
+     attacker could cause a DoS attack through memory exhaustion.
+
+     This issue was reported to OpenSSL by Quan Luo.
+     (CVE-2016-2179)
+     [Matt Caswell]
+
+  *) DTLS replay protection DoS
+
+     A flaw in the DTLS replay attack protection mechanism means that records
+     that arrive for future epochs update the replay protection "window" before
+     the MAC for the record has been validated. This could be exploited by an
+     attacker by sending a record for the next epoch (which does not have to
+     decrypt or have a valid MAC), with a very large sequence number. This means
+     that all subsequent legitimate packets are dropped causing a denial of
+     service for a specific DTLS connection.
+
+     This issue was reported to OpenSSL by the OCAP audit team.
+     (CVE-2016-2181)
+     [Matt Caswell]
+
+  *) Certificate message OOB reads
+
+     In OpenSSL 1.0.2 and earlier some missing message length checks can result
+     in OOB reads of up to 2 bytes beyond an allocated buffer. There is a
+     theoretical DoS risk but this has not been observed in practice on common
+     platforms.
+
+     The messages affected are client certificate, client certificate request
+     and server certificate. As a result the attack can only be performed
+     against a client or a server which enables client authentication.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6306)
+     [Stephen Henson]
+
  Changes between 1.0.2g and 1.0.2h [3 May 2016]
 
   *) Prevent padding oracle in AES-NI CBC MAC check
diff --git a/NEWS b/NEWS
index 1d59f3e..6a787e6 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,24 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.2h and OpenSSL 1.0.2i [under development]
+  Major changes between OpenSSL 1.0.2i and OpenSSL 1.0.2j [under development]
 
       o
 
+  Major changes between OpenSSL 1.0.2h and OpenSSL 1.0.2i [22 Sep 2016]
+
+      o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
+      o SWEET32 Mitigation (CVE-2016-2183)
+      o OOB write in MDC2_Update() (CVE-2016-6303)
+      o Malformed SHA512 ticket DoS (CVE-2016-6302)
+      o OOB write in BN_bn2dec() (CVE-2016-2182)
+      o OOB read in TS_OBJ_print_bio() (CVE-2016-2180)
+      o Pointer arithmetic undefined behaviour (CVE-2016-2177)
+      o Constant time flag not preserved in DSA signing (CVE-2016-2178)
+      o DTLS buffered message DoS (CVE-2016-2179)
+      o DTLS replay protection DoS (CVE-2016-2181)
+      o Certificate message OOB reads (CVE-2016-6306)
+
   Major changes between OpenSSL 1.0.2g and OpenSSL 1.0.2h [3 May 2016]
 
       o Prevent padding oracle in AES-NI CBC MAC check (CVE-2016-2107)
diff --git a/README b/README
index a065f68..9cba523 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2i-dev
+ OpenSSL 1.0.2j-dev
 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 2db36ac..c40160b 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10002090L
+# define OPENSSL_VERSION_NUMBER  0x100020a0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2i-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2j-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2i-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2j-dev  xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index e4bf1b7..880a5c3 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -7,7 +7,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.2i
+Version: 1.0.2j
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index d2afaa5..2185347 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -3014,19 +3014,6 @@ int ssl3_send_client_key_exchange(SSL *s)
                 goto err;
             }
             /*
-             * If we have client certificate, use its secret as peer key
-             */
-            if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
-                if (EVP_PKEY_derive_set_peer
-                    (pkey_ctx, s->cert->key->privatekey) <= 0) {
-                    /*
-                     * If there was an error - just ignore it. Ephemeral key
-                     * * would be used
-                     */
-                    ERR_clear_error();
-                }
-            }
-            /*
              * Compute shared IV and store it in algorithm-specific context
              * data
              */
@@ -3072,12 +3059,6 @@ int ssl3_send_client_key_exchange(SSL *s)
                 n = msglen + 2;
             }
             memcpy(p, tmp, msglen);
-            /* Check if pubkey from client certificate was used */
-            if (EVP_PKEY_CTX_ctrl
-                (pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0) {
-                /* Set flag "skip certificate verify" */
-                s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
-            }
             EVP_PKEY_CTX_free(pkey_ctx);
             s->session->master_key_length =
                 s->method->ssl3_enc->generate_master_secret(s,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index fbcf2e6..7831046 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2316,6 +2316,23 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
                 size -= 2;
                 if (dsize > size)
                     goto err;
+
+                /*
+                 * We remove any OCSP_RESPIDs from a previous handshake
+                 * to prevent unbounded memory growth - CVE-2016-6304
+                 */
+                sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,
+                                        OCSP_RESPID_free);
+                if (dsize > 0) {
+                    s->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null();
+                    if (s->tlsext_ocsp_ids == NULL) {
+                        *al = SSL_AD_INTERNAL_ERROR;
+                        return 0;
+                    }
+                } else {
+                    s->tlsext_ocsp_ids = NULL;
+                }
+
                 while (dsize > 0) {
                     OCSP_RESPID *id;
                     int idsize;
@@ -2335,13 +2352,6 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
                         OCSP_RESPID_free(id);
                         goto err;
                     }
-                    if (!s->tlsext_ocsp_ids
-                        && !(s->tlsext_ocsp_ids =
-                             sk_OCSP_RESPID_new_null())) {
-                        OCSP_RESPID_free(id);
-                        *al = SSL_AD_INTERNAL_ERROR;
-                        return 0;
-                    }
                     if (!sk_OCSP_RESPID_push(s->tlsext_ocsp_ids, id)) {
                         OCSP_RESPID_free(id);
                         *al = SSL_AD_INTERNAL_ERROR;
@@ -2712,6 +2722,11 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p,
                 *al = TLS1_AD_INTERNAL_ERROR;
                 return 0;
             }
+            /*
+             * Could be non-NULL if server has sent multiple NPN extensions in
+             * a single Serverhello
+             */
+            OPENSSL_free(s->next_proto_negotiated);
             s->next_proto_negotiated = OPENSSL_malloc(selected_len);
             if (!s->next_proto_negotiated) {
                 *al = TLS1_AD_INTERNAL_ERROR;

From matt at openssl.org  Thu Sep 22 10:37:51 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:37:51 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1-stable update
Message-ID: <1474540671.335443.4985.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_1-stable has been updated
       via  52a69c480d243f727c8393fb42b9ff9da742c143 (commit)
       via  888759a1d38197f29de7227876c3b58fbff8549f (commit)
       via  16ec56f0cd6337a2506dce4a1e7ef91e0b7ecb76 (commit)
       via  ab650f07a0dabc01a4410f8f702c3cea7932da62 (commit)
       via  2c0d295e26306e15a92eb23a84a1802005c1c137 (commit)
      from  151adf2e5cc23284a059e0f155505006a1c9fad9 (commit)


- Log -----------------------------------------------------------------
commit 52a69c480d243f727c8393fb42b9ff9da742c143
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:31:45 2016 +0100

    Prepare for 1.0.1v-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 888759a1d38197f29de7227876c3b58fbff8549f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:30:27 2016 +0100

    Prepare for 1.0.1u release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 16ec56f0cd6337a2506dce4a1e7ef91e0b7ecb76
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 23:20:45 2016 +0100

    Updates CHANGES and NEWS for new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ab650f07a0dabc01a4410f8f702c3cea7932da62
Author: Dmitry Belyavsky <beldmit at gmail.com>
Date:   Mon Sep 19 16:05:53 2016 +0100

    Avoid KCI attack for GOST
    
    Russian GOST ciphersuites are vulnerable to the KCI attack because they use
    long-term keys to establish the connection when ssl client authorization is
    on. This change brings the GOST implementation into line with the latest
    specs in order to avoid the attack. It should not break backwards
    compatibility.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 2c0d295e26306e15a92eb23a84a1802005c1c137
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 9 10:08:45 2016 +0100

    Fix OCSP Status Request extension unbounded memory growth
    
    A malicious client can send an excessively large OCSP Status Request
    extension. If that client continually requests renegotiation,
    sending a large OCSP Status Request extension each time, then there will
    be unbounded memory growth on the server. This will eventually lead to a
    Denial Of Service attack through memory exhaustion. Servers with a
    default configuration are vulnerable even if they do not support OCSP.
    Builds using the "no-ocsp" build time option are not affected.
    
    I have also checked other extensions to see if they suffer from a similar
    problem but I could not find any other issues.
    
    CVE-2016-6304
    
    Issue reported by Shi Lei.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES           | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 NEWS              |  16 +++++-
 README            |   2 +-
 crypto/opensslv.h |   6 +-
 openssl.spec      |   2 +-
 ssl/s3_clnt.c     |  19 -------
 ssl/t1_lib.c      |  24 +++++---
 7 files changed, 198 insertions(+), 35 deletions(-)

diff --git a/CHANGES b/CHANGES
index f89b50b..e2edbaf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,170 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.1t and 1.0.1u [xx XXX xxxx]
+ Changes between 1.0.1u and 1.0.1v [xx XXX xxxx]
 
-  *) In order to mitigate the SWEET32 attack (CVE-2016-2183),
-     the DES ciphers were moved from HIGH to MEDIUM.
+  *)
+
+ Changes between 1.0.1t and 1.0.1u [22 Sep 2016]
+
+  *) OCSP Status Request extension unbounded memory growth
+
+     A malicious client can send an excessively large OCSP Status Request
+     extension. If that client continually requests renegotiation, sending a
+     large OCSP Status Request extension each time, then there will be unbounded
+     memory growth on the server. This will eventually lead to a Denial Of
+     Service attack through memory exhaustion. Servers with a default
+     configuration are vulnerable even if they do not support OCSP. Builds using
+     the "no-ocsp" build time option are not affected.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6304)
+     [Matt Caswell]
+
+  *) In order to mitigate the SWEET32 attack, the DES ciphers were moved from
+     HIGH to MEDIUM.
+
+     This issue was reported to OpenSSL Karthikeyan Bhargavan and Gaetan
+     Leurent (INRIA)
+     (CVE-2016-2183)
      [Rich Salz]
 
+  *) OOB write in MDC2_Update()
+
+     An overflow can occur in MDC2_Update() either if called directly or
+     through the EVP_DigestUpdate() function using MDC2. If an attacker
+     is able to supply very large amounts of input data after a previous
+     call to EVP_EncryptUpdate() with a partial block then a length check
+     can overflow resulting in a heap corruption.
+
+     The amount of data needed is comparable to SIZE_MAX which is impractical
+     on most platforms.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6303)
+     [Stephen Henson]
+
+  *) Malformed SHA512 ticket DoS
+
+     If a server uses SHA512 for TLS session ticket HMAC it is vulnerable to a
+     DoS attack where a malformed ticket will result in an OOB read which will
+     ultimately crash.
+
+     The use of SHA512 in TLS session tickets is comparatively rare as it requires
+     a custom server callback and ticket lookup mechanism.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6302)
+     [Stephen Henson]
+
+  *) OOB write in BN_bn2dec()
+
+     The function BN_bn2dec() does not check the return value of BN_div_word().
+     This can cause an OOB write if an application uses this function with an
+     overly large BIGNUM. This could be a problem if an overly large certificate
+     or CRL is printed out from an untrusted source. TLS is not affected because
+     record limits will reject an oversized certificate before it is parsed.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-2182)
+     [Stephen Henson]
+
+  *) OOB read in TS_OBJ_print_bio()
+
+     The function TS_OBJ_print_bio() misuses OBJ_obj2txt(): the return value is
+     the total length the OID text representation would use and not the amount
+     of data written. This will result in OOB reads when large OIDs are
+     presented.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-2180)
+     [Stephen Henson]
+
+  *) Pointer arithmetic undefined behaviour
+
+     Avoid some undefined pointer arithmetic
+
+     A common idiom in the codebase is to check limits in the following manner:
+     "p + len > limit"
+
+     Where "p" points to some malloc'd data of SIZE bytes and
+     limit == p + SIZE
+
+     "len" here could be from some externally supplied data (e.g. from a TLS
+     message).
+
+     The rules of C pointer arithmetic are such that "p + len" is only well
+     defined where len <= SIZE. Therefore the above idiom is actually
+     undefined behaviour.
+
+     For example this could cause problems if some malloc implementation
+     provides an address for "p" such that "p + len" actually overflows for
+     values of len that are too big and therefore p + len < limit.
+
+     This issue was reported to OpenSSL by Guido Vranken
+     (CVE-2016-2177)
+     [Matt Caswell]
+
+  *) Constant time flag not preserved in DSA signing
+
+     Operations in the DSA signing algorithm should run in constant time in
+     order to avoid side channel attacks. A flaw in the OpenSSL DSA
+     implementation means that a non-constant time codepath is followed for
+     certain operations. This has been demonstrated through a cache-timing
+     attack to be sufficient for an attacker to recover the private DSA key.
+
+     This issue was reported by C?sar Pereida (Aalto University), Billy Brumley
+     (Tampere University of Technology), and Yuval Yarom (The University of
+     Adelaide and NICTA).
+     (CVE-2016-2178)
+     [C?sar Pereida]
+
+  *) DTLS buffered message DoS
+
+     In a DTLS connection where handshake messages are delivered out-of-order
+     those messages that OpenSSL is not yet ready to process will be buffered
+     for later use. Under certain circumstances, a flaw in the logic means that
+     those messages do not get removed from the buffer even though the handshake
+     has been completed. An attacker could force up to approx. 15 messages to
+     remain in the buffer when they are no longer required. These messages will
+     be cleared when the DTLS connection is closed. The default maximum size for
+     a message is 100k. Therefore the attacker could force an additional 1500k
+     to be consumed per connection. By opening many simulataneous connections an
+     attacker could cause a DoS attack through memory exhaustion.
+
+     This issue was reported to OpenSSL by Quan Luo.
+     (CVE-2016-2179)
+     [Matt Caswell]
+
+  *) DTLS replay protection DoS
+
+     A flaw in the DTLS replay attack protection mechanism means that records
+     that arrive for future epochs update the replay protection "window" before
+     the MAC for the record has been validated. This could be exploited by an
+     attacker by sending a record for the next epoch (which does not have to
+     decrypt or have a valid MAC), with a very large sequence number. This means
+     that all subsequent legitimate packets are dropped causing a denial of
+     service for a specific DTLS connection.
+
+     This issue was reported to OpenSSL by the OCAP audit team.
+     (CVE-2016-2181)
+     [Matt Caswell]
+
+  *) Certificate message OOB reads
+
+     In OpenSSL 1.0.2 and earlier some missing message length checks can result
+     in OOB reads of up to 2 bytes beyond an allocated buffer. There is a
+     theoretical DoS risk but this has not been observed in practice on common
+     platforms.
+
+     The messages affected are client certificate, client certificate request
+     and server certificate. As a result the attack can only be performed
+     against a client or a server which enables client authentication.
+
+     This issue was reported to OpenSSL by Shi Lei (Gear Team, Qihoo 360 Inc.)
+     (CVE-2016-6306)
+     [Stephen Henson]
+
  Changes between 1.0.1s and 1.0.1t [3 May 2016]
 
   *) Prevent padding oracle in AES-NI CBC MAC check
diff --git a/NEWS b/NEWS
index 4ae5cb4..7ff2935 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,24 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.1t and OpenSSL 1.0.1u [under development]
+  Major changes between OpenSSL 1.0.1u and OpenSSL 1.0.1v [under development]
 
       o
 
+  Major changes between OpenSSL 1.0.1t and OpenSSL 1.0.1u [22 Sep 2016]
+
+      o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
+      o SWEET32 Mitigation (CVE-2016-2183)
+      o OOB write in MDC2_Update() (CVE-2016-6303)
+      o Malformed SHA512 ticket DoS (CVE-2016-6302)
+      o OOB write in BN_bn2dec() (CVE-2016-2182)
+      o OOB read in TS_OBJ_print_bio() (CVE-2016-2180)
+      o Pointer arithmetic undefined behaviour (CVE-2016-2177)
+      o Constant time flag not preserved in DSA signing (CVE-2016-2178)
+      o DTLS buffered message DoS (CVE-2016-2179)
+      o DTLS replay protection DoS (CVE-2016-2181)
+      o Certificate message OOB reads (CVE-2016-6306)
+
   Major changes between OpenSSL 1.0.1s and OpenSSL 1.0.1t [3 May 2016]
 
       o Prevent padding oracle in AES-NI CBC MAC check (CVE-2016-2107)
diff --git a/README b/README
index 0947452..9d8e192 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1u-dev
+ OpenSSL 1.0.1v-dev
 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index a71ca2c..eb1cdfe 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10001150L
+# define OPENSSL_VERSION_NUMBER  0x10001160L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1u-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1v-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1u-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1v-dev  xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index e95c7c2..ba3094f 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -7,7 +7,7 @@ Release: 1
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
 #Version: %{libmaj}.%{libmin}.%{librel}
-Version: 1.0.1u
+Version: 1.0.1v
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 40ca13d..f033a2b 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2879,19 +2879,6 @@ int ssl3_send_client_key_exchange(SSL *s)
                 goto err;
             }
             /*
-             * If we have client certificate, use its secret as peer key
-             */
-            if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
-                if (EVP_PKEY_derive_set_peer
-                    (pkey_ctx, s->cert->key->privatekey) <= 0) {
-                    /*
-                     * If there was an error - just ignore it. Ephemeral key
-                     * * would be used
-                     */
-                    ERR_clear_error();
-                }
-            }
-            /*
              * Compute shared IV and store it in algorithm-specific context
              * data
              */
@@ -2937,12 +2924,6 @@ int ssl3_send_client_key_exchange(SSL *s)
                 n = msglen + 2;
             }
             memcpy(p, tmp, msglen);
-            /* Check if pubkey from client certificate was used */
-            if (EVP_PKEY_CTX_ctrl
-                (pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0) {
-                /* Set flag "skip certificate verify" */
-                s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
-            }
             EVP_PKEY_CTX_free(pkey_ctx);
             s->session->master_key_length =
                 s->method->ssl3_enc->generate_master_secret(s,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 7680491..4bc13ca 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1284,6 +1284,23 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p,
                 size -= 2;
                 if (dsize > size)
                     goto err;
+
+                /*
+                 * We remove any OCSP_RESPIDs from a previous handshake
+                 * to prevent unbounded memory growth - CVE-2016-6304
+                 */
+                sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,
+                                        OCSP_RESPID_free);
+                if (dsize > 0) {
+                    s->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null();
+                    if (s->tlsext_ocsp_ids == NULL) {
+                        *al = SSL_AD_INTERNAL_ERROR;
+                        return 0;
+                    }
+                } else {
+                    s->tlsext_ocsp_ids = NULL;
+                }
+
                 while (dsize > 0) {
                     OCSP_RESPID *id;
                     int idsize;
@@ -1303,13 +1320,6 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p,
                         OCSP_RESPID_free(id);
                         goto err;
                     }
-                    if (!s->tlsext_ocsp_ids
-                        && !(s->tlsext_ocsp_ids =
-                             sk_OCSP_RESPID_new_null())) {
-                        OCSP_RESPID_free(id);
-                        *al = SSL_AD_INTERNAL_ERROR;
-                        return 0;
-                    }
                     if (!sk_OCSP_RESPID_push(s->tlsext_ocsp_ids, id)) {
                         OCSP_RESPID_free(id);
                         *al = SSL_AD_INTERNAL_ERROR;

From matt at openssl.org  Thu Sep 22 10:38:12 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:38:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_1u create
Message-ID: <1474540692.116823.5571.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_0_1u has been created
        at  1883c9e66f488b03bacf2fb634ae0cda438352b1 (tag)
   tagging  888759a1d38197f29de7227876c3b58fbff8549f (commit)
  replaces  OpenSSL_1_0_1t
 tagged by  Matt Caswell
        on  Thu Sep 22 11:30:27 2016 +0100

- Log -----------------------------------------------------------------
OpenSSL 1.0.1u release tag
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJX47LDAAoJENnE0m0OYESREagIAIhmezllxDLm/jxDP+YfrcpO
R2sN77jbIR4v+V0O4ox+UI0QCI45YhiQAc9RbhmQzw6vlZk6bpCwRElQREPhZfRG
9zTU8uA7Cdmc6u2u84a//ciKtjcts1QsfT+yVYOM4QjijYNzl5W6/JVNhtCszv2v
GaDpcExS8MHsKqLZc8PalLxLRF2aSs9oVQ9K2thVPc4R0wuetsLoEIhxKY9Prc8b
PNpXp6QoKvpFFqsI1alZ/PQl6Oj/IpWYch66o2TzhkDqsuHX/qzSfkODhFmxGaps
b+mVtdwUMsPc0oWBphvjD81pdJs61/S2gCAEOy+giLDItaRJkg9OL+t5um410Qk=
=sOzA
-----END PGP SIGNATURE-----

Cesar Pereida (1):
      Fix DSA, preserve BN_FLG_CONSTTIME

David Woodhouse (1):
      Fix SSL_export_keying_material() for DTLS1_BAD_VER

Dmitry Belyavsky (1):
      Avoid KCI attack for GOST

Dr. Stephen Henson (29):
      add documentation
      Fix double free in d2i_PrivateKey().
      Fix name length limit check.
      Always try to set ASN.1 parameters for CMS.
      Use default ASN.1 for SEED.
      Only set CMS parameter when encrypting
      Tidy up PKCS12_newpass() fix memory leaks.
      Constify PKCS12_newpass()
      Only call FIPS_update, FIPS_final in FIPS mode.
      Update S/MIME certificates.
      Fix OOB read in TS_OBJ_print_bio().
      Check for overlows and error return from ASN1_object_size()
      Check for overflows in ASN1_object_size().
      include <limits.h>
      Calculate sequence length properly.
      Check for overflows in i2d_ASN1_SET()
      Limit recursion depth in old d2i_ASN1_bytes function
      Leak fixes.
      Sanity check input length in OPENSSL_uni2asc().
      Check for errors in a2d_ASN1_OBJECT()
      Check for errors in BN_bn2dec()
      Limit reads in do_b2i_bio()
      Sanity check ticket length.
      Avoid overflow in MDC2_Update()
      Fix small OOB reads.
      Remove unnecessary check.
      Use SSL3_HM_HEADER_LENGTH instead of 4.
      Make message buffer slightly larger than message.
      update default dependency options

Kazuki Yamaguchi (1):
      Fix overflow check in BN_bn2dec()

Kurt Roeckx (2):
      Return error when trying to print invalid ASN1 integer
      Fix off by 1 in ASN1_STRING_set()

Matt Caswell (16):
      Prepare for 1.0.1u-dev
      Check that the obtained public key is valid
      Fix error return value in SRP functions
      Avoid some undefined pointer arithmetic
      Update CONTRIBUTING
      More fix DSA, preserve BN_FLG_CONSTTIME
      Change usage of RAND_pseudo_bytes to RAND_bytes
      Convert memset calls to OPENSSL_cleanse
      Fix DTLS unprocessed records bug
      Fix DTLS replay protection
      Update function error code
      Fix DTLS buffered message DoS attack
      Prevent DTLS Finished message injection
      Fix OCSP Status Request extension unbounded memory growth
      Updates CHANGES and NEWS for new release
      Prepare for 1.0.1u release

Rich Salz (3):
      Recommend GH over RT, per team vote.
      RT3940: For now, just document the issue.
      SWEET32 (CVE-2016-2183): Move DES from HIGH to MEDIUM

Richard Levitte (4):
      Check that the subject name in a proxy cert complies to RFC 3820
      Fix proxy certificate pathlength verification
      Allow proxy certs to be present when verifying a chain
      make update to have PEM_R_HEADER_TOO_LONG defined

Viktor Dukhovni (2):
      Clarify negative return from X509_verify_cert()
      Ensure verify error is set when X509_verify_cert() fails

-----------------------------------------------------------------------

From matt at openssl.org  Thu Sep 22 10:38:12 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:38:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0a create
Message-ID: <1474540692.293227.5604.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_1_0a has been created
        at  381296ee513d8ce2c32c6cb08282ed28314d3def (tag)
   tagging  ac2c44c6289f9716de4c4beeb284a818eacde517 (commit)
  replaces  OpenSSL_1_1_0
 tagged by  Matt Caswell
        on  Thu Sep 22 11:14:50 2016 +0100

- Log -----------------------------------------------------------------
OpenSSL 1.1.0a release tag
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJX468aAAoJENnE0m0OYESRUawIAJbqKpgBDQoEhGHk22Gn1MHY
eyU1pl5HiP6xrDUjVGnEl47bSkGrbvynbbdZzH4M1WBLfyRdikPE9LbsYWaKoVuU
FFhGkewcHFeuMd5NkyoqsPKjNtgYrzgmmAN6lmv44b9TQaHQ5ATsYTcZweZopRWz
1VtEtUhHOreYftClN3rllQP25gBjnQo2PXv6VqfJXrMeJ7F9eyc+vDKh1DZIaYJo
18WpjpPc7lbOeisn2TTLN9bWt2ufdpR9JRos+Ccp/W21kqxnqxXXTG55F0gyl4iZ
zjQNsujhNBdhO1AMngVS+RRrhtXx1jpNjCEN+NFyVcDKGRiMBthTl0QU8O0kBYs=
=Ql3F
-----END PGP SIGNATURE-----

Alessandro Ghedini (1):
      Use switch instead of multiple ifs

Alex Gaynor (1):
      GH1537: Avoid double-free in the EVP_PKEY API

Andy Grundman (1):
      Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.

Andy Polyakov (14):
      crypto/bn/*: x86[_64] division instruction doesn't handle constants, change constraint from 'g' to 'r'.
      Configurations/10-main.conf: remove solaris-x86-cc target.
      Configurations/10-main.conf: fix omittions in commentary.
      modes/asm/ghash-armv4.pl: improve interoperability with Android NDK.
      chacha/asm/chacha-ppc.pl: add missing .text directive.
      Configurations/10-main.cf: AIX "facelift".
      engines/afalg: make it compile with backward compatibility headers.
      bn/bn_lcl.h: improve interoperability with clang and Android NDK.
      Configure: detect gcc's dependency generation capability more accurately.
      rand/randfile.c: restore fallback to $HOME for non-setuid programs.
      rand/randfile.c: rationalize __OpenBSD__ code path.
      rand/randfile.c: treat empty string in RAND_file_name as error.
      Configure: clarify and refine -static.
      CHANGES: mention removal of solaris-x86-cc.

David Woodhouse (2):
      Avoid EVP_PKEY_cmp() crash on EC keys without public component
      Add enginesdir to libcrypto.pc pkg-config file

Dmitry Belyavsky (1):
      Avoid KCI attack for GOST

FdaSilvaYY (4):
      Remove an useless definition.
      Update INSTALL about no-md5 removal
      Fix various missing option help messages ...
      Remove an option related to a deprecated flag

Guido Vranken (1):
      Prevent overflows in stack API

Matt Caswell (24):
      Prepare for 1.1.0a-dev
      Remove note from CHANGES about EC DRBG
      Ensure the CertStatus message adds a DTLS message header where needed
      Add some CertStatus tests
      Ensure trace recognises X25519
      Fix mem leaks during auto-deinit
      Abort on unrecognised warning alerts
      util/shlib_wrap.sh is now auto-generated so tell git to ignore it
      Add some sanity checks around usage of t_fromb64()
      Revert "Abort on unrecognised warning alerts"
      Convert num_alloc to a size_t in stack.c and tweak style
      Fix a missing NULL check in dsa_builtin_paramgen
      Don't allow too many consecutive warning alerts
      Don't leak on an OPENSSL_realloc() failure
      Excessive allocation of memory in tls_get_message_header()
      Excessive allocation of memory in dtls1_preprocess_fragment()
      Fix OCSP Status Request extension unbounded memory growth
      Add the ability to set OCSP_RESPID fields
      Add OCSP_RESPID_match()
      Add some more OCSP testing
      Fix a mem leak in NPN handling
      Fix a hang with SSL_peek()
      Updates CHANGES and NEWS for new release
      Prepare for 1.1.0a release

Rich Salz (11):
      Remove trailing zeros
      Use uppercase name for PCT_ enum
      Remove comment tags from structs (coding style)
      Code cleanup UI
      Misc BN fixes
      Add missing debug strings.
      Add -h and -help for c_rehash script and app
      Make reference to other manpage more explicit
      RT3669: dgst can only sign/verify one file.
      GH1555: Don't bump size on realloc failure
      Dcoument -alpn flag

Richard Levitte (49):
      Improve the definition of STITCHED_CALL in e_rc4_hmac_md5.c
      VMS: honor --openssldir setting
      Make it possible for the user to specify a different default build file
      Configure: clean away temporary section of code
      Configure: Redo the logic for finding build file templates
      Configure: save away the value of OPENSSL_LOCAL_CONFIG_DIR for reconf
      The Perl interpreter might be in a path with spaces, so maybe quote it
      Make it possible to disable fuzz testing
      Configure's print_table_entry printed incorrect information
      Have Configure's HASH or TABLE produce complete lists
      INSTALL: clarify OPENSSL_LOCAL_CONFIG_DIR
      INSTALL: add information on the environment variable BUILDFILE
      INSTALL: add information on option no-fuzz-test
      Revert "Make it possible to disable fuzz testing"
      Revert "INSTALL: add information on option no-fuzz-test"
      Move 05-test_fuzz.t to 90-test_fuzz.t
      Unix build: have the makedepend and cc actions in one recipe
      Correct detection of group end in map file when testing symbol presence
      Configure: Reorganise the checking of disabled options
      Allow asan, msan and ubsan to be configured with shared libraries
      Travis: Do asan and msan with shared libraries
      If errno is ENXIO in BSS_new_file(), set BIO_R_NO_SUCH_FILE
      Fix 'openssl passwd' with arguments -1 or -apr1
      Add a test for 'openssl passwd'
      VSI submission: redirect terminal input through socket
      Add copyright and license on apps/vms_term_sock.[ch]
      Reformat to fit OpenSSL source code standards
      Refactor to avoid unnecessary preprocessor logic
      Finally, make sure vms_term_sock.c is built on VMS
      Register the name of the config file each config target was found in
      Use the registered conf file names as dependencies to build configdata.pm
      Rearrange the storage of build file template names in %config
      Simplify the dependencies for remaking configdata.pm
      Simplify configudata.pm dependency generation
      Have the configuration options 'no-err' and 'no-async' work again
      Fix no-ocsp
      Fixup BIO demos for OpenSSL 1.1.x
      Fixup BIO demos for OpenSSL 1.1.x
      Fixup BIO demos for OpenSSL 1.1.x
      Don't ignore Makefiles in demos/
      Crude Makefile for demos/bio/
      Crude VMS build files for demos/bio/
      Documentation fixup; no more ECDHParameters
      apps/apps.c: include sys/socket.h to declare recv()
      util/dofile.pl: report if a template couldn't be loaded
      descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines
      VMS: add [.util]shlib_wrap.exe and its build instructions
      test/x509aux.c: Fix argv loop
      Fix error message typo, wrong function code

Tim Hudson (1):
      Fix EC_KEY_print so it prints out private key information     even when the public key is not present in an EC_KEY

Viktor Szakats (2):
      s_client: avoid warning on Windows/MS-DOS systems
      bio.h: fix number of arguments passed to BIO_ptr_ctrl()

-----------------------------------------------------------------------

From matt at openssl.org  Thu Sep 22 10:38:12 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:38:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2i create
Message-ID: <1474540692.184249.5588.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_0_2i has been created
        at  c3b111de3699ae812738e61c6b01101ea6a12b74 (tag)
   tagging  32c130160f7dac2cef5d0e30d94b335e4a87104d (commit)
  replaces  OpenSSL_1_0_2h
 tagged by  Matt Caswell
        on  Thu Sep 22 11:24:53 2016 +0100

- Log -----------------------------------------------------------------
OpenSSL 1.0.2i release tag
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJX47F1AAoJENnE0m0OYESRc3sIAI79tKT3pLjuUua0+24tw8B8
Va/LslUflHIv9Ajt2Zr/erB9eVPBshVdMaTsaoHbYtKsNqHby7BKxmIpUfQQ+0ZQ
YmWOFvHt2r5sUKMSTHldT2rY27M7v9LIIwxOL0BWSQ+odtxFMK8UxWwTBdKDKsaL
c1+SGHiw7m2Eqqkc/RLGM5mc2EflnG0I3UDTMTAazzaev6SPDiN1F+bR3tqI6VMt
DE0+5qYxlmgbJw0ndTUjqj4sH7bv7b3c2mR/DyE7AsrwVvUDq0siYi9BNTNn0aV8
O5sRNsioqdEoZ/o/nil3FIsfdsgnOoOXxUpe69nSBExjsSRpB8IcvUlT3nIFsBA=
=2QfE
-----END PGP SIGNATURE-----

Alessandro Ghedini (1):
      Avoid double declaration of COMP_METHOD     Reviewed-by: Matt Caswell <matt at openssl.org>     Reviewed-by: Kurt Roeckx <kurt at openssl.org>     Reviewed-by: Rich Salz <rsalz at openssl.org>     (Merged from https://github.com/openssl/openssl/pull/1083)

Andy Polyakov (16):
      rand/randfile.c: remove _XOPEN_SOURCE definition.
      hmac/hmac.c: switch to OPENSSL_cleanse.
      crypto/mem_clr.c: switch to OPENSSL_cleanse implementation from master.
      crypto/mem.c: drop reference to cleanse_ctr and fix no-asm builds.
      crypto/sparccpuid.S: limit symbol visibility.
      aes/asm/bsaes-armv7.pl: fix XTS decrypt test failure.
      aes/asm/bsaes-armv7.pl: omit redundant stores in XTS subroutines.
      doc/crypto/OPENSSL_ia32cap.pod: harmonize with actual declaration.
      SPARC assembly pack: enforce V8+ ABI constraints.
      sha/asm/sha1-x86_64.pl: fix crash in SHAEXT code on Windows.
      ec/ecp_nistz256.c: get is_one on 32-bit platforms right.
      bn/asm/x86[_64]-mont*.pl: implement slightly alternative page-walking.
      ec/asm/ecp_nistz256-x86_64.pl: addition to perform stricter reduction.
      ec/ecp_nistz256: harmonize is_infinity with ec_GFp_simple_is_at_infinity.
      ec/asm/ecp_nistz256-x86_64.pl: /cmovb/cmovc/ as nasm doesn't recognize cmovb.
      crypto/bn/*: x86[_64] division instruction doesn't handle constants, change constraint from 'g' to 'r'.

Cesar Pereida (1):
      Fix DSA, preserve BN_FLG_CONSTTIME

Cristian Stoica (1):
      remove double initialization of cryptodev engine

Cynh (1):
      Fix SRP client key computation

David Benjamin (2):
      Don't send signature algorithms when client_version is below TLS 1.2.
      Don't check for malloc failure twice.

David Woodhouse (4):
      Fix SSL_export_keying_material() for DTLS1_BAD_VER
      Fix ubsan 'left shift of negative value -1' error in satsub64be()
      Add basic test for Cisco DTLS1_BAD_VER and record replay handling
      Avoid EVP_PKEY_cmp() crash on EC keys without public component

Dirk Feytons (1):
      Fix build with no-cmac

Dmitry Belyavsky (1):
      Avoid KCI attack for GOST

Dr. Matthias St. Pierre (1):
      RT3925: Remove trailing semi from #define's.

Dr. Stephen Henson (50):
      add documentation
      Fix double free in d2i_PrivateKey().
      Fix name length limit check.
      Always try to set ASN.1 parameters for CMS.
      Use default ASN.1 for SEED.
      Only set CMS parameter when encrypting
      Tidy up PKCS12_newpass() fix memory leaks.
      Constify PKCS12_newpass()
      Only call FIPS_update, FIPS_final in FIPS mode.
      Typo.
      Add -signcert to CA.pl usage message.
      Parameter copy sanity checks.
      Don't skip leading zeroes in PSK keys.
      Fix link error.
      Fix omitted selector handling.
      Don't indicate errors during initial adb decode.
      Fix print of ASN.1 BIGNUM type.
      Check and print out boolean type properly.
      Support PKCS v2.0 print in pkcs12 utility.
      Send alert on CKE error.
      Sanity check in ssl_get_algorithm2().
      Clarify digest change in HMAC_Init_ex()
      Fix OOB read in TS_OBJ_print_bio().
      Send alert for bad DH CKE
      Use newest CRL.
      Set error if EVP_CipherUpdate fails.
      Note cipher BIO write errors too.
      Fix CRL time comparison.
      Check for overlows and error return from ASN1_object_size()
      Check for overflows in ASN1_object_size().
      include <limits.h>
      Calculate sequence length properly.
      Limit status message sisze in ts_get_status_check
      Check for overflows in i2d_ASN1_SET()
      Limit recursion depth in old d2i_ASN1_bytes function
      Leak fixes.
      Sanity check input length in OPENSSL_uni2asc().
      Check for errors in a2d_ASN1_OBJECT()
      Check for errors in BN_bn2dec()
      Limit reads in do_b2i_bio()
      Sanity check ticket length.
      Avoid overflow in MDC2_Update()
      Fix memory leak on error.
      Fix memory leak on error.
      Fix memory leak on realloc error.
      update default dependencies
      Fix small OOB reads.
      Remove unnecessary check.
      Use SSL3_HM_HEADER_LENGTH instead of 4.
      Make message buffer slightly larger than message.

FdaSilvaYY (2):
      Fix some missing inits
      Fix a few leaks in X509_REQ_to_X509.     Fix a possible leak on NETSCAPE_SPKI_verify failure.

John Foley (1):
      RT3752: Add FIPS callback for thread id

Jonas Maebe (1):
      cryptodev_asym, zapparams: use OPENSSL_* allocation routines, handle errors

Kazuki Yamaguchi (1):
      Fix overflow check in BN_bn2dec()

Kurt Roeckx (2):
      Return error when trying to print invalid ASN1 integer
      Fix off by 1 in ASN1_STRING_set()

Marcus Meissner (1):
      initialize the RSA struct to 0.

Matt Caswell (49):
      Prepare for 1.0.2i-dev
      Fix BIO_eof() for BIO pairs
      Fix SSL compression symbol exporting
      Remove repeated condition from if in X509_NAME_oneline
      Fix a double free in tls1_setup_key_block
      Check that the obtained public key is valid
      Fix error return value in SRP functions
      Fix a mem leak on an error path in OBJ_NAME_add()
      The ssl3_digest_cached_records() function does not handle errors properly
      Check for malloc failure in EVP_PKEY_keygen()
      Avoid some undefined pointer arithmetic
      Update CONTRIBUTING
      BIO_printf() can fail to print the last character
      Fix documentation error in x509 app certopt flag
      More fix DSA, preserve BN_FLG_CONSTTIME
      Fix BN_mod_word bug
      Add a BN_mod_word test()
      Fix seg fault in TS_RESP_verify_response()
      Fix an error path leak in do_ext_nconf()
      Fix an error path leak in int X509_ATTRIBUTE_set1_data()
      Revert "RT4526: Call TerminateProcess, not ExitProcess"
      Fix ASN1_STRING_to_UTF8 could not convert NumericString
      Ensure HMAC key gets cleansed after use
      Change usage of RAND_pseudo_bytes to RAND_bytes
      Convert memset calls to OPENSSL_cleanse
      Avoid an overflow in constructing the ServerKeyExchange message
      Disallow multiple protocol flags to s_server and s_client
      Back port ssltestlib code to 1.0.2
      Add a DTLS unprocesed records test
      Fix DTLS unprocessed records bug
      Add DTLS replay protection test
      Fix DTLS replay protection
      Update function error code
      Silence some "maybe used uninitialised" warnings
      Fix DTLS buffered message DoS attack
      Prevent DTLS Finished message injection
      Fix no-ec
      Fix the no-tls1 option
      SRP_create_verifier does not check for NULL before OPENSSL_cleanse
      Ensure the CertStatus message adds a DTLS message header where needed
      Abort on unrecognised warning alerts
      Add some sanity checks around usage of t_fromb64()
      Revert "Abort on unrecognised warning alerts"
      Fix a missing NULL check in dsa_builtin_paramgen
      Don't allow too many consecutive warning alerts
      Fix OCSP Status Request extension unbounded memory growth
      Fix a mem leak in NPN handling
      Updates CHANGES and NEWS for new release
      Prepare for 1.0.2i release

Orgad Shaneh (1):
      Fix compilation with CMS disabled

Pauli (1):
      RT4573: Synopsis for RAND_add is wrong

Phillip Hellewell (1):
      RT3053: Check for NULL before dereferencing

Rich Salz (21):
      GH837: Avoid double-free in OCSP parse.
      Recommend GH over RT, per team vote.
      RT4560: Initialize variable to NULL
      RT4562: Backport doc fix.
      RT4546: Backport doc fix
      RT4526: Call TerminateProcess, not ExitProcess
      RT4545: Backport 2877 to 1.0.2
      RT2964: Fix it via doc
      Revert "RT2964: Fix it via doc"
      RT2964: Fix it via doc
      Add missing casts.
      Fix NULL-return checks in 1.0.2
      RT3940: For now, just document the issue.
      Fix incorrect return argument.
      Fix pointer/alloc prob from previous commit
      RT2676: Reject RSA eponent if even or 1
      SWEET32 (CVE-2016-2183): Move DES from HIGH to MEDIUM
      Misc BN fixes
      Make update
      GH1555: Don't bump size on realloc failure
      Dcoument -alpn flag

Richard Levitte (54):
      Check return of PEM_write_* functions and report possible errors
      Add NULL check in i2d_PrivateKey()
      Use RPMBUILD macros rather than hard coded paths in openssl.spec
      Windows: Add CRYPT32.LIB to the libraries to link your app with
      Documentation: Clarify sizes for UI_add_input_string()
      Add support for RC / WINDRES env variables
      Add missing initialiser in e_chil.c
      Don't require any length of password when decrypting
      Make it possible to have RFC2254 escapes with ASN1_STRING_print_ex()
      make update
      Document the esc_2254 command line name option
      Refresh seldom used C generating scripts to current C standard
      Run the refreshed scripts
      Fix util/mkerr.pl
      Cleanup openssl.ec
      Revert "Make it possible to have RFC2254 escapes with ASN1_STRING_print_ex()"
      Revert "make update"
      Revert "Document the esc_2254 command line name option"
      openssl verify: only display the command usage on usage errors
      Always check that the value returned by asn1_do_adb() is non-NULL
      Change (!seqtt) to (seqtt == NULL)
      apps/req.c: Increment the right variable when parsing '+'
      Fix missing opening braces
      Check that the subject name in a proxy cert complies to RFC 3820
      Fix proxy certificate pathlength verification
      Allow proxy certs to be present when verifying a chain
      Fix ASN.1 private encode of EC_KEY to not change the input key
      Remove the silly CVS markers from LPdir_*.c
      Don't check any revocation info on proxy certificates
      make update to have PEM_R_HEADER_TOO_LONG defined
      VMS: synchronise tests with Unix
      evp_test.c: avoid warning from having a pointer difference returned as int
      VSI submission: avoid pointer size warnings in mem.c
      VSI submission: make better use of item lists in o_time.c
      VSI submission: RAND fixups
      Have dtlstest run on VMS as well
      ssltestlib: Tell compiler we don't care about the value when we don't
      Make 'openssl req -x509' more equivalent to 'openssl req -new'
      GOST: rearrange code so it's more like C rather than C++
      VMS: Use strict refdef extern model when building library object files
      mk1mf: dtlstest needs ssltestlib, include it with a hack
      Improve the definition of STITCHED_CALL in e_rc4_hmac_md5.c
      If errno is ENXIO in BSS_new_file(), set BIO_R_NO_SUCH_FILE
      Add enginesdir to libcrypto.pc pkg-config file
      VMS: only use _realloc32 with /POINTER_SIZE=32
      VSI submission: redirect terminal input through socket
      Add copyright and license on apps/vms_term_sock.[ch]
      Remove entirely unnecessary pointer size guards
      Reformat to fit OpenSSL source code standards
      Refactor to avoid unnecessary preprocessor logic
      Finally, make sure vms_term_sock.c is built
      RT4669: dgst can only sign/verify one file
      apps/apps.c: include sys/socket.h to declare recv()
      mk1mf.pl: check for no-tls1 here as well

Steven Valdez (1):
      Adding missing BN_CTX_(start/end) in crypto/ec/ec_key.c

Todd Short (2):
      OCSP_request_add0_id() inconsistent error return
      Always use session_ctx when removing a session

Viktor Dukhovni (3):
      Fix i2d_X509_AUX and update docs
      Clarify negative return from X509_verify_cert()
      Ensure verify error is set when X509_verify_cert() fails

isnotnick (1):
      RT3513: req doesn't display attributes using utf8string

-----------------------------------------------------------------------

From matt at openssl.org  Thu Sep 22 10:38:43 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 10:38:43 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1474540723.758601.6080.nullmailer@dev.openssl.org>

The branch master has been updated
       via  fbd32b1a5c7f0d7bc90e8a716bdf44cbfbeeb7a6 (commit)
      from  08e980caee8d6252b0838e9924498db12083203b (commit)


- Log -----------------------------------------------------------------
commit fbd32b1a5c7f0d7bc90e8a716bdf44cbfbeeb7a6
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 22 11:10:48 2016 +0100

    Update website for new release

-----------------------------------------------------------------------

Summary of changes:
 news/newsflash.txt       |   4 +
 news/secadv/20160922.txt | 361 +++++++++++++++++++++++++++++
 news/vulnerabilities.xml | 590 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 954 insertions(+), 1 deletion(-)
 create mode 100644 news/secadv/20160922.txt

diff --git a/news/newsflash.txt b/news/newsflash.txt
index 0a90069..6eb393c 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -4,6 +4,10 @@
 # Format is two fields, colon-separated; the first line is the column
 # headings.  URL paths must all be absolute.
 Date: Item
+22-Sep-2016: <a href="/news/secadv/20160922.txt">Security Advisory</a>: several security fixes
+22-Sep-2016: OpenSSL 1.1.0a is now available, including bug and security fixes
+22-Sep-2016: OpenSSL 1.0.2i is now available, including bug and security fixes
+22-Sep-2016: OpenSSL 1.0.1u is now available, including bug and security fixes
 19-Sep-2016: OpenSSL 1.1.0a, 1.0.2i, 1.0.1u <a href="https://mta.openssl.org/pipermail/openssl-announce/2016-September/000076.html">security releases due 22nd Sep 2016</a>
 25-Aug-2016: OpenSSL 1.1.0 is now available
 04-Aug-2016: Beta 3 (pre-release 6) of OpenSSL 1.1.0 is now available: please download and test it
diff --git a/news/secadv/20160922.txt b/news/secadv/20160922.txt
new file mode 100644
index 0000000..c35d70a
--- /dev/null
+++ b/news/secadv/20160922.txt
@@ -0,0 +1,361 @@
+
+OpenSSL Security Advisory [22 Sep 2016]
+========================================
+
+OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
+=====================================================================
+
+Severity: High
+
+A malicious client can send an excessively large OCSP Status Request extension.
+If that client continually requests renegotiation, sending a large OCSP Status
+Request extension each time, then there will be unbounded memory growth on the
+server. This will eventually lead to a Denial Of Service attack through memory
+exhaustion. Servers with a default configuration are vulnerable even if they do
+not support OCSP. Builds using the "no-ocsp" build time option are not affected.
+
+Servers using OpenSSL versions prior to 1.0.1g are not vulnerable in a default
+configuration, instead only if an application explicitly enables OCSP stapling
+support.
+
+OpenSSL 1.1.0 users should upgrade to 1.1.0a
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 29th August 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Matt Caswell of the OpenSSL
+development team.
+
+SSL_peek() hang on empty record (CVE-2016-6305)
+===============================================
+
+Severity: Moderate
+
+OpenSSL 1.1.0 SSL/TLS will hang during a call to SSL_peek() if the peer sends an
+empty record. This could be exploited by a malicious peer in a Denial Of Service
+attack.
+
+OpenSSL 1.1.0 users should upgrade to 1.1.0a
+
+This issue was reported to OpenSSL on 10th September 2016 by Alex Gaynor. The
+fix was developed by Matt Caswell of the OpenSSL development team.
+
+SWEET32 Mitigation (CVE-2016-2183)
+==================================
+
+Severity: Low
+
+SWEET32 (https://sweet32.info) is an attack on older block cipher algorithms
+that use a block size of 64 bits. In mitigation for the SWEET32 attack DES based
+ciphersuites have been moved from the HIGH cipherstring group to MEDIUM in
+OpenSSL 1.0.1 and OpenSSL 1.0.2.  OpenSSL 1.1.0 since release has had these
+ciphersuites disabled by default.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 16th August 2016 by Karthikeyan
+Bhargavan and Gaetan Leurent (INRIA). The fix was developed by Rich Salz of the
+OpenSSL development team.
+
+OOB write in MDC2_Update() (CVE-2016-6303)
+==========================================
+
+Severity: Low
+
+An overflow can occur in MDC2_Update() either if called directly or
+through the EVP_DigestUpdate() function using MDC2. If an attacker
+is able to supply very large amounts of input data after a previous
+call to EVP_EncryptUpdate() with a partial block then a length check
+can overflow resulting in a heap corruption.
+
+The amount of data needed is comparable to SIZE_MAX which is impractical
+on most platforms.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 11th August 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Stephen Henson of the OpenSSL
+development team.
+
+Malformed SHA512 ticket DoS (CVE-2016-6302)
+===========================================
+
+Severity: Low
+
+If a server uses SHA512 for TLS session ticket HMAC it is vulnerable to a
+DoS attack where a malformed ticket will result in an OOB read which will
+ultimately crash.
+
+The use of SHA512 in TLS session tickets is comparatively rare as it requires
+a custom server callback and ticket lookup mechanism.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 19th August 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Stephen Henson of the OpenSSL
+development team.
+
+OOB write in BN_bn2dec() (CVE-2016-2182)
+========================================
+
+Severity: Low
+
+The function BN_bn2dec() does not check the return value of BN_div_word().
+This can cause an OOB write if an application uses this function with an
+overly large BIGNUM. This could be a problem if an overly large certificate
+or CRL is printed out from an untrusted source. TLS is not affected because
+record limits will reject an oversized certificate before it is parsed.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 2nd August 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Stephen Henson of the OpenSSL
+development team.
+
+OOB read in TS_OBJ_print_bio() (CVE-2016-2180)
+==============================================
+
+Severity: Low
+
+The function TS_OBJ_print_bio() misuses OBJ_obj2txt(): the return value is
+the total length the OID text representation would use and not the amount
+of data written. This will result in OOB reads when large OIDs are presented.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 21st July 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Stephen Henson of the OpenSSL
+development team.
+
+Pointer arithmetic undefined behaviour (CVE-2016-2177)
+======================================================
+
+Severity: Low
+
+Avoid some undefined pointer arithmetic
+
+A common idiom in the codebase is to check limits in the following manner:
+"p + len > limit"
+
+Where "p" points to some malloc'd data of SIZE bytes and
+limit == p + SIZE
+
+"len" here could be from some externally supplied data (e.g. from a TLS
+message).
+
+The rules of C pointer arithmetic are such that "p + len" is only well
+defined where len <= SIZE. Therefore the above idiom is actually
+undefined behaviour.
+
+For example this could cause problems if some malloc implementation
+provides an address for "p" such that "p + len" actually overflows for
+values of len that are too big and therefore p + len < limit.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 4th May 2016 by Guido Vranken. The
+fix was developed by Matt Caswell of the OpenSSL development team.
+
+Constant time flag not preserved in DSA signing (CVE-2016-2178)
+===============================================================
+
+Severity: Low
+
+Operations in the DSA signing algorithm should run in constant time in order to
+avoid side channel attacks. A flaw in the OpenSSL DSA implementation means that
+a non-constant time codepath is followed for certain operations. This has been
+demonstrated through a cache-timing attack to be sufficient for an attacker to
+recover the private DSA key.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 23rd May 2016 by C?sar Pereida (Aalto
+University), Billy Brumley (Tampere University of Technology), and Yuval Yarom
+(The University of Adelaide and NICTA). The fix was developed by C?sar Pereida.
+
+DTLS buffered message DoS (CVE-2016-2179)
+=========================================
+
+Severity: Low
+
+In a DTLS connection where handshake messages are delivered out-of-order those
+messages that OpenSSL is not yet ready to process will be buffered for later
+use. Under certain circumstances, a flaw in the logic means that those messages
+do not get removed from the buffer even though the handshake has been completed.
+An attacker could force up to approx. 15 messages to remain in the buffer when
+they are no longer required. These messages will be cleared when the DTLS
+connection is closed. The default maximum size for a message is 100k. Therefore
+the attacker could force an additional 1500k to be consumed per connection. By
+opening many simulataneous connections an attacker could cause a DoS attack
+through memory exhaustion.
+
+OpenSSL 1.0.2 DTLS users should upgrade to 1.0.2i
+OpenSSL 1.0.1 DTLS users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 22nd June 2016 by Quan Luo. The fix was
+developed by Matt Caswell of the OpenSSL development team.
+
+DTLS replay protection DoS (CVE-2016-2181)
+==========================================
+
+Severity: Low
+
+A flaw in the DTLS replay attack protection mechanism means that records that
+arrive for future epochs update the replay protection "window" before the MAC
+for the record has been validated. This could be exploited by an attacker by
+sending a record for the next epoch (which does not have to decrypt or have a
+valid MAC), with a very large sequence number. This means that all subsequent
+legitimate packets are dropped causing a denial of service for a specific
+DTLS connection.
+
+OpenSSL 1.0.2 DTLS users should upgrade to 1.0.2i
+OpenSSL 1.0.1 DTLS users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 21st November 2015 by the OCAP audit team.
+The fix was developed by Matt Caswell of the OpenSSL development team.
+
+Certificate message OOB reads (CVE-2016-6306)
+=============================================
+
+Severity: Low
+
+In OpenSSL 1.0.2 and earlier some missing message length checks can result in
+OOB reads of up to 2 bytes beyond an allocated buffer. There is a theoretical
+DoS risk but this has not been observed in practice on common platforms.
+
+The messages affected are client certificate, client certificate request and
+server certificate. As a result the attack can only be performed against
+a client or a server which enables client authentication.
+
+OpenSSL 1.1.0 is not affected.
+
+OpenSSL 1.0.2 users should upgrade to 1.0.2i
+OpenSSL 1.0.1 users should upgrade to 1.0.1u
+
+This issue was reported to OpenSSL on 22nd August 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Stephen Henson of the OpenSSL
+development team.
+
+Excessive allocation of memory in tls_get_message_header() (CVE-2016-6307)
+==========================================================================
+
+Severity: Low
+
+A TLS message includes 3 bytes for its length in the header for the message.
+This would allow for messages up to 16Mb in length. Messages of this length are
+excessive and OpenSSL includes a check to ensure that a peer is sending
+reasonably sized messages in order to avoid too much memory being consumed to
+service a connection. A flaw in the logic of version 1.1.0 means that memory for
+the message is allocated too early, prior to the excessive message length
+check. Due to way memory is allocated in OpenSSL this could mean an attacker
+could force up to 21Mb to be allocated to service a connection. This could lead
+to a Denial of Service through memory exhaustion. However, the excessive message
+length check still takes place, and this would cause the connection to
+immediately fail. Assuming that the application calls SSL_free() on the failed
+conneciton in a timely manner then the 21Mb of allocated memory will then be
+immediately freed again. Therefore the excessive memory allocation will be
+transitory in nature. This then means that there is only a security impact if:
+
+1) The application does not call SSL_free() in a timely manner in the
+event that the connection fails
+or
+2) The application is working in a constrained environment where there
+is very little free memory
+or
+3) The attacker initiates multiple connection attempts such that there
+are multiple connections in a state where memory has been allocated for
+the connection; SSL_free() has not yet been called; and there is
+insufficient memory to service the multiple requests.
+
+Except in the instance of (1) above any Denial Of Service is likely to
+be transitory because as soon as the connection fails the memory is
+subsequently freed again in the SSL_free() call. However there is an
+increased risk during this period of application crashes due to the lack
+of memory - which would then mean a more serious Denial of Service.
+
+This issue does not affect DTLS users.
+
+OpenSSL 1.1.0 TLS users should upgrade to 1.1.0a
+
+This issue was reported to OpenSSL on 18th September 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Matt Caswell of the OpenSSL
+development team.
+
+Excessive allocation of memory in dtls1_preprocess_fragment() (CVE-2016-6308)
+=============================================================================
+
+Severity: Low
+
+This issue is very similar to CVE-2016-6307. The underlying defect is different
+but the security analysis and impacts are the same except that it impacts DTLS.
+
+A DTLS message includes 3 bytes for its length in the header for the message.
+This would allow for messages up to 16Mb in length. Messages of this length are
+excessive and OpenSSL includes a check to ensure that a peer is sending
+reasonably sized messages in order to avoid too much memory being consumed to
+service a connection. A flaw in the logic of version 1.1.0 means that memory for
+the message is allocated too early, prior to the excessive message length
+check. Due to way memory is allocated in OpenSSL this could mean an attacker
+could force up to 21Mb to be allocated to service a connection. This could lead
+to a Denial of Service through memory exhaustion. However, the excessive message
+length check still takes place, and this would cause the connection to
+immediately fail. Assuming that the application calls SSL_free() on the failed
+conneciton in a timely manner then the 21Mb of allocated memory will then be
+immediately freed again. Therefore the excessive memory allocation will be
+transitory in nature. This then means that there is only a security impact if:
+
+1) The application does not call SSL_free() in a timely manner in the
+event that the connection fails
+or
+2) The application is working in a constrained environment where there
+is very little free memory
+or
+3) The attacker initiates multiple connection attempts such that there
+are multiple connections in a state where memory has been allocated for
+the connection; SSL_free() has not yet been called; and there is
+insufficient memory to service the multiple requests.
+
+Except in the instance of (1) above any Denial Of Service is likely to
+be transitory because as soon as the connection fails the memory is
+subsequently freed again in the SSL_free() call. However there is an
+increased risk during this period of application crashes due to the lack
+of memory - which would then mean a more serious Denial of Service.
+
+This issue does not affect TLS users.
+
+OpenSSL 1.1.0 DTLS users should upgrade to 1.1.0a
+
+This issue was reported to OpenSSL on 18th September 2016 by Shi Lei (Gear Team,
+Qihoo 360 Inc.). The fix was developed by Matt Caswell of the OpenSSL
+development team.
+
+Note
+====
+
+As per our previous announcements and our Release Strategy
+(https://www.openssl.org/policies/releasestrat.html), support for OpenSSL
+version 1.0.1 will cease on 31st December 2016. No security updates for that
+version will be provided after that date. Users of 1.0.1 are advised to
+upgrade.
+
+Support for versions 0.9.8 and 1.0.0 ended on 31st December 2015. Those
+versions are no longer receiving security updates.
+
+References
+==========
+
+URL for this Security Advisory:
+https://www.openssl.org/news/secadv/20160922.txt
+
+Note: the online version of the advisory may be updated with additional details
+over time.
+
+For details of OpenSSL severity classifications please see:
+https://www.openssl.org/policies/secpolicy.html
diff --git a/news/vulnerabilities.xml b/news/vulnerabilities.xml
index da6d047..f9b4a5d 100644
--- a/news/vulnerabilities.xml
+++ b/news/vulnerabilities.xml
@@ -5,7 +5,595 @@
      1.0.0 on 20100329
 -->
 
-<security updated="20160503">
+<security updated="20160922">
+  <issue public="20160922">
+    <impact severity="High"/>
+    <cve name="2016-6304"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <affects base="1.1.0" version="1.1.0"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+    <fixed base="1.1.0" version="1.1.0a" date="20160922"/>
+
+    <description>
+      A malicious client can send an excessively large OCSP Status Request extension.
+      If that client continually requests renegotiation, sending a large OCSP Status
+      Request extension each time, then there will be unbounded memory growth on the
+      server. This will eventually lead to a Denial Of Service attack through memory
+      exhaustion. Servers with a default configuration are vulnerable even if they do
+      not support OCSP. Builds using the "no-ocsp" build time option are not affected.
+
+      Servers using OpenSSL versions prior to 1.0.1g are not vulnerable in a default
+      configuration, instead only if an application explicitly enables OCSP stapling
+      support.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160922">
+    <impact severity="Moderate"/>
+    <cve name="2016-6305"/>
+    <affects base="1.1.0" version="1.1.0"/>
+    <fixed base="1.1.0" version="1.1.0a" date="20160922"/>
+
+    <description>
+      OpenSSL 1.1.0 SSL/TLS will hang during a call to SSL_peek() if the peer sends an
+      empty record. This could be exploited by a malicious peer in a Denial Of Service
+      attack.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Alex Gaynor"/>
+  </issue>
+  <issue public="20160824">
+    <impact severity="Low"/>
+    <cve name="2016-6303"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      An overflow can occur in MDC2_Update() either if called directly or
+      through the EVP_DigestUpdate() function using MDC2. If an attacker
+      is able to supply very large amounts of input data after a previous
+      call to EVP_EncryptUpdate() with a partial block then a length check
+      can overflow resulting in a heap corruption.
+
+      The amount of data needed is comparable to SIZE_MAX which is impractical
+      on most platforms.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160823">
+    <impact severity="Low"/>
+    <cve name="2016-6302"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      If a server uses SHA512 for TLS session ticket HMAC it is vulnerable to a
+      DoS attack where a malformed ticket will result in an OOB read which will
+      ultimately crash.
+
+      The use of SHA512 in TLS session tickets is comparatively rare as it requires
+      a custom server callback and ticket lookup mechanism.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160816">
+    <impact severity="Low"/>
+    <cve name="2016-2182"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      The function BN_bn2dec() does not check the return value of BN_div_word().
+      This can cause an OOB write if an application uses this function with an
+      overly large BIGNUM. This could be a problem if an overly large certificate
+      or CRL is printed out from an untrusted source. TLS is not affected because
+      record limits will reject an oversized certificate before it is parsed.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160722">
+    <impact severity="Low"/>
+    <cve name="2016-2180"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      The function TS_OBJ_print_bio() misuses OBJ_obj2txt(): the return value is
+      the total length the OID text representation would use and not the amount
+      of data written. This will result in OOB reads when large OIDs are presented.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160601">
+    <impact severity="Low"/>
+    <cve name="2016-2177"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+        Avoid some undefined pointer arithmetic
+
+        A common idiom in the codebase is to check limits in the following manner:
+        "p + len &gt; limit"
+
+        Where "p" points to some malloc'd data of SIZE bytes and
+        limit == p + SIZE
+
+        "len" here could be from some externally supplied data (e.g. from a TLS
+        message).
+
+        The rules of C pointer arithmetic are such that "p + len" is only well
+        defined where len &lt;= SIZE. Therefore the above idiom is actually
+        undefined behaviour.
+
+        For example this could cause problems if some malloc implementation
+        provides an address for "p" such that "p + len" actually overflows for
+        values of len that are too big and therefore p + len &lt; limit.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Guido Vranken"/>
+  </issue>
+  <issue public="20160607">
+    <impact severity="Low"/>
+    <cve name="2016-2178"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      Operations in the DSA signing algorithm should run in constant time in order to
+      avoid side channel attacks. A flaw in the OpenSSL DSA implementation means that
+      a non-constant time codepath is followed for certain operations. This has been
+      demonstrated through a cache-timing attack to be sufficient for an attacker to
+      recover the private DSA key.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="C?sar Pereida (Aalto University), Billy Brumley (Tampere University of Technology), and Yuval Yarom (The University of Adelaide and NICTA)"/>
+  </issue>
+  <issue public="20160822">
+    <impact severity="Low"/>
+    <cve name="2016-2179"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      In a DTLS connection where handshake messages are delivered out-of-order those
+      messages that OpenSSL is not yet ready to process will be buffered for later
+      use. Under certain circumstances, a flaw in the logic means that those messages
+      do not get removed from the buffer even though the handshake has been completed.
+      An attacker could force up to approx. 15 messages to remain in the buffer when
+      they are no longer required. These messages will be cleared when the DTLS
+      connection is closed. The default maximum size for a message is 100k. Therefore
+      the attacker could force an additional 1500k to be consumed per connection. By
+      opening many simulataneous connections an attacker could cause a DoS attack
+      through memory exhaustion.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Quan Luo"/>
+  </issue>
+  <issue public="20160819">
+    <impact severity="Low"/>
+    <cve name="2016-2181"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+
+    <description>
+      A flaw in the DTLS replay attack protection mechanism means that records that
+      arrive for future epochs update the replay protection "window" before the MAC
+      for the record has been validated. This could be exploited by an attacker by
+      sending a record for the next epoch (which does not have to decrypt or have a
+      valid MAC), with a very large sequence number. This means that all subsequent
+      legitimate packets are dropped causing a denial of service for a specific
+      DTLS connection.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="OCAP audit team"/>
+  </issue>
+  <issue public="20160921">
+    <impact severity="Low"/>
+    <cve name="2016-6306"/>
+    <affects base="1.0.1" version="1.0.1"/>
+    <affects base="1.0.1" version="1.0.1a"/>
+    <affects base="1.0.1" version="1.0.1b"/>
+    <affects base="1.0.1" version="1.0.1c"/>
+    <affects base="1.0.1" version="1.0.1d"/>
+    <affects base="1.0.1" version="1.0.1e"/>
+    <affects base="1.0.1" version="1.0.1f"/>
+    <affects base="1.0.1" version="1.0.1g"/>
+    <affects base="1.0.1" version="1.0.1h"/>
+    <affects base="1.0.1" version="1.0.1i"/>
+    <affects base="1.0.1" version="1.0.1j"/>
+    <affects base="1.0.1" version="1.0.1k"/>
+    <affects base="1.0.1" version="1.0.1l"/>
+    <affects base="1.0.1" version="1.0.1m"/>
+    <affects base="1.0.1" version="1.0.1n"/>
+    <affects base="1.0.1" version="1.0.1o"/>
+    <affects base="1.0.1" version="1.0.1p"/>
+    <affects base="1.0.1" version="1.0.1q"/>
+    <affects base="1.0.1" version="1.0.1r"/>
+    <affects base="1.0.1" version="1.0.1s"/>
+    <affects base="1.0.1" version="1.0.1t"/>
+    <affects base="1.0.2" version="1.0.2"/>
+    <affects base="1.0.2" version="1.0.2a"/>
+    <affects base="1.0.2" version="1.0.2b"/>
+    <affects base="1.0.2" version="1.0.2c"/>
+    <affects base="1.0.2" version="1.0.2d"/>
+    <affects base="1.0.2" version="1.0.2e"/>
+    <affects base="1.0.2" version="1.0.2f"/>
+    <affects base="1.0.2" version="1.0.2g"/>
+    <affects base="1.0.2" version="1.0.2h"/>
+    <fixed base="1.0.1" version="1.0.1u" date="20160922"/>
+    <fixed base="1.0.2" version="1.0.2i" date="20160922"/>
+    <description>
+      In OpenSSL 1.0.2 and earlier some missing message length checks can result in
+      OOB reads of up to 2 bytes beyond an allocated buffer. There is a theoretical
+      DoS risk but this has not been observed in practice on common platforms.
+
+      The messages affected are client certificate, client certificate request and
+      server certificate. As a result the attack can only be performed against
+      a client or a server which enables client authentication.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160921">
+    <impact severity="Low"/>
+    <cve name="2016-6307"/>
+    <affects base="1.1.0" version="1.1.0"/>
+    <fixed base="1.1.0" version="1.1.0a" date="20160922"/>
+
+    <description>
+      A TLS message includes 3 bytes for its length in the header for the message.
+      This would allow for messages up to 16Mb in length. Messages of this length are
+      excessive and OpenSSL includes a check to ensure that a peer is sending
+      reasonably sized messages in order to avoid too much memory being consumed to
+      service a connection. A flaw in the logic of version 1.1.0 means that memory for
+      the message is allocated too early, prior to the excessive message length
+      check. Due to way memory is allocated in OpenSSL this could mean an attacker
+      could force up to 21Mb to be allocated to service a connection. This could lead
+      to a Denial of Service through memory exhaustion. However, the excessive message
+      length check still takes place, and this would cause the connection to
+      immediately fail. Assuming that the application calls SSL_free() on the failed
+      conneciton in a timely manner then the 21Mb of allocated memory will then be
+      immediately freed again. Therefore the excessive memory allocation will be
+      transitory in nature. This then means that there is only a security impact if:
+
+      1) The application does not call SSL_free() in a timely manner in the
+      event that the connection fails
+      or
+      2) The application is working in a constrained environment where there
+      is very little free memory
+      or
+      3) The attacker initiates multiple connection attempts such that there
+      are multiple connections in a state where memory has been allocated for
+      the connection; SSL_free() has not yet been called; and there is
+      insufficient memory to service the multiple requests.
+
+      Except in the instance of (1) above any Denial Of Service is likely to
+      be transitory because as soon as the connection fails the memory is
+      subsequently freed again in the SSL_free() call. However there is an
+      increased risk during this period of application crashes due to the lack
+      of memory - which would then mean a more serious Denial of Service.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
+  <issue public="20160921">
+    <impact severity="Low"/>
+    <cve name="2016-6308"/>
+    <affects base="1.1.0" version="1.1.0"/>
+    <fixed base="1.1.0" version="1.1.0a" date="20160922"/>
+
+    <description>
+      A DTLS message includes 3 bytes for its length in the header for the message.
+      This would allow for messages up to 16Mb in length. Messages of this length are
+      excessive and OpenSSL includes a check to ensure that a peer is sending
+      reasonably sized messages in order to avoid too much memory being consumed to
+      service a connection. A flaw in the logic of version 1.1.0 means that memory for
+      the message is allocated too early, prior to the excessive message length
+      check. Due to way memory is allocated in OpenSSL this could mean an attacker
+      could force up to 21Mb to be allocated to service a connection. This could lead
+      to a Denial of Service through memory exhaustion. However, the excessive message
+      length check still takes place, and this would cause the connection to
+      immediately fail. Assuming that the application calls SSL_free() on the failed
+      conneciton in a timely manner then the 21Mb of allocated memory will then be
+      immediately freed again. Therefore the excessive memory allocation will be
+      transitory in nature. This then means that there is only a security impact if:
+
+      1) The application does not call SSL_free() in a timely manner in the
+      event that the connection fails
+      or
+      2) The application is working in a constrained environment where there
+      is very little free memory
+      or
+      3) The attacker initiates multiple connection attempts such that there
+      are multiple connections in a state where memory has been allocated for
+      the connection; SSL_free() has not yet been called; and there is
+      insufficient memory to service the multiple requests.
+
+      Except in the instance of (1) above any Denial Of Service is likely to
+      be transitory because as soon as the connection fails the memory is
+      subsequently freed again in the SSL_free() call. However there is an
+      increased risk during this period of application crashes due to the lack
+      of memory - which would then mean a more serious Denial of Service.
+    </description>
+    <advisory url="/news/secadv/20160922.txt"/>
+    <reported source="Shi Lei (Gear Team, Qihoo 360 Inc.)"/>
+  </issue>
   <issue public="20160503">
     <impact severity="High"/>
     <cve name="2016-2108"/>

From builds at travis-ci.org  Thu Sep 22 12:23:43 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 12:23:43 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6146 (OpenSSL_1_0_2i -
	32c1301)
In-Reply-To: <openssl/openssl+161875963+passed@travis-ci.org>
Message-ID: <57e3cd4f548db_33f9da5cd7b0c2576c0@256c4052-fa40-47b7-9e25-90f23ddb5ec5.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6146
Status: Passed

Duration: 18 minutes and 44 seconds
Commit: 32c1301 (OpenSSL_1_0_2i)
Author: Matt Caswell
Message: Prepare for 1.0.2i release

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/OpenSSL_1_0_2i

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161875963

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/31cc0464/attachment.html>

From rsalz at openssl.org  Thu Sep 22 12:43:22 2016
From: rsalz at openssl.org (Rich Salz)
Date: Thu, 22 Sep 2016 12:43:22 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474548202.150258.24117.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f3b3d7f0033080f86ede5a53e8af2fb313091b5a (commit)
      from  39c136cc53d7b6fafdd1a0b52c035fd24358e01c (commit)


- Log -----------------------------------------------------------------
commit f3b3d7f0033080f86ede5a53e8af2fb313091b5a
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Aug 30 13:31:18 2016 -0400

    Add -Wswitch-enum
    
    Change code so when switching on an enumeration, have case's for all
    enumeration values.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure                |  3 +-
 apps/apps.c              | 12 ++++++--
 apps/openssl.c           | 16 +++++++----
 apps/ts.c                | 15 ++++------
 crypto/asn1/bio_asn1.c   |  4 +--
 crypto/ct/ct_sct.c       | 13 +++++----
 crypto/ec/ec_lib.c       | 22 +++++++++++----
 crypto/ec/ecp_nistz256.c | 10 +++++++
 crypto/ui/ui_lib.c       | 51 ++++++++++++++++++++++++++--------
 crypto/ui/ui_openssl.c   |  9 ++++--
 crypto/x509/x509_lu.c    |  8 +++---
 ssl/statem/statem.c      | 14 +++++++---
 ssl/statem/statem_clnt.c | 72 +++++++++++++++++++++---------------------------
 ssl/statem/statem_srvr.c | 69 +++++++++++++++++++++-------------------------
 test/ct_test.c           |  5 +++-
 test/handshake_helper.c  | 13 +++++----
 16 files changed, 200 insertions(+), 136 deletions(-)

diff --git a/Configure b/Configure
index 0cfc3ea..bfb9dbf 100755
--- a/Configure
+++ b/Configure
@@ -114,6 +114,7 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED"
         # it grew impossible to resolve this without sizeable additional
         # code, so we just tell compiler to be pedantic about everything
         # but 'long long' type.
+        . " -Wswitch"
         . " -DPEDANTIC -pedantic -Wno-long-long"
         . " -Wall"
         . " -Wsign-compare"
@@ -127,7 +128,6 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED"
 # These are used in addition to $gcc_devteam_warn when the compiler is clang.
 # TODO(openssl-team): fix problems and investigate if (at least) the
 # following warnings can also be enabled:
-#       -Wswitch-enum
 #       -Wcast-align
 #       -Wunreachable-code
 #       -Wlanguage-extension-token -- no, we use asm()
@@ -136,6 +136,7 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED"
 my $clang_devteam_warn = ""
         . " -Qunused-arguments"
         . " -Wextra"
+        . " -Wswitch -Wswitch-default"
         . " -Wno-unused-parameter"
         . " -Wno-missing-field-initializers"
         . " -Wno-language-extension-token"
diff --git a/apps/apps.c b/apps/apps.c
index aa564b8..b287748 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -188,7 +188,11 @@ static int ui_read(UI *ui, UI_STRING *uis)
                     return 1;
                 }
             }
-        default:
+            break;
+        case UIT_NONE:
+        case UIT_BOOLEAN:
+        case UIT_INFO:
+        case UIT_ERROR:
             break;
         }
     }
@@ -208,7 +212,11 @@ static int ui_write(UI *ui, UI_STRING *uis)
                 if (password && password[0] != '\0')
                     return 1;
             }
-        default:
+            break;
+        case UIT_NONE:
+        case UIT_BOOLEAN:
+        case UIT_INFO:
+        case UIT_ERROR:
             break;
         }
     }
diff --git a/apps/openssl.c b/apps/openssl.c
index 4f4175c..fceb458 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -393,26 +393,32 @@ int list_main(int argc, char **argv)
     return 0;
 }
 
+typedef enum HELP_CHOICE {
+    OPT_hERR = -1, OPT_hEOF = 0, OPT_hHELP
+} HELP_CHOICE;
+
 OPTIONS help_options[] = {
-    {"help", OPT_HELP, '-', "Display this summary"},
+    {"help", OPT_hHELP, '-', "Display this summary"},
     {NULL}
 };
 
+
 int help_main(int argc, char **argv)
 {
     FUNCTION *fp;
     int i, nl;
     FUNC_TYPE tp;
     char *prog;
-    HELPLIST_CHOICE o;
+    HELP_CHOICE o;
 
     prog = opt_init(argc, argv, help_options);
-    while ((o = opt_next()) != OPT_EOF) {
+    while ((o = opt_next()) != OPT_hEOF) {
         switch (o) {
-        default:
+        case OPT_hERR:
+        case OPT_hEOF:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             return 1;
-        case OPT_HELP:
+        case OPT_hHELP:
             opt_help(help_options);
             return 0;
         }
diff --git a/apps/ts.c b/apps/ts.c
index eda5297..e785ea0 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -296,19 +296,14 @@ int ts_main(int argc, char **argv)
         goto end;
 
     /* Check parameter consistency and execute the appropriate function. */
-    switch (mode) {
-    default:
-    case OPT_ERR:
-        goto opthelp;
-    case OPT_QUERY:
+    if (mode == OPT_QUERY) {
         if (vpmtouched)
             goto opthelp;
         if ((data != NULL) && (digest != NULL))
             goto opthelp;
         ret = !query_command(data, digest, md, policy, no_nonce, cert,
                              in, out, text);
-        break;
-    case OPT_REPLY:
+    } else if (mode == OPT_REPLY) {
         if (vpmtouched)
             goto opthelp;
         if ((in != NULL) && (queryfile != NULL))
@@ -320,13 +315,15 @@ int ts_main(int argc, char **argv)
         ret = !reply_command(conf, section, engine, queryfile,
                              password, inkey, md, signer, chain, policy,
                              in, token_in, out, token_out, text);
-        break;
-    case OPT_VERIFY:
+
+    } else if (mode == OPT_VERIFY) {
         if ((in == NULL) || !EXACTLY_ONE(queryfile, data, digest))
             goto opthelp;
         ret = !verify_command(data, digest, queryfile, in, token_in,
                               CApath, CAfile, untrusted,
                               vpmtouched ? vpm : NULL);
+    } else {
+        goto opthelp;
     }
 
  end:
diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c
index 400effa..d3cc108 100644
--- a/crypto/asn1/bio_asn1.c
+++ b/crypto/asn1/bio_asn1.c
@@ -157,7 +157,6 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
 
     for (;;) {
         switch (ctx->state) {
-
             /* Setup prefix data, call it */
         case ASN1_STATE_START:
             if (!asn1_bio_setup_ex(b, ctx, ctx->prefix,
@@ -223,7 +222,8 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
 
             break;
 
-        default:
+        case ASN1_STATE_POST_COPY:
+        case ASN1_STATE_DONE:
             BIO_clear_retry_flags(b);
             return 0;
 
diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c
index 67adcfa..2f0fef7 100644
--- a/crypto/ct/ct_sct.c
+++ b/crypto/ct/ct_sct.c
@@ -65,10 +65,11 @@ int SCT_set_log_entry_type(SCT *sct, ct_log_entry_type_t entry_type)
     case CT_LOG_ENTRY_TYPE_PRECERT:
         sct->entry_type = entry_type;
         return 1;
-    default:
-        CTerr(CT_F_SCT_SET_LOG_ENTRY_TYPE, CT_R_UNSUPPORTED_ENTRY_TYPE);
-        return 0;
+    case CT_LOG_ENTRY_TYPE_NOT_SET:
+        break;
     }
+    CTerr(CT_F_SCT_SET_LOG_ENTRY_TYPE, CT_R_UNSUPPORTED_ENTRY_TYPE);
+    return 0;
 }
 
 int SCT_set0_log_id(SCT *sct, unsigned char *log_id, size_t log_id_len)
@@ -269,9 +270,11 @@ int SCT_set_source(SCT *sct, sct_source_t source)
         return SCT_set_log_entry_type(sct, CT_LOG_ENTRY_TYPE_X509);
     case SCT_SOURCE_X509V3_EXTENSION:
         return SCT_set_log_entry_type(sct, CT_LOG_ENTRY_TYPE_PRECERT);
-    default: /* if we aren't sure, leave the log entry type alone */
-        return 1;
+    case SCT_SOURCE_UNKNOWN:
+        break;
     }
+    /* if we aren't sure, leave the log entry type alone */
+    return 1;
 }
 
 sct_validation_status_t SCT_get_validation_status(const SCT *sct)
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index 7cb4bfe..9e45a31 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -66,13 +66,13 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
 void EC_pre_comp_free(EC_GROUP *group)
 {
     switch (group->pre_comp_type) {
-    default:
+    case PCT_none:
         break;
-#ifdef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
     case PCT_nistz256:
+#ifdef ECP_NISTZ256_ASM
         EC_nistz256_pre_comp_free(group->pre_comp.nistz256);
-        break;
 #endif
+        break;
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
     case PCT_nistp224:
         EC_nistp224_pre_comp_free(group->pre_comp.nistp224);
@@ -83,6 +83,11 @@ void EC_pre_comp_free(EC_GROUP *group)
     case PCT_nistp521:
         EC_nistp521_pre_comp_free(group->pre_comp.nistp521);
         break;
+#else
+    case PCT_nistp224:
+    case PCT_nistp256:
+    case PCT_nistp521:
+        break;
 #endif
     case PCT_ec:
         EC_ec_pre_comp_free(group->pre_comp.ec);
@@ -143,14 +148,14 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
     /* Copy precomputed */
     dest->pre_comp_type = src->pre_comp_type;
     switch (src->pre_comp_type) {
-    default:
+    case PCT_none:
         dest->pre_comp.ec = NULL;
         break;
-#ifdef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
     case PCT_nistz256:
+#ifdef ECP_NISTZ256_ASM
         dest->pre_comp.nistz256 = EC_nistz256_pre_comp_dup(src->pre_comp.nistz256);
-        break;
 #endif
+        break;
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
     case PCT_nistp224:
         dest->pre_comp.nistp224 = EC_nistp224_pre_comp_dup(src->pre_comp.nistp224);
@@ -161,6 +166,11 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
     case PCT_nistp521:
         dest->pre_comp.nistp521 = EC_nistp521_pre_comp_dup(src->pre_comp.nistp521);
         break;
+#else
+    case PCT_nistp224:
+    case PCT_nistp256:
+    case PCT_nistp521:
+        break;
 #endif
     case PCT_ec:
         dest->pre_comp.ec = EC_ec_pre_comp_dup(src->pre_comp.ec);
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index dca3a2d..6e4ca51 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -254,6 +254,16 @@ static BN_ULONG is_one(const BIGNUM *z)
     return res;
 }
 
+/*
+ * For reference, this macro is used only when new ecp_nistz256 assembly
+ * module is being developed.  For example, configure with
+ * -DECP_NISTZ256_REFERENCE_IMPLEMENTATION and implement only functions
+ * performing simplest arithmetic operations on 256-bit vectors. Then
+ * work on implementation of higher-level functions performing point
+ * operations. Then remove ECP_NISTZ256_REFERENCE_IMPLEMENTATION
+ * and never define it again. (The correct macro denoting presence of
+ * ecp_nistz256 module is ECP_NISTZ256_ASM.)
+ */
 #ifndef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
 void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a);
 void ecp_nistz256_point_add(P256_POINT *r,
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 004aeb0..273bfb6 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -60,7 +60,11 @@ static void free_string(UI_STRING *uis)
             OPENSSL_free((char *)uis->_.boolean_data.ok_chars);
             OPENSSL_free((char *)uis->_.boolean_data.cancel_chars);
             break;
-        default:
+        case UIT_NONE:
+        case UIT_PROMPT:
+        case UIT_VERIFY:
+        case UIT_ERROR:
+        case UIT_INFO:
             break;
         }
     }
@@ -689,9 +693,13 @@ const char *UI_get0_action_string(UI_STRING *uis)
     case UIT_PROMPT:
     case UIT_BOOLEAN:
         return uis->_.boolean_data.action_desc;
-    default:
-        return NULL;
+    case UIT_NONE:
+    case UIT_VERIFY:
+    case UIT_INFO:
+    case UIT_ERROR:
+        break;
     }
+    return NULL;
 }
 
 const char *UI_get0_result_string(UI_STRING *uis)
@@ -700,9 +708,13 @@ const char *UI_get0_result_string(UI_STRING *uis)
     case UIT_PROMPT:
     case UIT_VERIFY:
         return uis->result_buf;
-    default:
-        return NULL;
+    case UIT_NONE:
+    case UIT_BOOLEAN:
+    case UIT_INFO:
+    case UIT_ERROR:
+        break;
     }
+    return NULL;
 }
 
 const char *UI_get0_test_string(UI_STRING *uis)
@@ -710,9 +722,14 @@ const char *UI_get0_test_string(UI_STRING *uis)
     switch (uis->type) {
     case UIT_VERIFY:
         return uis->_.string_data.test_buf;
-    default:
-        return NULL;
+    case UIT_NONE:
+    case UIT_BOOLEAN:
+    case UIT_INFO:
+    case UIT_ERROR:
+    case UIT_PROMPT:
+        break;
     }
+    return NULL;
 }
 
 int UI_get_result_minsize(UI_STRING *uis)
@@ -721,9 +738,13 @@ int UI_get_result_minsize(UI_STRING *uis)
     case UIT_PROMPT:
     case UIT_VERIFY:
         return uis->_.string_data.result_minsize;
-    default:
-        return -1;
+    case UIT_NONE:
+    case UIT_INFO:
+    case UIT_ERROR:
+    case UIT_BOOLEAN:
+        break;
     }
+    return -1;
 }
 
 int UI_get_result_maxsize(UI_STRING *uis)
@@ -732,9 +753,13 @@ int UI_get_result_maxsize(UI_STRING *uis)
     case UIT_PROMPT:
     case UIT_VERIFY:
         return uis->_.string_data.result_maxsize;
-    default:
-        return -1;
+    case UIT_NONE:
+    case UIT_INFO:
+    case UIT_ERROR:
+    case UIT_BOOLEAN:
+        break;
     }
+    return -1;
 }
 
 int UI_set_result(UI *ui, UI_STRING *uis, const char *result)
@@ -800,7 +825,9 @@ int UI_set_result(UI *ui, UI_STRING *uis, const char *result)
                 }
             }
         }
-    default:
+    case UIT_NONE:
+    case UIT_INFO:
+    case UIT_ERROR:
         break;
     }
     return 0;
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index befe973..bdd07f9 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -219,7 +219,10 @@ static int write_string(UI *ui, UI_STRING *uis)
         fputs(UI_get0_output_string(uis), tty_out);
         fflush(tty_out);
         break;
-    default:
+    case UIT_NONE:
+    case UIT_PROMPT:
+    case UIT_VERIFY:
+    case UIT_BOOLEAN:
         break;
     }
     return 1;
@@ -256,7 +259,9 @@ static int read_string(UI *ui, UI_STRING *uis)
             return 0;
         }
         break;
-    default:
+    case UIT_NONE:
+    case UIT_INFO:
+    case UIT_ERROR:
         break;
     }
     return 1;
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index 952cbfb..04ae1cb 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -132,7 +132,7 @@ static int x509_object_cmp(const X509_OBJECT *const *a,
     case X509_LU_CRL:
         ret = X509_CRL_cmp((*a)->data.crl, (*b)->data.crl);
         break;
-    default:
+    case X509_LU_NONE:
         /* abort(); */
         return 0;
     }
@@ -377,7 +377,7 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x)
 int X509_OBJECT_up_ref_count(X509_OBJECT *a)
 {
     switch (a->type) {
-    default:
+    case X509_LU_NONE:
         break;
     case X509_LU_X509:
         return X509_up_ref(a->data.x509);
@@ -424,7 +424,7 @@ void X509_OBJECT_free(X509_OBJECT *a)
     if (a == NULL)
         return;
     switch (a->type) {
-    default:
+    case X509_LU_NONE:
         break;
     case X509_LU_X509:
         X509_free(a->data.x509);
@@ -454,7 +454,7 @@ static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
         stmp.data.crl = &crl_s;
         crl_s.crl.issuer = name;
         break;
-    default:
+    case X509_LU_NONE:
         /* abort(); */
         return -1;
     }
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 5faf6ae..27dd5d6 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -601,7 +601,9 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
         case READ_STATE_POST_PROCESS:
             st->read_state_work = post_process_message(s, st->read_state_work);
             switch (st->read_state_work) {
-            default:
+            case WORK_ERROR:
+            case WORK_MORE_A:
+            case WORK_MORE_B:
                 return SUB_STATE_ERROR;
 
             case WORK_FINISHED_CONTINUE:
@@ -729,14 +731,16 @@ static SUB_STATE_RETURN write_state_machine(SSL *s)
                 return SUB_STATE_FINISHED;
                 break;
 
-            default:
+            case WRITE_TRAN_ERROR:
                 return SUB_STATE_ERROR;
             }
             break;
 
         case WRITE_STATE_PRE_WORK:
             switch (st->write_state_work = pre_work(s, st->write_state_work)) {
-            default:
+            case WORK_ERROR:
+            case WORK_MORE_A:
+            case WORK_MORE_B:
                 return SUB_STATE_ERROR;
 
             case WORK_FINISHED_CONTINUE:
@@ -765,7 +769,9 @@ static SUB_STATE_RETURN write_state_machine(SSL *s)
 
         case WRITE_STATE_POST_WORK:
             switch (st->write_state_work = post_work(s, st->write_state_work)) {
-            default:
+            case WORK_ERROR:
+            case WORK_MORE_A:
+            case WORK_MORE_B:
                 return SUB_STATE_ERROR;
 
             case WORK_FINISHED_CONTINUE:
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index e3e593b..67f4ac4 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -122,6 +122,9 @@ int ossl_statem_client_read_transition(SSL *s, int mt)
     int ske_expected;
 
     switch (st->hand_state) {
+    default:
+        break;
+
     case TLS_ST_CW_CLNT_HELLO:
         if (mt == SSL3_MT_SERVER_HELLO) {
             st->hand_state = TLS_ST_CR_SRVR_HELLO;
@@ -258,9 +261,6 @@ int ossl_statem_client_read_transition(SSL *s, int mt)
             return 1;
         }
         break;
-
-    default:
-        break;
     }
 
  err:
@@ -279,6 +279,10 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL *s)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return WRITE_TRAN_ERROR;
+
     case TLS_ST_OK:
         /* Renegotiation - fall through */
     case TLS_ST_BEFORE:
@@ -367,10 +371,6 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL *s)
             ossl_statem_set_in_init(s, 0);
             return WRITE_TRAN_CONTINUE;
         }
-
-    default:
-        /* Shouldn't happen */
-        return WRITE_TRAN_ERROR;
     }
 }
 
@@ -383,6 +383,10 @@ WORK_STATE ossl_statem_client_pre_work(SSL *s, WORK_STATE wst)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* No pre work to be done */
+        break;
+
     case TLS_ST_CW_CLNT_HELLO:
         s->shutdown = 0;
         if (SSL_IS_DTLS(s)) {
@@ -408,14 +412,10 @@ WORK_STATE ossl_statem_client_pre_work(SSL *s, WORK_STATE wst)
                 return dtls_wait_for_dry(s);
 #endif
         }
-        return WORK_FINISHED_CONTINUE;
+        break;
 
     case TLS_ST_OK:
         return tls_finish_handshake(s, wst);
-
-    default:
-        /* No pre work to be done */
-        break;
     }
 
     return WORK_FINISHED_CONTINUE;
@@ -432,6 +432,10 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
     s->init_num = 0;
 
     switch (st->hand_state) {
+    default:
+        /* No post work to be done */
+        break;
+
     case TLS_ST_CW_CLNT_HELLO:
         if (wst == WORK_MORE_A && statem_flush(s) != 1)
             return WORK_MORE_A;
@@ -494,10 +498,6 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
         if (statem_flush(s) != 1)
             return WORK_MORE_B;
         break;
-
-    default:
-        /* No post work to be done */
-        break;
     }
 
     return WORK_FINISHED_CONTINUE;
@@ -515,6 +515,10 @@ int ossl_statem_client_construct_message(SSL *s)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return 0;
+
     case TLS_ST_CW_CLNT_HELLO:
         return tls_construct_client_hello(s);
 
@@ -543,13 +547,7 @@ int ossl_statem_client_construct_message(SSL *s)
                                       ssl3_enc->client_finished_label,
                                       s->method->
                                       ssl3_enc->client_finished_label_len);
-
-    default:
-        /* Shouldn't happen */
-        break;
     }
-
-    return 0;
 }
 
 /*
@@ -561,6 +559,10 @@ unsigned long ossl_statem_client_max_message_size(SSL *s)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return 0;
+
     case TLS_ST_CR_SRVR_HELLO:
         return SERVER_HELLO_MAX_LENGTH;
 
@@ -597,13 +599,7 @@ unsigned long ossl_statem_client_max_message_size(SSL *s)
 
     case TLS_ST_CR_FINISHED:
         return FINISHED_MAX_LENGTH;
-
-    default:
-        /* Shouldn't happen */
-        break;
     }
-
-    return 0;
 }
 
 /*
@@ -614,6 +610,10 @@ MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL *s, PACKET *pkt)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return MSG_PROCESS_ERROR;
+
     case TLS_ST_CR_SRVR_HELLO:
         return tls_process_server_hello(s, pkt);
 
@@ -643,13 +643,7 @@ MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL *s, PACKET *pkt)
 
     case TLS_ST_CR_FINISHED:
         return tls_process_finished(s, pkt);
-
-    default:
-        /* Shouldn't happen */
-        break;
     }
-
-    return MSG_PROCESS_ERROR;
 }
 
 /*
@@ -661,6 +655,10 @@ WORK_STATE ossl_statem_client_post_process_message(SSL *s, WORK_STATE wst)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return WORK_ERROR;
+
     case TLS_ST_CR_CERT_REQ:
         return tls_prepare_client_certificate(s, wst);
 
@@ -678,13 +676,7 @@ WORK_STATE ossl_statem_client_post_process_message(SSL *s, WORK_STATE wst)
         ossl_statem_set_sctp_read_sock(s, 0);
         return WORK_FINISHED_STOP;
 #endif
-
-    default:
-        break;
     }
-
-    /* Shouldn't happen */
-    return WORK_ERROR;
 }
 
 int tls_construct_client_hello(SSL *s)
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 7536e6e..587bead 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -82,6 +82,9 @@ int ossl_statem_server_read_transition(SSL *s, int mt)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        break;
+
     case TLS_ST_BEFORE:
     case DTLS_ST_SW_HELLO_VERIFY_REQUEST:
         if (mt == SSL3_MT_CLIENT_HELLO) {
@@ -207,9 +210,6 @@ int ossl_statem_server_read_transition(SSL *s, int mt)
             return 1;
         }
         break;
-
-    default:
-        break;
     }
 
     /* No valid transition found */
@@ -312,6 +312,10 @@ WRITE_TRAN ossl_statem_server_write_transition(SSL *s)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return WRITE_TRAN_ERROR;
+
     case TLS_ST_BEFORE:
         /* Just go straight to trying to read from the client */
         return WRITE_TRAN_FINISHED;
@@ -414,10 +418,6 @@ WRITE_TRAN ossl_statem_server_write_transition(SSL *s)
         st->hand_state = TLS_ST_OK;
         ossl_statem_set_in_init(s, 0);
         return WRITE_TRAN_CONTINUE;
-
-    default:
-        /* Shouldn't happen */
-        return WRITE_TRAN_ERROR;
     }
 }
 
@@ -430,6 +430,10 @@ WORK_STATE ossl_statem_server_pre_work(SSL *s, WORK_STATE wst)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* No pre work to be done */
+        break;
+
     case TLS_ST_SW_HELLO_REQ:
         s->shutdown = 0;
         if (SSL_IS_DTLS(s))
@@ -491,10 +495,6 @@ WORK_STATE ossl_statem_server_pre_work(SSL *s, WORK_STATE wst)
 
     case TLS_ST_OK:
         return tls_finish_handshake(s, wst);
-
-    default:
-        /* No pre work to be done */
-        break;
     }
 
     return WORK_FINISHED_CONTINUE;
@@ -511,6 +511,10 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst)
     s->init_num = 0;
 
     switch (st->hand_state) {
+    default:
+        /* No post work to be done */
+        break;
+
     case TLS_ST_SW_HELLO_REQ:
         if (statem_flush(s) != 1)
             return WORK_MORE_A;
@@ -603,10 +607,6 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst)
         }
 #endif
         break;
-
-    default:
-        /* No post work to be done */
-        break;
     }
 
     return WORK_FINISHED_CONTINUE;
@@ -624,6 +624,10 @@ int ossl_statem_server_construct_message(SSL *s)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return 0;
+
     case DTLS_ST_SW_HELLO_VERIFY_REQUEST:
         return dtls_construct_hello_verify_request(s);
 
@@ -663,13 +667,7 @@ int ossl_statem_server_construct_message(SSL *s)
                                       ssl3_enc->server_finished_label,
                                       s->method->
                                       ssl3_enc->server_finished_label_len);
-
-    default:
-        /* Shouldn't happen */
-        break;
     }
-
-    return 0;
 }
 
 /*
@@ -701,6 +699,10 @@ unsigned long ossl_statem_server_max_message_size(SSL *s)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return 0;
+
     case TLS_ST_SR_CLNT_HELLO:
         return CLIENT_HELLO_MAX_LENGTH;
 
@@ -723,13 +725,7 @@ unsigned long ossl_statem_server_max_message_size(SSL *s)
 
     case TLS_ST_SR_FINISHED:
         return FINISHED_MAX_LENGTH;
-
-    default:
-        /* Shouldn't happen */
-        break;
     }
-
-    return 0;
 }
 
 /*
@@ -740,6 +736,10 @@ MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL *s, PACKET *pkt)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return MSG_PROCESS_ERROR;
+
     case TLS_ST_SR_CLNT_HELLO:
         return tls_process_client_hello(s, pkt);
 
@@ -762,13 +762,7 @@ MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL *s, PACKET *pkt)
 
     case TLS_ST_SR_FINISHED:
         return tls_process_finished(s, pkt);
-
-    default:
-        /* Shouldn't happen */
-        break;
     }
-
-    return MSG_PROCESS_ERROR;
 }
 
 /*
@@ -780,6 +774,10 @@ WORK_STATE ossl_statem_server_post_process_message(SSL *s, WORK_STATE wst)
     OSSL_STATEM *st = &s->statem;
 
     switch (st->hand_state) {
+    default:
+        /* Shouldn't happen */
+        return WORK_ERROR;
+
     case TLS_ST_SR_CLNT_HELLO:
         return tls_post_process_client_hello(s, wst);
 
@@ -803,13 +801,8 @@ WORK_STATE ossl_statem_server_post_process_message(SSL *s, WORK_STATE wst)
         }
 #endif
         return WORK_FINISHED_CONTINUE;
-
-    default:
-        break;
     }
 
-    /* Shouldn't happen */
-    return WORK_ERROR;
 }
 
 #ifndef OPENSSL_NO_SRP
diff --git a/test/ct_test.c b/test/ct_test.c
index 6c96268..705fbfb 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -244,7 +244,10 @@ static int assert_validity(CT_TEST_FIXTURE fixture,
         case SCT_VALIDATION_STATUS_INVALID:
             ++invalid_sct_count;
             break;
-        default:
+        case SCT_VALIDATION_STATUS_NOT_SET:
+        case SCT_VALIDATION_STATUS_UNKNOWN_LOG:
+        case SCT_VALIDATION_STATUS_UNVERIFIED:
+        case SCT_VALIDATION_STATUS_UNKNOWN_VERSION:
             /* Ignore other validation statuses. */
             break;
         }
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 90e18fc..3cfee16 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -333,7 +333,7 @@ static void configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
         SSL_CTX_set_cert_verify_callback(client_ctx, &verify_reject_cb,
                                          NULL);
         break;
-    default:
+    case SSL_TEST_VERIFY_NONE:
         break;
     }
 
@@ -347,7 +347,7 @@ static void configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
         SSL_CTX_set_tlsext_servername_callback(server_ctx, servername_reject_cb);
         SSL_CTX_set_tlsext_servername_arg(server_ctx, server2_ctx);
         break;
-    default:
+    case SSL_TEST_SERVERNAME_CB_NONE:
         break;
     }
 
@@ -631,9 +631,11 @@ static connect_phase_t next_phase(connect_phase_t phase)
         return SHUTDOWN;
     case SHUTDOWN:
         return CONNECTION_DONE;
-    default:
-        TEST_check(0); /* Should never call next_phase when done. */
+    case CONNECTION_DONE:
+        TEST_check(0);
+        break;
     }
+    return -1;
 }
 
 static void do_connect_step(PEER *peer, connect_phase_t phase)
@@ -648,8 +650,9 @@ static void do_connect_step(PEER *peer, connect_phase_t phase)
     case SHUTDOWN:
         do_shutdown_step(peer);
         break;
-    default:
+    case CONNECTION_DONE:
         TEST_check(0);
+        break;
     }
 }
 

From rsalz at openssl.org  Thu Sep 22 12:57:38 2016
From: rsalz at openssl.org (Rich Salz)
Date: Thu, 22 Sep 2016 12:57:38 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474549058.631390.30598.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  581215a519c66db7255ea360ed25bb00033ccd52 (commit)
      from  9d264d11a93413d2724b7c8c873e56b2ddd8c53f (commit)


- Log -----------------------------------------------------------------
commit 581215a519c66db7255ea360ed25bb00033ccd52
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Sep 22 08:47:45 2016 -0400

    Fix typo introduced by a03f81f4
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_cryptodev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index 65a74df..2a2b95c 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -939,7 +939,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
     if (fstate->mac_len != 0) {
         if (fstate->mac_data != NULL) {
             dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
-            if (dstate->ac_data == NULL) {
+            if (dstate->mac_data == NULL) {
                 printf("cryptodev_digest_init: malloc failed\n");
                 return 0;
             }

From builds at travis-ci.org  Thu Sep 22 13:11:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 13:11:55 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6147 (OpenSSL_1_1_0a -
	ac2c44c)
In-Reply-To: <openssl/openssl+161875987+passed@travis-ci.org>
Message-ID: <57e3d8999a329_33f886ddbbcf0110246@92dffa55-e8d6-4285-94a3-b0280d5e379b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6147
Status: Passed

Duration: 48 minutes and 1 second
Commit: ac2c44c (OpenSSL_1_1_0a)
Author: Matt Caswell
Message: Prepare for 1.1.0a release

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/OpenSSL_1_1_0a

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161875987

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/bfb2018a/attachment.html>

From stevem at openssl.org  Thu Sep 22 14:42:44 2016
From: stevem at openssl.org (Steve Marquess)
Date: Thu, 22 Sep 2016 14:42:44 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1474555364.163313.6547.nullmailer@dev.openssl.org>

The branch master has been updated
       via  d6a33b3c69b5776beaba29c61823e2474a00d17d (commit)
      from  fbd32b1a5c7f0d7bc90e8a716bdf44cbfbeeb7a6 (commit)


- Log -----------------------------------------------------------------
commit d6a33b3c69b5776beaba29c61823e2474a00d17d
Author: Steve Marquess <marquess at openssl.com>
Date:   Thu Sep 22 10:42:26 2016 -0400

    Add 2.0.13 Security Policy

-----------------------------------------------------------------------

Summary of changes:
 ...Policy-2.0.11.pdf => SecurityPolicy-2.0.13.pdf} | Bin 902341 -> 916608 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 copy docs/fips/{SecurityPolicy-2.0.11.pdf => SecurityPolicy-2.0.13.pdf} (87%)

diff --git a/docs/fips/SecurityPolicy-2.0.11.pdf b/docs/fips/SecurityPolicy-2.0.13.pdf
similarity index 87%
copy from docs/fips/SecurityPolicy-2.0.11.pdf
copy to docs/fips/SecurityPolicy-2.0.13.pdf
index e4354dd..e4ea6c6 100644
Binary files a/docs/fips/SecurityPolicy-2.0.11.pdf and b/docs/fips/SecurityPolicy-2.0.13.pdf differ

From rsalz at openssl.org  Thu Sep 22 14:44:17 2016
From: rsalz at openssl.org (Rich Salz)
Date: Thu, 22 Sep 2016 14:44:17 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474555457.048398.7520.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  f15a7e39a1f7d41716ca5f07faef74f55147d2cf (commit)
      from  581215a519c66db7255ea360ed25bb00033ccd52 (commit)


- Log -----------------------------------------------------------------
commit f15a7e39a1f7d41716ca5f07faef74f55147d2cf
Author: Dirk Feytons <dirk.feytons at gmail.com>
Date:   Thu Sep 22 16:17:45 2016 +0200

    Fix build with no-nextprotoneg
    
    Add a missing ifdef. Same change is already present in master.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1100)

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_ext.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 724ddf7..79ed946 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -275,7 +275,9 @@ int SSL_extension_supported(unsigned int ext_type)
     case TLSEXT_TYPE_ec_point_formats:
     case TLSEXT_TYPE_elliptic_curves:
     case TLSEXT_TYPE_heartbeat:
+# ifndef OPENSSL_NO_NEXTPROTONEG
     case TLSEXT_TYPE_next_proto_neg:
+# endif
     case TLSEXT_TYPE_padding:
     case TLSEXT_TYPE_renegotiate:
     case TLSEXT_TYPE_server_name:

From builds at travis-ci.org  Thu Sep 22 15:13:00 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 15:13:00 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6153
	(OpenSSL_1_0_2-stable - f15a7e3)
In-Reply-To: <openssl/openssl+161931598+errored@travis-ci.org>
Message-ID: <57e3f4fbce3fc_33f9da5cd7a1c4710f6@256c4052-fa40-47b7-9e25-90f23ddb5ec5.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6153
Status: Errored

Duration: 25 minutes and 33 seconds
Commit: f15a7e3 (OpenSSL_1_0_2-stable)
Author: Dirk Feytons
Message: Fix build with no-nextprotoneg

Add a missing ifdef. Same change is already present in master.

Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1100)

View the changeset: https://github.com/openssl/openssl/compare/581215a519c6...f15a7e39a1f7

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/161931598

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/0bf6a4a6/attachment-0001.html>

From levitte at openssl.org  Thu Sep 22 18:48:50 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 22 Sep 2016 18:48:50 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1474570130.801135.12583.nullmailer@dev.openssl.org>

The branch master has been updated
       via  50b169440002898052ea41e9a9393ed41a68e7b2 (commit)
      from  d6a33b3c69b5776beaba29c61823e2474a00d17d (commit)


- Log -----------------------------------------------------------------
commit 50b169440002898052ea41e9a9393ed41a68e7b2
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 22 20:48:34 2016 +0200

    Make the links in the topmost sidebar.shtml rooted
    
    The reason is quite simple.  If a URL doesn't lead to a page,
    err404.html is loaded and this sidebar along with it.
    
    Now, consider the URL https://www.openssl.org/files/.
    Clicking on "Downloads: source code" will get you to
    https://www.openssl.org/files/source rather than
    https://www.openssl.org/source...

-----------------------------------------------------------------------

Summary of changes:
 sidebar.shtml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sidebar.shtml b/sidebar.shtml
index 1b3d6b6..37b715e 100644
--- a/sidebar.shtml
+++ b/sidebar.shtml
@@ -1,28 +1,28 @@
 <!-- sidebar.inc -->
 <aside class="sidebar">
   <section>
-    <h1><a href=".">Home</a></h1>
+    <h1><a href="/">Home</a></h1>
     <ul>
       <li>
-        <a href="source">Downloads: Source code</a>
+        <a href="/source">Downloads: Source code</a>
       </li>
       <li>
-        <a href="docs">Docs: FAQ, FIPS, manpages, ...</a>
+        <a href="/docs">Docs: FAQ, FIPS, manpages, ...</a>
       </li>
       <li>
-        <a href="news">News: Latest information</a>
+        <a href="/news">News: Latest information</a>
       </li>
       <li>
-        <a href="policies">Policies: How we operate</a>
+        <a href="/policies">Policies: How we operate</a>
       </li>
       <li>
-        <a href="community">Community: Blog, bugs, email, ...</a>
+        <a href="/community">Community: Blog, bugs, email, ...</a>
       </li>
       <li>
-        <a href="support">Support: Commercial support and contracting</a>
+        <a href="/support">Support: Commercial support and contracting</a>
       </li>
       <li>
-        <a href="support/acks.html">Sponsor Acknowledgements</a>
+        <a href="/support/acks.html">Sponsor Acknowledgements</a>
       </li>
     </ul>
   </section>

From matt at openssl.org  Thu Sep 22 22:14:54 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 22 Sep 2016 22:14:54 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474582494.283441.3557.nullmailer@dev.openssl.org>

The branch master has been updated
       via  c536b6be1a72aefd632d5530106a67c516cb9f4b (commit)
       via  4b0fc9fc7a8767f3e6289b2b9f4527db186b3566 (commit)
      from  f3b3d7f0033080f86ede5a53e8af2fb313091b5a (commit)


- Log -----------------------------------------------------------------
commit c536b6be1a72aefd632d5530106a67c516cb9f4b
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 11:26:47 2016 +0100

    Convert HelloVerifyRequest construction to WPACKET
    
    We actually construct a HelloVerifyRequest in two places with common code
    pulled into a single function. This one commit handles both places.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4b0fc9fc7a8767f3e6289b2b9f4527db186b3566
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 21 11:20:18 2016 +0100

    Add warning about a potential pitfall with WPACKET_allocate_bytes()
    
    If the underlying BUF_MEM gets realloc'd then the pointer returned could
    become invalid. Therefore we should always ensure that the allocated
    memory is filled in prior to any more WPACKET_* calls.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_lib.c             | 116 +++++++++++++++++++++++++++--------------------
 ssl/packet.c             |   1 +
 ssl/packet_locl.h        |   5 +-
 ssl/ssl_locl.h           |   5 +-
 ssl/statem/statem_srvr.c |  51 +++++++++++----------
 5 files changed, 101 insertions(+), 77 deletions(-)

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 043057f..f34818b 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -437,8 +437,8 @@ int DTLSv1_listen(SSL *s, BIO_ADDR *client)
     unsigned char cookie[DTLS1_COOKIE_LENGTH];
     unsigned char seq[SEQ_NUM_SIZE];
     const unsigned char *data;
-    unsigned char *p, *buf;
-    unsigned long reclen, fragoff, fraglen, msglen;
+    unsigned char *buf;
+    unsigned long fragoff, fraglen, msglen;
     unsigned int rectype, versmajor, msgseq, msgtype, clientvers, cookielen;
     BIO *rbio, *wbio;
     BUF_MEM *bufm;
@@ -680,6 +680,10 @@ int DTLSv1_listen(SSL *s, BIO_ADDR *client)
         }
 
         if (next == LISTEN_SEND_VERIFY_REQUEST) {
+            WPACKET wpkt;
+            unsigned int version;
+            size_t wreclen;
+
             /*
              * There was no cookie in the ClientHello so we need to send a
              * HelloVerifyRequest. If this fails we do not worry about trying
@@ -703,60 +707,76 @@ int DTLSv1_listen(SSL *s, BIO_ADDR *client)
                 return -1;
             }
 
-            p = &buf[DTLS1_RT_HEADER_LENGTH];
-            msglen = dtls_raw_hello_verify_request(p + DTLS1_HM_HEADER_LENGTH,
-                                                   cookie, cookielen);
-
-            *p++ = DTLS1_MT_HELLO_VERIFY_REQUEST;
-
-            /* Message length */
-            l2n3(msglen, p);
-
-            /* Message sequence number is always 0 for a HelloVerifyRequest */
-            s2n(0, p);
-
-            /*
-             * We never fragment a HelloVerifyRequest, so fragment offset is 0
-             * and fragment length is message length
-             */
-            l2n3(0, p);
-            l2n3(msglen, p);
-
-            /* Set reclen equal to length of whole handshake message */
-            reclen = msglen + DTLS1_HM_HEADER_LENGTH;
-
-            /* Add the record header */
-            p = buf;
-
-            *(p++) = SSL3_RT_HANDSHAKE;
             /*
              * Special case: for hello verify request, client version 1.0 and we
              * haven't decided which version to use yet send back using version
              * 1.0 header: otherwise some clients will ignore it.
              */
-            if (s->method->version == DTLS_ANY_VERSION) {
-                *(p++) = DTLS1_VERSION >> 8;
-                *(p++) = DTLS1_VERSION & 0xff;
-            } else {
-                *(p++) = s->version >> 8;
-                *(p++) = s->version & 0xff;
+            version = (s->method->version == DTLS_ANY_VERSION) ? DTLS1_VERSION
+                                                               : s->version;
+
+            /* Construct the record and message headers */
+            if (!WPACKET_init(&wpkt, s->init_buf)
+                    || !WPACKET_put_bytes_u8(&wpkt, SSL3_RT_HANDSHAKE)
+                    || !WPACKET_put_bytes_u16(&wpkt, version)
+                       /*
+                        * Record sequence number is always the same as in the
+                        * received ClientHello
+                        */
+                    || !WPACKET_memcpy(&wpkt, seq, SEQ_NUM_SIZE)
+                       /* End of record, start sub packet for message */
+                    || !WPACKET_start_sub_packet_u16(&wpkt)
+                       /* Message type */
+                    || !WPACKET_put_bytes_u8(&wpkt,
+                                             DTLS1_MT_HELLO_VERIFY_REQUEST)
+                       /*
+                        * Message length - doesn't follow normal TLS convention:
+                        * the length isn't the last thing in the message header.
+                        * We'll need to fill this in later when we know the
+                        * length. Set it to zero for now
+                        */
+                    || !WPACKET_put_bytes_u24(&wpkt, 0)
+                       /*
+                        * Message sequence number is always 0 for a
+                        * HelloVerifyRequest
+                        */
+                    || !WPACKET_put_bytes_u16(&wpkt, 0)
+                       /*
+                        * We never fragment a HelloVerifyRequest, so fragment
+                        * offset is 0
+                        */
+                    || !WPACKET_put_bytes_u24(&wpkt, 0)
+                       /*
+                        * Fragment length is the same as message length, but
+                        * this *is* the last thing in the message header so we
+                        * can just start a sub-packet. No need to come back
+                        * later for this one.
+                        */
+                    || !WPACKET_start_sub_packet_u24(&wpkt)
+                       /* Create the actual HelloVerifyRequest body */
+                    || !dtls_raw_hello_verify_request(&wpkt, cookie, cookielen)
+                       /* Close message body */
+                    || !WPACKET_close(&wpkt)
+                       /* Close record body */
+                    || !WPACKET_close(&wpkt)
+                    || !WPACKET_get_total_written(&wpkt, &wreclen)
+                    || !WPACKET_finish(&wpkt)) {
+                SSLerr(SSL_F_DTLSV1_LISTEN, ERR_R_INTERNAL_ERROR);
+                WPACKET_cleanup(&wpkt);
+                /* This is fatal */
+                return -1;
             }
 
             /*
-             * Record sequence number is always the same as in the received
-             * ClientHello
-             */
-            memcpy(p, seq, SEQ_NUM_SIZE);
-            p += SEQ_NUM_SIZE;
-
-            /* Length */
-            s2n(reclen, p);
-
-            /*
-             * Set reclen equal to length of whole record including record
-             * header
+             * Fix up the message len in the message header. Its the same as the
+             * fragment len which has been filled in by WPACKET, so just copy
+             * that. Destination for the message len is after the record header
+             * plus one byte for the message content type. The source is the
+             * last 3 bytes of the message header
              */
-            reclen += DTLS1_RT_HEADER_LENGTH;
+            memcpy(&buf[DTLS1_RT_HEADER_LENGTH + 1],
+                   &buf[DTLS1_RT_HEADER_LENGTH + DTLS1_HM_HEADER_LENGTH - 3],
+                   3);
 
             if (s->msg_callback)
                 s->msg_callback(1, 0, SSL3_RT_HEADER, buf,
@@ -778,7 +798,7 @@ int DTLSv1_listen(SSL *s, BIO_ADDR *client)
             BIO_ADDR_free(tmpclient);
             tmpclient = NULL;
 
-            if (BIO_write(wbio, buf, reclen) < (int)reclen) {
+            if (BIO_write(wbio, buf, wreclen) < (int)wreclen) {
                 if (BIO_should_retry(wbio)) {
                     /*
                      * Non-blocking IO...but we're stateless, so we're just
diff --git a/ssl/packet.c b/ssl/packet.c
index 6199469..0e8e876 100644
--- a/ssl/packet.c
+++ b/ssl/packet.c
@@ -224,6 +224,7 @@ int WPACKET_start_sub_packet_len__(WPACKET *pkt, size_t lenbytes)
 
     if (!WPACKET_allocate_bytes(pkt, lenbytes, &lenchars))
         return 0;
+    /* Convert to an offset in case the underlying BUF_MEM gets realloc'd */
     sub->packet_len = lenchars - (unsigned char *)pkt->buf->data;
 
     return 1;
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index c51d892..44a8f82 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -671,6 +671,9 @@ int WPACKET_start_sub_packet(WPACKET *pkt);
  * Allocate bytes in the WPACKET for the output. This reserves the bytes
  * and counts them as "written", but doesn't actually do the writing. A pointer
  * to the allocated bytes is stored in |*allocbytes|.
+ * WARNING: the allocated bytes must be filled in immediately, without further
+ * WPACKET_* calls. If not then the underlying buffer may be realloc'd and
+ * change its location.
  */
 int WPACKET_allocate_bytes(WPACKET *pkt, size_t bytes,
                            unsigned char **allocbytes);
@@ -715,7 +718,7 @@ int WPACKET_put_bytes__(WPACKET *pkt, unsigned int val, size_t bytes);
 #define WPACKET_put_bytes_u16(pkt, val) \
     WPACKET_put_bytes__((pkt), (val), 2)
 #define WPACKET_put_bytes_u24(pkt, val) \
-    WPACKET_put_bytes__((pkt), (val)), 3)
+    WPACKET_put_bytes__((pkt), (val), 3)
 #define WPACKET_put_bytes_u32(pkt, val) \
     WPACKET_sub_allocate_bytes__((pkt), (val), 4)
 
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 6ad2735..630fea8 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1950,9 +1950,8 @@ void dtls1_start_timer(SSL *s);
 void dtls1_stop_timer(SSL *s);
 __owur int dtls1_is_timer_expired(SSL *s);
 void dtls1_double_timeout(SSL *s);
-__owur unsigned int dtls_raw_hello_verify_request(unsigned char *buf,
-                                                  unsigned char *cookie,
-                                                  unsigned char cookie_len);
+__owur int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie,
+                                         unsigned char cookie_len);
 __owur int dtls1_send_newsession_ticket(SSL *s);
 __owur unsigned int dtls1_min_mtu(SSL *s);
 void dtls1_hm_fragment_free(hm_fragment *frag);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 587bead..03d75d0 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -840,32 +840,21 @@ int tls_construct_hello_request(SSL *s)
     return 1;
 }
 
-unsigned int dtls_raw_hello_verify_request(unsigned char *buf,
-                                           unsigned char *cookie,
-                                           unsigned char cookie_len)
+int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie,
+                                  unsigned char cookie_len)
 {
-    unsigned int msg_len;
-    unsigned char *p;
-
-    p = buf;
     /* Always use DTLS 1.0 version: see RFC 6347 */
-    *(p++) = DTLS1_VERSION >> 8;
-    *(p++) = DTLS1_VERSION & 0xFF;
-
-    *(p++) = (unsigned char)cookie_len;
-    memcpy(p, cookie, cookie_len);
-    p += cookie_len;
-    msg_len = p - buf;
+    if (!WPACKET_put_bytes_u16(pkt, DTLS1_VERSION)
+            || !WPACKET_sub_memcpy_u8(pkt, cookie, cookie_len))
+        return 0;
 
-    return msg_len;
+    return 1;
 }
 
 int dtls_construct_hello_verify_request(SSL *s)
 {
-    unsigned int len;
-    unsigned char *buf;
-
-    buf = (unsigned char *)s->init_buf->data;
+    size_t msglen;
+    WPACKET pkt;
 
     if (s->ctx->app_gen_cookie_cb == NULL ||
         s->ctx->app_gen_cookie_cb(s, s->d1->cookie,
@@ -877,14 +866,26 @@ int dtls_construct_hello_verify_request(SSL *s)
         return 0;
     }
 
-    len = dtls_raw_hello_verify_request(&buf[DTLS1_HM_HEADER_LENGTH],
-                                        s->d1->cookie, s->d1->cookie_len);
-
-    dtls1_set_message_header(s, DTLS1_MT_HELLO_VERIFY_REQUEST, len, 0, len);
-    len += DTLS1_HM_HEADER_LENGTH;
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt,
+                                          DTLS1_MT_HELLO_VERIFY_REQUEST)
+            || !dtls_raw_hello_verify_request(&pkt, s->d1->cookie,
+                                              s->d1->cookie_len)
+               /*
+                * We don't call close_construct_packet() because we don't want
+                * to buffer this message
+                */
+            || !WPACKET_close(&pkt)
+            || !WPACKET_get_length(&pkt, &msglen)
+            || !WPACKET_finish(&pkt)) {
+        SSLerr(SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST, ERR_R_INTERNAL_ERROR);
+        WPACKET_cleanup(&pkt);
+        ossl_statem_set_error(s);
+        return 0;
+    }
 
     /* number of bytes to write */
-    s->init_num = len;
+    s->init_num = (int)msglen;
     s->init_off = 0;
 
     return 1;

From builds at travis-ci.org  Thu Sep 22 23:02:02 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 22 Sep 2016 23:02:02 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2024 (master - 3014dda)
In-Reply-To: <FdaSilvaYY/openssl+162037610+fixed@travis-ci.org>
Message-ID: <57e462e9cfc35_33f8ba5e5f33872973d@7ca4f237-b248-4f94-a836-dd41c5c2c475.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2024
Status: Fixed

Duration: 40 minutes and 25 seconds
Commit: 3014dda (master)
Author: FdaSilvaYY
Message: Clean whitespaces on line ending

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/372025c54b65...3014ddae4d08

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162037610

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160922/22ce4cf6/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 23 00:00:28 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 00:00:28 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2025 (pack_argv_options
	- e629ea2)
In-Reply-To: <FdaSilvaYY/openssl+162037927+fixed@travis-ci.org>
Message-ID: <57e4709b4425c_33fc98e2cd9d06219f9@d0c1df9f-3188-4092-9da0-3bf6386364ab.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2025
Status: Fixed

Duration: 1 hour, 17 minutes, and 53 seconds
Commit: e629ea2 (pack_argv_options)
Author: FdaSilvaYY
Message: Use PATH_MAX and NAME_MAX

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/a53bfb922c18...e629ea2ad5dc

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162037927

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/42f6687a/attachment.html>

From builds at travis-ci.org  Fri Sep 23 00:45:59 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 00:45:59 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2026
	(check_bn_wexpand_retcode - f963d47)
In-Reply-To: <FdaSilvaYY/openssl+162039141+fixed@travis-ci.org>
Message-ID: <57e47b551740f_33f9da5c9da3810948bd@256c4052-fa40-47b7-9e25-90f23ddb5ec5.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2026
Status: Fixed

Duration: 23 minutes and 23 seconds
Commit: f963d47 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on some conditional BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/cad489529990...f963d474121a

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162039141

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/d02bf1fe/attachment.html>

From builds at travis-ci.org  Fri Sep 23 04:09:54 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 04:09:54 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2027 (fix-ca-buf-usage
	- e75d4d6)
In-Reply-To: <FdaSilvaYY/openssl+162039263+fixed@travis-ci.org>
Message-ID: <57e4ab11975aa_33fc98e2909b87427e2@d0c1df9f-3188-4092-9da0-3bf6386364ab.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2027
Status: Fixed

Duration: 3 hours, 36 minutes, and 48 seconds
Commit: e75d4d6 (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Introduce PATH_MAX and NAME_MAX

 to define the certificate filename storage buffer.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/13aeb3d6cc4e...e75d4d6636cd

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162039263

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/ba871874/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 23 05:22:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 05:22:35 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2028 (oss_add_cb_args -
	050701d)
In-Reply-To: <FdaSilvaYY/openssl+162039501+fixed@travis-ci.org>
Message-ID: <57e4bc2972aca_33f8ba48d5df0925343@7ca4f237-b248-4f94-a836-dd41c5c2c475.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2028
Status: Fixed

Duration: 14 minutes and 47 seconds
Commit: 050701d (oss_add_cb_args)
Author: FdaSilvaYY
Message: Move global 'ctx' pointers and BIO variables into callback context ...

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/336947238c17...050701da2171

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162039501

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/5867ce0d/attachment.html>

From builds at travis-ci.org  Fri Sep 23 06:00:21 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 06:00:21 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2029 (oss-vpm-rework -
	3ba7adf)
In-Reply-To: <FdaSilvaYY/openssl+162039931+fixed@travis-ci.org>
Message-ID: <57e4c4f539250_33fc98e0d6a3c795338@d0c1df9f-3188-4092-9da0-3bf6386364ab.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2029
Status: Fixed

Duration: 49 minutes and 44 seconds
Commit: 3ba7adf (oss-vpm-rework)
Author: FdaSilvaYY
Message: Reduce X509_VERIFY_PARAM_new/X509_VERIFY_PARAM_free code amount

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/e9ec48303029...3ba7adf0d432

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162039931

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/2f58eaf2/attachment.html>

From no-reply at appveyor.com  Fri Sep 23 21:28:22 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 23 Sep 2016 21:28:22 +0000
Subject: [openssl-commits] Build failed: openssl master.5494
Message-ID: <20160923212821.13359.23655.14F8C716@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/4fc967d7/attachment.html>

From no-reply at appveyor.com  Fri Sep 23 21:35:42 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 23 Sep 2016 21:35:42 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1310
Message-ID: <20160923213542.12983.24110.A4976821@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/e564a505/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 23 21:45:45 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 21:45:45 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2031
	(oss_constify_api - 2f5efb1)
In-Reply-To: <FdaSilvaYY/openssl+162307764+still failing@travis-ci.org>
Message-ID: <57e5a2878e096_33f9b016d29ec117193c@926b8e1c-0482-4e25-bb9a-8b3c02e50840.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2031
Status: Still Failing

Duration: 34 minutes and 18 seconds
Commit: 2f5efb1 (oss_constify_api)
Author: FdaSilvaYY
Message: Fix msie_hack compilation hack...

 from previous commit.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/6c6c097089f5...2f5efb1cd7a1

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162307764

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/96816391/attachment.html>

From no-reply at appveyor.com  Fri Sep 23 22:04:15 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Fri, 23 Sep 2016 22:04:15 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1311
Message-ID: <20160923220415.2764.39144.E7811722@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/34234da2/attachment.html>

From builds at travis-ci.org  Fri Sep 23 22:18:23 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 23 Sep 2016 22:18:23 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2032 (apps-speed-rework
	- 42cdca9)
In-Reply-To: <FdaSilvaYY/openssl+162307912+fixed@travis-ci.org>
Message-ID: <57e5aa2fa2edd_33f87571aa4004628d7@527d5ed8-14d2-45df-af66-07e71b912a3c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2032
Status: Fixed

Duration: 43 minutes and 7 seconds
Commit: 42cdca9 (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/e69b74e7367b...42cdca923ddd

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162307912

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160923/f4702533/attachment.html>

From builds at travis-ci.org  Sat Sep 24 12:18:29 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 24 Sep 2016 12:18:29 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2033 (const-app-options
	- ce79100)
In-Reply-To: <FdaSilvaYY/openssl+162412818+fixed@travis-ci.org>
Message-ID: <57e66f11b44f4_33fb8c4c888741016cb@a24c76d8-8aea-423b-bbf9-7905e080fbb9.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2033
Status: Fixed

Duration: 35 minutes and 12 seconds
Commit: ce79100 (const-app-options)
Author: FdaSilvaYY
Message: Constify char* input parameters in apps/ca code

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/a75d6591bcb3...ce7910079cac

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162412818

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160924/77e9f7a0/attachment-0001.html>

From no-reply at appveyor.com  Sat Sep 24 12:28:09 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 24 Sep 2016 12:28:09 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1313
Message-ID: <20160924122808.24666.42372.32612661@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160924/9b3b2cfa/attachment.html>

From builds at travis-ci.org  Sat Sep 24 12:28:51 2016
From: builds at travis-ci.org (Travis CI)
Date: Sat, 24 Sep 2016 12:28:51 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2034
	(sk_num_alloc - d7b3fb3)
In-Reply-To: <FdaSilvaYY/openssl+162412854+still failing@travis-ci.org>
Message-ID: <57e6718587394_33f87576e8b9c770644@527d5ed8-14d2-45df-af66-07e71b912a3c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2034
Status: Still Failing

Duration: 10 minutes and 59 seconds
Commit: d7b3fb3 (sk_num_alloc)
Author: FdaSilvaYY
Message: enhance pre-allocation

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/bb72804b39ef...d7b3fb3b20be

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162412854

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160924/cfebb7ac/attachment.html>

From no-reply at appveyor.com  Sat Sep 24 12:38:30 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sat, 24 Sep 2016 12:38:30 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1314
Message-ID: <20160924123830.100945.51570.5175D3AB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160924/eff63513/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 19:01:22 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 19:01:22 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1315
Message-ID: <20160925190119.17771.93811.4E9709C3@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/ed9f1147/attachment.html>

From builds at travis-ci.org  Sun Sep 25 19:15:01 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 25 Sep 2016 19:15:01 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2036
	(1.1.1-internal-constification - 6dd90bf)
In-Reply-To: <FdaSilvaYY/openssl+162612452+failed@travis-ci.org>
Message-ID: <57e822357710_33fd33d9fc2fc2744cd@55b114d6-2dd1-4460-beca-566d20bec169.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2036
Status: Failed

Duration: 32 minutes and 14 seconds
Commit: 6dd90bf (1.1.1-internal-constification)
Author: FdaSilvaYY
Message: Add  more constify-ed API using get0 pattern

- X509_NAME_get0_entry
- X509_NAME_ENTRY_get0_data
- X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/commit/6dd90bf1f51b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162612452

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/7e0ee163/attachment-0001.html>

From no-reply at appveyor.com  Sun Sep 25 19:32:02 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 19:32:02 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1317
Message-ID: <20160925193201.17542.20025.7758E247@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/1b89884a/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 19:38:14 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 19:38:14 +0000
Subject: [openssl-commits] Build failed: openssl master.5495
Message-ID: <20160925193814.24811.40214.CE1D60EB@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/f3e3e1ac/attachment.html>

From builds at travis-ci.org  Sun Sep 25 19:42:49 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 25 Sep 2016 19:42:49 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2038
	(sk_num_alloc - aa4015b)
In-Reply-To: <FdaSilvaYY/openssl+162617245+still failing@travis-ci.org>
Message-ID: <57e828b99eb7f_33fd33ddade8c2864a4@55b114d6-2dd1-4460-beca-566d20bec169.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2038
Status: Still Failing

Duration: 29 minutes and 16 seconds
Commit: aa4015b (sk_num_alloc)
Author: FdaSilvaYY
Message: Introduce some pre-allocation

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/71788c3f32a1...aa4015baf1ec

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162617245

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/1a54473c/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 19:50:16 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 19:50:16 +0000
Subject: [openssl-commits] Build failed: openssl master.5496
Message-ID: <20160925195016.4551.85744.9FBD2564@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/22bf482e/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 19:58:59 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 19:58:59 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1318
Message-ID: <20160925195859.13070.60993.1FE7833C@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/eb3934a1/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 19:59:06 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 19:59:06 +0000
Subject: [openssl-commits] Build failed: openssl master.5497
Message-ID: <20160925195905.24926.27420.ECC32296@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/a93bb448/attachment-0001.html>

From no-reply at appveyor.com  Sun Sep 25 20:35:01 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 20:35:01 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1322
Message-ID: <20160925203501.24620.59119.F9071D74@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/1a9cc1eb/attachment.html>

From builds at travis-ci.org  Sun Sep 25 20:47:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 25 Sep 2016 20:47:03 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2043 (style_n_nit's -
	e01f00f)
In-Reply-To: <FdaSilvaYY/openssl+162623006+failed@travis-ci.org>
Message-ID: <57e837c6df85c_33ff53f6d58d4177593@d95aa883-9016-45de-8478-55670902f34c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2043
Status: Failed

Duration: 21 minutes and 15 seconds
Commit: e01f00f (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/8c4d8b9cdad6...e01f00fdf0a2

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162623006

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/d793cb8d/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 22:01:32 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 22:01:32 +0000
Subject: [openssl-commits] Build failed: openssl 1.0.1323
Message-ID: <20160925220131.2617.54032.9B1CFC68@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/5268d94d/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 22:01:49 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 22:01:49 +0000
Subject: [openssl-commits] Build failed: openssl master.5498
Message-ID: <20160925220149.14515.75145.205DE486@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/59017d3a/attachment.html>

From builds at travis-ci.org  Sun Sep 25 22:07:20 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 25 Sep 2016 22:07:20 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2044
	(style_n_nit's - 10fc9cd)
In-Reply-To: <FdaSilvaYY/openssl+162641655+still failing@travis-ci.org>
Message-ID: <57e84a97e891e_33fd33d9e723036067b@55b114d6-2dd1-4460-beca-566d20bec169.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2044
Status: Still Failing

Duration: 15 minutes and 3 seconds
Commit: 10fc9cd (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/e01f00fdf0a2...10fc9cd6fcca

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162641655

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/cb4d0ac3/attachment-0001.html>

From no-reply at appveyor.com  Sun Sep 25 23:10:13 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 23:10:13 +0000
Subject: [openssl-commits] Build completed: openssl master.5499
Message-ID: <20160925231013.19726.8836.383AB464@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/bf375017/attachment.html>

From no-reply at appveyor.com  Sun Sep 25 23:14:42 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Sun, 25 Sep 2016 23:14:42 +0000
Subject: [openssl-commits] Build completed: openssl 1.0.1324
Message-ID: <20160925231441.24926.16809.33539EC6@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/2ee46c5e/attachment.html>

From builds at travis-ci.org  Sun Sep 25 23:22:01 2016
From: builds at travis-ci.org (Travis CI)
Date: Sun, 25 Sep 2016 23:22:01 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2045 (style_n_nit's -
	568abd3)
In-Reply-To: <FdaSilvaYY/openssl+162648554+errored@travis-ci.org>
Message-ID: <57e85c19564c3_33fd33dbc1b143990be@55b114d6-2dd1-4460-beca-566d20bec169.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2045
Status: Errored

Duration: 34 minutes and 38 seconds
Commit: 568abd3 (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/10fc9cd6fcca...568abd396145

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162648554

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160925/332911cc/attachment.html>

From matt at openssl.org  Mon Sep 26 10:05:58 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:05:58 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474884358.363484.3620.nullmailer@dev.openssl.org>

The branch master has been updated
       via  3133c2d3067c6add91cf370b0b8342d891b8e97a (commit)
       via  44f206aa9dfd4f226f17d9093732dbece5300aa6 (commit)
       via  0d698f6696e114a6e47f8b75ff88ec81f9e30175 (commit)
       via  f789b04f407c2003da62d2b91b587629f1a781d0 (commit)
       via  84d5549e692e63a16fa1b11603e4098fc31746e9 (commit)
      from  c536b6be1a72aefd632d5530106a67c516cb9f4b (commit)


- Log -----------------------------------------------------------------
commit 3133c2d3067c6add91cf370b0b8342d891b8e97a
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 09:43:45 2016 +0100

    Updates CHANGES and NEWS for new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 44f206aa9dfd4f226f17d9093732dbece5300aa6
Author: Robert Swiecki <swiecki at google.com>
Date:   Sun Sep 25 16:35:56 2016 +0100

    Add to fuzz corpora for CVE-2016-6309
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 0d698f6696e114a6e47f8b75ff88ec81f9e30175
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 23 16:58:11 2016 +0100

    Fix Use After Free for large message sizes
    
    The buffer to receive messages is initialised to 16k. If a message is
    received that is larger than that then the buffer is "realloc'd". This can
    cause the location of the underlying buffer to change. Anything that is
    referring to the old location will be referring to free'd data. In the
    recent commit c1ef7c97 (master) and 4b390b6c (1.1.0) the point in the code
    where the message buffer is grown was changed. However s->init_msg was not
    updated to point at the new location.
    
    CVE-2016-6309
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit f789b04f407c2003da62d2b91b587629f1a781d0
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 23 16:41:50 2016 +0100

    Fix a WPACKET bug
    
    If we request more bytes to be allocated than double what we have already
    written, then we grow the buffer by the wrong amount.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

commit 84d5549e692e63a16fa1b11603e4098fc31746e9
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 23 15:37:13 2016 +0100

    Add a test for large messages
    
    Ensure that we send a large message during the test suite.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                                            |  17 +++++
 NEWS                                               |   4 +
 .../06d05ea3d37abe7554e610be69b743585cb0c6fe}      | Bin 820 -> 921 bytes
 .../6b008546166c7e1d2ef100eb5ecbac7efe3b3b90       | Bin 0 -> 267 bytes
 .../f6b0502e2a8a63e84d7b474fad2b2dc127f12bac       | Bin 0 -> 267 bytes
 ssl/packet.c                                       |  10 ++-
 ssl/statem/statem.c                                |  20 ++++-
 test/sslapitest.c                                  |  84 +++++++++++++++++++++
 8 files changed, 129 insertions(+), 6 deletions(-)
 copy fuzz/corpora/{x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc => server/06d05ea3d37abe7554e610be69b743585cb0c6fe} (76%)
 create mode 100644 fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90
 create mode 100644 fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac

diff --git a/CHANGES b/CHANGES
index 97e70ac..eb18673 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,23 @@
      https://www.akkadia.org/drepper/SHA-crypt.txt
      [Richard Levitte]
 
+ Changes between 1.1.0a and 1.1.0b [26 Sep 2016]
+
+  *) Fix Use After Free for large message sizes
+
+     The patch applied to address CVE-2016-6307 resulted in an issue where if a
+     message larger than approx 16k is received then the underlying buffer to
+     store the incoming message is reallocated and moved. Unfortunately a
+     dangling pointer to the old location is left which results in an attempt to
+     write to the previously freed location. This is likely to result in a
+     crash, however it could potentially lead to execution of arbitrary code.
+
+     This issue only affects OpenSSL 1.1.0a.
+
+     This issue was reported to OpenSSL by Robert ?wi?cki.
+     (CVE-2016-6309)
+     [Matt Caswell]
+
  Changes between 1.1.0 and 1.1.0a [22 Sep 2016]
 
   *) OCSP Status Request extension unbounded memory growth
diff --git a/NEWS b/NEWS
index bdb7a4f..82d1cb1 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@
 
       o
 
+  Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.0b [26 Sep 2016]
+
+      o Fix Use After Free for large message sizes (CVE-2016-6309)
+
   Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016]
 
       o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
diff --git a/fuzz/corpora/x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc b/fuzz/corpora/server/06d05ea3d37abe7554e610be69b743585cb0c6fe
similarity index 76%
copy from fuzz/corpora/x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc
copy to fuzz/corpora/server/06d05ea3d37abe7554e610be69b743585cb0c6fe
index 517c33c..42a535b 100644
Binary files a/fuzz/corpora/x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc and b/fuzz/corpora/server/06d05ea3d37abe7554e610be69b743585cb0c6fe differ
diff --git a/fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90 b/fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90
new file mode 100644
index 0000000..3b3f140
Binary files /dev/null and b/fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90 differ
diff --git a/fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac b/fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac
new file mode 100644
index 0000000..abc8c3c
Binary files /dev/null and b/fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac differ
diff --git a/ssl/packet.c b/ssl/packet.c
index 0e8e876..4077de5 100644
--- a/ssl/packet.c
+++ b/ssl/packet.c
@@ -24,12 +24,16 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 
     if (pkt->buf->length - pkt->written < len) {
         size_t newlen;
+        size_t reflen;
 
-        if (pkt->buf->length > SIZE_MAX / 2) {
+        reflen = (len > pkt->buf->length) ? len : pkt->buf->length;
+
+        if (reflen > SIZE_MAX / 2) {
             newlen = SIZE_MAX;
         } else {
-            newlen = (pkt->buf->length == 0) ? DEFAULT_BUF_SIZE
-                                             : pkt->buf->length * 2;
+            newlen = reflen * 2;
+            if (newlen < DEFAULT_BUF_SIZE)
+                newlen = DEFAULT_BUF_SIZE;
         }
         if (BUF_MEM_grow(pkt->buf, newlen) == 0)
             return 0;
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 27dd5d6..f004808 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -445,6 +445,21 @@ static void init_read_state_machine(SSL *s)
     st->read_state = READ_STATE_HEADER;
 }
 
+static int grow_init_buf(SSL *s, size_t size) {
+
+    size_t msg_offset = (char *)s->init_msg - s->init_buf->data;
+
+    if (!BUF_MEM_grow_clean(s->init_buf, (int)size))
+        return 0;
+
+    if (size < msg_offset)
+        return 0;
+
+    s->init_msg = s->init_buf->data + msg_offset;
+
+    return 1;
+}
+
 /*
  * This function implements the sub-state machine when the message flow is in
  * MSG_FLOW_READING. The valid sub-states and transitions are:
@@ -545,9 +560,8 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
             /* dtls_get_message already did this */
             if (!SSL_IS_DTLS(s)
                     && s->s3->tmp.message_size > 0
-                    && !BUF_MEM_grow_clean(s->init_buf,
-                                           (int)s->s3->tmp.message_size
-                                           + SSL3_HM_HEADER_LENGTH)) {
+                    && !grow_init_buf(s, s->s3->tmp.message_size
+                                         + SSL3_HM_HEADER_LENGTH)) {
                 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
                 SSLerr(SSL_F_READ_STATE_MACHINE, ERR_R_BUF_LIB);
                 return SUB_STATE_ERROR;
diff --git a/test/sslapitest.c b/test/sslapitest.c
index a2b18df..acb2087 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -28,6 +28,88 @@ static int ocsp_client_called = 0;
 static int cdummyarg = 1;
 static X509 *ocspcert = NULL;
 
+#define NUM_EXTRA_CERTS 40
+
+static int execute_test_large_message(const SSL_METHOD *smeth,
+                                      const SSL_METHOD *cmeth)
+{
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL;
+    int testresult = 0;
+    int i;
+    BIO *certbio = BIO_new_file(cert, "r");
+    X509 *chaincert = NULL;
+    int certlen;
+
+    if (certbio == NULL) {
+        printf("Can't load the certficate file\n");
+        goto end;
+    }
+    chaincert = PEM_read_bio_X509(certbio, NULL, NULL, NULL);
+
+    if (!create_ssl_ctx_pair(smeth, cmeth, &sctx,
+                             &cctx, cert, privkey)) {
+        printf("Unable to create SSL_CTX pair\n");
+        goto end;
+    }
+    BIO_free(certbio);
+    certbio = NULL;
+
+    /*
+     * We assume the supplied certificate is big enough so that if we add
+     * NUM_EXTRA_CERTS it will make the overall message large enough. The
+     * default buffer size is requested to be 16k, but due to the way BUF_MEM
+     * works, it ends up allocing a little over 21k (16 * 4/3). So, in this test
+     * we need to have a message larger than that.
+     */
+    certlen = i2d_X509(chaincert, NULL);
+    OPENSSL_assert((certlen * NUM_EXTRA_CERTS)
+                   > ((SSL3_RT_MAX_PLAIN_LENGTH * 4) / 3));
+    for (i = 0; i < NUM_EXTRA_CERTS; i++) {
+        if (!X509_up_ref(chaincert)) {
+            printf("Unable to up ref cert\n");
+            goto end;
+        }
+        if (!SSL_CTX_add_extra_chain_cert(sctx, chaincert)) {
+            printf("Unable to add extra chain cert %d\n", i);
+            X509_free(chaincert);
+            goto end;
+        }
+    }
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    if (!create_ssl_connection(serverssl, clientssl)) {
+        printf("Unable to create SSL connection\n");
+        goto end;
+    }
+
+    testresult = 1;
+
+ end:
+    X509_free(chaincert);
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+
+    return testresult;
+}
+
+static int test_large_message_tls(void)
+{
+    return execute_test_large_message(TLS_server_method(), TLS_client_method());
+}
+
+static int test_large_message_dtls(void)
+{
+    return execute_test_large_message(DTLS_server_method(),
+                                      DTLS_client_method());
+}
+
 static int ocsp_server_cb(SSL *s, void *arg)
 {
     int *argi = (int *)arg;
@@ -774,6 +856,8 @@ int main(int argc, char *argv[])
     CRYPTO_set_mem_debug(1);
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
+    ADD_TEST(test_large_message_tls);
+    ADD_TEST(test_large_message_dtls);
     ADD_TEST(test_tlsext_status_type);
     ADD_TEST(test_session_with_only_int_cache);
     ADD_TEST(test_session_with_only_ext_cache);

From matt at openssl.org  Mon Sep 26 10:06:12 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:06:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474884372.634464.4598.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  a12778be1782bb63055e7641c814d4fce1775e57 (commit)
       via  16c34d4f74e16443cfdc99f2a49ebb1ba3c37db3 (commit)
       via  87cd6f9253580866b13729d33fdd45205485b675 (commit)
       via  f8644220a05f75d51bbde627077cdf336e4d4592 (commit)
       via  acacbfa7565c78d2273c0b2a2e5e803f44afefeb (commit)
       via  df7681e46825d4a86df5dd73317d88923166a506 (commit)
      from  5fe5914d3068128cdc6b08fe72746bb516a30b8a (commit)


- Log -----------------------------------------------------------------
commit a12778be1782bb63055e7641c814d4fce1775e57
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 10:46:58 2016 +0100

    Prepare for 1.1.0c-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 16c34d4f74e16443cfdc99f2a49ebb1ba3c37db3
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 10:46:03 2016 +0100

    Prepare for 1.1.0b release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 87cd6f9253580866b13729d33fdd45205485b675
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 09:43:45 2016 +0100

    Updates CHANGES and NEWS for new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit f8644220a05f75d51bbde627077cdf336e4d4592
Author: Robert Swiecki <swiecki at google.com>
Date:   Sun Sep 25 16:35:56 2016 +0100

    Add to fuzz corpora for CVE-2016-6309
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 44f206aa9dfd4f226f17d9093732dbece5300aa6)

commit acacbfa7565c78d2273c0b2a2e5e803f44afefeb
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 23 16:58:11 2016 +0100

    Fix Use After Free for large message sizes
    
    The buffer to receive messages is initialised to 16k. If a message is
    received that is larger than that then the buffer is "realloc'd". This can
    cause the location of the underlying buffer to change. Anything that is
    referring to the old location will be referring to free'd data. In the
    recent commit c1ef7c97 (master) and 4b390b6c (1.1.0) the point in the code
    where the message buffer is grown was changed. However s->init_msg was not
    updated to point at the new location.
    
    CVE-2016-6309
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 0d698f6696e114a6e47f8b75ff88ec81f9e30175)

commit df7681e46825d4a86df5dd73317d88923166a506
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 23 15:37:13 2016 +0100

    Add a test for large messages
    
    Ensure that we send a large message during the test suite.
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    (cherry picked from commit 84d5549e692e63a16fa1b11603e4098fc31746e9)

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                                            |  19 ++++-
 NEWS                                               |   6 +-
 README                                             |   2 +-
 .../06d05ea3d37abe7554e610be69b743585cb0c6fe}      | Bin 820 -> 921 bytes
 .../6b008546166c7e1d2ef100eb5ecbac7efe3b3b90       | Bin 0 -> 267 bytes
 .../f6b0502e2a8a63e84d7b474fad2b2dc127f12bac       | Bin 0 -> 267 bytes
 include/openssl/opensslv.h                         |   6 +-
 ssl/statem/statem.c                                |  20 ++++-
 test/sslapitest.c                                  |  84 +++++++++++++++++++++
 9 files changed, 128 insertions(+), 9 deletions(-)
 copy fuzz/corpora/{x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc => server/06d05ea3d37abe7554e610be69b743585cb0c6fe} (76%)
 create mode 100644 fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90
 create mode 100644 fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac

diff --git a/CHANGES b/CHANGES
index 76b4974..3781d06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,27 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.1.0a and 1.1.0b [xx XXX xxxx]
+ Changes between 1.1.0b and 1.1.0c [xx XXX xxxx]
 
   *)
 
+ Changes between 1.1.0a and 1.1.0b [26 Sep 2016]
+
+  *) Fix Use After Free for large message sizes
+
+     The patch applied to address CVE-2016-6307 resulted in an issue where if a
+     message larger than approx 16k is received then the underlying buffer to
+     store the incoming message is reallocated and moved. Unfortunately a
+     dangling pointer to the old location is left which results in an attempt to
+     write to the previously freed location. This is likely to result in a
+     crash, however it could potentially lead to execution of arbitrary code.
+
+     This issue only affects OpenSSL 1.1.0a.
+
+     This issue was reported to OpenSSL by Robert ?wi?cki.
+     (CVE-2016-6309)
+     [Matt Caswell]
+
  Changes between 1.1.0 and 1.1.0a [22 Sep 2016]
 
   *) OCSP Status Request extension unbounded memory growth
diff --git a/NEWS b/NEWS
index 66bade1..81315be 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,14 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.0b [under development]
+  Major changes between OpenSSL 1.1.0b and OpenSSL 1.1.0c [under development]
 
       o
 
+  Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.0b [26 Sep 2016]
+
+      o Fix Use After Free for large message sizes (CVE-2016-6309)
+
   Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016]
 
       o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
diff --git a/README b/README
index fdf0f8f..8ca5eb4 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0b-dev
+ OpenSSL 1.1.0c-dev
 
  Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/fuzz/corpora/x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc b/fuzz/corpora/server/06d05ea3d37abe7554e610be69b743585cb0c6fe
similarity index 76%
copy from fuzz/corpora/x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc
copy to fuzz/corpora/server/06d05ea3d37abe7554e610be69b743585cb0c6fe
index 517c33c..42a535b 100644
Binary files a/fuzz/corpora/x509/3403363173e3b63d0b9f4e3fce6e8a734d946bfc and b/fuzz/corpora/server/06d05ea3d37abe7554e610be69b743585cb0c6fe differ
diff --git a/fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90 b/fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90
new file mode 100644
index 0000000..3b3f140
Binary files /dev/null and b/fuzz/corpora/server/6b008546166c7e1d2ef100eb5ecbac7efe3b3b90 differ
diff --git a/fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac b/fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac
new file mode 100644
index 0000000..abc8c3c
Binary files /dev/null and b/fuzz/corpora/server/f6b0502e2a8a63e84d7b474fad2b2dc127f12bac differ
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 5cc6881..4792f69 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,11 +39,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10100020L
+# define OPENSSL_VERSION_NUMBER  0x10100030L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0b-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0c-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0b-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0c-dev  xx XXX xxxx"
 # endif
 
 /*-
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 5faf6ae..caaf068 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -445,6 +445,21 @@ static void init_read_state_machine(SSL *s)
     st->read_state = READ_STATE_HEADER;
 }
 
+static int grow_init_buf(SSL *s, size_t size) {
+
+    size_t msg_offset = (char *)s->init_msg - s->init_buf->data;
+
+    if (!BUF_MEM_grow_clean(s->init_buf, (int)size))
+        return 0;
+
+    if (size < msg_offset)
+        return 0;
+
+    s->init_msg = s->init_buf->data + msg_offset;
+
+    return 1;
+}
+
 /*
  * This function implements the sub-state machine when the message flow is in
  * MSG_FLOW_READING. The valid sub-states and transitions are:
@@ -545,9 +560,8 @@ static SUB_STATE_RETURN read_state_machine(SSL *s)
             /* dtls_get_message already did this */
             if (!SSL_IS_DTLS(s)
                     && s->s3->tmp.message_size > 0
-                    && !BUF_MEM_grow_clean(s->init_buf,
-                                           (int)s->s3->tmp.message_size
-                                           + SSL3_HM_HEADER_LENGTH)) {
+                    && !grow_init_buf(s, s->s3->tmp.message_size
+                                         + SSL3_HM_HEADER_LENGTH)) {
                 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
                 SSLerr(SSL_F_READ_STATE_MACHINE, ERR_R_BUF_LIB);
                 return SUB_STATE_ERROR;
diff --git a/test/sslapitest.c b/test/sslapitest.c
index a2b18df..acb2087 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -28,6 +28,88 @@ static int ocsp_client_called = 0;
 static int cdummyarg = 1;
 static X509 *ocspcert = NULL;
 
+#define NUM_EXTRA_CERTS 40
+
+static int execute_test_large_message(const SSL_METHOD *smeth,
+                                      const SSL_METHOD *cmeth)
+{
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL;
+    int testresult = 0;
+    int i;
+    BIO *certbio = BIO_new_file(cert, "r");
+    X509 *chaincert = NULL;
+    int certlen;
+
+    if (certbio == NULL) {
+        printf("Can't load the certficate file\n");
+        goto end;
+    }
+    chaincert = PEM_read_bio_X509(certbio, NULL, NULL, NULL);
+
+    if (!create_ssl_ctx_pair(smeth, cmeth, &sctx,
+                             &cctx, cert, privkey)) {
+        printf("Unable to create SSL_CTX pair\n");
+        goto end;
+    }
+    BIO_free(certbio);
+    certbio = NULL;
+
+    /*
+     * We assume the supplied certificate is big enough so that if we add
+     * NUM_EXTRA_CERTS it will make the overall message large enough. The
+     * default buffer size is requested to be 16k, but due to the way BUF_MEM
+     * works, it ends up allocing a little over 21k (16 * 4/3). So, in this test
+     * we need to have a message larger than that.
+     */
+    certlen = i2d_X509(chaincert, NULL);
+    OPENSSL_assert((certlen * NUM_EXTRA_CERTS)
+                   > ((SSL3_RT_MAX_PLAIN_LENGTH * 4) / 3));
+    for (i = 0; i < NUM_EXTRA_CERTS; i++) {
+        if (!X509_up_ref(chaincert)) {
+            printf("Unable to up ref cert\n");
+            goto end;
+        }
+        if (!SSL_CTX_add_extra_chain_cert(sctx, chaincert)) {
+            printf("Unable to add extra chain cert %d\n", i);
+            X509_free(chaincert);
+            goto end;
+        }
+    }
+
+    if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+        printf("Unable to create SSL objects\n");
+        goto end;
+    }
+
+    if (!create_ssl_connection(serverssl, clientssl)) {
+        printf("Unable to create SSL connection\n");
+        goto end;
+    }
+
+    testresult = 1;
+
+ end:
+    X509_free(chaincert);
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+
+    return testresult;
+}
+
+static int test_large_message_tls(void)
+{
+    return execute_test_large_message(TLS_server_method(), TLS_client_method());
+}
+
+static int test_large_message_dtls(void)
+{
+    return execute_test_large_message(DTLS_server_method(),
+                                      DTLS_client_method());
+}
+
 static int ocsp_server_cb(SSL *s, void *arg)
 {
     int *argi = (int *)arg;
@@ -774,6 +856,8 @@ int main(int argc, char *argv[])
     CRYPTO_set_mem_debug(1);
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
+    ADD_TEST(test_large_message_tls);
+    ADD_TEST(test_large_message_dtls);
     ADD_TEST(test_tlsext_status_type);
     ADD_TEST(test_session_with_only_int_cache);
     ADD_TEST(test_session_with_only_ext_cache);

From matt at openssl.org  Mon Sep 26 10:06:25 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:06:25 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474884385.456736.4988.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  f6e43fee7060ec5c335724fea8097060a4359f2f (commit)
       via  e216bf9d7ca761718f34e8b3094fcb32c7a143e4 (commit)
       via  ca430ece0d5cf5820d9e580252f3118602e40332 (commit)
       via  6e629b5be45face20b4ca71c4fcbfed78b864a2e (commit)
      from  f15a7e39a1f7d41716ca5f07faef74f55147d2cf (commit)


- Log -----------------------------------------------------------------
commit f6e43fee7060ec5c335724fea8097060a4359f2f
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 10:50:48 2016 +0100

    Prepare for 1.0.2k-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit e216bf9d7ca761718f34e8b3094fcb32c7a143e4
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 10:49:49 2016 +0100

    Prepare for 1.0.2j release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ca430ece0d5cf5820d9e580252f3118602e40332
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 09:51:30 2016 +0100

    Update CHANGES and NEWS for the new release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 6e629b5be45face20b4ca71c4fcbfed78b864a2e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Aug 23 00:01:57 2016 +0100

    Add some sanity checks when checking CRL scores
    
    Note: this was accidentally omitted from OpenSSL 1.0.2 branch.
    Without this fix any attempt to use CRLs will crash.
    
    CVE-2016-7052
    
    Thanks to Bruce Stephens and Thomas Jakobi for reporting this issue.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                | 14 +++++++++++++-
 NEWS                   |  6 +++++-
 README                 |  2 +-
 crypto/opensslv.h      |  6 +++---
 crypto/x509/x509_vfy.c |  4 ++--
 openssl.spec           |  2 +-
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index c072379..009b7ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,22 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.2i and 1.0.2j [xx XXX xxxx]
+ Changes between 1.0.2j and 1.0.2k [xx XXX xxxx]
 
   *)
 
+ Changes between 1.0.2i and 1.0.2j [26 Sep 2016]
+
+  *) Missing CRL sanity check
+
+     A bug fix which included a CRL sanity check was added to OpenSSL 1.1.0
+     but was omitted from OpenSSL 1.0.2i. As a result any attempt to use
+     CRLs in OpenSSL 1.0.2i will crash with a null pointer exception.
+
+     This issue only affects the OpenSSL 1.0.2i
+     (CVE-2016-7052)
+     [Matt Caswell]
+
  Changes between 1.0.2h and 1.0.2i [22 Sep 2016]
 
   *) OCSP Status Request extension unbounded memory growth
diff --git a/NEWS b/NEWS
index 6a787e6..24a1317 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,14 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.2i and OpenSSL 1.0.2j [under development]
+  Major changes between OpenSSL 1.0.2j and OpenSSL 1.0.2k [under development]
 
       o
 
+  Major changes between OpenSSL 1.0.2i and OpenSSL 1.0.2j [26 Sep 2016]
+
+      o Fix Use After Free for large message sizes (CVE-2016-6309)
+
   Major changes between OpenSSL 1.0.2h and OpenSSL 1.0.2i [22 Sep 2016]
 
       o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
diff --git a/README b/README
index 9cba523..dece269 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2j-dev
+ OpenSSL 1.0.2k-dev
 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index c40160b..0f4251f 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x100020a0L
+# define OPENSSL_VERSION_NUMBER  0x100020b0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2j-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2k-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2j-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2k-dev  xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 8334b3f..b147201 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -1124,10 +1124,10 @@ static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
         crl = sk_X509_CRL_value(crls, i);
         reasons = *preasons;
         crl_score = get_crl_score(ctx, &crl_issuer, &reasons, crl, x);
-        if (crl_score < best_score)
+        if (crl_score < best_score || crl_score == 0)
             continue;
         /* If current CRL is equivalent use it if it is newer */
-        if (crl_score == best_score) {
+        if (crl_score == best_score && best_crl != NULL) {
             int day, sec;
             if (ASN1_TIME_diff(&day, &sec, X509_CRL_get_lastUpdate(best_crl),
                                X509_CRL_get_lastUpdate(crl)) == 0)
diff --git a/openssl.spec b/openssl.spec
index 880a5c3..7bbcdf6 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -7,7 +7,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.2j
+Version: 1.0.2k
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries

From matt at openssl.org  Mon Sep 26 10:06:41 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:06:41 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2j create
Message-ID: <1474884401.481066.5396.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_0_2j has been created
        at  65d7fcd069380dc8f9033cb5f2b26e2f3422e5cc (tag)
   tagging  e216bf9d7ca761718f34e8b3094fcb32c7a143e4 (commit)
  replaces  OpenSSL_1_0_2i
 tagged by  Matt Caswell
        on  Mon Sep 26 10:49:49 2016 +0100

- Log -----------------------------------------------------------------
OpenSSL 1.0.2j release tag
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJX6O89AAoJENnE0m0OYESR758H/iXm06Pq/AKsDLrY2M8rvY2A
hGMBhxRS9GuMywje7RxksN2Jxn0K1dFG98XuSOYTyQZnA2bYH11oX2DLnvkvQDt9
BGh/vhvXKTqBXFgBa9jqWVgzF8UXvJM/JrblkjtbMOj9LVdHgRJAPyLf1GzVQC1g
kaaz/xknE63hQmHc3A77GD1zJyAmg20kI+yZggi80WYYySURiz1kObG1ocnEAE5r
CCc7tYxbjycaq+kSYQjxw1BjtgeaU/51LmJ5Rx0FU1wBvO1Tf1ZIgZ+74YS4aJET
jCm9nngc1Rko+eTEj7iUZJaO5u3p/HaLIgBPe1bZ3/xeZCJdg63gcSq4rFNS0ZQ=
=BWLw
-----END PGP SIGNATURE-----

Dirk Feytons (1):
      Fix build with no-nextprotoneg

Matt Caswell (4):
      Prepare for 1.0.2j-dev
      Add some sanity checks when checking CRL scores
      Update CHANGES and NEWS for the new release
      Prepare for 1.0.2j release

Rich Salz (1):
      Fix typo introduced by a03f81f4

-----------------------------------------------------------------------

From matt at openssl.org  Mon Sep 26 10:06:41 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:06:41 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0b create
Message-ID: <1474884401.538203.5413.nullmailer@dev.openssl.org>

The annotated tag OpenSSL_1_1_0b has been created
        at  77d1fec0e1709f55967e50162e68a2046b6c1997 (tag)
   tagging  16c34d4f74e16443cfdc99f2a49ebb1ba3c37db3 (commit)
  replaces  OpenSSL_1_1_0a
 tagged by  Matt Caswell
        on  Mon Sep 26 10:46:03 2016 +0100

- Log -----------------------------------------------------------------
OpenSSL 1.1.0b release tag
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJX6O5bAAoJENnE0m0OYESRM6MIAIqMH1rqHf048qh6kcmCf33G
7OATwozu8U0aeQV5XIkoO4ldSVuWAThGAetFJhpiIuJA7/PtqAWMR7RMdmEeqYEY
ogRcawwwsTSVZxaXQVhecHab+xK2YURV/D+L5zyWhw2iGYuCoAUbKVgKM4I9eshh
DHgqRg7yFhg0bz6P/MgYV0SCRsX51Edpd4NHzvyQ9lTPoYOEy2U/Wl2x2ZpL9qD1
8pazD7v5m3/3RijjsbEBWja3gMIfzJ5zPiErkwLfXM6ml+rt+k+xbtIB/x/xS/Vy
/ZjqC6oeU/9z8wVym3qXnlIt7O72XhwN5HY2PmcyOv8BMBmn6NedCAEe57b3UPk=
=bdjH
-----END PGP SIGNATURE-----

Matt Caswell (5):
      Prepare for 1.1.0b-dev
      Add a test for large messages
      Fix Use After Free for large message sizes
      Updates CHANGES and NEWS for new release
      Prepare for 1.1.0b release

Robert Swiecki (1):
      Add to fuzz corpora for CVE-2016-6309

-----------------------------------------------------------------------

From matt at openssl.org  Mon Sep 26 10:06:58 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:06:58 +0000
Subject: [openssl-commits] [web]  master update
Message-ID: <1474884418.085716.5679.nullmailer@dev.openssl.org>

The branch master has been updated
       via  6d223568b215ccb0c297a1ea8761f00b2b470473 (commit)
      from  50b169440002898052ea41e9a9393ed41a68e7b2 (commit)


- Log -----------------------------------------------------------------
commit 6d223568b215ccb0c297a1ea8761f00b2b470473
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 11:01:35 2016 +0100

    Update website for new release

-----------------------------------------------------------------------

Summary of changes:
 news/newsflash.txt       |  3 +++
 news/secadv/20160926.txt | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
 news/vulnerabilities.xml | 37 ++++++++++++++++++++++++++++-
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 news/secadv/20160926.txt

diff --git a/news/newsflash.txt b/news/newsflash.txt
index 6eb393c..e10aef8 100644
--- a/news/newsflash.txt
+++ b/news/newsflash.txt
@@ -4,6 +4,9 @@
 # Format is two fields, colon-separated; the first line is the column
 # headings.  URL paths must all be absolute.
 Date: Item
+26-Sep-2016: <a href="/news/secadv/20160926.txt">Security Advisory</a>: Two security fixes
+26-Sep-2016: OpenSSL 1.1.0b is now available, including a security fix
+26-Sep-2016: OpenSSL 1.0.2j is now available, including a security fix
 22-Sep-2016: <a href="/news/secadv/20160922.txt">Security Advisory</a>: several security fixes
 22-Sep-2016: OpenSSL 1.1.0a is now available, including bug and security fixes
 22-Sep-2016: OpenSSL 1.0.2i is now available, including bug and security fixes
diff --git a/news/secadv/20160926.txt b/news/secadv/20160926.txt
new file mode 100644
index 0000000..467a119
--- /dev/null
+++ b/news/secadv/20160926.txt
@@ -0,0 +1,60 @@
+
+OpenSSL Security Advisory [26 Sep 2016]
+========================================
+
+This security update addresses issues that were caused by patches
+included in our previous security update, released on 22nd September
+2016.  Given the Critical severity of one of these flaws we have
+chosen to release this advisory immediately to prevent upgrades to the
+affected version, rather than delaying in order to provide our usual
+public pre-notification.
+
+
+Fix Use After Free for large message sizes (CVE-2016-6309)
+==========================================================
+
+Severity: Critical
+
+This issue only affects OpenSSL 1.1.0a, released on 22nd September 2016.
+
+The patch applied to address CVE-2016-6307 resulted in an issue where if a
+message larger than approx 16k is received then the underlying buffer to store
+the incoming message is reallocated and moved. Unfortunately a dangling pointer
+to the old location is left which results in an attempt to write to the
+previously freed location. This is likely to result in a crash, however it
+could potentially lead to execution of arbitrary code.
+
+OpenSSL 1.1.0 users should upgrade to 1.1.0b
+
+This issue was reported to OpenSSL on 23rd September 2016 by Robert
+?wi?cki (Google Security Team), and was found using honggfuzz. The fix
+was developed by Matt Caswell of the OpenSSL development team.
+
+Missing CRL sanity check (CVE-2016-7052)
+========================================
+
+Severity: Moderate
+
+This issue only affects OpenSSL 1.0.2i, released on 22nd September 2016.
+
+A bug fix which included a CRL sanity check was added to OpenSSL 1.1.0
+but was omitted from OpenSSL 1.0.2i. As a result any attempt to use
+CRLs in OpenSSL 1.0.2i will crash with a null pointer exception.
+
+OpenSSL 1.0.2i users should upgrade to 1.0.2j
+
+The issue was reported to OpenSSL on 22nd September 2016 by Bruce Stephens and
+Thomas Jakobi. The fix was developed by Matt Caswell of the OpenSSL development
+team.
+
+References
+==========
+
+URL for this Security Advisory:
+https://www.openssl.org/news/secadv/20160926.txt
+
+Note: the online version of the advisory may be updated with additional details
+over time.
+
+For details of OpenSSL severity classifications please see:
+https://www.openssl.org/policies/secpolicy.html
diff --git a/news/vulnerabilities.xml b/news/vulnerabilities.xml
index f9b4a5d..e53c367 100644
--- a/news/vulnerabilities.xml
+++ b/news/vulnerabilities.xml
@@ -5,7 +5,42 @@
      1.0.0 on 20100329
 -->
 
-<security updated="20160922">
+<security updated="20160926">
+  <issue public="20160926">
+    <impact severity="Critical"/>
+    <cve name="2016-6309"/>
+    <affects base="1.1.0" version="1.1.0a"/>
+    <fixed base="1.1.0" version="1.1.0b" date="20160926"/>
+
+    <description>
+      This issue only affects OpenSSL 1.1.0a, released on 22nd September 2016.
+
+      The patch applied to address CVE-2016-6307 resulted in an issue where if a
+      message larger than approx 16k is received then the underlying buffer to store
+      the incoming message is reallocated and moved. Unfortunately a dangling pointer
+      to the old location is left which results in an attempt to write to the
+      previously freed location. This is likely to result in a crash, however it
+      could potentially lead to execution of arbitrary code.
+    </description>
+    <advisory url="/news/secadv/20160926.txt"/>
+    <reported source="Robert ?wi?cki (Google Security Team)"/>
+  </issue>
+  <issue public="20160926">
+    <impact severity="Moderate"/>
+    <cve name="2016-7052"/>
+    <affects base="1.0.2" version="1.0.2i"/>
+    <fixed base="1.0.2" version="1.0.2j" date="20160926"/>
+
+    <description>
+      This issue only affects OpenSSL 1.0.2i, released on 22nd September 2016.
+
+      A bug fix which included a CRL sanity check was added to OpenSSL 1.1.0
+      but was omitted from OpenSSL 1.0.2i. As a result any attempt to use
+      CRLs in OpenSSL 1.0.2i will crash with a null pointer exception.
+    </description>
+    <advisory url="/news/secadv/20160926.txt"/>
+    <reported source="Bruce Stephens and Thomas Jakobi"/>
+  </issue>
   <issue public="20160922">
     <impact severity="High"/>
     <cve name="2016-6304"/>

From matt at openssl.org  Mon Sep 26 10:26:23 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 10:26:23 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1474885583.590923.12603.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  9702bf5fa269eea8eb3d8bad13cc11fc58fb7e8e (commit)
      from  f6e43fee7060ec5c335724fea8097060a4359f2f (commit)


- Log -----------------------------------------------------------------
commit 9702bf5fa269eea8eb3d8bad13cc11fc58fb7e8e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 11:20:11 2016 +0100

    Fix NEWS error
    
    The NEWS file referenced the wrong CVE for 1.0.2
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 24a1317..d750fb5 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@
 
   Major changes between OpenSSL 1.0.2i and OpenSSL 1.0.2j [26 Sep 2016]
 
-      o Fix Use After Free for large message sizes (CVE-2016-6309)
+      o Missing CRL sanity check (CVE-2016-7052)
 
   Major changes between OpenSSL 1.0.2h and OpenSSL 1.0.2i [22 Sep 2016]
 

From builds at travis-ci.org  Mon Sep 26 10:47:25 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 10:47:25 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6167 (master - 3133c2d)
In-Reply-To: <openssl/openssl+162739709+broken@travis-ci.org>
Message-ID: <57e8fcd625493_33fd33ddade8c73124b@55b114d6-2dd1-4460-beca-566d20bec169.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6167
Status: Broken

Duration: 38 minutes and 50 seconds
Commit: 3133c2d (master)
Author: Matt Caswell
Message: Updates CHANGES and NEWS for new release

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/c536b6be1a72...3133c2d3067c

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162739709

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/c88f24d6/attachment.html>

From builds at travis-ci.org  Mon Sep 26 11:01:37 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 11:01:37 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6167
	(OpenSSL_1_0_2-stable - f6e43fe)
In-Reply-To: <openssl/openssl+162739760+errored@travis-ci.org>
Message-ID: <57e900106120b_33ff53f69c444817718@d95aa883-9016-45de-8478-55670902f34c.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6167
Status: Errored

Duration: 21 minutes and 52 seconds
Commit: f6e43fe (OpenSSL_1_0_2-stable)
Author: Matt Caswell
Message: Prepare for 1.0.2k-dev

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/f15a7e39a1f7...f6e43fee7060

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162739760

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/b85cb0fb/attachment.html>

From builds at travis-ci.org  Mon Sep 26 11:27:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 11:27:55 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6167
	(OpenSSL_1_1_0-stable - a12778b)
In-Reply-To: <openssl/openssl+162739733+broken@travis-ci.org>
Message-ID: <57e9063cd0fce_33f7f74cdf8c48635@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6167
Status: Broken

Duration: 59 minutes and 7 seconds
Commit: a12778b (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Prepare for 1.1.0c-dev

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/5fe5914d3068...a12778be1782

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162739733

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/2eeeee81/attachment-0001.html>

From builds at travis-ci.org  Mon Sep 26 11:48:05 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 11:48:05 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6168 (OpenSSL_1_0_2j -
	e216bf9)
In-Reply-To: <openssl/openssl+162739888+passed@travis-ci.org>
Message-ID: <57e90af591003_33ff53f8b5bb8876977@d95aa883-9016-45de-8478-55670902f34c.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6168
Status: Passed

Duration: 33 minutes and 47 seconds
Commit: e216bf9 (OpenSSL_1_0_2j)
Author: Matt Caswell
Message: Prepare for 1.0.2j release

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/OpenSSL_1_0_2j

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162739888

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/2ce38404/attachment.html>

From builds at travis-ci.org  Mon Sep 26 11:54:25 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 11:54:25 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6168 (OpenSSL_1_1_0b -
	16c34d4)
In-Reply-To: <openssl/openssl+162739893+errored@travis-ci.org>
Message-ID: <57e90c6cd56e7_33f844cf118547990bb@0cdd5724-d5e3-4b66-828e-d600cc69ecb3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6168
Status: Errored

Duration: 37 minutes and 52 seconds
Commit: 16c34d4 (OpenSSL_1_1_0b)
Author: Matt Caswell
Message: Prepare for 1.1.0b release

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/OpenSSL_1_1_0b

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162739893

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/dbda3348/attachment.html>

From builds at travis-ci.org  Mon Sep 26 12:08:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 12:08:35 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6169
	(OpenSSL_1_0_2-stable - 9702bf5)
In-Reply-To: <openssl/openssl+162743449+errored@travis-ci.org>
Message-ID: <57e90fc2ac54c_33ff53fc4eeb4893164@d95aa883-9016-45de-8478-55670902f34c.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6169
Status: Errored

Duration: 18 minutes and 48 seconds
Commit: 9702bf5 (OpenSSL_1_0_2-stable)
Author: Matt Caswell
Message: Fix NEWS error

The NEWS file referenced the wrong CVE for 1.0.2

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/f6e43fee7060...9702bf5fa269

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162743449

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/af4c1366/attachment-0001.html>

From matt at openssl.org  Mon Sep 26 13:43:02 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 13:43:02 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474897382.761783.21746.nullmailer@dev.openssl.org>

The branch master has been updated
       via  98c1f5b429d036c0370de15f4d6851eed41fa5b3 (commit)
      from  3133c2d3067c6add91cf370b0b8342d891b8e97a (commit)


- Log -----------------------------------------------------------------
commit 98c1f5b429d036c0370de15f4d6851eed41fa5b3
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 23 14:40:16 2016 +0100

    Fix HelloVerifyRequest construction
    
    commit c536b6be1a introduced a bug that causes a reachable assert. This fixes
    it.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 03d75d0..fbca5a1 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -885,6 +885,8 @@ int dtls_construct_hello_verify_request(SSL *s)
     }
 
     /* number of bytes to write */
+    s->d1->w_msg_hdr.msg_len = msglen - DTLS1_HM_HEADER_LENGTH;
+    s->d1->w_msg_hdr.frag_len = msglen - DTLS1_HM_HEADER_LENGTH;
     s->init_num = (int)msglen;
     s->init_off = 0;
 

From builds at travis-ci.org  Mon Sep 26 14:25:20 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 14:25:20 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6170 (master -
	98c1f5b)
In-Reply-To: <openssl/openssl+162785147+still failing@travis-ci.org>
Message-ID: <57e92fded1c0b_33f7f674dc8f0263927@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6170
Status: Still Failing

Duration: 40 minutes and 41 seconds
Commit: 98c1f5b (master)
Author: Matt Caswell
Message: Fix HelloVerifyRequest construction

commit c536b6be1a introduced a bug that causes a reachable assert. This fixes
it.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/3133c2d3067c...98c1f5b429d0

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162785147

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/53b8a229/attachment.html>

From rsalz at openssl.org  Mon Sep 26 15:15:21 2016
From: rsalz at openssl.org (Rich Salz)
Date: Mon, 26 Sep 2016 15:15:21 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474902921.655863.1681.nullmailer@dev.openssl.org>

The branch master has been updated
       via  8ff70f3326983360c6f6306a1cd2238ef92d1f26 (commit)
      from  98c1f5b429d036c0370de15f4d6851eed41fa5b3 (commit)


- Log -----------------------------------------------------------------
commit 8ff70f3326983360c6f6306a1cd2238ef92d1f26
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 25 17:45:20 2016 -0400

    Add a basic test for BN_bn2dec.
    
    This would have caught 099e2968ed3c7d256cda048995626664082b1b30. This is
    a port of the test added in
    https://boringssl.googlesource.com/boringssl/+/7c040756178e14a4d181b6d93abb3827c93189c4
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1496)

-----------------------------------------------------------------------

Summary of changes:
 test/bntest.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/test/bntest.c b/test/bntest.c
index 3507b31..51b75d3 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -83,6 +83,7 @@ int test_gf2m_mod_solve_quad(BIO *bp, BN_CTX *ctx);
 int test_kron(BIO *bp, BN_CTX *ctx);
 int test_sqrt(BIO *bp, BN_CTX *ctx);
 int test_small_prime(BIO *bp, BN_CTX *ctx);
+int test_bn2dec(BIO *bp);
 int rand_neg(void);
 static int results = 0;
 
@@ -260,6 +261,11 @@ int main(int argc, char *argv[])
         goto err;
     (void)BIO_flush(out);
 
+    message(out, "BN_bn2dec");
+    if (!test_bn2dec(out))
+        goto err;
+    (void)BIO_flush(out);
+
 #ifndef OPENSSL_NO_EC2M
     message(out, "BN_GF2m_add");
     if (!test_gf2m_add(out))
@@ -1839,6 +1845,52 @@ int test_small_prime(BIO *bp, BN_CTX *ctx)
     return ret;
 }
 
+int test_bn2dec(BIO *bp)
+{
+    static const char *bn2dec_tests[] = {
+        "0",
+        "1",
+        "-1",
+        "100",
+        "-100",
+        "123456789012345678901234567890",
+        "-123456789012345678901234567890",
+        "123456789012345678901234567890123456789012345678901234567890",
+        "-123456789012345678901234567890123456789012345678901234567890",
+    };
+    int ret = 0;
+    size_t i;
+    BIGNUM *bn = NULL;
+    char *dec = NULL;
+
+    for (i = 0; i < OSSL_NELEM(bn2dec_tests); i++) {
+        if (!BN_dec2bn(&bn, bn2dec_tests[i]))
+            goto err;
+
+        dec = BN_bn2dec(bn);
+        if (dec == NULL) {
+            fprintf(stderr, "BN_bn2dec failed on %s.\n", bn2dec_tests[i]);
+            goto err;
+        }
+
+        if (strcmp(dec, bn2dec_tests[i]) != 0) {
+            fprintf(stderr, "BN_bn2dec gave %s, wanted %s.\n", dec,
+                    bn2dec_tests[i]);
+            goto err;
+        }
+
+        OPENSSL_free(dec);
+        dec = NULL;
+    }
+
+    ret = 1;
+
+err:
+    BN_free(bn);
+    OPENSSL_free(dec);
+    return ret;
+}
+
 int test_lshift(BIO *bp, BN_CTX *ctx, BIGNUM *a_)
 {
     BIGNUM *a, *b, *c, *d;

From builds at travis-ci.org  Mon Sep 26 15:54:59 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 15:54:59 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6171 (master -
	8ff70f3)
In-Reply-To: <openssl/openssl+162811770+still failing@travis-ci.org>
Message-ID: <57e944d3260c7_33f84416c09441126610@0cdd5724-d5e3-4b66-828e-d600cc69ecb3.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6171
Status: Still Failing

Duration: 38 minutes and 55 seconds
Commit: 8ff70f3 (master)
Author: David Benjamin
Message: Add a basic test for BN_bn2dec.

This would have caught 099e2968ed3c7d256cda048995626664082b1b30. This is
a port of the test added in
https://boringssl.googlesource.com/boringssl/+/7c040756178e14a4d181b6d93abb3827c93189c4

Reviewed-by: Emilia K?sper <emilia at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1496)

View the changeset: https://github.com/openssl/openssl/compare/98c1f5b429d0...8ff70f332698

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162811770

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/3f12f0d5/attachment-0001.html>

From matt at openssl.org  Mon Sep 26 16:31:32 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 16:31:32 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474907492.398853.4589.nullmailer@dev.openssl.org>

The branch master has been updated
       via  fa454945cf2855fed452ff9bdb1876096bc07beb (commit)
      from  8ff70f3326983360c6f6306a1cd2238ef92d1f26 (commit)


- Log -----------------------------------------------------------------
commit fa454945cf2855fed452ff9bdb1876096bc07beb
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 12:04:23 2016 +0100

    Fix some mem leaks in sslapitest
    
    A mem leak could occur on an error path. Also the mempacket BIO_METHOD
    needs to be cleaned up, because of the newly added DTLS test.
    
    Also fixed a double semi-colon in ssltestlib.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/sslapitest.c | 10 ++++++++--
 test/ssltestlib.c |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index acb2087..b08eb8c 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -46,14 +46,18 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
         goto end;
     }
     chaincert = PEM_read_bio_X509(certbio, NULL, NULL, NULL);
+    BIO_free(certbio);
+    certbio = NULL;
+    if (chaincert == NULL) {
+        printf("Unable to load certificate for chain\n");
+        goto end;
+    }
 
     if (!create_ssl_ctx_pair(smeth, cmeth, &sctx,
                              &cctx, cert, privkey)) {
         printf("Unable to create SSL_CTX pair\n");
         goto end;
     }
-    BIO_free(certbio);
-    certbio = NULL;
 
     /*
      * We assume the supplied certificate is big enough so that if we add
@@ -870,6 +874,8 @@ int main(int argc, char *argv[])
 
     testresult = run_tests(argv[0]);
 
+    bio_s_mempacket_test_free();
+
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     if (CRYPTO_mem_leaks(err) <= 0)
         testresult = 1;
diff --git a/test/ssltestlib.c b/test/ssltestlib.c
index 9fcd98d..655fc05 100644
--- a/test/ssltestlib.c
+++ b/test/ssltestlib.c
@@ -587,7 +587,7 @@ int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
 
     if (SSL_is_dtls(clientssl)) {
         s_to_c_bio = BIO_new(bio_s_mempacket_test());
-        c_to_s_bio = BIO_new(bio_s_mempacket_test());;
+        c_to_s_bio = BIO_new(bio_s_mempacket_test());
     } else {
         s_to_c_bio = BIO_new(BIO_s_mem());
         c_to_s_bio = BIO_new(BIO_s_mem());

From matt at openssl.org  Mon Sep 26 16:31:47 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 16:31:47 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474907507.464859.5438.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  7cac0558008a1f46218191e6f26fa7f08256f582 (commit)
      from  a12778be1782bb63055e7641c814d4fce1775e57 (commit)


- Log -----------------------------------------------------------------
commit 7cac0558008a1f46218191e6f26fa7f08256f582
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 12:04:23 2016 +0100

    Fix some mem leaks in sslapitest
    
    A mem leak could occur on an error path. Also the mempacket BIO_METHOD
    needs to be cleaned up, because of the newly added DTLS test.
    
    Also fixed a double semi-colon in ssltestlib.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit fa454945cf2855fed452ff9bdb1876096bc07beb)

-----------------------------------------------------------------------

Summary of changes:
 test/sslapitest.c | 10 ++++++++--
 test/ssltestlib.c |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index acb2087..b08eb8c 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -46,14 +46,18 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
         goto end;
     }
     chaincert = PEM_read_bio_X509(certbio, NULL, NULL, NULL);
+    BIO_free(certbio);
+    certbio = NULL;
+    if (chaincert == NULL) {
+        printf("Unable to load certificate for chain\n");
+        goto end;
+    }
 
     if (!create_ssl_ctx_pair(smeth, cmeth, &sctx,
                              &cctx, cert, privkey)) {
         printf("Unable to create SSL_CTX pair\n");
         goto end;
     }
-    BIO_free(certbio);
-    certbio = NULL;
 
     /*
      * We assume the supplied certificate is big enough so that if we add
@@ -870,6 +874,8 @@ int main(int argc, char *argv[])
 
     testresult = run_tests(argv[0]);
 
+    bio_s_mempacket_test_free();
+
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     if (CRYPTO_mem_leaks(err) <= 0)
         testresult = 1;
diff --git a/test/ssltestlib.c b/test/ssltestlib.c
index 9fcd98d..655fc05 100644
--- a/test/ssltestlib.c
+++ b/test/ssltestlib.c
@@ -587,7 +587,7 @@ int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
 
     if (SSL_is_dtls(clientssl)) {
         s_to_c_bio = BIO_new(bio_s_mempacket_test());
-        c_to_s_bio = BIO_new(bio_s_mempacket_test());;
+        c_to_s_bio = BIO_new(bio_s_mempacket_test());
     } else {
         s_to_c_bio = BIO_new(BIO_s_mem());
         c_to_s_bio = BIO_new(BIO_s_mem());

From builds at travis-ci.org  Mon Sep 26 17:14:16 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 17:14:16 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6172 (master - fa45494)
In-Reply-To: <openssl/openssl+162832733+fixed@travis-ci.org>
Message-ID: <57e957686c14f_33fe85fdd1cc479865@563e33b4-138e-472f-a70a-7b994ae154ff.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6172
Status: Fixed

Duration: 42 minutes and 5 seconds
Commit: fa45494 (master)
Author: Matt Caswell
Message: Fix some mem leaks in sslapitest

A mem leak could occur on an error path. Also the mempacket BIO_METHOD
needs to be cleaned up, because of the newly added DTLS test.

Also fixed a double semi-colon in ssltestlib.c

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/8ff70f332698...fa454945cf28

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162832733

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/200287f0/attachment.html>

From builds at travis-ci.org  Mon Sep 26 17:48:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 17:48:40 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6173 (OpenSSL_1_1_0-stable
	- 7cac055)
In-Reply-To: <openssl/openssl+162832771+fixed@travis-ci.org>
Message-ID: <57e95f7744a00_33f7f70ce767c50334a@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6173
Status: Fixed

Duration: 44 minutes and 52 seconds
Commit: 7cac055 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Fix some mem leaks in sslapitest

A mem leak could occur on an error path. Also the mempacket BIO_METHOD
needs to be cleaned up, because of the newly added DTLS test.

Also fixed a double semi-colon in ssltestlib.c

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit fa454945cf2855fed452ff9bdb1876096bc07beb)

View the changeset: https://github.com/openssl/openssl/compare/a12778be1782...7cac0558008a

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/162832771

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/ee886c13/attachment-0001.html>

From builds at travis-ci.org  Mon Sep 26 18:17:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 18:17:40 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#2046
	(MFL-patch-for-1_1_0-stable - d28058b)
In-Reply-To: <FdaSilvaYY/openssl+162848250+passed@travis-ci.org>
Message-ID: <57e96643d1a9b_33f7f76c21750531128@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2046
Status: Passed

Duration: 48 minutes and 30 seconds
Commit: d28058b (MFL-patch-for-1_1_0-stable)
Author: FdaSilvaYY
Message: Implement Maximum Fragment Length TLS extension.

based on https://groups.google.com/forum/#!topic/mailing.openssl.dev/fQxXvCg1uQY
adapted to the new Packet API.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/abd30777cc72^...d28058be7e34

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162848250

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/4870e2ca/attachment.html>

From builds at travis-ci.org  Mon Sep 26 18:42:54 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 18:42:54 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#2047 (style_n_nit's -
	8b093c0)
In-Reply-To: <FdaSilvaYY/openssl+162848945+passed@travis-ci.org>
Message-ID: <57e96c2e34a06_33fe85fd9b78c143266@563e33b4-138e-472f-a70a-7b994ae154ff.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2047
Status: Passed

Duration: 44 minutes and 4 seconds
Commit: 8b093c0 (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/568abd396145...8b093c06a5fa

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162848945

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/f6a66022/attachment.html>

From builds at travis-ci.org  Mon Sep 26 19:33:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 19:33:50 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2048 (master - fa45494)
In-Reply-To: <FdaSilvaYY/openssl+162849153+broken@travis-ci.org>
Message-ID: <57e978202668a_33f7f6cd501a86333fd@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2048
Status: Broken

Duration: 15 minutes and 29 seconds
Commit: fa45494 (master)
Author: Matt Caswell
Message: Fix some mem leaks in sslapitest

A mem leak could occur on an error path. Also the mempacket BIO_METHOD
needs to be cleaned up, because of the newly added DTLS test.

Also fixed a double semi-colon in ssltestlib.c

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/c536b6be1a72...fa454945cf28

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162849153

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/13e5317f/attachment-0001.html>

From builds at travis-ci.org  Mon Sep 26 20:14:40 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 20:14:40 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#2050
	(clang-unreachable-code - 922d424)
In-Reply-To: <FdaSilvaYY/openssl+162851317+passed@travis-ci.org>
Message-ID: <57e981b083cfe_33f7f75123764687750@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2050
Status: Passed

Duration: 22 minutes and 9 seconds
Commit: 922d424 (clang-unreachable-code)
Author: FdaSilvaYY
Message: Add -Wunreachable-code for tests

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/c61ee04c30dc^...922d42499ecc

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162851317

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/af6c3a18/attachment.html>

From builds at travis-ci.org  Mon Sep 26 20:59:23 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 20:59:23 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2051 (sk_num_alloc -
	0666061)
In-Reply-To: <FdaSilvaYY/openssl+162852490+fixed@travis-ci.org>
Message-ID: <57e98c2b4e617_33f7f6a9eb578752799@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2051
Status: Fixed

Duration: 50 minutes and 1 second
Commit: 0666061 (sk_num_alloc)
Author: FdaSilvaYY
Message: Introduce some pre-allocation

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/aa4015baf1ec...06660612f2e1

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162852490

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/79c21e8c/attachment.html>

From builds at travis-ci.org  Mon Sep 26 21:33:18 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 21:33:18 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2052
	(1.1.1-internal-constification - a2dda8a)
In-Reply-To: <FdaSilvaYY/openssl+162852839+still failing@travis-ci.org>
Message-ID: <57e9941e1cc04_33f7f6cdce580801740@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2052
Status: Still Failing

Duration: 50 minutes and 1 second
Commit: a2dda8a (1.1.1-internal-constification)
Author: FdaSilvaYY
Message: Add  more constify-ed API using get0 pattern

- X509_NAME_get0_entry
- X509_NAME_ENTRY_get0_data
- X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/6dd90bf1f51b...a2dda8aecd03

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162852839

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/1e2b49bc/attachment-0001.html>

From builds at travis-ci.org  Mon Sep 26 22:11:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 22:11:55 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2053
	(oss_builds_options_check - 39c6473)
In-Reply-To: <FdaSilvaYY/openssl+162853410+fixed@travis-ci.org>
Message-ID: <57e99d2b577e2_33fe85fdd19cc3976f9@563e33b4-138e-472f-a70a-7b994ae154ff.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2053
Status: Fixed

Duration: 48 minutes and 55 seconds
Commit: 39c6473 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/e48d06b55fcf...39c64731a10c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162853410

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/f12504a3/attachment.html>

From matt at openssl.org  Mon Sep 26 22:16:16 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 22:16:16 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1474928176.831455.5814.nullmailer@dev.openssl.org>

The branch master has been updated
       via  243ecf19ddc0dc2366de1be5c404d66d483b196d (commit)
       via  f3ea8d77080580979be086d97879ebc8b72f970a (commit)
       via  3058b742664287a30be77488c2ce3d8103bffd64 (commit)
       via  5cf6d7c51f16fd78de7921dc441e24897c8b3cc6 (commit)
       via  8523288e6d667f052bda092e01ab17986782fede (commit)
      from  fa454945cf2855fed452ff9bdb1876096bc07beb (commit)


- Log -----------------------------------------------------------------
commit 243ecf19ddc0dc2366de1be5c404d66d483b196d
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 25 01:55:48 2016 -0400

    Add missing parameter.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit f3ea8d77080580979be086d97879ebc8b72f970a
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 18 00:43:05 2016 -0400

    Switch back to assuming TLS 1.2.
    
    The TLSProxy::Record->new call hard-codes a version, like
    70-test_sslrecords.t.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 3058b742664287a30be77488c2ce3d8103bffd64
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 18 00:38:43 2016 -0400

    Address review comments.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 5cf6d7c51f16fd78de7921dc441e24897c8b3cc6
Author: David Benjamin <davidben at google.com>
Date:   Wed Aug 10 10:45:49 2016 -0400

    Don't test quite so many of them.
    
    Avoid making the CI blow up.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 8523288e6d667f052bda092e01ab17986782fede
Author: David Benjamin <davidben at google.com>
Date:   Wed Aug 10 00:45:51 2016 -0400

    Test CBC mode padding.
    
    This is a regression test for
    https://github.com/openssl/openssl/pull/1431. It tests a
    maximally-padded record with each possible invalid offset.
    
    This required fixing a bug in Message.pm where the client sending a
    fatal alert followed by close_notify was still treated as success.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/70-test_sslcbcpadding.t | 110 +++++++++++++++++++++++++++++++++++
 util/TLSProxy/Message.pm             |   6 +-
 util/TLSProxy/Proxy.pm               |  11 ++++
 3 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 test/recipes/70-test_sslcbcpadding.t

diff --git a/test/recipes/70-test_sslcbcpadding.t b/test/recipes/70-test_sslcbcpadding.t
new file mode 100644
index 0000000..fdaa466
--- /dev/null
+++ b/test/recipes/70-test_sslcbcpadding.t
@@ -0,0 +1,110 @@
+#! /usr/bin/env perl
+# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+use strict;
+use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;
+use OpenSSL::Test::Utils;
+use TLSProxy::Proxy;
+
+my $test_name = "test_sslcbcpadding";
+setup($test_name);
+
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^(VMS|MSWin32)$/;
+
+plan skip_all => "$test_name needs the dynamic engine feature enabled"
+    if disabled("engine") || disabled("dynamic-engine");
+
+plan skip_all => "$test_name needs the sock feature enabled"
+    if disabled("sock");
+
+plan skip_all => "$test_name needs TLSv1.2 enabled"
+    if disabled("tls1_2");
+
+$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
+my $proxy = TLSProxy::Proxy->new(
+    \&add_maximal_padding_filter,
+    cmdstr(app(["openssl"]), display => 1),
+    srctop_file("apps", "server.pem"),
+    (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
+);
+
+# TODO: We could test all 256 values, but then the log file gets too large for
+# CI. See https://github.com/openssl/openssl/issues/1440.
+my @test_offsets = (0, 128, 254, 255);
+
+# Test that maximally-padded records are accepted.
+my $bad_padding_offset = -1;
+$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
+plan tests => 1 + scalar(@test_offsets);
+ok(TLSProxy::Message->success(), "Maximally-padded record test");
+
+# Test that invalid padding is rejected.
+foreach my $offset (@test_offsets) {
+    $proxy->clear();
+    $bad_padding_offset = $offset;
+    $proxy->start();
+    ok(TLSProxy::Message->fail(), "Invalid padding byte $bad_padding_offset");
+}
+
+sub add_maximal_padding_filter
+{
+    my $proxy = shift;
+
+    if ($proxy->flight == 0) {
+        # Disable Encrypt-then-MAC.
+        foreach my $message (@{$proxy->message_list}) {
+            if ($message->mt != TLSProxy::Message::MT_CLIENT_HELLO) {
+                next;
+            }
+
+            $message->delete_extension(TLSProxy::Message::EXT_ENCRYPT_THEN_MAC);
+            $message->process_extensions();
+            $message->repack();
+        }
+    }
+
+    if ($proxy->flight == 3) {
+        # Insert a maximally-padded record. Assume a block size of 16 (AES) and
+        # a MAC length of 20 (SHA-1).
+        my $block_size = 16;
+        my $mac_len = 20;
+
+        # Size the plaintext so that 256 is a valid padding.
+        my $plaintext_len = $block_size - ($mac_len % $block_size);
+        my $plaintext = "A" x $plaintext_len;
+
+        my $data = "B" x $block_size; # Explicit IV.
+        $data .= $plaintext;
+        $data .= TLSProxy::Proxy::fill_known_data($mac_len); # MAC.
+
+        # Add padding.
+        for (my $i = 0; $i < 256; $i++) {
+            if ($i == $bad_padding_offset) {
+                $data .= "\xfe";
+            } else {
+                $data .= "\xff";
+            }
+        }
+
+        my $record = TLSProxy::Record->new(
+            $proxy->flight,
+            TLSProxy::Record::RT_APPLICATION_DATA,
+            TLSProxy::Record::VERS_TLS_1_2,
+            length($data),
+            0,
+            length($data),
+            $plaintext_len,
+            $data,
+            $plaintext,
+        );
+
+        # Send the record immediately after the server Finished.
+        push @{$proxy->record_list}, $record;
+    }
+}
diff --git a/util/TLSProxy/Message.pm b/util/TLSProxy/Message.pm
index 321e080..1810d8c 100644
--- a/util/TLSProxy/Message.pm
+++ b/util/TLSProxy/Message.pm
@@ -199,14 +199,14 @@ sub get_messages
         print "  [".$record->decrypt_data."]\n";
     } elsif ($record->content_type == TLSProxy::Record::RT_ALERT) {
         my ($alertlev, $alertdesc) = unpack('CC', $record->decrypt_data);
-        #All alerts end the test
-        $end = 1;
         #A CloseNotify from the client indicates we have finished successfully
         #(we assume)
-        if (!$server && $alertlev == AL_LEVEL_WARN
+        if (!$end && !$server && $alertlev == AL_LEVEL_WARN
             && $alertdesc == AL_DESC_CLOSE_NOTIFY) {
             $success = 1;
         }
+        #All alerts end the test
+        $end = 1;
     }
 
     return @messages;
diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index e0ce43a..eeb83ed 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -493,4 +493,15 @@ sub serverpid
     }
     return $self->{serverpid};
 }
+
+sub fill_known_data
+{
+    my $length = shift;
+    my $ret = "";
+    for (my $i = 0; $i < $length; $i++) {
+        $ret .= chr($i);
+    }
+    return $ret;
+}
+
 1;

From matt at openssl.org  Mon Sep 26 22:16:26 2016
From: matt at openssl.org (Matt Caswell)
Date: Mon, 26 Sep 2016 22:16:26 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474928186.645481.6642.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  35c2aca31f943bf35a425128fb7068d52309bc94 (commit)
       via  9e4a7023aa1d713969879110caa25338390ef68e (commit)
       via  f53e42e518072597d02d3a32ff98ebea2d99214f (commit)
       via  a905d13bbbd25c0976ba39a0f2e55033eeca26d7 (commit)
       via  384fd75ad822569a61fe43235df270b2948a8f7d (commit)
      from  7cac0558008a1f46218191e6f26fa7f08256f582 (commit)


- Log -----------------------------------------------------------------
commit 35c2aca31f943bf35a425128fb7068d52309bc94
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 25 01:55:48 2016 -0400

    Add missing parameter.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 243ecf19ddc0dc2366de1be5c404d66d483b196d)

commit 9e4a7023aa1d713969879110caa25338390ef68e
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 18 00:43:05 2016 -0400

    Switch back to assuming TLS 1.2.
    
    The TLSProxy::Record->new call hard-codes a version, like
    70-test_sslrecords.t.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit f3ea8d77080580979be086d97879ebc8b72f970a)

commit f53e42e518072597d02d3a32ff98ebea2d99214f
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 18 00:38:43 2016 -0400

    Address review comments.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 3058b742664287a30be77488c2ce3d8103bffd64)

commit a905d13bbbd25c0976ba39a0f2e55033eeca26d7
Author: David Benjamin <davidben at google.com>
Date:   Wed Aug 10 10:45:49 2016 -0400

    Don't test quite so many of them.
    
    Avoid making the CI blow up.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 5cf6d7c51f16fd78de7921dc441e24897c8b3cc6)

commit 384fd75ad822569a61fe43235df270b2948a8f7d
Author: David Benjamin <davidben at google.com>
Date:   Wed Aug 10 00:45:51 2016 -0400

    Test CBC mode padding.
    
    This is a regression test for
    https://github.com/openssl/openssl/pull/1431. It tests a
    maximally-padded record with each possible invalid offset.
    
    This required fixing a bug in Message.pm where the client sending a
    fatal alert followed by close_notify was still treated as success.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 8523288e6d667f052bda092e01ab17986782fede)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/70-test_sslcbcpadding.t | 110 +++++++++++++++++++++++++++++++++++
 util/TLSProxy/Message.pm             |   6 +-
 util/TLSProxy/Proxy.pm               |  11 ++++
 3 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 test/recipes/70-test_sslcbcpadding.t

diff --git a/test/recipes/70-test_sslcbcpadding.t b/test/recipes/70-test_sslcbcpadding.t
new file mode 100644
index 0000000..fdaa466
--- /dev/null
+++ b/test/recipes/70-test_sslcbcpadding.t
@@ -0,0 +1,110 @@
+#! /usr/bin/env perl
+# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+use strict;
+use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;
+use OpenSSL::Test::Utils;
+use TLSProxy::Proxy;
+
+my $test_name = "test_sslcbcpadding";
+setup($test_name);
+
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^(VMS|MSWin32)$/;
+
+plan skip_all => "$test_name needs the dynamic engine feature enabled"
+    if disabled("engine") || disabled("dynamic-engine");
+
+plan skip_all => "$test_name needs the sock feature enabled"
+    if disabled("sock");
+
+plan skip_all => "$test_name needs TLSv1.2 enabled"
+    if disabled("tls1_2");
+
+$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
+my $proxy = TLSProxy::Proxy->new(
+    \&add_maximal_padding_filter,
+    cmdstr(app(["openssl"]), display => 1),
+    srctop_file("apps", "server.pem"),
+    (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
+);
+
+# TODO: We could test all 256 values, but then the log file gets too large for
+# CI. See https://github.com/openssl/openssl/issues/1440.
+my @test_offsets = (0, 128, 254, 255);
+
+# Test that maximally-padded records are accepted.
+my $bad_padding_offset = -1;
+$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
+plan tests => 1 + scalar(@test_offsets);
+ok(TLSProxy::Message->success(), "Maximally-padded record test");
+
+# Test that invalid padding is rejected.
+foreach my $offset (@test_offsets) {
+    $proxy->clear();
+    $bad_padding_offset = $offset;
+    $proxy->start();
+    ok(TLSProxy::Message->fail(), "Invalid padding byte $bad_padding_offset");
+}
+
+sub add_maximal_padding_filter
+{
+    my $proxy = shift;
+
+    if ($proxy->flight == 0) {
+        # Disable Encrypt-then-MAC.
+        foreach my $message (@{$proxy->message_list}) {
+            if ($message->mt != TLSProxy::Message::MT_CLIENT_HELLO) {
+                next;
+            }
+
+            $message->delete_extension(TLSProxy::Message::EXT_ENCRYPT_THEN_MAC);
+            $message->process_extensions();
+            $message->repack();
+        }
+    }
+
+    if ($proxy->flight == 3) {
+        # Insert a maximally-padded record. Assume a block size of 16 (AES) and
+        # a MAC length of 20 (SHA-1).
+        my $block_size = 16;
+        my $mac_len = 20;
+
+        # Size the plaintext so that 256 is a valid padding.
+        my $plaintext_len = $block_size - ($mac_len % $block_size);
+        my $plaintext = "A" x $plaintext_len;
+
+        my $data = "B" x $block_size; # Explicit IV.
+        $data .= $plaintext;
+        $data .= TLSProxy::Proxy::fill_known_data($mac_len); # MAC.
+
+        # Add padding.
+        for (my $i = 0; $i < 256; $i++) {
+            if ($i == $bad_padding_offset) {
+                $data .= "\xfe";
+            } else {
+                $data .= "\xff";
+            }
+        }
+
+        my $record = TLSProxy::Record->new(
+            $proxy->flight,
+            TLSProxy::Record::RT_APPLICATION_DATA,
+            TLSProxy::Record::VERS_TLS_1_2,
+            length($data),
+            0,
+            length($data),
+            $plaintext_len,
+            $data,
+            $plaintext,
+        );
+
+        # Send the record immediately after the server Finished.
+        push @{$proxy->record_list}, $record;
+    }
+}
diff --git a/util/TLSProxy/Message.pm b/util/TLSProxy/Message.pm
index 321e080..1810d8c 100644
--- a/util/TLSProxy/Message.pm
+++ b/util/TLSProxy/Message.pm
@@ -199,14 +199,14 @@ sub get_messages
         print "  [".$record->decrypt_data."]\n";
     } elsif ($record->content_type == TLSProxy::Record::RT_ALERT) {
         my ($alertlev, $alertdesc) = unpack('CC', $record->decrypt_data);
-        #All alerts end the test
-        $end = 1;
         #A CloseNotify from the client indicates we have finished successfully
         #(we assume)
-        if (!$server && $alertlev == AL_LEVEL_WARN
+        if (!$end && !$server && $alertlev == AL_LEVEL_WARN
             && $alertdesc == AL_DESC_CLOSE_NOTIFY) {
             $success = 1;
         }
+        #All alerts end the test
+        $end = 1;
     }
 
     return @messages;
diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index e0ce43a..eeb83ed 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -493,4 +493,15 @@ sub serverpid
     }
     return $self->{serverpid};
 }
+
+sub fill_known_data
+{
+    my $length = shift;
+    my $ret = "";
+    for (my $i = 0; $i < $length; $i++) {
+        $ret .= chr($i);
+    }
+    return $ret;
+}
+
 1;

From builds at travis-ci.org  Mon Sep 26 22:45:45 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 22:45:45 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2055
	(fix_set_dup_exdata - d80fd6d)
In-Reply-To: <FdaSilvaYY/openssl+162854425+fixed@travis-ci.org>
Message-ID: <57e9a519a787d_33fe85fd9eea0432493@563e33b4-138e-472f-a70a-7b994ae154ff.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2055
Status: Fixed

Duration: 46 minutes and 38 seconds
Commit: d80fd6d (fix_set_dup_exdata)
Author: FdaSilvaYY
Message: Fix possible malloc failure inside CRYPTO_dup_ex_data()

Fix related docs.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/f7cc56d6d673...d80fd6d145bd

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162854425

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/9c7ffee7/attachment.html>

From builds at travis-ci.org  Mon Sep 26 22:58:19 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 22:58:19 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2056
	(clang-unreachable-code - 1fddaf0)
In-Reply-To: <FdaSilvaYY/openssl+162914960+errored@travis-ci.org>
Message-ID: <57e9a80b23038_33f7f752a2d2490873e@fa7792af-b776-40f7-9da2-e1265967a68b.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2056
Status: Errored

Duration: 25 minutes and 30 seconds
Commit: 1fddaf0 (clang-unreachable-code)
Author: FdaSilvaYY
Message: code will never be executed

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/922d42499ecc...1fddaf0c808c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162914960

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/4e093d3e/attachment.html>

From builds at travis-ci.org  Mon Sep 26 23:33:07 2016
From: builds at travis-ci.org (Travis CI)
Date: Mon, 26 Sep 2016 23:33:07 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2057
	(1.1.1-internal-constification - 6df26df)
In-Reply-To: <FdaSilvaYY/openssl+162917521+still failing@travis-ci.org>
Message-ID: <57e9b03397db3_33fe85fdd19cc4770ee@563e33b4-138e-472f-a70a-7b994ae154ff.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2057
Status: Still Failing

Duration: 39 minutes and 10 seconds
Commit: 6df26df (1.1.1-internal-constification)
Author: FdaSilvaYY
Message: Add  more constify-ed API using get0 pattern

- X509_NAME_get0_entry
- X509_NAME_ENTRY_get0_data
- X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/a2dda8aecd03...6df26df50a8e

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/162917521

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160926/52249203/attachment-0001.html>

From rsalz at openssl.org  Tue Sep 27 13:42:04 2016
From: rsalz at openssl.org (Rich Salz)
Date: Tue, 27 Sep 2016 13:42:04 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1474983724.971279.10391.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  a7511d72a32e13ab007f2f02fa1433965cbfe6ed (commit)
      from  35c2aca31f943bf35a425128fb7068d52309bc94 (commit)


- Log -----------------------------------------------------------------
commit a7511d72a32e13ab007f2f02fa1433965cbfe6ed
Author: David Benjamin <davidben at google.com>
Date:   Thu Aug 25 17:45:20 2016 -0400

    Add a basic test for BN_bn2dec.
    
    This would have caught 099e2968ed3c7d256cda048995626664082b1b30. This is
    a port of the test added in
    https://boringssl.googlesource.com/boringssl/+/7c040756178e14a4d181b6d93abb3827c93189c4
    
    Reviewed-by: Emilia K?sper <emilia at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1496)
    (cherry picked from commit 8ff70f3326983360c6f6306a1cd2238ef92d1f26)

-----------------------------------------------------------------------

Summary of changes:
 test/bntest.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/test/bntest.c b/test/bntest.c
index 3507b31..51b75d3 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -83,6 +83,7 @@ int test_gf2m_mod_solve_quad(BIO *bp, BN_CTX *ctx);
 int test_kron(BIO *bp, BN_CTX *ctx);
 int test_sqrt(BIO *bp, BN_CTX *ctx);
 int test_small_prime(BIO *bp, BN_CTX *ctx);
+int test_bn2dec(BIO *bp);
 int rand_neg(void);
 static int results = 0;
 
@@ -260,6 +261,11 @@ int main(int argc, char *argv[])
         goto err;
     (void)BIO_flush(out);
 
+    message(out, "BN_bn2dec");
+    if (!test_bn2dec(out))
+        goto err;
+    (void)BIO_flush(out);
+
 #ifndef OPENSSL_NO_EC2M
     message(out, "BN_GF2m_add");
     if (!test_gf2m_add(out))
@@ -1839,6 +1845,52 @@ int test_small_prime(BIO *bp, BN_CTX *ctx)
     return ret;
 }
 
+int test_bn2dec(BIO *bp)
+{
+    static const char *bn2dec_tests[] = {
+        "0",
+        "1",
+        "-1",
+        "100",
+        "-100",
+        "123456789012345678901234567890",
+        "-123456789012345678901234567890",
+        "123456789012345678901234567890123456789012345678901234567890",
+        "-123456789012345678901234567890123456789012345678901234567890",
+    };
+    int ret = 0;
+    size_t i;
+    BIGNUM *bn = NULL;
+    char *dec = NULL;
+
+    for (i = 0; i < OSSL_NELEM(bn2dec_tests); i++) {
+        if (!BN_dec2bn(&bn, bn2dec_tests[i]))
+            goto err;
+
+        dec = BN_bn2dec(bn);
+        if (dec == NULL) {
+            fprintf(stderr, "BN_bn2dec failed on %s.\n", bn2dec_tests[i]);
+            goto err;
+        }
+
+        if (strcmp(dec, bn2dec_tests[i]) != 0) {
+            fprintf(stderr, "BN_bn2dec gave %s, wanted %s.\n", dec,
+                    bn2dec_tests[i]);
+            goto err;
+        }
+
+        OPENSSL_free(dec);
+        dec = NULL;
+    }
+
+    ret = 1;
+
+err:
+    BN_free(bn);
+    OPENSSL_free(dec);
+    return ret;
+}
+
 int test_lshift(BIO *bp, BN_CTX *ctx, BIGNUM *a_)
 {
     BIGNUM *a, *b, *c, *d;

From builds at travis-ci.org  Tue Sep 27 16:54:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 27 Sep 2016 16:54:52 +0000
Subject: [openssl-commits] Errored: mouse07410/openssl#56
	(OpenSSL_1_0_2-stable - 9702bf5)
In-Reply-To: <mouse07410/openssl+163142514+errored@travis-ci.org>
Message-ID: <57eaa45ad5ea7_33f92883f8450347622@95a4d8fd-eec0-4019-86e5-c4707fe83013.mail>

Build Update for mouse07410/openssl
-------------------------------------

Build: #56
Status: Errored

Duration: 51 minutes and 4 seconds
Commit: 9702bf5 (OpenSSL_1_0_2-stable)
Author: Matt Caswell
Message: Fix NEWS error

The NEWS file referenced the wrong CVE for 1.0.2

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/mouse07410/openssl/compare/a5e55f62975c...9702bf5fa269

View the full build log and details: https://travis-ci.org/mouse07410/openssl/builds/163142514

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160927/a8531408/attachment.html>

From builds at travis-ci.org  Tue Sep 27 19:25:04 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 27 Sep 2016 19:25:04 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2058
	(check_bn_wexpand_retcode - 86fca02)
In-Reply-To: <FdaSilvaYY/openssl+163184032+errored@travis-ci.org>
Message-ID: <57eac7903128_33f808d3d17e014766@a1c5227e-e446-4bc0-b5b4-4c75c8e3f964.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2058
Status: Errored

Duration: 1 hour, 1 minute, and 21 seconds
Commit: 86fca02 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on some conditional BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/c68efb0a6bed...86fca028058b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163184032

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160927/e5147874/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 27 20:10:31 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 27 Sep 2016 20:10:31 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2059 (master - 243ecf1)
In-Reply-To: <FdaSilvaYY/openssl+163186448+broken@travis-ci.org>
Message-ID: <57ead237a540e_33f92886d5a10569650@95a4d8fd-eec0-4019-86e5-c4707fe83013.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2059
Status: Broken

Duration: 59 minutes and 33 seconds
Commit: 243ecf1 (master)
Author: David Benjamin
Message: Add missing parameter.

Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/fa454945cf28...243ecf19ddc0

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163186448

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160927/0c2ea2b3/attachment.html>

From builds at travis-ci.org  Tue Sep 27 20:56:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 27 Sep 2016 20:56:03 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2060 (style_n_nit's -
	8d481e8)
In-Reply-To: <FdaSilvaYY/openssl+163197235+errored@travis-ci.org>
Message-ID: <57eadce38799f_33f928859e28c6356d4@95a4d8fd-eec0-4019-86e5-c4707fe83013.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2060
Status: Errored

Duration: 55 minutes and 28 seconds
Commit: 8d481e8 (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/8b093c06a5fa...8d481e8985c0

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163197235

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160927/0a3ca30d/attachment.html>

From builds at travis-ci.org  Tue Sep 27 21:30:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 27 Sep 2016 21:30:44 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2061
	(clang-unreachable-code - 1fda178)
In-Reply-To: <FdaSilvaYY/openssl+163197368+broken@travis-ci.org>
Message-ID: <57eae504b6a39_33fcdac48bb601369fb@704512ca-026c-41f6-944e-2edb156f897c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2061
Status: Broken

Duration: 47 minutes and 55 seconds
Commit: 1fda178 (clang-unreachable-code)
Author: FdaSilvaYY
Message: try-out

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/1fddaf0c808c...1fda1783f309

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163197368

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160927/5ef5bdbc/attachment-0001.html>

From builds at travis-ci.org  Tue Sep 27 23:09:49 2016
From: builds at travis-ci.org (Travis CI)
Date: Tue, 27 Sep 2016 23:09:49 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2064
	(apps-speed-rework - 9abc264)
In-Reply-To: <FdaSilvaYY/openssl+163197970+broken@travis-ci.org>
Message-ID: <57eafc3cb0ff1_33f808d2cfb80374659@a1c5227e-e446-4bc0-b5b4-4c75c8e3f964.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2064
Status: Broken

Duration: 44 minutes and 0 seconds
Commit: 9abc264 (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/42cdca923ddd...9abc264152de

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163197970

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160927/298e1733/attachment.html>

From builds at travis-ci.org  Wed Sep 28 00:39:33 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 00:39:33 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2067 (sk_num_alloc -
	d729904)
In-Reply-To: <FdaSilvaYY/openssl+163198471+errored@travis-ci.org>
Message-ID: <57eb114461bae_33f92885d9c2488204e@95a4d8fd-eec0-4019-86e5-c4707fe83013.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2067
Status: Errored

Duration: 43 minutes and 22 seconds
Commit: d729904 (sk_num_alloc)
Author: FdaSilvaYY
Message: Introduce some pre-allocation

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/06660612f2e1...d7299043aa8e

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163198471

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/df39bce2/attachment.html>

From builds at travis-ci.org  Wed Sep 28 01:32:16 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 01:32:16 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#2069 (reduce_array -
	22dde95)
In-Reply-To: <FdaSilvaYY/openssl+163236225+passed@travis-ci.org>
Message-ID: <57eb1da0b6e0f_33fcdac737490281918@704512ca-026c-41f6-944e-2edb156f897c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2069
Status: Passed

Duration: 38 minutes and 45 seconds
Commit: 22dde95 (reduce_array)
Author: FdaSilvaYY
Message: Discard last useless array item

only  &v3_ns_ia5_list[0...6 ] are used

View the changeset: https://github.com/FdaSilvaYY/openssl/commit/22dde9570294

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163236225

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/4b83e475/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 28 01:04:00 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 01:04:00 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#2068 (prn_nit -
	a99ffe3)
In-Reply-To: <FdaSilvaYY/openssl+163230263+passed@travis-ci.org>
Message-ID: <57eb17006f7b5_33f92885a8d9090047a@95a4d8fd-eec0-4019-86e5-c4707fe83013.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2068
Status: Passed

Duration: 37 minutes and 4 seconds
Commit: a99ffe3 (prn_nit)
Author: FdaSilvaYY
Message: Add error checking, small nit on ouput

View the changeset: https://github.com/FdaSilvaYY/openssl/commit/a99ffe34efa4

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163230263

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/f9042ade/attachment.html>

From builds at travis-ci.org  Wed Sep 28 02:02:01 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 02:02:01 +0000
Subject: [openssl-commits] Passed: FdaSilvaYY/openssl#2070
	(x509_crl_method-fix - 16923d2)
In-Reply-To: <FdaSilvaYY/openssl+163244891+passed@travis-ci.org>
Message-ID: <57eb24991d78_33fcdac4a37d8295517@704512ca-026c-41f6-944e-2edb156f897c.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2070
Status: Passed

Duration: 41 minutes and 48 seconds
Commit: 16923d2 (x509_crl_method-fix)
Author: FdaSilvaYY
Message: Allow null in  X509_CRL_METHOD_free

and fix documentation.

View the changeset: https://github.com/FdaSilvaYY/openssl/commit/16923d231765

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163244891

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/45abd8d1/attachment.html>

From matt at openssl.org  Wed Sep 28 08:20:43 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 28 Sep 2016 08:20:43 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475050843.245262.21262.nullmailer@dev.openssl.org>

The branch master has been updated
       via  f9b1b6644a3a8fc6d617625ad979ee61cb67d381 (commit)
       via  fe7dd5534176d1b04be046fcbaad24430c8727e0 (commit)
       via  1329b952a675c3c445b73b34bf9f09483fbc759c (commit)
       via  e42c4544c88046a01c53a81aeb9d48685d708cf9 (commit)
       via  2f97192c78928ab2b2d44ac2f4859c321f57fd1f (commit)
       via  0086ca4e9bcfc9b8598c81ee356f57130f5fbe5f (commit)
      from  243ecf19ddc0dc2366de1be5c404d66d483b196d (commit)


- Log -----------------------------------------------------------------
commit f9b1b6644a3a8fc6d617625ad979ee61cb67d381
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 27 12:24:47 2016 +0100

    Add DTLS renegotiation tests
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit fe7dd5534176d1b04be046fcbaad24430c8727e0
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 27 11:50:43 2016 +0100

    Extend the renegotiation tests
    
    Add the ability to test both server initiated and client initiated reneg.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1329b952a675c3c445b73b34bf9f09483fbc759c
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 27 10:18:00 2016 +0100

    Update README.ssltest.md
    
    Add update for testing renegotiation. Also change info on CTLOG_FILE
    environment variable - which always seems to be required.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit e42c4544c88046a01c53a81aeb9d48685d708cf9
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 17:25:43 2016 +0100

    Add support for testing renegotiation
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 2f97192c78928ab2b2d44ac2f4859c321f57fd1f
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 15:31:20 2016 +0100

    Fix a bug in Renegotiation extension construction
    
    The conversion to WPACKET broke the construction of the renegotiation
    extension.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0086ca4e9bcfc9b8598c81ee356f57130f5fbe5f
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 14:59:08 2016 +0100

    Convert HelloRequest construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c                   |   7 +-
 ssl/t1_lib.c                               |   6 +-
 test/README.ssltest.md                     |  14 ++--
 test/handshake_helper.c                    | 116 +++++++++++++++++++++++++++--
 test/recipes/80-test_ssl_new.t             |   3 +-
 test/ssl-tests/17-renegotiate.conf         | 114 ++++++++++++++++++++++++++++
 test/ssl-tests/17-renegotiate.conf.in      |  67 +++++++++++++++++
 test/ssl-tests/18-dtls-renegotiate.conf    |  86 +++++++++++++++++++++
 test/ssl-tests/18-dtls-renegotiate.conf.in |  63 ++++++++++++++++
 test/ssl_test_ctx.c                        |   3 +-
 test/ssl_test_ctx.h                        |   4 +-
 11 files changed, 460 insertions(+), 23 deletions(-)
 create mode 100644 test/ssl-tests/17-renegotiate.conf
 create mode 100644 test/ssl-tests/17-renegotiate.conf.in
 create mode 100644 test/ssl-tests/18-dtls-renegotiate.conf
 create mode 100644 test/ssl-tests/18-dtls-renegotiate.conf.in

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index fbca5a1..8a2791a 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -831,9 +831,14 @@ static int ssl_check_srp_ext_ClientHello(SSL *s, int *al)
 
 int tls_construct_hello_request(SSL *s)
 {
-    if (!ssl_set_handshake_header(s, SSL3_MT_HELLO_REQUEST, 0)) {
+    WPACKET pkt;
+
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt, SSL3_MT_HELLO_REQUEST)
+            || !ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_HELLO_REQUEST, ERR_R_INTERNAL_ERROR);
         ossl_statem_set_error(s);
+        WPACKET_cleanup(&pkt);
         return 0;
     }
 
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 4733bff..40932fa 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1040,8 +1040,10 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
     /* Add RI if renegotiating */
     if (s->renegotiate) {
         if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_renegotiate)
-                || !WPACKET_sub_memcpy_u16(pkt, s->s3->previous_client_finished,
-                                   s->s3->previous_client_finished_len)) {
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_sub_memcpy_u8(pkt, s->s3->previous_client_finished,
+                                   s->s3->previous_client_finished_len)
+                || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
         }
diff --git a/test/README.ssltest.md b/test/README.ssltest.md
index 8923578..e28d4b0 100644
--- a/test/README.ssltest.md
+++ b/test/README.ssltest.md
@@ -38,7 +38,8 @@ The test section supports the following options
 * HandshakeMode - which handshake flavour to test:
   - Simple - plain handshake (default)
   - Resume - test resumption
-  - (Renegotiate - test renegotiation, not yet implemented)
+  - RenegotiateServer - test server initiated renegotiation
+  - RenegotiateClient - test client initiated renegotiation
 
 When HandshakeMode is Resume or Renegotiate, the original handshake is expected
 to succeed. All configured test expectations are verified against the second
@@ -245,20 +246,17 @@ environment variable to point to the location of the certs. E.g., from the root
 OpenSSL directory, do
 
 ```
-$ TEST_CERTS_DIR=test/certs test/ssl_test test/ssl-tests/01-simple.conf
+$ CTLOG_FILE=test/ct/log_list.conf TEST_CERTS_DIR=test/certs test/ssl_test \
+  test/ssl-tests/01-simple.conf
 ```
 
 or for shared builds
 
 ```
-$ TEST_CERTS_DIR=test/certs util/shlib_wrap.sh test/ssl_test \
-  test/ssl-tests/01-simple.conf
+$ CTLOG_FILE=test/ct/log_list.conf  TEST_CERTS_DIR=test/certs \
+  util/shlib_wrap.sh test/ssl_test test/ssl-tests/01-simple.conf
 ```
 
-Some tests also need additional environment variables; for example, Certificate
-Transparency tests need a `CTLOG_FILE`. See `test/recipes/80-test_ssl_new.t` for
-details.
-
 Note that the test expectations sometimes depend on the Configure settings. For
 example, the negotiated protocol depends on the set of available (enabled)
 protocols: a build with `enable-ssl3` has different test expectations than a
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 3cfee16..9004489 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -583,6 +583,85 @@ static void do_app_data_step(PEER *peer)
     }
 }
 
+static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
+{
+    int ret;
+    char buf;
+
+    TEST_check(peer->status == PEER_RETRY);
+    TEST_check(test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
+                || test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT);
+
+    /* Check if we are the peer that is going to initiate */
+    if ((test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
+                && SSL_is_server(peer->ssl))
+            || (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT
+                && !SSL_is_server(peer->ssl))) {
+        /*
+         * If we already asked for a renegotiation then fall through to the
+         * SSL_read() below.
+         */
+        if (!SSL_renegotiate_pending(peer->ssl)) {
+            /*
+             * If we are the client we will always attempt to resume the
+             * session. The server may or may not resume dependant on the
+             * setting of SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+             */
+            if (SSL_is_server(peer->ssl))
+                ret = SSL_renegotiate(peer->ssl);
+            else
+                ret = SSL_renegotiate_abbreviated(peer->ssl);
+            if (!ret) {
+                peer->status = PEER_ERROR;
+                return;
+            }
+            do_handshake_step(peer);
+            /*
+             * If status is PEER_RETRY it means we're waiting on the peer to
+             * continue the handshake. As far as setting up the renegotiation is
+             * concerned that is a success. The next step will continue the
+             * handshake to its conclusion.
+             *
+             * If status is PEER_SUCCESS then we are the server and we have
+             * successfully sent the HelloRequest. We need to continue to wait
+             * until the handshake arrives from the client.
+             */
+            if (peer->status == PEER_RETRY)
+                peer->status = PEER_SUCCESS;
+            else if (peer->status == PEER_SUCCESS)
+                peer->status = PEER_RETRY;
+            return;
+        }
+    }
+
+    /*
+     * The SSL object is still expecting app data, even though it's going to
+     * get a handshake message. We try to read, and it should fail - after which
+     * we should be in a handshake
+     */
+    ret = SSL_read(peer->ssl, &buf, sizeof(buf));
+    if (ret >= 0) {
+        /*
+         * We're not actually expecting data - we're expecting a reneg to
+         * start
+         */
+        peer->status = PEER_ERROR;
+        return;
+    } else {
+        int error = SSL_get_error(peer->ssl, ret);
+        if (error != SSL_ERROR_WANT_READ) {
+            peer->status = PEER_ERROR;
+            return;
+        }
+        /* If we're no in init yet then we're not done with setup yet */
+        if (!SSL_in_init(peer->ssl))
+            return;
+    }
+
+    peer->status = PEER_SUCCESS;
+}
+
+
 /*
  * RFC 5246 says:
  *
@@ -617,15 +696,28 @@ static void do_shutdown_step(PEER *peer)
 
 typedef enum {
     HANDSHAKE,
+    RENEG_APPLICATION_DATA,
+    RENEG_SETUP,
+    RENEG_HANDSHAKE,
     APPLICATION_DATA,
     SHUTDOWN,
     CONNECTION_DONE
 } connect_phase_t;
 
-static connect_phase_t next_phase(connect_phase_t phase)
+static connect_phase_t next_phase(const SSL_TEST_CTX *test_ctx,
+                                  connect_phase_t phase)
 {
     switch (phase) {
     case HANDSHAKE:
+        if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
+                || test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT)
+            return RENEG_APPLICATION_DATA;
+        return APPLICATION_DATA;
+    case RENEG_APPLICATION_DATA:
+        return RENEG_SETUP;
+    case RENEG_SETUP:
+        return RENEG_HANDSHAKE;
+    case RENEG_HANDSHAKE:
         return APPLICATION_DATA;
     case APPLICATION_DATA:
         return SHUTDOWN;
@@ -638,12 +730,22 @@ static connect_phase_t next_phase(connect_phase_t phase)
     return -1;
 }
 
-static void do_connect_step(PEER *peer, connect_phase_t phase)
+static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer,
+                            connect_phase_t phase)
 {
     switch (phase) {
     case HANDSHAKE:
         do_handshake_step(peer);
         break;
+    case RENEG_APPLICATION_DATA:
+        do_app_data_step(peer);
+        break;
+    case RENEG_SETUP:
+        do_reneg_setup_step(test_ctx, peer);
+        break;
+    case RENEG_HANDSHAKE:
+        do_handshake_step(peer);
+        break;
     case APPLICATION_DATA:
         do_app_data_step(peer);
         break;
@@ -846,18 +948,18 @@ static HANDSHAKE_RESULT *do_handshake_internal(
      */
     for(;;) {
         if (client_turn) {
-            do_connect_step(&client, phase);
+            do_connect_step(test_ctx, &client, phase);
             status = handshake_status(client.status, server.status,
                                       1 /* client went last */);
         } else {
-            do_connect_step(&server, phase);
+            do_connect_step(test_ctx, &server, phase);
             status = handshake_status(server.status, client.status,
                                       0 /* server went last */);
         }
 
         switch (status) {
         case HANDSHAKE_SUCCESS:
-            phase = next_phase(phase);
+            phase = next_phase(test_ctx, phase);
             if (phase == CONNECTION_DONE) {
                 ret->result = SSL_TEST_SUCCESS;
                 goto err;
@@ -945,11 +1047,9 @@ HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
     result = do_handshake_internal(server_ctx, server2_ctx, client_ctx,
                                    test_ctx, &test_ctx->extra,
                                    NULL, &session);
-    if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_SIMPLE)
+    if (test_ctx->handshake_mode != SSL_TEST_HANDSHAKE_RESUME)
         goto end;
 
-    TEST_check(test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME);
-
     if (result->result != SSL_TEST_SUCCESS) {
         result->result = SSL_TEST_FIRST_HANDSHAKE_FAILED;
         goto end;
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 47eab18..54e32bb 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -29,7 +29,7 @@ map { s/\.in// } @conf_files;
 
 # We hard-code the number of tests to double-check that the globbing above
 # finds all files as expected.
-plan tests => 16;  # = scalar @conf_srcs
+plan tests => 18;  # = scalar @conf_srcs
 
 # Some test results depend on the configuration of enabled protocols. We only
 # verify generated sources in the default configuration.
@@ -73,6 +73,7 @@ my %skip = (
   "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
   "15-certstatus.conf" => $no_ocsp,
   "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
+  "18-dtls-renegotiate.conf" => $no_dtls,
 );
 
 foreach my $conf (@conf_files) {
diff --git a/test/ssl-tests/17-renegotiate.conf b/test/ssl-tests/17-renegotiate.conf
new file mode 100644
index 0000000..c47a956
--- /dev/null
+++ b/test/ssl-tests/17-renegotiate.conf
@@ -0,0 +1,114 @@
+# Generated with generate_ssl_tests.pl
+
+num_tests = 4
+
+test-0 = 0-renegotiate-client-no-resume
+test-1 = 1-renegotiate-client-resume
+test-2 = 2-renegotiate-server-no-resume
+test-3 = 3-renegotiate-server-resume
+# ===========================================================
+
+[0-renegotiate-client-no-resume]
+ssl_conf = 0-renegotiate-client-no-resume-ssl
+
+[0-renegotiate-client-no-resume-ssl]
+server = 0-renegotiate-client-no-resume-server
+client = 0-renegotiate-client-no-resume-client
+
+[0-renegotiate-client-no-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+Options = NoResumptionOnRenegotiation
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[0-renegotiate-client-no-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-0]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = TLS
+ResumptionExpected = No
+
+
+# ===========================================================
+
+[1-renegotiate-client-resume]
+ssl_conf = 1-renegotiate-client-resume-ssl
+
+[1-renegotiate-client-resume-ssl]
+server = 1-renegotiate-client-resume-server
+client = 1-renegotiate-client-resume-client
+
+[1-renegotiate-client-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[1-renegotiate-client-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-1]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = TLS
+ResumptionExpected = Yes
+
+
+# ===========================================================
+
+[2-renegotiate-server-no-resume]
+ssl_conf = 2-renegotiate-server-no-resume-ssl
+
+[2-renegotiate-server-no-resume-ssl]
+server = 2-renegotiate-server-no-resume-server
+client = 2-renegotiate-server-no-resume-client
+
+[2-renegotiate-server-no-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+Options = NoResumptionOnRenegotiation
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[2-renegotiate-server-no-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-2]
+ExpectedResult = Success
+HandshakeMode = RenegotiateServer
+Method = TLS
+ResumptionExpected = No
+
+
+# ===========================================================
+
+[3-renegotiate-server-resume]
+ssl_conf = 3-renegotiate-server-resume-ssl
+
+[3-renegotiate-server-resume-ssl]
+server = 3-renegotiate-server-resume-server
+client = 3-renegotiate-server-resume-client
+
+[3-renegotiate-server-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[3-renegotiate-server-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-3]
+ExpectedResult = Success
+HandshakeMode = RenegotiateServer
+Method = TLS
+ResumptionExpected = Yes
+
+
diff --git a/test/ssl-tests/17-renegotiate.conf.in b/test/ssl-tests/17-renegotiate.conf.in
new file mode 100644
index 0000000..a081617
--- /dev/null
+++ b/test/ssl-tests/17-renegotiate.conf.in
@@ -0,0 +1,67 @@
+# -*- mode: perl; -*-
+# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+## Test Renegotiation
+
+use strict;
+use warnings;
+
+package ssltests;
+
+
+our @tests = (
+    {
+        name => "renegotiate-client-no-resume",
+        server => {
+            "Options" => "NoResumptionOnRenegotiation"
+        },
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-client-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-server-no-resume",
+        server => {
+            "Options" => "NoResumptionOnRenegotiation"
+        },
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateServer",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-server-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateServer",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success"
+        }
+    },
+);
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf b/test/ssl-tests/18-dtls-renegotiate.conf
new file mode 100644
index 0000000..32eeaf0
--- /dev/null
+++ b/test/ssl-tests/18-dtls-renegotiate.conf
@@ -0,0 +1,86 @@
+# Generated with generate_ssl_tests.pl
+
+num_tests = 3
+
+test-0 = 0-renegotiate-client-no-resume
+test-1 = 1-renegotiate-client-resume
+test-2 = 2-renegotiate-server-resume
+# ===========================================================
+
+[0-renegotiate-client-no-resume]
+ssl_conf = 0-renegotiate-client-no-resume-ssl
+
+[0-renegotiate-client-no-resume-ssl]
+server = 0-renegotiate-client-no-resume-server
+client = 0-renegotiate-client-no-resume-client
+
+[0-renegotiate-client-no-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+Options = NoResumptionOnRenegotiation
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[0-renegotiate-client-no-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-0]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = DTLS
+ResumptionExpected = No
+
+
+# ===========================================================
+
+[1-renegotiate-client-resume]
+ssl_conf = 1-renegotiate-client-resume-ssl
+
+[1-renegotiate-client-resume-ssl]
+server = 1-renegotiate-client-resume-server
+client = 1-renegotiate-client-resume-client
+
+[1-renegotiate-client-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[1-renegotiate-client-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-1]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = DTLS
+ResumptionExpected = Yes
+
+
+# ===========================================================
+
+[2-renegotiate-server-resume]
+ssl_conf = 2-renegotiate-server-resume-ssl
+
+[2-renegotiate-server-resume-ssl]
+server = 2-renegotiate-server-resume-server
+client = 2-renegotiate-server-resume-client
+
+[2-renegotiate-server-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[2-renegotiate-server-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-2]
+ExpectedResult = Success
+HandshakeMode = RenegotiateServer
+Method = DTLS
+ResumptionExpected = No
+
+
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf.in b/test/ssl-tests/18-dtls-renegotiate.conf.in
new file mode 100644
index 0000000..440fb25
--- /dev/null
+++ b/test/ssl-tests/18-dtls-renegotiate.conf.in
@@ -0,0 +1,63 @@
+# -*- mode: perl; -*-
+# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+## Test Renegotiation
+
+use strict;
+use warnings;
+
+package ssltests;
+
+
+our @tests = (
+    {
+        name => "renegotiate-client-no-resume",
+        server => {
+            "Options" => "NoResumptionOnRenegotiation"
+        },
+        client => {},
+        test => {
+            "Method" => "DTLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-client-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "DTLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success"
+        }
+    },
+# Note: Unlike the TLS tests, we will never do resumption with server
+# initiated reneg. This is because an OpenSSL DTLS client will always do a full
+# handshake (i.e. it doesn't supply a session id) when it receives a
+# HelloRequest. This is different to the OpenSSL TLS implementation where an
+# OpenSSL client will always try an abbreviated handshake (i.e. it will supply
+# the session id). This goes all the way to commit 48ae85b6f when abbreviated
+# handshake support was first added. Neither behaviour is wrong, but the
+# discrepancy is strange. TODO: Should we harmonise the TLS and DTLS behaviour,
+# and if so, what to?
+    {
+        name => "renegotiate-server-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "DTLS",
+            "HandshakeMode" => "RenegotiateServer",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+);
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index ee2e8a1..0a528d8 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -339,7 +339,8 @@ IMPLEMENT_SSL_TEST_STRING_OPTION(SSL_TEST_CTX, test, expected_alpn_protocol)
 static const test_enum ssl_handshake_modes[] = {
     {"Simple", SSL_TEST_HANDSHAKE_SIMPLE},
     {"Resume", SSL_TEST_HANDSHAKE_RESUME},
-    {"Renegotiate", SSL_TEST_HANDSHAKE_RENEGOTIATE},
+    {"RenegotiateServer", SSL_TEST_HANDSHAKE_RENEG_SERVER},
+    {"RenegotiateClient", SSL_TEST_HANDSHAKE_RENEG_CLIENT},
 };
 
 __owur static int parse_handshake_mode(SSL_TEST_CTX *test_ctx, const char *value)
diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h
index c8c66d6..14acaff 100644
--- a/test/ssl_test_ctx.h
+++ b/test/ssl_test_ctx.h
@@ -56,8 +56,8 @@ typedef enum {
 typedef enum {
     SSL_TEST_HANDSHAKE_SIMPLE = 0, /* Default */
     SSL_TEST_HANDSHAKE_RESUME,
-    /* Not yet implemented */
-    SSL_TEST_HANDSHAKE_RENEGOTIATE
+    SSL_TEST_HANDSHAKE_RENEG_SERVER,
+    SSL_TEST_HANDSHAKE_RENEG_CLIENT
 } ssl_handshake_mode_t;
 
 typedef enum {

From matt at openssl.org  Wed Sep 28 08:20:55 2016
From: matt at openssl.org (Matt Caswell)
Date: Wed, 28 Sep 2016 08:20:55 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1475050855.030723.22175.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  8061fdc8d3048220a758ad1304669944810ac386 (commit)
       via  f1522af442d4154db28928ab178c258f07ed4c5e (commit)
       via  d17300093cfc1994891cc50909bb2bc88237de7d (commit)
       via  cccaf5d60b5ac37c7c300199a88a46edf6fe3fb5 (commit)
      from  a7511d72a32e13ab007f2f02fa1433965cbfe6ed (commit)


- Log -----------------------------------------------------------------
commit 8061fdc8d3048220a758ad1304669944810ac386
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 27 12:24:47 2016 +0100

    Add DTLS renegotiation tests
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f9b1b6644a3a8fc6d617625ad979ee61cb67d381)

commit f1522af442d4154db28928ab178c258f07ed4c5e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 27 11:50:43 2016 +0100

    Extend the renegotiation tests
    
    Add the ability to test both server initiated and client initiated reneg.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit fe7dd5534176d1b04be046fcbaad24430c8727e0)

commit d17300093cfc1994891cc50909bb2bc88237de7d
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 27 10:18:00 2016 +0100

    Update README.ssltest.md
    
    Add update for testing renegotiation. Also change info on CTLOG_FILE
    environment variable - which always seems to be required.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 1329b952a675c3c445b73b34bf9f09483fbc759c)

commit cccaf5d60b5ac37c7c300199a88a46edf6fe3fb5
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 26 17:25:43 2016 +0100

    Add support for testing renegotiation
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit e42c4544c88046a01c53a81aeb9d48685d708cf9)

-----------------------------------------------------------------------

Summary of changes:
 test/README.ssltest.md                     |  14 ++--
 test/handshake_helper.c                    | 116 +++++++++++++++++++++++++++--
 test/recipes/80-test_ssl_new.t             |   3 +-
 test/ssl-tests/17-renegotiate.conf         | 114 ++++++++++++++++++++++++++++
 test/ssl-tests/17-renegotiate.conf.in      |  67 +++++++++++++++++
 test/ssl-tests/18-dtls-renegotiate.conf    |  86 +++++++++++++++++++++
 test/ssl-tests/18-dtls-renegotiate.conf.in |  63 ++++++++++++++++
 test/ssl_test_ctx.c                        |   3 +-
 test/ssl_test_ctx.h                        |   4 +-
 9 files changed, 450 insertions(+), 20 deletions(-)
 create mode 100644 test/ssl-tests/17-renegotiate.conf
 create mode 100644 test/ssl-tests/17-renegotiate.conf.in
 create mode 100644 test/ssl-tests/18-dtls-renegotiate.conf
 create mode 100644 test/ssl-tests/18-dtls-renegotiate.conf.in

diff --git a/test/README.ssltest.md b/test/README.ssltest.md
index 8923578..e28d4b0 100644
--- a/test/README.ssltest.md
+++ b/test/README.ssltest.md
@@ -38,7 +38,8 @@ The test section supports the following options
 * HandshakeMode - which handshake flavour to test:
   - Simple - plain handshake (default)
   - Resume - test resumption
-  - (Renegotiate - test renegotiation, not yet implemented)
+  - RenegotiateServer - test server initiated renegotiation
+  - RenegotiateClient - test client initiated renegotiation
 
 When HandshakeMode is Resume or Renegotiate, the original handshake is expected
 to succeed. All configured test expectations are verified against the second
@@ -245,20 +246,17 @@ environment variable to point to the location of the certs. E.g., from the root
 OpenSSL directory, do
 
 ```
-$ TEST_CERTS_DIR=test/certs test/ssl_test test/ssl-tests/01-simple.conf
+$ CTLOG_FILE=test/ct/log_list.conf TEST_CERTS_DIR=test/certs test/ssl_test \
+  test/ssl-tests/01-simple.conf
 ```
 
 or for shared builds
 
 ```
-$ TEST_CERTS_DIR=test/certs util/shlib_wrap.sh test/ssl_test \
-  test/ssl-tests/01-simple.conf
+$ CTLOG_FILE=test/ct/log_list.conf  TEST_CERTS_DIR=test/certs \
+  util/shlib_wrap.sh test/ssl_test test/ssl-tests/01-simple.conf
 ```
 
-Some tests also need additional environment variables; for example, Certificate
-Transparency tests need a `CTLOG_FILE`. See `test/recipes/80-test_ssl_new.t` for
-details.
-
 Note that the test expectations sometimes depend on the Configure settings. For
 example, the negotiated protocol depends on the set of available (enabled)
 protocols: a build with `enable-ssl3` has different test expectations than a
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 90e18fc..c14d8e3 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -583,6 +583,85 @@ static void do_app_data_step(PEER *peer)
     }
 }
 
+static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
+{
+    int ret;
+    char buf;
+
+    TEST_check(peer->status == PEER_RETRY);
+    TEST_check(test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
+                || test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT);
+
+    /* Check if we are the peer that is going to initiate */
+    if ((test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
+                && SSL_is_server(peer->ssl))
+            || (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT
+                && !SSL_is_server(peer->ssl))) {
+        /*
+         * If we already asked for a renegotiation then fall through to the
+         * SSL_read() below.
+         */
+        if (!SSL_renegotiate_pending(peer->ssl)) {
+            /*
+             * If we are the client we will always attempt to resume the
+             * session. The server may or may not resume dependant on the
+             * setting of SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+             */
+            if (SSL_is_server(peer->ssl))
+                ret = SSL_renegotiate(peer->ssl);
+            else
+                ret = SSL_renegotiate_abbreviated(peer->ssl);
+            if (!ret) {
+                peer->status = PEER_ERROR;
+                return;
+            }
+            do_handshake_step(peer);
+            /*
+             * If status is PEER_RETRY it means we're waiting on the peer to
+             * continue the handshake. As far as setting up the renegotiation is
+             * concerned that is a success. The next step will continue the
+             * handshake to its conclusion.
+             *
+             * If status is PEER_SUCCESS then we are the server and we have
+             * successfully sent the HelloRequest. We need to continue to wait
+             * until the handshake arrives from the client.
+             */
+            if (peer->status == PEER_RETRY)
+                peer->status = PEER_SUCCESS;
+            else if (peer->status == PEER_SUCCESS)
+                peer->status = PEER_RETRY;
+            return;
+        }
+    }
+
+    /*
+     * The SSL object is still expecting app data, even though it's going to
+     * get a handshake message. We try to read, and it should fail - after which
+     * we should be in a handshake
+     */
+    ret = SSL_read(peer->ssl, &buf, sizeof(buf));
+    if (ret >= 0) {
+        /*
+         * We're not actually expecting data - we're expecting a reneg to
+         * start
+         */
+        peer->status = PEER_ERROR;
+        return;
+    } else {
+        int error = SSL_get_error(peer->ssl, ret);
+        if (error != SSL_ERROR_WANT_READ) {
+            peer->status = PEER_ERROR;
+            return;
+        }
+        /* If we're no in init yet then we're not done with setup yet */
+        if (!SSL_in_init(peer->ssl))
+            return;
+    }
+
+    peer->status = PEER_SUCCESS;
+}
+
+
 /*
  * RFC 5246 says:
  *
@@ -617,15 +696,28 @@ static void do_shutdown_step(PEER *peer)
 
 typedef enum {
     HANDSHAKE,
+    RENEG_APPLICATION_DATA,
+    RENEG_SETUP,
+    RENEG_HANDSHAKE,
     APPLICATION_DATA,
     SHUTDOWN,
     CONNECTION_DONE
 } connect_phase_t;
 
-static connect_phase_t next_phase(connect_phase_t phase)
+static connect_phase_t next_phase(const SSL_TEST_CTX *test_ctx,
+                                  connect_phase_t phase)
 {
     switch (phase) {
     case HANDSHAKE:
+        if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
+                || test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT)
+            return RENEG_APPLICATION_DATA;
+        return APPLICATION_DATA;
+    case RENEG_APPLICATION_DATA:
+        return RENEG_SETUP;
+    case RENEG_SETUP:
+        return RENEG_HANDSHAKE;
+    case RENEG_HANDSHAKE:
         return APPLICATION_DATA;
     case APPLICATION_DATA:
         return SHUTDOWN;
@@ -636,12 +728,22 @@ static connect_phase_t next_phase(connect_phase_t phase)
     }
 }
 
-static void do_connect_step(PEER *peer, connect_phase_t phase)
+static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer,
+                            connect_phase_t phase)
 {
     switch (phase) {
     case HANDSHAKE:
         do_handshake_step(peer);
         break;
+    case RENEG_APPLICATION_DATA:
+        do_app_data_step(peer);
+        break;
+    case RENEG_SETUP:
+        do_reneg_setup_step(test_ctx, peer);
+        break;
+    case RENEG_HANDSHAKE:
+        do_handshake_step(peer);
+        break;
     case APPLICATION_DATA:
         do_app_data_step(peer);
         break;
@@ -843,18 +945,18 @@ static HANDSHAKE_RESULT *do_handshake_internal(
      */
     for(;;) {
         if (client_turn) {
-            do_connect_step(&client, phase);
+            do_connect_step(test_ctx, &client, phase);
             status = handshake_status(client.status, server.status,
                                       1 /* client went last */);
         } else {
-            do_connect_step(&server, phase);
+            do_connect_step(test_ctx, &server, phase);
             status = handshake_status(server.status, client.status,
                                       0 /* server went last */);
         }
 
         switch (status) {
         case HANDSHAKE_SUCCESS:
-            phase = next_phase(phase);
+            phase = next_phase(test_ctx, phase);
             if (phase == CONNECTION_DONE) {
                 ret->result = SSL_TEST_SUCCESS;
                 goto err;
@@ -942,11 +1044,9 @@ HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
     result = do_handshake_internal(server_ctx, server2_ctx, client_ctx,
                                    test_ctx, &test_ctx->extra,
                                    NULL, &session);
-    if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_SIMPLE)
+    if (test_ctx->handshake_mode != SSL_TEST_HANDSHAKE_RESUME)
         goto end;
 
-    TEST_check(test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME);
-
     if (result->result != SSL_TEST_SUCCESS) {
         result->result = SSL_TEST_FIRST_HANDSHAKE_FAILED;
         goto end;
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 47eab18..54e32bb 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -29,7 +29,7 @@ map { s/\.in// } @conf_files;
 
 # We hard-code the number of tests to double-check that the globbing above
 # finds all files as expected.
-plan tests => 16;  # = scalar @conf_srcs
+plan tests => 18;  # = scalar @conf_srcs
 
 # Some test results depend on the configuration of enabled protocols. We only
 # verify generated sources in the default configuration.
@@ -73,6 +73,7 @@ my %skip = (
   "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
   "15-certstatus.conf" => $no_ocsp,
   "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
+  "18-dtls-renegotiate.conf" => $no_dtls,
 );
 
 foreach my $conf (@conf_files) {
diff --git a/test/ssl-tests/17-renegotiate.conf b/test/ssl-tests/17-renegotiate.conf
new file mode 100644
index 0000000..c47a956
--- /dev/null
+++ b/test/ssl-tests/17-renegotiate.conf
@@ -0,0 +1,114 @@
+# Generated with generate_ssl_tests.pl
+
+num_tests = 4
+
+test-0 = 0-renegotiate-client-no-resume
+test-1 = 1-renegotiate-client-resume
+test-2 = 2-renegotiate-server-no-resume
+test-3 = 3-renegotiate-server-resume
+# ===========================================================
+
+[0-renegotiate-client-no-resume]
+ssl_conf = 0-renegotiate-client-no-resume-ssl
+
+[0-renegotiate-client-no-resume-ssl]
+server = 0-renegotiate-client-no-resume-server
+client = 0-renegotiate-client-no-resume-client
+
+[0-renegotiate-client-no-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+Options = NoResumptionOnRenegotiation
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[0-renegotiate-client-no-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-0]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = TLS
+ResumptionExpected = No
+
+
+# ===========================================================
+
+[1-renegotiate-client-resume]
+ssl_conf = 1-renegotiate-client-resume-ssl
+
+[1-renegotiate-client-resume-ssl]
+server = 1-renegotiate-client-resume-server
+client = 1-renegotiate-client-resume-client
+
+[1-renegotiate-client-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[1-renegotiate-client-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-1]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = TLS
+ResumptionExpected = Yes
+
+
+# ===========================================================
+
+[2-renegotiate-server-no-resume]
+ssl_conf = 2-renegotiate-server-no-resume-ssl
+
+[2-renegotiate-server-no-resume-ssl]
+server = 2-renegotiate-server-no-resume-server
+client = 2-renegotiate-server-no-resume-client
+
+[2-renegotiate-server-no-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+Options = NoResumptionOnRenegotiation
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[2-renegotiate-server-no-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-2]
+ExpectedResult = Success
+HandshakeMode = RenegotiateServer
+Method = TLS
+ResumptionExpected = No
+
+
+# ===========================================================
+
+[3-renegotiate-server-resume]
+ssl_conf = 3-renegotiate-server-resume-ssl
+
+[3-renegotiate-server-resume-ssl]
+server = 3-renegotiate-server-resume-server
+client = 3-renegotiate-server-resume-client
+
+[3-renegotiate-server-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[3-renegotiate-server-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-3]
+ExpectedResult = Success
+HandshakeMode = RenegotiateServer
+Method = TLS
+ResumptionExpected = Yes
+
+
diff --git a/test/ssl-tests/17-renegotiate.conf.in b/test/ssl-tests/17-renegotiate.conf.in
new file mode 100644
index 0000000..a081617
--- /dev/null
+++ b/test/ssl-tests/17-renegotiate.conf.in
@@ -0,0 +1,67 @@
+# -*- mode: perl; -*-
+# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+## Test Renegotiation
+
+use strict;
+use warnings;
+
+package ssltests;
+
+
+our @tests = (
+    {
+        name => "renegotiate-client-no-resume",
+        server => {
+            "Options" => "NoResumptionOnRenegotiation"
+        },
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-client-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-server-no-resume",
+        server => {
+            "Options" => "NoResumptionOnRenegotiation"
+        },
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateServer",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-server-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "TLS",
+            "HandshakeMode" => "RenegotiateServer",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success"
+        }
+    },
+);
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf b/test/ssl-tests/18-dtls-renegotiate.conf
new file mode 100644
index 0000000..32eeaf0
--- /dev/null
+++ b/test/ssl-tests/18-dtls-renegotiate.conf
@@ -0,0 +1,86 @@
+# Generated with generate_ssl_tests.pl
+
+num_tests = 3
+
+test-0 = 0-renegotiate-client-no-resume
+test-1 = 1-renegotiate-client-resume
+test-2 = 2-renegotiate-server-resume
+# ===========================================================
+
+[0-renegotiate-client-no-resume]
+ssl_conf = 0-renegotiate-client-no-resume-ssl
+
+[0-renegotiate-client-no-resume-ssl]
+server = 0-renegotiate-client-no-resume-server
+client = 0-renegotiate-client-no-resume-client
+
+[0-renegotiate-client-no-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+Options = NoResumptionOnRenegotiation
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[0-renegotiate-client-no-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-0]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = DTLS
+ResumptionExpected = No
+
+
+# ===========================================================
+
+[1-renegotiate-client-resume]
+ssl_conf = 1-renegotiate-client-resume-ssl
+
+[1-renegotiate-client-resume-ssl]
+server = 1-renegotiate-client-resume-server
+client = 1-renegotiate-client-resume-client
+
+[1-renegotiate-client-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[1-renegotiate-client-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-1]
+ExpectedResult = Success
+HandshakeMode = RenegotiateClient
+Method = DTLS
+ResumptionExpected = Yes
+
+
+# ===========================================================
+
+[2-renegotiate-server-resume]
+ssl_conf = 2-renegotiate-server-resume-ssl
+
+[2-renegotiate-server-resume-ssl]
+server = 2-renegotiate-server-resume-server
+client = 2-renegotiate-server-resume-client
+
+[2-renegotiate-server-resume-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[2-renegotiate-server-resume-client]
+CipherString = DEFAULT
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-2]
+ExpectedResult = Success
+HandshakeMode = RenegotiateServer
+Method = DTLS
+ResumptionExpected = No
+
+
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf.in b/test/ssl-tests/18-dtls-renegotiate.conf.in
new file mode 100644
index 0000000..440fb25
--- /dev/null
+++ b/test/ssl-tests/18-dtls-renegotiate.conf.in
@@ -0,0 +1,63 @@
+# -*- mode: perl; -*-
+# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+## Test Renegotiation
+
+use strict;
+use warnings;
+
+package ssltests;
+
+
+our @tests = (
+    {
+        name => "renegotiate-client-no-resume",
+        server => {
+            "Options" => "NoResumptionOnRenegotiation"
+        },
+        client => {},
+        test => {
+            "Method" => "DTLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+    {
+        name => "renegotiate-client-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "DTLS",
+            "HandshakeMode" => "RenegotiateClient",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success"
+        }
+    },
+# Note: Unlike the TLS tests, we will never do resumption with server
+# initiated reneg. This is because an OpenSSL DTLS client will always do a full
+# handshake (i.e. it doesn't supply a session id) when it receives a
+# HelloRequest. This is different to the OpenSSL TLS implementation where an
+# OpenSSL client will always try an abbreviated handshake (i.e. it will supply
+# the session id). This goes all the way to commit 48ae85b6f when abbreviated
+# handshake support was first added. Neither behaviour is wrong, but the
+# discrepancy is strange. TODO: Should we harmonise the TLS and DTLS behaviour,
+# and if so, what to?
+    {
+        name => "renegotiate-server-resume",
+        server => {},
+        client => {},
+        test => {
+            "Method" => "DTLS",
+            "HandshakeMode" => "RenegotiateServer",
+            "ResumptionExpected" => "No",
+            "ExpectedResult" => "Success"
+        }
+    },
+);
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index ee2e8a1..0a528d8 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -339,7 +339,8 @@ IMPLEMENT_SSL_TEST_STRING_OPTION(SSL_TEST_CTX, test, expected_alpn_protocol)
 static const test_enum ssl_handshake_modes[] = {
     {"Simple", SSL_TEST_HANDSHAKE_SIMPLE},
     {"Resume", SSL_TEST_HANDSHAKE_RESUME},
-    {"Renegotiate", SSL_TEST_HANDSHAKE_RENEGOTIATE},
+    {"RenegotiateServer", SSL_TEST_HANDSHAKE_RENEG_SERVER},
+    {"RenegotiateClient", SSL_TEST_HANDSHAKE_RENEG_CLIENT},
 };
 
 __owur static int parse_handshake_mode(SSL_TEST_CTX *test_ctx, const char *value)
diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h
index c8c66d6..14acaff 100644
--- a/test/ssl_test_ctx.h
+++ b/test/ssl_test_ctx.h
@@ -56,8 +56,8 @@ typedef enum {
 typedef enum {
     SSL_TEST_HANDSHAKE_SIMPLE = 0, /* Default */
     SSL_TEST_HANDSHAKE_RESUME,
-    /* Not yet implemented */
-    SSL_TEST_HANDSHAKE_RENEGOTIATE
+    SSL_TEST_HANDSHAKE_RENEG_SERVER,
+    SSL_TEST_HANDSHAKE_RENEG_CLIENT
 } ssl_handshake_mode_t;
 
 typedef enum {

From builds at travis-ci.org  Wed Sep 28 09:03:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 09:03:50 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6191 (master - f9b1b66)
In-Reply-To: <openssl/openssl+163334122+broken@travis-ci.org>
Message-ID: <57eb877657b24_33f928859e46c12248f0@95a4d8fd-eec0-4019-86e5-c4707fe83013.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6191
Status: Broken

Duration: 42 minutes and 27 seconds
Commit: f9b1b66 (master)
Author: Matt Caswell
Message: Add DTLS renegotiation tests

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/243ecf19ddc0...f9b1b6644a3a

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163334122

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/27036b90/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 28 09:34:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 09:34:11 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6192
	(OpenSSL_1_1_0-stable - 8061fdc)
In-Reply-To: <openssl/openssl+163334173+broken@travis-ci.org>
Message-ID: <57eb8e935bc5e_33fcdada33cb05327f@704512ca-026c-41f6-944e-2edb156f897c.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6192
Status: Broken

Duration: 45 minutes and 45 seconds
Commit: 8061fdc (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Add DTLS renegotiation tests

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit f9b1b6644a3a8fc6d617625ad979ee61cb67d381)

View the changeset: https://github.com/openssl/openssl/compare/a7511d72a32e...8061fdc8d304

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163334173

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/2538e058/attachment.html>

From rsalz at openssl.org  Wed Sep 28 16:01:30 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 28 Sep 2016 16:01:30 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1475078490.058997.15352.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  4badd2b3c29c2c6c551c737c07a429a53d9d1a0d (commit)
      from  9702bf5fa269eea8eb3d8bad13cc11fc58fb7e8e (commit)


- Log -----------------------------------------------------------------
commit 4badd2b3c29c2c6c551c737c07a429a53d9d1a0d
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 28 14:31:22 2016 +0100

    Call ENGINE_init() before trying to use keys from engine
    
    Things like 'openssl s_client' only ever worked with keys from an engine
    which provided a default generic method for some key type ? because it
    called ENGINE_set_default() and that ended up being an implicit
    initialisation and functional refcount.
    
    But an engine which doesn't provide generic methods doesn't get
    initialised, and then when you try to use it you get an error:
    
    cannot load client certificate private key file from engine
    140688147056384:error:26096075:engine routines:ENGINE_load_private_key:not initialised:crypto/engine/eng_pkey.c:66:
    unable to load client certificate private key file
    
    cf. https://github.com/OpenSC/libp11/issues/107 (in which we discover
    that engine_pkcs11 *used* to provide generic methods that OpenSSL would
    try to use for ephemeral DH keys when negotiating ECDHE cipher suites in
    TLS, and that didn't work out very well.)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1640)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 9fdc3e0..40401c1 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1553,7 +1553,7 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, err, 0);
         }
         ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
-        if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+        if (!ENGINE_init(e) || !ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
             BIO_printf(err, "can't use that engine\n");
             ERR_print_errors(err);
             ENGINE_free(e);

From rsalz at openssl.org  Wed Sep 28 16:23:43 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 28 Sep 2016 16:23:43 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475079823.925039.26634.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0a72002993b8619fd0642d19af3364bafbd9a06c (commit)
       via  a6972f346248fbc37e42056bb943fae0896a2967 (commit)
      from  f9b1b6644a3a8fc6d617625ad979ee61cb67d381 (commit)


- Log -----------------------------------------------------------------
commit 0a72002993b8619fd0642d19af3364bafbd9a06c
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 28 13:08:45 2016 +0100

    Call ENGINE_init() before trying to use keys from engine
    
    When I said before that s_client "used to work in 1.0.2" that was only
    partly true. It worked for engines which provided a default generic
    method for some key type, because it called ENGINE_set_default() and
    that ended up being an implicit initialisation and functional refcount.
    
    But an engine which doesn't provide generic methods doesn't get initialised,
    and then when you try to use it you get an error:
    
    cannot load client certificate private key file from engine
    140688147056384:error:26096075:engine routines:ENGINE_load_private_key:not initialised:crypto/engine/eng_pkey.c:66:
    unable to load client certificate private key file
    
    cf. https://github.com/OpenSC/libp11/issues/107 (in which we discover
    that engine_pkcs11 *used* to provide generic methods that OpenSSL would
    try to use for ephemeral DH keys when negotiating ECDHE cipher suites in
    TLS, and that didn't work out very well.)
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1639)

commit a6972f346248fbc37e42056bb943fae0896a2967
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 28 13:07:52 2016 +0100

    Restore '-keyform engine' support for s_client
    
    This used to work in 1.0.2 but disappeared when the argument parsing was
    revamped.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1639)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c     | 2 +-
 apps/s_client.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index b287748..9a58f17 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1269,7 +1269,7 @@ ENGINE *setup_engine(const char *engine, int debug)
             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0);
         }
         ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
-        if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+        if (!ENGINE_init(e) || !ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
             BIO_printf(bio_err, "can't use that engine\n");
             ERR_print_errors(bio_err);
             ENGINE_free(e);
diff --git a/apps/s_client.c b/apps/s_client.c
index 41f6d48..10ea1f1 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -577,8 +577,8 @@ OPTIONS s_client_options[] = {
     {"cert", OPT_CERT, '<', "Certificate file to use, PEM format assumed"},
     {"certform", OPT_CERTFORM, 'F',
      "Certificate format (PEM or DER) PEM default"},
-    {"key", OPT_KEY, '<', "Private key file to use, if not in -cert file"},
-    {"keyform", OPT_KEYFORM, 'F', "Key format (PEM or DER) PEM default"},
+    {"key", OPT_KEY, 's', "Private key file to use, if not in -cert file"},
+    {"keyform", OPT_KEYFORM, 'E', "Key format (PEM, DER or engine) PEM default"},
     {"pass", OPT_PASS, 's', "Private key file pass phrase source"},
     {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
     {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
@@ -1202,7 +1202,7 @@ int s_client_main(int argc, char **argv)
             fallback_scsv = 1;
             break;
         case OPT_KEYFORM:
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &key_format))
+            if (!opt_format(opt_arg(), OPT_FMT_PDE, &key_format))
                 goto opthelp;
             break;
         case OPT_PASS:

From builds at travis-ci.org  Wed Sep 28 17:04:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 17:04:11 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6195
	(OpenSSL_1_0_2-stable - 4badd2b)
In-Reply-To: <openssl/openssl+163449098+passed@travis-ci.org>
Message-ID: <57ebf80d622b8_33fb50eacd8e031213@51c89e3f-2d95-42b9-8b2e-6d08921155f2.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6195
Status: Passed

Duration: 1 hour, 1 minute, and 40 seconds
Commit: 4badd2b (OpenSSL_1_0_2-stable)
Author: David Woodhouse
Message: Call ENGINE_init() before trying to use keys from engine

Things like 'openssl s_client' only ever worked with keys from an engine
which provided a default generic method for some key type ? because it
called ENGINE_set_default() and that ended up being an implicit
initialisation and functional refcount.

But an engine which doesn't provide generic methods doesn't get
initialised, and then when you try to use it you get an error:

cannot load client certificate private key file from engine
140688147056384:error:26096075:engine routines:ENGINE_load_private_key:not initialised:crypto/engine/eng_pkey.c:66:
unable to load client certificate private key file

cf. https://github.com/OpenSC/libp11/issues/107 (in which we discover
that engine_pkcs11 *used* to provide generic methods that OpenSSL would
try to use for ephemeral DH keys when negotiating ECDHE cipher suites in
TLS, and that didn't work out very well.)

Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1640)

View the changeset: https://github.com/openssl/openssl/compare/9702bf5fa269...4badd2b3c29c

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163449098

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/d751a3ac/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 28 17:35:28 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 17:35:28 +0000
Subject: [openssl-commits] Passed: mouse07410/openssl#57
	(OpenSSL_1_0_2-stable - 4badd2b)
In-Reply-To: <mouse07410/openssl+163454269+passed@travis-ci.org>
Message-ID: <57ebff5f1ddae_33fb50ea8dcb860817@51c89e3f-2d95-42b9-8b2e-6d08921155f2.mail>

Build Update for mouse07410/openssl
-------------------------------------

Build: #57
Status: Passed

Duration: 1 hour, 14 minutes, and 25 seconds
Commit: 4badd2b (OpenSSL_1_0_2-stable)
Author: David Woodhouse
Message: Call ENGINE_init() before trying to use keys from engine

Things like 'openssl s_client' only ever worked with keys from an engine
which provided a default generic method for some key type ? because it
called ENGINE_set_default() and that ended up being an implicit
initialisation and functional refcount.

But an engine which doesn't provide generic methods doesn't get
initialised, and then when you try to use it you get an error:

cannot load client certificate private key file from engine
140688147056384:error:26096075:engine routines:ENGINE_load_private_key:not initialised:crypto/engine/eng_pkey.c:66:
unable to load client certificate private key file

cf. https://github.com/OpenSC/libp11/issues/107 (in which we discover
that engine_pkcs11 *used* to provide generic methods that OpenSSL would
try to use for ephemeral DH keys when negotiating ECDHE cipher suites in
TLS, and that didn't work out very well.)

Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1640)

View the changeset: https://github.com/mouse07410/openssl/compare/9702bf5fa269...4badd2b3c29c

View the full build log and details: https://travis-ci.org/mouse07410/openssl/builds/163454269

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/46963d6e/attachment.html>

From builds at travis-ci.org  Wed Sep 28 17:47:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 17:47:11 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6196 (master -
	0a72002)
In-Reply-To: <openssl/openssl+163455144+still failing@travis-ci.org>
Message-ID: <57ec021f6649f_33fb50ea9990073037@51c89e3f-2d95-42b9-8b2e-6d08921155f2.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6196
Status: Still Failing

Duration: 1 hour, 15 minutes, and 22 seconds
Commit: 0a72002 (master)
Author: David Woodhouse
Message: Call ENGINE_init() before trying to use keys from engine

When I said before that s_client "used to work in 1.0.2" that was only
partly true. It worked for engines which provided a default generic
method for some key type, because it called ENGINE_set_default() and
that ended up being an implicit initialisation and functional refcount.

But an engine which doesn't provide generic methods doesn't get initialised,
and then when you try to use it you get an error:

cannot load client certificate private key file from engine
140688147056384:error:26096075:engine routines:ENGINE_load_private_key:not initialised:crypto/engine/eng_pkey.c:66:
unable to load client certificate private key file

cf. https://github.com/OpenSC/libp11/issues/107 (in which we discover
that engine_pkcs11 *used* to provide generic methods that OpenSSL would
try to use for ephemeral DH keys when negotiating ECDHE cipher suites in
TLS, and that didn't work out very well.)

Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1639)

View the changeset: https://github.com/openssl/openssl/compare/f9b1b6644a3a...0a72002993b8

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163455144

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/91f6e673/attachment.html>

From rsalz at openssl.org  Wed Sep 28 18:41:48 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 28 Sep 2016 18:41:48 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475088108.948653.25348.nullmailer@dev.openssl.org>

The branch master has been updated
       via  56e36bdaef442536681bce2a1579385c0279bec8 (commit)
      from  0a72002993b8619fd0642d19af3364bafbd9a06c (commit)


- Log -----------------------------------------------------------------
commit 56e36bdaef442536681bce2a1579385c0279bec8
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 28 14:40:25 2016 -0400

    Revert "Call ENGINE_init() before trying to use keys from engine"
    
    This reverts commit 0a72002993b8619fd0642d19af3364bafbd9a06c.
    This fails to call ENGINE_finish; an alternate fix is forthcoming.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 9a58f17..b287748 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1269,7 +1269,7 @@ ENGINE *setup_engine(const char *engine, int debug)
             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0);
         }
         ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
-        if (!ENGINE_init(e) || !ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+        if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
             BIO_printf(bio_err, "can't use that engine\n");
             ERR_print_errors(bio_err);
             ENGINE_free(e);

From rsalz at openssl.org  Wed Sep 28 18:41:54 2016
From: rsalz at openssl.org (Rich Salz)
Date: Wed, 28 Sep 2016 18:41:54 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1475088114.369506.26146.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  a269e5f09a6e8f5b7a1f5ab92a90a41e61631e74 (commit)
      from  4badd2b3c29c2c6c551c737c07a429a53d9d1a0d (commit)


- Log -----------------------------------------------------------------
commit a269e5f09a6e8f5b7a1f5ab92a90a41e61631e74
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 28 14:39:32 2016 -0400

    Revert "Call ENGINE_init() before trying to use keys from engine"
    
    This reverts commit 4badd2b3c29c2c6c551c737c07a429a53d9d1a0d.
    This fails to call ENGINE_finish; an alternate fix is coming.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 40401c1..9fdc3e0 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1553,7 +1553,7 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, err, 0);
         }
         ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
-        if (!ENGINE_init(e) || !ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+        if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
             BIO_printf(err, "can't use that engine\n");
             ERR_print_errors(err);
             ENGINE_free(e);

From builds at travis-ci.org  Wed Sep 28 19:39:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 19:39:41 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2071 (master -
	0a72002)
In-Reply-To: <FdaSilvaYY/openssl+163486440+still failing@travis-ci.org>
Message-ID: <57ec1c7c54487_33fb50ea8ddf81766ee@51c89e3f-2d95-42b9-8b2e-6d08921155f2.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2071
Status: Still Failing

Duration: 1 hour, 7 minutes, and 17 seconds
Commit: 0a72002 (master)
Author: David Woodhouse
Message: Call ENGINE_init() before trying to use keys from engine

When I said before that s_client "used to work in 1.0.2" that was only
partly true. It worked for engines which provided a default generic
method for some key type, because it called ENGINE_set_default() and
that ended up being an implicit initialisation and functional refcount.

But an engine which doesn't provide generic methods doesn't get initialised,
and then when you try to use it you get an error:

cannot load client certificate private key file from engine
140688147056384:error:26096075:engine routines:ENGINE_load_private_key:not initialised:crypto/engine/eng_pkey.c:66:
unable to load client certificate private key file

cf. https://github.com/OpenSC/libp11/issues/107 (in which we discover
that engine_pkcs11 *used* to provide generic methods that OpenSSL would
try to use for ephemeral DH keys when negotiating ECDHE cipher suites in
TLS, and that didn't work out very well.)

Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1639)

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/243ecf19ddc0...0a72002993b8

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163486440

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/babdfdce/attachment.html>

From levitte at openssl.org  Wed Sep 28 19:58:04 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 28 Sep 2016 19:58:04 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475092684.177628.31741.nullmailer@dev.openssl.org>

The branch master has been updated
       via  49e476a5382602d0bad1139d6f1f66ddbc7959d6 (commit)
      from  56e36bdaef442536681bce2a1579385c0279bec8 (commit)


- Log -----------------------------------------------------------------
commit 49e476a5382602d0bad1139d6f1f66ddbc7959d6
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 28 21:28:00 2016 +0200

    apps/apps.c: initialize and de-initialize engine around key loading
    
    Before loading a key from an engine, it may need to be initialized.
    When done loading the key, we must de-initialize the engine.
    (if the engine is already initialized somehow, only the reference
    counter will be incremented then decremented)
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index b287748..68f2f27 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -700,7 +700,10 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
             BIO_printf(bio_err, "no engine specified\n");
         else {
 #ifndef OPENSSL_NO_ENGINE
-            pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+            if (ENGINE_init(e)) {
+                pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+                ENGINE_finish(e);
+            }
             if (pkey == NULL) {
                 BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip);
                 ERR_print_errors(bio_err);

From levitte at openssl.org  Wed Sep 28 20:00:50 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 28 Sep 2016 20:00:50 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1475092850.818578.1891.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  a1b791225f2913ace014071bfb9099790ef468e5 (commit)
      from  8061fdc8d3048220a758ad1304669944810ac386 (commit)


- Log -----------------------------------------------------------------
commit a1b791225f2913ace014071bfb9099790ef468e5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 28 21:28:00 2016 +0200

    apps/apps.c: initialize and de-initialize engine around key loading
    
    Before loading a key from an engine, it may need to be initialized.
    When done loading the key, we must de-initialize the engine.
    (if the engine is already initialized somehow, only the reference
    counter will be incremented then decremented)
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit 49e476a5382602d0bad1139d6f1f66ddbc7959d6)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index aa564b8..96184a6 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -692,7 +692,10 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
             BIO_printf(bio_err, "no engine specified\n");
         else {
 #ifndef OPENSSL_NO_ENGINE
-            pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+            if (ENGINE_init(e)) {
+                pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+                ENGINE_finish(e);
+            }
             if (pkey == NULL) {
                 BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip);
                 ERR_print_errors(bio_err);

From levitte at openssl.org  Wed Sep 28 20:00:56 2016
From: levitte at openssl.org (Richard Levitte)
Date: Wed, 28 Sep 2016 20:00:56 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_0_2-stable update
Message-ID: <1475092856.252409.2556.nullmailer@dev.openssl.org>

The branch OpenSSL_1_0_2-stable has been updated
       via  53a71b7429a4315f7761bea1be20a6d0b9c9a502 (commit)
      from  a269e5f09a6e8f5b7a1f5ab92a90a41e61631e74 (commit)


- Log -----------------------------------------------------------------
commit 53a71b7429a4315f7761bea1be20a6d0b9c9a502
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 28 21:28:00 2016 +0200

    apps/apps.c: initialize and de-initialize engine around key loading
    
    Before loading a key from an engine, it may need to be initialized.
    When done loading the key, we must de-initialize the engine.
    (if the engine is already initialized somehow, only the reference
    counter will be incremented then decremented)
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit 49e476a5382602d0bad1139d6f1f66ddbc7959d6)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 9fdc3e0..ff17b35 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -972,7 +972,10 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
         if (!e)
             BIO_printf(err, "no engine specified\n");
         else {
-            pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+            if (ENGINE_init(e)) {
+                pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+                ENGINE_finish(e);
+            }
             if (!pkey) {
                 BIO_printf(err, "cannot load %s from engine\n", key_descrip);
                 ERR_print_errors(err);

From builds at travis-ci.org  Wed Sep 28 20:28:36 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 20:28:36 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6198 (master -
	56e36bd)
In-Reply-To: <openssl/openssl+163488994+still failing@travis-ci.org>
Message-ID: <57ec27f626da6_33fc9541cae285739d@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6198
Status: Still Failing

Duration: 1 hour, 6 minutes, and 42 seconds
Commit: 56e36bd (master)
Author: Rich Salz
Message: Revert "Call ENGINE_init() before trying to use keys from engine"

This reverts commit 0a72002993b8619fd0642d19af3364bafbd9a06c.
This fails to call ENGINE_finish; an alternate fix is forthcoming.

Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/0a72002993b8...56e36bdaef44

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163488994

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/975e31b3/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 28 20:36:21 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 20:36:21 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2072 (master -
	56e36bd)
In-Reply-To: <FdaSilvaYY/openssl+163494897+still failing@travis-ci.org>
Message-ID: <57ec29c587c27_33fc953efd90c5823f9@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2072
Status: Still Failing

Duration: 1 hour, 6 minutes, and 2 seconds
Commit: 56e36bd (master)
Author: Rich Salz
Message: Revert "Call ENGINE_init() before trying to use keys from engine"

This reverts commit 0a72002993b8619fd0642d19af3364bafbd9a06c.
This fails to call ENGINE_finish; an alternate fix is forthcoming.

Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/0a72002993b8...56e36bdaef44

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163494897

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/c6148d30/attachment.html>

From builds at travis-ci.org  Wed Sep 28 21:29:30 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 21:29:30 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2073 (prn_nit -
	4117270)
In-Reply-To: <FdaSilvaYY/openssl+163495931+broken@travis-ci.org>
Message-ID: <57ec363a211a0_33fb50ea8dac426743f@51c89e3f-2d95-42b9-8b2e-6d08921155f2.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2073
Status: Broken

Duration: 1 hour, 0 minutes, and 57 seconds
Commit: 4117270 (prn_nit)
Author: FdaSilvaYY
Message: Add error checking, small nit on ouput

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/a99ffe34efa4...41172709f812

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163495931

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/8c70582c/attachment.html>

From builds at travis-ci.org  Wed Sep 28 22:17:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 22:17:35 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2074
	(check_bn_wexpand_retcode - 4ae28d9)
In-Reply-To: <FdaSilvaYY/openssl+163496069+failed@travis-ci.org>
Message-ID: <57ec417f4a678_33fb3f1e93d1c8945b8@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2074
Status: Failed

Duration: 58 minutes and 57 seconds
Commit: 4ae28d9 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on some conditional BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/86fca028058b...4ae28d9c87e9

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163496069

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/1b6abf6a/attachment-0001.html>

From builds at travis-ci.org  Wed Sep 28 23:03:57 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 23:03:57 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2075
	(1.1.1-internal-constification - 8389e3f)
In-Reply-To: <FdaSilvaYY/openssl+163496232+still failing@travis-ci.org>
Message-ID: <57ec4c6c6bb7_33fc953efdac47271c7@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2075
Status: Still Failing

Duration: 19 minutes and 17 seconds
Commit: 8389e3f (1.1.1-internal-constification)
Author: FdaSilvaYY
Message: Add  more constify-ed API using get0 pattern

- X509_NAME_get0_entry
- X509_NAME_ENTRY_get0_data
- X509_NAME_ENTRY_get0_data

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/6df26df50a8e...8389e3f22fb9

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163496232

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/f88922bd/attachment.html>

From builds at travis-ci.org  Wed Sep 28 23:38:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Wed, 28 Sep 2016 23:38:41 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2076 (sk_num_alloc -
	64035c8)
In-Reply-To: <FdaSilvaYY/openssl+163496353+failed@travis-ci.org>
Message-ID: <57ec5481bb3ee_33fb3f1e93d1c97433b@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2076
Status: Failed

Duration: 49 minutes and 11 seconds
Commit: 64035c8 (sk_num_alloc)
Author: FdaSilvaYY
Message: Introduce some pre-allocation

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/d7299043aa8e...64035c8ecb62

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163496353

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160928/d2357957/attachment.html>

From builds at travis-ci.org  Thu Sep 29 00:11:48 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 00:11:48 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2077 (reduce_array -
	4bb8bd6)
In-Reply-To: <FdaSilvaYY/openssl+163496553+broken@travis-ci.org>
Message-ID: <57ec5c435f16f_33fb3f1e925ac998934@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2077
Status: Broken

Duration: 43 minutes and 35 seconds
Commit: 4bb8bd6 (reduce_array)
Author: FdaSilvaYY
Message: Discard last useless array item

only  &v3_ns_ia5_list[0...6 ] are used

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/22dde9570294...4bb8bd6e01f2

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163496553

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/934db7c7/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 29 00:39:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 00:39:52 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2078 (fix-ca-buf-usage
	- 99846cd)
In-Reply-To: <FdaSilvaYY/openssl+163496643+broken@travis-ci.org>
Message-ID: <57ec62e77d861_33fc953efdfb08013fc@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2078
Status: Broken

Duration: 40 minutes and 37 seconds
Commit: 99846cd (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Introduce PATH_MAX and NAME_MAX

 to define the certificate filename storage buffer.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/350bf5cab7c7...99846cd6ea77

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163496643

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/7f445cef/attachment.html>

From builds at travis-ci.org  Thu Sep 29 00:54:52 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 00:54:52 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6205 (master -
	49e476a)
In-Reply-To: <openssl/openssl+163508144+still failing@travis-ci.org>
Message-ID: <57ec665cb3a0_33fb3f1e92e081029925@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6205
Status: Still Failing

Duration: 38 minutes and 43 seconds
Commit: 49e476a (master)
Author: Richard Levitte
Message: apps/apps.c: initialize and de-initialize engine around key loading

Before loading a key from an engine, it may need to be initialized.
When done loading the key, we must de-initialize the engine.
(if the engine is already initialized somehow, only the reference
counter will be incremented then decremented)

Reviewed-by: Stephen Henson <steve at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/56e36bdaef44...49e476a53826

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163508144

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/c6a369d3/attachment.html>

From builds at travis-ci.org  Thu Sep 29 01:09:09 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 01:09:09 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2079
	(x509_crl_method-fix - 280cd17)
In-Reply-To: <FdaSilvaYY/openssl+163497029+broken@travis-ci.org>
Message-ID: <57ec69b52ca0a_33fc953efdd8082294b@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2079
Status: Broken

Duration: 42 minutes and 13 seconds
Commit: 280cd17 (x509_crl_method-fix)
Author: FdaSilvaYY
Message: Allow null in  X509_CRL_METHOD_free

and fix documentation.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/16923d231765...280cd179c1e3

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163497029

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/77234963/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 29 01:36:00 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 01:36:00 +0000
Subject: [openssl-commits] Still Failing: FdaSilvaYY/openssl#2080
	(apps-speed-rework - 2103c74)
In-Reply-To: <FdaSilvaYY/openssl+163497741+still failing@travis-ci.org>
Message-ID: <57ec7019a4f68_33fb3f1e92ef81057329@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2080
Status: Still Failing

Duration: 39 minutes and 57 seconds
Commit: 2103c74 (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/9abc264152de...2103c7437c30

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163497741

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/64456f1e/attachment.html>

From builds at travis-ci.org  Thu Sep 29 01:24:51 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 01:24:51 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6206
	(OpenSSL_1_1_0-stable - a1b7912)
In-Reply-To: <openssl/openssl+163509154+still failing@travis-ci.org>
Message-ID: <57ec6d7c7937_33fb3f98cf66c10523eb@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6206
Status: Still Failing

Duration: 42 minutes and 27 seconds
Commit: a1b7912 (OpenSSL_1_1_0-stable)
Author: Richard Levitte
Message: apps/apps.c: initialize and de-initialize engine around key loading

Before loading a key from an engine, it may need to be initialized.
When done loading the key, we must de-initialize the engine.
(if the engine is already initialized somehow, only the reference
counter will be incremented then decremented)

Reviewed-by: Stephen Henson <steve at openssl.org>
(cherry picked from commit 49e476a5382602d0bad1139d6f1f66ddbc7959d6)

View the changeset: https://github.com/openssl/openssl/compare/8061fdc8d304...a1b791225f29

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163509154

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/4bb81f52/attachment.html>

From builds at travis-ci.org  Thu Sep 29 02:04:26 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 02:04:26 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2081 (style_n_nit's -
	f267cd2)
In-Reply-To: <FdaSilvaYY/openssl+163499507+failed@travis-ci.org>
Message-ID: <57ec76a9ec7bd_33fb3f1e89678107491b@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2081
Status: Failed

Duration: 23 minutes and 24 seconds
Commit: f267cd2 (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/8d481e8985c0...f267cd272eb4

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163499507

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/4c75fd70/attachment-0001.html>

From no-reply at appveyor.com  Thu Sep 29 08:39:28 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 29 Sep 2016 08:39:28 +0000
Subject: [openssl-commits] Build failed: openssl master.5548
Message-ID: <20160929083928.82459.48993.079D48EA@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/9e635c84/attachment.html>

From matt at openssl.org  Thu Sep 29 08:56:25 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 08:56:25 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475139385.774544.7860.nullmailer@dev.openssl.org>

The branch master has been updated
       via  55386bef807c7edd0f1db036c0ed464b28a61d68 (commit)
      from  49e476a5382602d0bad1139d6f1f66ddbc7959d6 (commit)


- Log -----------------------------------------------------------------
commit 55386bef807c7edd0f1db036c0ed464b28a61d68
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 09:35:05 2016 +0100

    Fix no-dtls
    
    The new large message test in sslapitest needs OPENSSL_NO_DTLS guards
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/sslapitest.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index b08eb8c..4d22d8e 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -108,11 +108,13 @@ static int test_large_message_tls(void)
     return execute_test_large_message(TLS_server_method(), TLS_client_method());
 }
 
+#ifndef OPENSSL_NO_DTLS
 static int test_large_message_dtls(void)
 {
     return execute_test_large_message(DTLS_server_method(),
                                       DTLS_client_method());
 }
+#endif
 
 static int ocsp_server_cb(SSL *s, void *arg)
 {
@@ -861,7 +863,9 @@ int main(int argc, char *argv[])
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
     ADD_TEST(test_large_message_tls);
+#ifndef OPENSSL_NO_DTLS
     ADD_TEST(test_large_message_dtls);
+#endif
     ADD_TEST(test_tlsext_status_type);
     ADD_TEST(test_session_with_only_int_cache);
     ADD_TEST(test_session_with_only_ext_cache);

From matt at openssl.org  Thu Sep 29 08:56:38 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 08:56:38 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1475139398.103606.8650.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  dd63da7032c655afcc80b82c38f2805b8f9476cf (commit)
      from  a1b791225f2913ace014071bfb9099790ef468e5 (commit)


- Log -----------------------------------------------------------------
commit dd63da7032c655afcc80b82c38f2805b8f9476cf
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 09:35:05 2016 +0100

    Fix no-dtls
    
    The new large message test in sslapitest needs OPENSSL_NO_DTLS guards
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 55386bef807c7edd0f1db036c0ed464b28a61d68)

-----------------------------------------------------------------------

Summary of changes:
 test/sslapitest.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index b08eb8c..4d22d8e 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -108,11 +108,13 @@ static int test_large_message_tls(void)
     return execute_test_large_message(TLS_server_method(), TLS_client_method());
 }
 
+#ifndef OPENSSL_NO_DTLS
 static int test_large_message_dtls(void)
 {
     return execute_test_large_message(DTLS_server_method(),
                                       DTLS_client_method());
 }
+#endif
 
 static int ocsp_server_cb(SSL *s, void *arg)
 {
@@ -861,7 +863,9 @@ int main(int argc, char *argv[])
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
     ADD_TEST(test_large_message_tls);
+#ifndef OPENSSL_NO_DTLS
     ADD_TEST(test_large_message_dtls);
+#endif
     ADD_TEST(test_tlsext_status_type);
     ADD_TEST(test_session_with_only_int_cache);
     ADD_TEST(test_session_with_only_ext_cache);

From matt at openssl.org  Thu Sep 29 09:02:50 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 09:02:50 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475139770.112596.11584.nullmailer@dev.openssl.org>

The branch master has been updated
       via  2f2d6e3e3ccd1ae7bba9f1af62f97dfca986e083 (commit)
      from  55386bef807c7edd0f1db036c0ed464b28a61d68 (commit)


- Log -----------------------------------------------------------------
commit 2f2d6e3e3ccd1ae7bba9f1af62f97dfca986e083
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 14:12:26 2016 +0100

    Fix an Uninit read in DTLS
    
    If we have a handshake fragment waiting then dtls1_read_bytes() was not
    correctly setting the value of recvd_type, leading to an uninit read.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_d1.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 2455c2b..1d16319 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -359,8 +359,10 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
     /*
      * check whether there's a handshake message (client hello?) waiting
      */
-    if ((ret = have_handshake_fragment(s, type, buf, len)))
+    if ((ret = have_handshake_fragment(s, type, buf, len))) {
+        *recvd_type = SSL3_RT_HANDSHAKE;
         return ret;
+    }
 
     /*
      * Now s->rlayer.d->handshake_fragment_len == 0 if

From matt at openssl.org  Thu Sep 29 09:03:00 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 09:03:00 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1475139780.567646.12399.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  61b1eb2c67542c85311843300f49d019f80afc6c (commit)
      from  dd63da7032c655afcc80b82c38f2805b8f9476cf (commit)


- Log -----------------------------------------------------------------
commit 61b1eb2c67542c85311843300f49d019f80afc6c
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 14:12:26 2016 +0100

    Fix an Uninit read in DTLS
    
    If we have a handshake fragment waiting then dtls1_read_bytes() was not
    correctly setting the value of recvd_type, leading to an uninit read.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 2f2d6e3e3ccd1ae7bba9f1af62f97dfca986e083)

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_d1.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 2455c2b..1d16319 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -359,8 +359,10 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
     /*
      * check whether there's a handshake message (client hello?) waiting
      */
-    if ((ret = have_handshake_fragment(s, type, buf, len)))
+    if ((ret = have_handshake_fragment(s, type, buf, len))) {
+        *recvd_type = SSL3_RT_HANDSHAKE;
         return ret;
+    }
 
     /*
      * Now s->rlayer.d->handshake_fragment_len == 0 if

From matt at openssl.org  Thu Sep 29 09:09:21 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 09:09:21 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475140161.145481.15172.nullmailer@dev.openssl.org>

The branch master has been updated
       via  25849a8f8bb64956f35a8a2a160ae0de1d2990c6 (commit)
       via  7facdbd66f19f4a87cf2a5a335568c879772d92f (commit)
       via  7507e73d409b8f3046d6efcc3f4c0b6208b59b64 (commit)
       via  150e298551a6788baac56c0c89dc8b8342ac0079 (commit)
       via  8157d44b624da08142f3f9f6edc37fb5542c2573 (commit)
      from  2f2d6e3e3ccd1ae7bba9f1af62f97dfca986e083 (commit)


- Log -----------------------------------------------------------------
commit 25849a8f8bb64956f35a8a2a160ae0de1d2990c6
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 10:06:11 2016 +0100

    Address style feedback comments
    
    Merge declarations of same type together.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 7facdbd66f19f4a87cf2a5a335568c879772d92f
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 13:33:41 2016 +0100

    Fix a bug in the construction of the ClienHello SRTP extension
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 7507e73d409b8f3046d6efcc3f4c0b6208b59b64
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 12:03:30 2016 +0100

    Fix heartbeat compilation error
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 150e298551a6788baac56c0c89dc8b8342ac0079
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 11:15:36 2016 +0100

    Delete some unneeded code
    
    Some functions were being called from both code that used WPACKETs and code
    that did not. Now that more code has been converted to use WPACKETs some of
    that duplication can be removed.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 8157d44b624da08142f3f9f6edc37fb5542c2573
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 11:13:48 2016 +0100

    Convert ServerHello construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_srtp.c            |  24 ------
 ssl/s3_lib.c             |  20 -----
 ssl/ssl_locl.h           |  11 +--
 ssl/statem/statem_srvr.c |  82 +++++++------------
 ssl/t1_ext.c             |  65 ---------------
 ssl/t1_lib.c             | 209 +++++++++++++++++++++--------------------------
 ssl/t1_reneg.c           |  36 +++-----
 7 files changed, 138 insertions(+), 309 deletions(-)

diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index b5e5ef3..bcefb9e 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -203,30 +203,6 @@ int ssl_parse_clienthello_use_srtp_ext(SSL *s, PACKET *pkt, int *al)
     return 0;
 }
 
-int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
-                                     int maxlen)
-{
-    if (p) {
-        if (maxlen < 5) {
-            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT,
-                   SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG);
-            return 1;
-        }
-
-        if (s->srtp_profile == 0) {
-            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT,
-                   SSL_R_USE_SRTP_NOT_NEGOTIATED);
-            return 1;
-        }
-        s2n(2, p);
-        s2n(s->srtp_profile->id, p);
-        *p++ = 0;
-    }
-    *len = 5;
-
-    return 0;
-}
-
 int ssl_parse_serverhello_use_srtp_ext(SSL *s, PACKET *pkt, int *al)
 {
     unsigned int id, ct, mki;
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 2a4dc6d..2115a7e 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3571,26 +3571,6 @@ const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
     return cp;
 }
 
-/*
- * Old version of the ssl3_put_cipher_by_char function used by code that has not
- * yet been converted to WPACKET yet. It will be deleted once WPACKET conversion
- * is complete.
- * TODO - DELETE ME
- */
-int ssl3_put_cipher_by_char_old(const SSL_CIPHER *c, unsigned char *p)
-{
-    long l;
-
-    if (p != NULL) {
-        l = c->id;
-        if ((l & 0xff000000) != 0x03000000)
-            return (0);
-        p[0] = ((unsigned char)(l >> 8L)) & 0xFF;
-        p[1] = ((unsigned char)(l)) & 0xFF;
-    }
-    return (2);
-}
-
 int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt, size_t *len)
 {
     if ((c->id & 0xff000000) != 0x03000000) {
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 630fea8..7dbff76 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1863,7 +1863,6 @@ __owur int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey);
 __owur EVP_PKEY *ssl_dh_to_pkey(DH *dh);
 
 __owur const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
-__owur int ssl3_put_cipher_by_char_old(const SSL_CIPHER *c, unsigned char *p);
 __owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt,
                                    size_t *len);
 int ssl3_init_finished_mac(SSL *s);
@@ -2017,8 +2016,7 @@ __owur int tls1_shared_list(SSL *s,
                             const unsigned char *l1, size_t l1len,
                             const unsigned char *l2, size_t l2len, int nmatch);
 __owur int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al);
-__owur unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
-                                                 unsigned char *limit, int *al);
+__owur int ssl_add_serverhello_tlsext(SSL *s, WPACKET *pkt, int *al);
 __owur int ssl_parse_clienthello_tlsext(SSL *s, PACKET *pkt);
 void ssl_set_default_md(SSL *s);
 __owur int tls1_set_server_sigalgs(SSL *s);
@@ -2066,8 +2064,7 @@ __owur int ssl_security_cert_chain(SSL *s, STACK_OF(X509) *sk, X509 *ex,
 
 __owur EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md);
 void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
-__owur int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p,
-                                               int *len, int maxlen);
+__owur int ssl_add_serverhello_renegotiate_ext(SSL *s, WPACKET *pkt);
 __owur int ssl_parse_serverhello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
 __owur int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
 __owur long ssl_get_algorithm2(SSL *s);
@@ -2084,8 +2081,6 @@ void ssl_set_client_disabled(SSL *s);
 __owur int ssl_cipher_disabled(SSL *s, const SSL_CIPHER *c, int op);
 
 __owur int ssl_parse_clienthello_use_srtp_ext(SSL *s, PACKET *pkt, int *al);
-__owur int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len,
-                                            int maxlen);
 __owur int ssl_parse_serverhello_use_srtp_ext(SSL *s, PACKET *pkt, int *al);
 
 __owur int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen);
@@ -2121,8 +2116,6 @@ __owur int custom_ext_parse(SSL *s, int server,
                             unsigned int ext_type,
                             const unsigned char *ext_data, size_t ext_size,
                             int *al);
-__owur int custom_ext_add_old(SSL *s, int server, unsigned char **pret,
-                              unsigned char *limit, int *al);
 __owur int custom_ext_add(SSL *s, int server, WPACKET *pkt, int *al);
 
 __owur int custom_exts_copy(custom_ext_methods *dst,
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 8a2791a..bf50e79 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1499,26 +1499,21 @@ WORK_STATE tls_post_process_client_hello(SSL *s, WORK_STATE wst)
 
 int tls_construct_server_hello(SSL *s)
 {
-    unsigned char *buf;
-    unsigned char *p, *d;
-    int i, sl;
-    int al = 0;
-    unsigned long l;
-
-    buf = (unsigned char *)s->init_buf->data;
-
-    /* Do the message type and length last */
-    d = p = ssl_handshake_start(s);
-
-    *(p++) = s->version >> 8;
-    *(p++) = s->version & 0xff;
+    int sl, compm, al = SSL_AD_INTERNAL_ERROR;
+    size_t len;
+    WPACKET pkt;
 
-    /*
-     * Random stuff. Filling of the server_random takes place in
-     * tls_process_client_hello()
-     */
-    memcpy(p, s->s3->server_random, SSL3_RANDOM_SIZE);
-    p += SSL3_RANDOM_SIZE;
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt, SSL3_MT_SERVER_HELLO)
+            || !WPACKET_put_bytes_u16(&pkt, s->version)
+               /*
+                * Random stuff. Filling of the server_random takes place in
+                * tls_process_client_hello()
+                */
+            || !WPACKET_memcpy(&pkt, s->s3->server_random, SSL3_RANDOM_SIZE)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     /*-
      * There are several cases for the session ID to send
@@ -1544,50 +1539,35 @@ int tls_construct_server_hello(SSL *s)
     sl = s->session->session_id_length;
     if (sl > (int)sizeof(s->session->session_id)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
-        ossl_statem_set_error(s);
-        return 0;
+        goto err;
     }
-    *(p++) = sl;
-    memcpy(p, s->session->session_id, sl);
-    p += sl;
 
-    /* put the cipher */
-    i = ssl3_put_cipher_by_char_old(s->s3->tmp.new_cipher, p);
-    p += i;
-
-    /* put the compression method */
+    /* set up the compression method */
 #ifdef OPENSSL_NO_COMP
-    *(p++) = 0;
+    compm = 0;
 #else
     if (s->s3->tmp.new_compression == NULL)
-        *(p++) = 0;
+        compm = 0;
     else
-        *(p++) = s->s3->tmp.new_compression->id;
+        compm = s->s3->tmp.new_compression->id;
 #endif
 
-    if (ssl_prepare_serverhello_tlsext(s) <= 0) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT);
-        ossl_statem_set_error(s);
-        return 0;
-    }
-    if ((p =
-         ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH,
-                                    &al)) == NULL) {
-        ssl3_send_alert(s, SSL3_AL_FATAL, al);
-        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
-        ossl_statem_set_error(s);
-        return 0;
-    }
-
-    /* do the header */
-    l = (p - d);
-    if (!ssl_set_handshake_header(s, SSL3_MT_SERVER_HELLO, l)) {
+    if (!WPACKET_sub_memcpy_u8(&pkt, s->session->session_id, sl)
+            || !s->method->put_cipher_by_char(s->s3->tmp.new_cipher, &pkt, &len)
+            || !WPACKET_put_bytes_u8(&pkt, compm)
+            || !ssl_prepare_serverhello_tlsext(s)
+            || !ssl_add_serverhello_tlsext(s, &pkt, &al)
+            || !ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
-        ossl_statem_set_error(s);
-        return 0;
+        goto err;
     }
 
     return 1;
+ err:
+    WPACKET_cleanup(&pkt);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+    ossl_statem_set_error(s);
+    return 0;
 }
 
 int tls_construct_server_done(SSL *s)
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 099a0ae..30b3046 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -72,71 +72,6 @@ int custom_ext_parse(SSL *s, int server,
 
 /*
  * Request custom extension data from the application and add to the return
- * buffer. This is the old style function signature prior to WPACKET. This is
- * here temporarily until the conversion to WPACKET is completed, i.e. it is
- * used by code that hasn't been converted yet.
- * TODO - REMOVE THIS FUNCTION
- */
-int custom_ext_add_old(SSL *s, int server,
-                       unsigned char **pret, unsigned char *limit, int *al)
-{
-    custom_ext_methods *exts = server ? &s->cert->srv_ext : &s->cert->cli_ext;
-    custom_ext_method *meth;
-    unsigned char *ret = *pret;
-    size_t i;
-
-    for (i = 0; i < exts->meths_count; i++) {
-        const unsigned char *out = NULL;
-        size_t outlen = 0;
-        meth = exts->meths + i;
-
-        if (server) {
-            /*
-             * For ServerHello only send extensions present in ClientHello.
-             */
-            if (!(meth->ext_flags & SSL_EXT_FLAG_RECEIVED))
-                continue;
-            /* If callback absent for server skip it */
-            if (!meth->add_cb)
-                continue;
-        }
-        if (meth->add_cb) {
-            int cb_retval = 0;
-            cb_retval = meth->add_cb(s, meth->ext_type,
-                                     &out, &outlen, al, meth->add_arg);
-            if (cb_retval < 0)
-                return 0;       /* error */
-            if (cb_retval == 0)
-                continue;       /* skip this extension */
-        }
-        if (4 > limit - ret || outlen > (size_t)(limit - ret - 4))
-            return 0;
-        s2n(meth->ext_type, ret);
-        s2n(outlen, ret);
-        if (outlen) {
-            memcpy(ret, out, outlen);
-            ret += outlen;
-        }
-        /*
-         * We can't send duplicates: code logic should prevent this.
-         */
-        OPENSSL_assert(!(meth->ext_flags & SSL_EXT_FLAG_SENT));
-        /*
-         * Indicate extension has been sent: this is both a sanity check to
-         * ensure we don't send duplicate extensions and indicates that it is
-         * not an error if the extension is present in ServerHello.
-         */
-        meth->ext_flags |= SSL_EXT_FLAG_SENT;
-        if (meth->free_cb)
-            meth->free_cb(s, meth->ext_type, out, meth->add_arg);
-    }
-    *pret = ret;
-    return 1;
-}
-
-
-/*
- * Request custom extension data from the application and add to the return
  * buffer.
  */
 int custom_ext_add(SSL *s, int server, WPACKET *pkt, int *al)
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 40932fa..230fe66 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1302,7 +1302,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
     }
 #ifndef OPENSSL_NO_SRTP
     if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) {
-        STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = 0;
+        STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = SSL_get_srtp_profiles(s);
         SRTP_PROTECTION_PROFILE *prof;
         int i, ct;
 
@@ -1322,7 +1322,10 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
                 return 0;
             }
         }
-        if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
+        if (!WPACKET_close(pkt)
+                   /* Add an empty use_mki value */
+                || !WPACKET_put_bytes_u8(pkt, 0)
+                || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1392,12 +1395,8 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
     return 1;
 }
 
-unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
-                                          unsigned char *limit, int *al)
+int ssl_add_serverhello_tlsext(SSL *s, WPACKET *pkt, int *al)
 {
-    int extdatalen = 0;
-    unsigned char *orig = buf;
-    unsigned char *ret = buf;
 #ifndef OPENSSL_NO_NEXTPROTONEG
     int next_proto_neg_seen;
 #endif
@@ -1408,30 +1407,16 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
     using_ecc = using_ecc && (s->session->tlsext_ecpointformatlist != NULL);
 #endif
 
-    ret += 2;
-    if (ret >= limit)
-        return NULL;            /* this really never occurs, but ... */
-
-    if (s->s3->send_connection_binding) {
-        int el;
-
-        if (!ssl_add_serverhello_renegotiate_ext(s, 0, &el, 0)) {
-            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
-        }
-
-        if ((limit - ret - 4 - el) < 0)
-            return NULL;
-
-        s2n(TLSEXT_TYPE_renegotiate, ret);
-        s2n(el, ret);
-
-        if (!ssl_add_serverhello_renegotiate_ext(s, ret, &el, el)) {
-            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
-        }
+    if (!WPACKET_start_sub_packet_u16(pkt)
+            || !WPACKET_set_flags(pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)) {
+        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
 
-        ret += el;
+    if (s->s3->send_connection_binding &&
+            !ssl_add_serverhello_renegotiate_ext(s, pkt)) {
+        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
     }
 
     /* Only add RI for SSLv3 */
@@ -1439,12 +1424,12 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
         goto done;
 
     if (!s->hit && s->servername_done == 1
-        && s->session->tlsext_hostname != NULL) {
-        if ((long)(limit - ret - 4) < 0)
-            return NULL;
-
-        s2n(TLSEXT_TYPE_server_name, ret);
-        s2n(0, ret);
+            && s->session->tlsext_hostname != NULL) {
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_server_name)
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #ifndef OPENSSL_NO_EC
     if (using_ecc) {
@@ -1453,25 +1438,15 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
         /*
          * Add TLS extension ECPointFormats to the ServerHello message
          */
-        long lenmax;
-
         tls1_get_formatlist(s, &plist, &plistlen);
 
-        if ((lenmax = limit - ret - 5) < 0)
-            return NULL;
-        if (plistlen > (size_t)lenmax)
-            return NULL;
-        if (plistlen > 255) {
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_ec_point_formats)
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_sub_memcpy_u8(pkt, plist, plistlen)
+                || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
-
-        s2n(TLSEXT_TYPE_ec_point_formats, ret);
-        s2n(plistlen + 1, ret);
-        *(ret++) = (unsigned char)plistlen;
-        memcpy(ret, plist, plistlen);
-        ret += plistlen;
-
     }
     /*
      * Currently the server should not respond with a SupportedCurves
@@ -1480,10 +1455,11 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
 #endif                          /* OPENSSL_NO_EC */
 
     if (s->tlsext_ticket_expected && tls_use_ticket(s)) {
-        if ((long)(limit - ret - 4) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_session_ticket, ret);
-        s2n(0, ret);
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_session_ticket)
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     } else {
         /*
          * if we don't add the above TLSEXT, we can't add a session ticket
@@ -1493,31 +1469,23 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
     }
 
     if (s->tlsext_status_expected) {
-        if ((long)(limit - ret - 4) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_status_request, ret);
-        s2n(0, ret);
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_status_request)
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #ifndef OPENSSL_NO_SRTP
     if (SSL_IS_DTLS(s) && s->srtp_profile) {
-        int el;
-
-        /* Returns 0 on success!! */
-        if (ssl_add_serverhello_use_srtp_ext(s, 0, &el, 0)) {
-            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
-        }
-        if ((limit - ret - 4 - el) < 0)
-            return NULL;
-
-        s2n(TLSEXT_TYPE_use_srtp, ret);
-        s2n(el, ret);
-
-        if (ssl_add_serverhello_use_srtp_ext(s, ret, &el, el)) {
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_use_srtp)
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_put_bytes_u16(pkt, 2)
+                || !WPACKET_put_bytes_u16(pkt, s->srtp_profile->id)
+                || !WPACKET_put_bytes_u8(pkt, 0)
+                || !WPACKET_close(pkt)) {
             SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
-            return NULL;
+            return 0;
         }
-        ret += el;
     }
 #endif
 
@@ -1532,28 +1500,32 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
             0x2a, 0x85, 0x03, 0x02, 0x02, 0x16, 0x30, 0x08,
             0x06, 0x06, 0x2a, 0x85, 0x03, 0x02, 0x02, 0x17
         };
-        if (limit - ret < 36)
-            return NULL;
-        memcpy(ret, cryptopro_ext, 36);
-        ret += 36;
-
+        if (!WPACKET_memcpy(pkt, cryptopro_ext, sizeof(cryptopro_ext))) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 #ifndef OPENSSL_NO_HEARTBEATS
     /* Add Heartbeat extension if we've received one */
     if (SSL_IS_DTLS(s) && (s->tlsext_heartbeat & SSL_DTLSEXT_HB_ENABLED)) {
-        if ((limit - ret - 4 - 1) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_heartbeat, ret);
-        s2n(1, ret);
+        unsigned int mode;
         /*-
          * Set mode:
          * 1: peer may send requests
          * 2: peer not allowed to send requests
          */
         if (s->tlsext_heartbeat & SSL_DTLSEXT_HB_DONT_RECV_REQUESTS)
-            *(ret++) = SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
+            mode = SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
         else
-            *(ret++) = SSL_DTLSEXT_HB_ENABLED;
+            mode = SSL_DTLSEXT_HB_ENABLED;
+
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_heartbeat)
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_put_bytes_u8(pkt, mode)
+                || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
 
     }
 #endif
@@ -1570,18 +1542,20 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
                                               s->
                                               ctx->next_protos_advertised_cb_arg);
         if (r == SSL_TLSEXT_ERR_OK) {
-            if ((long)(limit - ret - 4 - npalen) < 0)
-                return NULL;
-            s2n(TLSEXT_TYPE_next_proto_neg, ret);
-            s2n(npalen, ret);
-            memcpy(ret, npa, npalen);
-            ret += npalen;
+            if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_next_proto_neg)
+                    || !WPACKET_sub_memcpy_u16(pkt, npa, npalen)) {
+                SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
             s->s3->next_proto_neg_seen = 1;
         }
     }
 #endif
-    if (!custom_ext_add_old(s, 1, &ret, limit, al))
-        return NULL;
+    if (!custom_ext_add(s, 1, pkt, al)) {
+        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
+
     if (s->s3->flags & TLS1_FLAGS_ENCRYPT_THEN_MAC) {
         /*
          * Don't use encrypt_then_mac if AEAD or RC4 might want to disable
@@ -1593,36 +1567,41 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
             || s->s3->tmp.new_cipher->algorithm_enc == SSL_eGOST2814789CNT12)
             s->s3->flags &= ~TLS1_FLAGS_ENCRYPT_THEN_MAC;
         else {
-            s2n(TLSEXT_TYPE_encrypt_then_mac, ret);
-            s2n(0, ret);
+            if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_encrypt_then_mac)
+                    || !WPACKET_put_bytes_u16(pkt, 0)) {
+                SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
         }
     }
     if (s->s3->flags & TLS1_FLAGS_RECEIVED_EXTMS) {
-        s2n(TLSEXT_TYPE_extended_master_secret, ret);
-        s2n(0, ret);
+        if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_extended_master_secret)
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 
     if (s->s3->alpn_selected != NULL) {
-        const unsigned char *selected = s->s3->alpn_selected;
-        unsigned int len = s->s3->alpn_selected_len;
-
-        if ((long)(limit - ret - 4 - 2 - 1 - len) < 0)
-            return NULL;
-        s2n(TLSEXT_TYPE_application_layer_protocol_negotiation, ret);
-        s2n(3 + len, ret);
-        s2n(1 + len, ret);
-        *ret++ = len;
-        memcpy(ret, selected, len);
-        ret += len;
+        if (!WPACKET_put_bytes_u16(pkt,
+                    TLSEXT_TYPE_application_layer_protocol_negotiation)
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_start_sub_packet_u16(pkt)
+                || !WPACKET_sub_memcpy_u8(pkt, s->s3->alpn_selected,
+                                          s->s3->alpn_selected_len)
+                || !WPACKET_close(pkt)
+                || !WPACKET_close(pkt)) {
+            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+            return 0;
+        }
     }
 
  done:
-
-    if ((extdatalen = ret - orig - 2) == 0)
-        return orig;
-
-    s2n(extdatalen, orig);
-    return ret;
+    if (!WPACKET_close(pkt)) {
+        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
+    return 1;
 }
 
 /*
diff --git a/ssl/t1_reneg.c b/ssl/t1_reneg.c
index f5136e2..f3e01bb 100644
--- a/ssl/t1_reneg.c
+++ b/ssl/t1_reneg.c
@@ -50,32 +50,18 @@ int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al)
 }
 
 /* Add the server's renegotiation binding */
-int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
-                                        int maxlen)
+int ssl_add_serverhello_renegotiate_ext(SSL *s, WPACKET *pkt)
 {
-    if (p) {
-        if ((s->s3->previous_client_finished_len +
-             s->s3->previous_server_finished_len + 1) > maxlen) {
-            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT,
-                   SSL_R_RENEGOTIATE_EXT_TOO_LONG);
-            return 0;
-        }
-
-        /* Length byte */
-        *p = s->s3->previous_client_finished_len +
-            s->s3->previous_server_finished_len;
-        p++;
-
-        memcpy(p, s->s3->previous_client_finished,
-               s->s3->previous_client_finished_len);
-        p += s->s3->previous_client_finished_len;
-
-        memcpy(p, s->s3->previous_server_finished,
-               s->s3->previous_server_finished_len);
-    }
-
-    *len = s->s3->previous_client_finished_len
-        + s->s3->previous_server_finished_len + 1;
+    if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_renegotiate)
+            || !WPACKET_start_sub_packet_u16(pkt)
+            || !WPACKET_start_sub_packet_u8(pkt)
+            || !WPACKET_memcpy(pkt, s->s3->previous_client_finished,
+                               s->s3->previous_client_finished_len)
+            || !WPACKET_memcpy(pkt, s->s3->previous_server_finished,
+                               s->s3->previous_server_finished_len)
+            || !WPACKET_close(pkt)
+            || !WPACKET_close(pkt))
+        return 0;
 
     return 1;
 }

From no-reply at appveyor.com  Thu Sep 29 09:09:36 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 29 Sep 2016 09:09:36 +0000
Subject: [openssl-commits] Build failed: openssl master.5549
Message-ID: <20160929090935.12279.88567.DD907324@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/dede230b/attachment.html>

From no-reply at appveyor.com  Thu Sep 29 09:37:53 2016
From: no-reply at appveyor.com (AppVeyor)
Date: Thu, 29 Sep 2016 09:37:53 +0000
Subject: [openssl-commits] Build completed: openssl OpenSSL_1_1_0-stable.5550
Message-ID: <20160929093752.12248.42068.256ACD88@appveyor.com>

An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/75cdf582/attachment.html>

From builds at travis-ci.org  Thu Sep 29 10:05:33 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 10:05:33 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6213 (master -
	55386be)
In-Reply-To: <openssl/openssl+163651079+still failing@travis-ci.org>
Message-ID: <57ece76b35e50_33fb3f1ed5ce413843d8@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6213
Status: Still Failing

Duration: 41 minutes and 30 seconds
Commit: 55386be (master)
Author: Matt Caswell
Message: Fix no-dtls

The new large message test in sslapitest needs OPENSSL_NO_DTLS guards

Reviewed-by: Richard Levitte <levitte at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/49e476a53826...55386bef807c

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163651079

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/f7d963d4/attachment.html>

From levitte at openssl.org  Thu Sep 29 10:52:33 2016
From: levitte at openssl.org (Richard Levitte)
Date: Thu, 29 Sep 2016 10:52:33 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1475146353.075629.23926.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  9cb0c3a3cae638143af8bc66dd2b19f7593e3978 (commit)
      from  61b1eb2c67542c85311843300f49d019f80afc6c (commit)


- Log -----------------------------------------------------------------
commit 9cb0c3a3cae638143af8bc66dd2b19f7593e3978
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Sep 28 13:07:52 2016 +0100

    Restore '-keyform engine' support for s_client
    
    This used to work in 1.0.2 but disappeared when the argument parsing was
    revamped.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1639)
    
    (cherry picked from commit a6972f346248fbc37e42056bb943fae0896a2967)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 41f6d48..10ea1f1 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -577,8 +577,8 @@ OPTIONS s_client_options[] = {
     {"cert", OPT_CERT, '<', "Certificate file to use, PEM format assumed"},
     {"certform", OPT_CERTFORM, 'F',
      "Certificate format (PEM or DER) PEM default"},
-    {"key", OPT_KEY, '<', "Private key file to use, if not in -cert file"},
-    {"keyform", OPT_KEYFORM, 'F', "Key format (PEM or DER) PEM default"},
+    {"key", OPT_KEY, 's', "Private key file to use, if not in -cert file"},
+    {"keyform", OPT_KEYFORM, 'E', "Key format (PEM, DER or engine) PEM default"},
     {"pass", OPT_PASS, 's', "Private key file pass phrase source"},
     {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
     {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
@@ -1202,7 +1202,7 @@ int s_client_main(int argc, char **argv)
             fallback_scsv = 1;
             break;
         case OPT_KEYFORM:
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &key_format))
+            if (!opt_format(opt_arg(), OPT_FMT_PDE, &key_format))
                 goto opthelp;
             break;
         case OPT_PASS:

From builds at travis-ci.org  Thu Sep 29 10:40:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 10:40:35 +0000
Subject: [openssl-commits] Still Failing: openssl/openssl#6214
	(OpenSSL_1_1_0-stable - dd63da7)
In-Reply-To: <openssl/openssl+163651103+still failing@travis-ci.org>
Message-ID: <57ecefa3bb5a5_33fc9541caae011941c5@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6214
Status: Still Failing

Duration: 47 minutes and 33 seconds
Commit: dd63da7 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Fix no-dtls

The new large message test in sslapitest needs OPENSSL_NO_DTLS guards

Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit 55386bef807c7edd0f1db036c0ed464b28a61d68)

View the changeset: https://github.com/openssl/openssl/compare/a1b791225f29...dd63da7032c6

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163651103

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/4e5e95e3/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 29 11:06:25 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 11:06:25 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6215 (master - 2f2d6e3)
In-Reply-To: <openssl/openssl+163652572+fixed@travis-ci.org>
Message-ID: <57ecf5cada44f_33fc95408ce441220124@426323cd-1164-4067-99d1-ad59cbd5ef43.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6215
Status: Fixed

Duration: 42 minutes and 13 seconds
Commit: 2f2d6e3 (master)
Author: Matt Caswell
Message: Fix an Uninit read in DTLS

If we have a handshake fragment waiting then dtls1_read_bytes() was not
correctly setting the value of recvd_type, leading to an uninit read.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/55386bef807c...2f2d6e3e3ccd

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163652572

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/094d285a/attachment.html>

From builds at travis-ci.org  Thu Sep 29 11:36:26 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 11:36:26 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6216 (OpenSSL_1_1_0-stable
	- 61b1eb2)
In-Reply-To: <openssl/openssl+163652623+fixed@travis-ci.org>
Message-ID: <57ecfcba2a692_33fb3f1e929e414751e1@717552b0-76a1-4be8-af52-cd2aa4e99d13.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6216
Status: Fixed

Duration: 19 minutes and 10 seconds
Commit: 61b1eb2 (OpenSSL_1_1_0-stable)
Author: Matt Caswell
Message: Fix an Uninit read in DTLS

If we have a handshake fragment waiting then dtls1_read_bytes() was not
correctly setting the value of recvd_type, leading to an uninit read.

Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit 2f2d6e3e3ccd1ae7bba9f1af62f97dfca986e083)

View the changeset: https://github.com/openssl/openssl/compare/dd63da7032c6...61b1eb2c6754

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163652623

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/399e801c/attachment.html>

From builds at travis-ci.org  Thu Sep 29 12:04:44 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 12:04:44 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6217 (master - 25849a8)
In-Reply-To: <openssl/openssl+163653912+fixed@travis-ci.org>
Message-ID: <57ed035c6b552_33fa4b62fbecc572ac@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6217
Status: Fixed

Duration: 41 minutes and 37 seconds
Commit: 25849a8 (master)
Author: Matt Caswell
Message: Address style feedback comments

Merge declarations of same type together.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/2f2d6e3e3ccd...25849a8f8bb6

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163653912

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/1aaceea2/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 29 13:00:37 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 13:00:37 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6219 (OpenSSL_1_1_0-stable
	- 9cb0c3a)
In-Reply-To: <openssl/openssl+163676699+fixed@travis-ci.org>
Message-ID: <57ed1075312bd_33ff5cfb8d7101509d4@eae72b8c-fc4f-497d-b052-ab1ec79f5e24.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6219
Status: Fixed

Duration: 39 minutes and 21 seconds
Commit: 9cb0c3a (OpenSSL_1_1_0-stable)
Author: David Woodhouse
Message: Restore '-keyform engine' support for s_client

This used to work in 1.0.2 but disappeared when the argument parsing was
revamped.

Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1639)

(cherry picked from commit a6972f346248fbc37e42056bb943fae0896a2967)

View the changeset: https://github.com/openssl/openssl/compare/61b1eb2c6754...9cb0c3a3cae6

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163676699

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/39ad975c/attachment.html>

From matt at openssl.org  Thu Sep 29 13:58:21 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 13:58:21 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475157501.040848.20183.nullmailer@dev.openssl.org>

The branch master has been updated
       via  ac8cc3efb26fa91c4f29463044cfe9e7070ebc14 (commit)
       via  28ff8ef3f71e23660db5d42002af1b44d99f3e4a (commit)
      from  25849a8f8bb64956f35a8a2a160ae0de1d2990c6 (commit)


- Log -----------------------------------------------------------------
commit ac8cc3efb26fa91c4f29463044cfe9e7070ebc14
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 14:26:36 2016 +0100

    Remove tls12_copy_sigalgs_old()
    
    This was a temporary function needed during the conversion to WPACKET. All
    callers have now been converted to the new way of doing this so this
    function is no longer required.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 28ff8ef3f71e23660db5d42002af1b44d99f3e4a
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 14:25:52 2016 +0100

    Convert CertificateRequest construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_lib.c             | 42 ++++++++++++--------------
 ssl/ssl_locl.h           |  4 +--
 ssl/statem/statem_srvr.c | 76 ++++++++++++++++++++++++++----------------------
 ssl/t1_lib.c             | 20 -------------
 4 files changed, 61 insertions(+), 81 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 2115a7e..ea607a5 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3708,15 +3708,13 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
     return (ret);
 }
 
-int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
+int ssl3_get_req_cert_type(SSL *s, WPACKET *pkt)
 {
-    int ret = 0;
     uint32_t alg_k, alg_a = 0;
 
     /* If we have custom certificate types set, use them */
     if (s->cert->ctypes) {
-        memcpy(p, s->cert->ctypes, s->cert->ctype_num);
-        return (int)s->cert->ctype_num;
+        return WPACKET_memcpy(pkt, s->cert->ctypes, s->cert->ctype_num);
     }
     /* Get mask of algorithms disabled by signature list */
     ssl_set_sig_mask(&alg_a, s, SSL_SECOP_SIGALG_MASK);
@@ -3724,45 +3722,43 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
     alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
 #ifndef OPENSSL_NO_GOST
-    if (s->version >= TLS1_VERSION) {
-        if (alg_k & SSL_kGOST) {
-            p[ret++] = TLS_CT_GOST01_SIGN;
-            p[ret++] = TLS_CT_GOST12_SIGN;
-            p[ret++] = TLS_CT_GOST12_512_SIGN;
-            return (ret);
-        }
-    }
+    if (s->version >= TLS1_VERSION && (alg_k & SSL_kGOST))
+            return WPACKET_put_bytes_u8(pkt, TLS_CT_GOST01_SIGN)
+                    && WPACKET_put_bytes_u8(pkt, TLS_CT_GOST12_SIGN)
+                    && WPACKET_put_bytes_u8(pkt, TLS_CT_GOST12_512_SIGN);
 #endif
 
     if ((s->version == SSL3_VERSION) && (alg_k & SSL_kDHE)) {
 #ifndef OPENSSL_NO_DH
 # ifndef OPENSSL_NO_RSA
-        p[ret++] = SSL3_CT_RSA_EPHEMERAL_DH;
+        if (!WPACKET_put_bytes_u8(pkt, SSL3_CT_RSA_EPHEMERAL_DH))
+            return 0;
 # endif
 # ifndef OPENSSL_NO_DSA
-        p[ret++] = SSL3_CT_DSS_EPHEMERAL_DH;
+        if (!WPACKET_put_bytes_u8(pkt, SSL3_CT_DSS_EPHEMERAL_DH))
+            return 0;
 # endif
 #endif                          /* !OPENSSL_NO_DH */
     }
 #ifndef OPENSSL_NO_RSA
-    if (!(alg_a & SSL_aRSA))
-        p[ret++] = SSL3_CT_RSA_SIGN;
+    if (!(alg_a & SSL_aRSA) && !WPACKET_put_bytes_u8(pkt, SSL3_CT_RSA_SIGN))
+        return 0;
 #endif
 #ifndef OPENSSL_NO_DSA
-    if (!(alg_a & SSL_aDSS))
-        p[ret++] = SSL3_CT_DSS_SIGN;
+    if (!(alg_a & SSL_aDSS) && !WPACKET_put_bytes_u8(pkt, SSL3_CT_DSS_SIGN))
+        return 0;
 #endif
 #ifndef OPENSSL_NO_EC
     /*
      * ECDSA certs can be used with RSA cipher suites too so we don't
      * need to check for SSL_kECDH or SSL_kECDHE
      */
-    if (s->version >= TLS1_VERSION) {
-        if (!(alg_a & SSL_aECDSA))
-            p[ret++] = TLS_CT_ECDSA_SIGN;
-    }
+    if (s->version >= TLS1_VERSION
+            && !(alg_a & SSL_aECDSA)
+            && !WPACKET_put_bytes_u8(pkt, TLS_CT_ECDSA_SIGN))
+        return 0;
 #endif
-    return (ret);
+    return 1;
 }
 
 static int ssl3_set_req_cert_type(CERT *c, const unsigned char *p, size_t len)
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 7dbff76..a1b3e3d 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1873,7 +1873,7 @@ __owur int ssl3_do_write(SSL *s, int type);
 int ssl3_send_alert(SSL *s, int level, int desc);
 __owur int ssl3_generate_master_secret(SSL *s, unsigned char *out,
                                        unsigned char *p, int len);
-__owur int ssl3_get_req_cert_type(SSL *s, unsigned char *p);
+__owur int ssl3_get_req_cert_type(SSL *s, WPACKET *pkt);
 __owur int ssl3_num_ciphers(void);
 __owur const SSL_CIPHER *ssl3_get_cipher(unsigned int u);
 int ssl3_renegotiate(SSL *ssl);
@@ -2068,8 +2068,6 @@ __owur int ssl_add_serverhello_renegotiate_ext(SSL *s, WPACKET *pkt);
 __owur int ssl_parse_serverhello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
 __owur int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
 __owur long ssl_get_algorithm2(SSL *s);
-__owur size_t tls12_copy_sigalgs_old(SSL *s, unsigned char *out,
-                                     const unsigned char *psig, size_t psiglen);
 __owur int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,
                               const unsigned char *psig, size_t psiglen);
 __owur int tls1_save_sigalgs(SSL *s, const unsigned char *data, int dsize);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index bf50e79..799700b 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1960,62 +1960,66 @@ int tls_construct_server_key_exchange(SSL *s)
 
 int tls_construct_certificate_request(SSL *s)
 {
-    unsigned char *p, *d;
-    int i, j, nl, off, n;
+    int i, nl;
     STACK_OF(X509_NAME) *sk = NULL;
-    X509_NAME *name;
-    BUF_MEM *buf;
+    WPACKET pkt;
 
-    buf = s->init_buf;
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt,
+                                          SSL3_MT_CERTIFICATE_REQUEST)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
-    d = p = ssl_handshake_start(s);
 
     /* get the list of acceptable cert types */
-    p++;
-    n = ssl3_get_req_cert_type(s, p);
-    d[0] = n;
-    p += n;
-    n++;
+    if (!WPACKET_start_sub_packet_u8(&pkt)
+            || !ssl3_get_req_cert_type(s, &pkt)
+            || !WPACKET_close(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     if (SSL_USE_SIGALGS(s)) {
         const unsigned char *psigs;
-        unsigned char *etmp = p;
         nl = tls12_get_psigalgs(s, &psigs);
-        /* Skip over length for now */
-        p += 2;
-        nl = tls12_copy_sigalgs_old(s, p, psigs, nl);
-        /* Now fill in length */
-        s2n(nl, etmp);
-        p += nl;
-        n += nl + 2;
+        if (!WPACKET_start_sub_packet_u16(&pkt)
+                || !tls12_copy_sigalgs(s, &pkt, psigs, nl)
+                || !WPACKET_close(&pkt)) {
+            SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST,
+                   ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
     }
 
-    off = n;
-    p += 2;
-    n += 2;
+    /* Start sub-packet for client CA list */
+    if (!WPACKET_start_sub_packet_u16(&pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
 
     sk = SSL_get_client_CA_list(s);
-    nl = 0;
     if (sk != NULL) {
         for (i = 0; i < sk_X509_NAME_num(sk); i++) {
-            name = sk_X509_NAME_value(sk, i);
-            j = i2d_X509_NAME(name, NULL);
-            if (!BUF_MEM_grow_clean(buf, SSL_HM_HEADER_LENGTH(s) + n + j + 2)) {
-                SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_BUF_LIB);
+            unsigned char *namebytes;
+            X509_NAME *name = sk_X509_NAME_value(sk, i);
+            int namelen;
+
+            if (name == NULL
+                    || (namelen = i2d_X509_NAME(name, NULL)) < 0
+                    || !WPACKET_sub_allocate_bytes_u16(&pkt, namelen,
+                                                       &namebytes)
+                    || i2d_X509_NAME(name, &namebytes) != namelen) {
+                SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST,
+                       ERR_R_INTERNAL_ERROR);
                 goto err;
             }
-            p = ssl_handshake_start(s) + n;
-            s2n(j, p);
-            i2d_X509_NAME(name, &p);
-            n += 2 + j;
-            nl += 2 + j;
         }
     }
     /* else no CA names */
-    p = ssl_handshake_start(s) + off;
-    s2n(nl, p);
 
-    if (!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_REQUEST, n)) {
+    if (!WPACKET_close(&pkt)
+            || !ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -2024,6 +2028,8 @@ int tls_construct_certificate_request(SSL *s)
 
     return 1;
  err:
+    WPACKET_cleanup(&pkt);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
     ossl_statem_set_error(s);
     return 0;
 }
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 230fe66..e2e5f60 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3320,26 +3320,6 @@ void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op)
         *pmask_a |= SSL_aECDSA;
 }
 
-/*
- * Old version of the tls12_copy_sigalgs function used by code that has not
- * yet been converted to WPACKET yet. It will be deleted once WPACKET conversion
- * is complete.
- * TODO - DELETE ME
- */
-size_t tls12_copy_sigalgs_old(SSL *s, unsigned char *out,
-                          const unsigned char *psig, size_t psiglen)
-{
-    unsigned char *tmpout = out;
-    size_t i;
-    for (i = 0; i < psiglen; i += 2, psig += 2) {
-        if (tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, psig)) {
-            *tmpout++ = psig[0];
-            *tmpout++ = psig[1];
-        }
-    }
-    return tmpout - out;
-}
-
 int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,
                        const unsigned char *psig, size_t psiglen)
 {

From matt at openssl.org  Thu Sep 29 14:11:05 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 14:11:05 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475158265.169616.29057.nullmailer@dev.openssl.org>

The branch master has been updated
       via  0023baffb8f648c22d397bfa5e1cc8749749bd29 (commit)
       via  ff8194774ca2d8e30223c6f8e2583112514e9fb7 (commit)
       via  4a424545c4f3148bfbf54270422e05177b4c392f (commit)
       via  c13d2a5be720a8ab8f0cb67fc2750ed27eee3d9e (commit)
       via  1ff8434040b35f35c27f77ef064481622490bba9 (commit)
      from  ac8cc3efb26fa91c4f29463044cfe9e7070ebc14 (commit)


- Log -----------------------------------------------------------------
commit 0023baffb8f648c22d397bfa5e1cc8749749bd29
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 14:45:49 2016 +0100

    Add an example of usage to the WPACKET_reserve_bytes() documentation
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ff8194774ca2d8e30223c6f8e2583112514e9fb7
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 14:39:47 2016 +0100

    Address style feedback comments
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4a424545c4f3148bfbf54270422e05177b4c392f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 12:04:08 2016 +0100

    Fix a bug in CKE construction for PSK
    
    In plain PSK we don't need to do anymore construction after the preamble.
    We weren't detecting this case and treating it as an unknown cipher.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit c13d2a5be720a8ab8f0cb67fc2750ed27eee3d9e
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 11:46:08 2016 +0100

    Convert ServerKeyExchange construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1ff8434040b35f35c27f77ef064481622490bba9
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 11:43:37 2016 +0100

    Add the WPACKET_reserve_bytes() function
    
    WPACKET_allocate_bytes() requires you to know the size of the data you
    are allocating for, before you create it. Sometimes this isn't the case,
    for example we know the maximum size that a signature will be before we
    create it, but not the actual size. WPACKET_reserve_bytes() enables us to
    reserve bytes in the WPACKET, but not count them as written yet. We then
    subsequently need to acall WPACKET_allocate_bytes to actually count them as
    written.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/packet.c             |  33 +++++--
 ssl/packet_locl.h        |  40 ++++++++-
 ssl/statem/statem_clnt.c |   2 +-
 ssl/statem/statem_srvr.c | 218 +++++++++++++++++++++--------------------------
 4 files changed, 164 insertions(+), 129 deletions(-)

diff --git a/ssl/packet.c b/ssl/packet.c
index 4077de5..2a8fe25 100644
--- a/ssl/packet.c
+++ b/ssl/packet.c
@@ -14,6 +14,27 @@
 
 int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 {
+    if (!WPACKET_reserve_bytes(pkt, len, allocbytes))
+        return 0;
+
+    pkt->written += len;
+    pkt->curr += len;
+    return 1;
+}
+
+int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
+                                 unsigned char **allocbytes, size_t lenbytes)
+{
+    if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
+            || !WPACKET_allocate_bytes(pkt, len, allocbytes)
+            || !WPACKET_close(pkt))
+        return 0;
+
+    return 1;
+}
+
+int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
+{
     /* Internal API, so should not fail */
     assert(pkt->subs != NULL && len != 0);
     if (pkt->subs == NULL || len == 0)
@@ -39,20 +60,18 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
             return 0;
     }
     *allocbytes = (unsigned char *)pkt->buf->data + pkt->curr;
-    pkt->written += len;
-    pkt->curr += len;
 
     return 1;
 }
 
-int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
-                                 unsigned char **allocbytes, size_t lenbytes)
+int WPACKET_sub_reserve_bytes__(WPACKET *pkt, size_t len,
+                                unsigned char **allocbytes, size_t lenbytes)
 {
-    if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
-            || !WPACKET_allocate_bytes(pkt, len, allocbytes)
-            || !WPACKET_close(pkt))
+    if (!WPACKET_reserve_bytes(pkt, lenbytes + len, allocbytes))
         return 0;
 
+    *allocbytes += lenbytes;
+
     return 1;
 }
 
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 44a8f82..8d3fd37 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -675,7 +675,7 @@ int WPACKET_start_sub_packet(WPACKET *pkt);
  * WPACKET_* calls. If not then the underlying buffer may be realloc'd and
  * change its location.
  */
-int WPACKET_allocate_bytes(WPACKET *pkt, size_t bytes,
+int WPACKET_allocate_bytes(WPACKET *pkt, size_t len,
                            unsigned char **allocbytes);
 
 /*
@@ -701,6 +701,44 @@ int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
     WPACKET_sub_allocate_bytes__((pkt), (len), (bytes), 4)
 
 /*
+ * The same as WPACKET_allocate_bytes() except the reserved bytes are not
+ * actually counted as written. Typically this will be for when we don't know
+ * how big arbitrary data is going to be up front, but we do know what the
+ * maximum size will be. If this function is used, then it should be immediately
+ * followed by a WPACKET_allocate_bytes() call before any other WPACKET
+ * functions are called (unless the write to the allocated bytes is abandoned).
+ * 
+ * For example: If we are generating a signature, then the size of that
+ * signature may not be known in advance. We can use WPACKET_reserve_bytes() to
+ * handle this:
+ *
+ *  if (!WPACKET_sub_reserve_bytes_u16(&pkt, EVP_PKEY_size(pkey), &sigbytes1)
+ *          || EVP_SignFinal(md_ctx, sigbytes1, &siglen, pkey) <= 0
+ *          || !WPACKET_sub_allocate_bytes_u16(&pkt, siglen, &sigbytes2)
+ *          || sigbytes1 != sigbytes2)
+ *      goto err;
+ */
+int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes);
+
+/*
+ * The "reserve_bytes" equivalent of WPACKET_sub_allocate_bytes__()
+ */
+int WPACKET_sub_reserve_bytes__(WPACKET *pkt, size_t len,
+                                 unsigned char **allocbytes, size_t lenbytes);
+
+/*
+ * Convenience macros for  WPACKET_sub_reserve_bytes with different lengths
+ */
+#define WPACKET_sub_reserve_bytes_u8(pkt, len, bytes) \
+    WPACKET_reserve_bytes__((pkt), (len), (bytes), 1)
+#define WPACKET_sub_reserve_bytes_u16(pkt, len, bytes) \
+    WPACKET_sub_reserve_bytes__((pkt), (len), (bytes), 2)
+#define WPACKET_sub_reserve_bytes_u24(pkt, len, bytes) \
+    WPACKET_sub_reserve_bytes__((pkt), (len), (bytes), 3)
+#define WPACKET_sub_reserve_bytes_u32(pkt, len, bytes) \
+    WPACKET_sub_reserve_bytes__((pkt), (len), (bytes), 4)
+
+/*
  * Write the value stored in |val| into the WPACKET. The value will consume
  * |bytes| amount of storage. An error will occur if |val| cannot be
  * accommodated in |bytes| storage, e.g. attempting to write the value 256 into
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 67f4ac4..e4b2219 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2496,7 +2496,7 @@ int tls_construct_client_key_exchange(SSL *s)
     } else if (alg_k & SSL_kSRP) {
         if (!tls_construct_cke_srp(s, &pkt, &al))
             goto err;
-    } else {
+    } else if (!(alg_k & SSL_kPSK)) {
         ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
         goto err;
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 799700b..3c3544c 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1591,7 +1591,6 @@ int tls_construct_server_key_exchange(SSL *s)
 {
 #ifndef OPENSSL_NO_DH
     EVP_PKEY *pkdh = NULL;
-    int j;
 #endif
 #ifndef OPENSSL_NO_EC
     unsigned char *encodedPoint = NULL;
@@ -1600,36 +1599,30 @@ int tls_construct_server_key_exchange(SSL *s)
 #endif
     EVP_PKEY *pkey;
     const EVP_MD *md = NULL;
-    unsigned char *p, *d;
-    int al, i;
+    int al = SSL_AD_INTERNAL_ERROR, i;
     unsigned long type;
-    int n;
     const BIGNUM *r[4];
-    int nr[4], kn;
-    BUF_MEM *buf;
     EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
+    WPACKET pkt;
+    size_t paramlen, paramoffset;
+
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt,
+                                          SSL3_MT_SERVER_KEY_EXCHANGE)
+            || !WPACKET_get_total_written(&pkt, &paramoffset)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
+        goto f_err;
+    }
 
     if (md_ctx == NULL) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
-        al = SSL_AD_INTERNAL_ERROR;
         goto f_err;
     }
 
     type = s->s3->tmp.new_cipher->algorithm_mkey;
 
-    buf = s->init_buf;
-
     r[0] = r[1] = r[2] = r[3] = NULL;
-    n = 0;
 #ifndef OPENSSL_NO_PSK
-    if (type & SSL_PSK) {
-        /*
-         * reserve size for record length and PSK identity hint
-         */
-        n += 2;
-        if (s->cert->psk_identity_hint)
-            n += strlen(s->cert->psk_identity_hint);
-    }
     /* Plain PSK or RSAPSK nothing to do */
     if (type & (SSL_kPSK | SSL_kRSAPSK)) {
     } else
@@ -1646,7 +1639,6 @@ int tls_construct_server_key_exchange(SSL *s)
             pkdh = EVP_PKEY_new();
             if (pkdh == NULL || dhp == NULL) {
                 DH_free(dhp);
-                al = SSL_AD_INTERNAL_ERROR;
                 SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
                        ERR_R_INTERNAL_ERROR);
                 goto f_err;
@@ -1660,7 +1652,6 @@ int tls_construct_server_key_exchange(SSL *s)
             DH *dhp = s->cert->dh_tmp_cb(s, 0, 1024);
             pkdh = ssl_dh_to_pkey(dhp);
             if (pkdh == NULL) {
-                al = SSL_AD_INTERNAL_ERROR;
                 SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
                        ERR_R_INTERNAL_ERROR);
                 goto f_err;
@@ -1723,7 +1714,6 @@ int tls_construct_server_key_exchange(SSL *s)
         s->s3->tmp.pkey = ssl_generate_pkey_curve(curve_id);
         /* Generate a new key for this curve */
         if (s->s3->tmp.pkey == NULL) {
-            al = SSL_AD_INTERNAL_ERROR;
             SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_R_EVP_LIB);
             goto f_err;
         }
@@ -1737,13 +1727,6 @@ int tls_construct_server_key_exchange(SSL *s)
         }
 
         /*
-         * We only support named (not generic) curves in ECDH ephemeral key
-         * exchanges. In this situation, we need four additional bytes to
-         * encode the entire ServerECDHParams structure.
-         */
-        n += 4 + encodedlen;
-
-        /*
          * We'll generate the serverKeyExchange message explicitly so we
          * can set these to NULLs
          */
@@ -1774,25 +1757,6 @@ int tls_construct_server_key_exchange(SSL *s)
                SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
         goto f_err;
     }
-    for (i = 0; i < 4 && r[i] != NULL; i++) {
-        nr[i] = BN_num_bytes(r[i]);
-#ifndef OPENSSL_NO_SRP
-        if ((i == 2) && (type & SSL_kSRP))
-            n += 1 + nr[i];
-        else
-#endif
-#ifndef OPENSSL_NO_DH
-        /*-
-         * for interoperability with some versions of the Microsoft TLS
-         * stack, we need to zero pad the DHE pub key to the same length
-         * as the prime, so use the length of the prime here
-         */
-        if ((i == 2) && (type & (SSL_kDHE | SSL_kDHEPSK)))
-            n += 2 + nr[0];
-        else
-#endif
-            n += 2 + nr[i];
-    }
 
     if (!(s->s3->tmp.new_cipher->algorithm_auth & (SSL_aNULL | SSL_aSRP))
         && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_PSK)) {
@@ -1801,53 +1765,46 @@ int tls_construct_server_key_exchange(SSL *s)
             al = SSL_AD_DECODE_ERROR;
             goto f_err;
         }
-        kn = EVP_PKEY_size(pkey);
-        /* Allow space for signature algorithm */
-        if (SSL_USE_SIGALGS(s))
-            kn += 2;
-        /* Allow space for signature length */
-        kn += 2;
     } else {
         pkey = NULL;
-        kn = 0;
     }
 
-    if (!BUF_MEM_grow_clean(buf, n + SSL_HM_HEADER_LENGTH(s) + kn)) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_LIB_BUF);
-        goto err;
-    }
-    d = p = ssl_handshake_start(s);
-
 #ifndef OPENSSL_NO_PSK
     if (type & SSL_PSK) {
-        /* copy PSK identity hint */
-        if (s->cert->psk_identity_hint) {
-            size_t len = strlen(s->cert->psk_identity_hint);
-            if (len > PSK_MAX_IDENTITY_LEN) {
-                /*
-                 * Should not happen - we already checked this when we set
-                 * the identity hint
-                 */
-                SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
-                       ERR_R_INTERNAL_ERROR);
-                goto err;
-            }
-            s2n(len, p);
-            memcpy(p, s->cert->psk_identity_hint, len);
-            p += len;
-        } else {
-            s2n(0, p);
+        size_t len = (s->cert->psk_identity_hint == NULL)
+                        ? 0 : strlen(s->cert->psk_identity_hint);
+
+        /*
+         * It should not happen that len > PSK_MAX_IDENTITY_LEN - we already
+         * checked this when we set the identity hint - but just in case
+         */
+        if (len > PSK_MAX_IDENTITY_LEN
+                || !WPACKET_sub_memcpy_u16(&pkt, s->cert->psk_identity_hint,
+                                           len)) {
+            SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                   ERR_R_INTERNAL_ERROR);
+            goto f_err;
         }
     }
 #endif
 
     for (i = 0; i < 4 && r[i] != NULL; i++) {
+        unsigned char *binval;
+        int res;
+
 #ifndef OPENSSL_NO_SRP
         if ((i == 2) && (type & SSL_kSRP)) {
-            *p = nr[i];
-            p++;
+            res = WPACKET_start_sub_packet_u8(&pkt);
         } else
 #endif
+            res = WPACKET_start_sub_packet_u16(&pkt);
+
+        if (!res) {
+            SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                   ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
+
 #ifndef OPENSSL_NO_DH
         /*-
          * for interoperability with some versions of the Microsoft TLS
@@ -1855,38 +1812,46 @@ int tls_construct_server_key_exchange(SSL *s)
          * as the prime
          */
         if ((i == 2) && (type & (SSL_kDHE | SSL_kDHEPSK))) {
-            s2n(nr[0], p);
-            for (j = 0; j < (nr[0] - nr[2]); ++j) {
-                *p = 0;
-                ++p;
+            size_t len = BN_num_bytes(r[0]) - BN_num_bytes(r[2]);
+
+            if (len > 0) {
+                if (!WPACKET_allocate_bytes(&pkt, len, &binval)) {
+                    SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                           ERR_R_INTERNAL_ERROR);
+                    goto f_err;
+                }
+                memset(binval, 0, len);
             }
-        } else
+        }
 #endif
-            s2n(nr[i], p);
-        BN_bn2bin(r[i], p);
-        p += nr[i];
+        if (!WPACKET_allocate_bytes(&pkt, BN_num_bytes(r[i]), &binval)
+                || !WPACKET_close(&pkt)) {
+            SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                   ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
+
+        BN_bn2bin(r[i], binval);
     }
 
 #ifndef OPENSSL_NO_EC
     if (type & (SSL_kECDHE | SSL_kECDHEPSK)) {
         /*
-         * XXX: For now, we only support named (not generic) curves. In
-         * this situation, the serverKeyExchange message has: [1 byte
-         * CurveType], [2 byte CurveName] [1 byte length of encoded
-         * point], followed by the actual encoded point itself
+         * We only support named (not generic) curves. In this situation, the
+         * ServerKeyExchange message has: [1 byte CurveType], [2 byte CurveName]
+         * [1 byte length of encoded point], followed by the actual encoded
+         * point itself
          */
-        *p = NAMED_CURVE_TYPE;
-        p += 1;
-        *p = 0;
-        p += 1;
-        *p = curve_id;
-        p += 1;
-        *p = encodedlen;
-        p += 1;
-        memcpy(p, encodedPoint, encodedlen);
+        if (!WPACKET_put_bytes_u8(&pkt, NAMED_CURVE_TYPE)
+                || !WPACKET_put_bytes_u8(&pkt, 0)
+                || !WPACKET_put_bytes_u8(&pkt, curve_id)
+                || !WPACKET_sub_memcpy_u8(&pkt, encodedPoint, encodedlen)) {
+            SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                   ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
         OPENSSL_free(encodedPoint);
         encodedPoint = NULL;
-        p += encodedlen;
     }
 #endif
 
@@ -1897,36 +1862,49 @@ int tls_construct_server_key_exchange(SSL *s)
          * points to the space at the end.
          */
         if (md) {
+            unsigned char *sigbytes1, *sigbytes2;
+            unsigned int siglen;
+
+            /* Get length of the parameters we have written above */
+            if (!WPACKET_get_length(&pkt, &paramlen)) {
+                SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                       ERR_R_INTERNAL_ERROR);
+                goto f_err;
+            }
             /* send signature algorithm */
             if (SSL_USE_SIGALGS(s)) {
-                if (!tls12_get_sigandhash_old(p, pkey, md)) {
+                if (!tls12_get_sigandhash(&pkt, pkey, md)) {
                     /* Should never happen */
-                    al = SSL_AD_INTERNAL_ERROR;
                     SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
                            ERR_R_INTERNAL_ERROR);
                     goto f_err;
                 }
-                p += 2;
             }
 #ifdef SSL_DEBUG
             fprintf(stderr, "Using hash %s\n", EVP_MD_name(md));
 #endif
-            if (EVP_SignInit_ex(md_ctx, md, NULL) <= 0
-                || EVP_SignUpdate(md_ctx, &(s->s3->client_random[0]),
-                                  SSL3_RANDOM_SIZE) <= 0
-                || EVP_SignUpdate(md_ctx, &(s->s3->server_random[0]),
-                                  SSL3_RANDOM_SIZE) <= 0
-                || EVP_SignUpdate(md_ctx, d, n) <= 0
-                || EVP_SignFinal(md_ctx, &(p[2]),
-                                 (unsigned int *)&i, pkey) <= 0) {
-                SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_LIB_EVP);
-                al = SSL_AD_INTERNAL_ERROR;
+            /*
+             * Create the signature. We don't know the actual length of the sig
+             * until after we've created it, so we reserve enough bytes for it
+             * up front, and then properly allocate them in the WPACKET
+             * afterwards.
+             */
+            if (!WPACKET_sub_reserve_bytes_u16(&pkt, EVP_PKEY_size(pkey),
+                                               &sigbytes1)
+                    || EVP_SignInit_ex(md_ctx, md, NULL) <= 0
+                    || EVP_SignUpdate(md_ctx, &(s->s3->client_random[0]),
+                                      SSL3_RANDOM_SIZE) <= 0
+                    || EVP_SignUpdate(md_ctx, &(s->s3->server_random[0]),
+                                      SSL3_RANDOM_SIZE) <= 0
+                    || EVP_SignUpdate(md_ctx, s->init_buf->data + paramoffset,
+                                      paramlen) <= 0
+                    || EVP_SignFinal(md_ctx, sigbytes1, &siglen, pkey) <= 0
+                    || !WPACKET_sub_allocate_bytes_u16(&pkt, siglen, &sigbytes2)
+                    || sigbytes1 != sigbytes2) {
+                SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,
+                       ERR_R_INTERNAL_ERROR);
                 goto f_err;
             }
-            s2n(i, p);
-            n += i + 2;
-            if (SSL_USE_SIGALGS(s))
-                n += 2;
         } else {
             /* Is this error check actually needed? */
             al = SSL_AD_HANDSHAKE_FAILURE;
@@ -1936,8 +1914,7 @@ int tls_construct_server_key_exchange(SSL *s)
         }
     }
 
-    if (!ssl_set_handshake_header(s, SSL3_MT_SERVER_KEY_EXCHANGE, n)) {
-        al = SSL_AD_HANDSHAKE_FAILURE;
+    if (!ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
         goto f_err;
     }
@@ -1955,6 +1932,7 @@ int tls_construct_server_key_exchange(SSL *s)
 #endif
     EVP_MD_CTX_free(md_ctx);
     ossl_statem_set_error(s);
+    WPACKET_cleanup(&pkt);
     return 0;
 }
 

From builds at travis-ci.org  Thu Sep 29 14:38:09 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 14:38:09 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6221 (master - ac8cc3e)
In-Reply-To: <openssl/openssl+163724235+errored@travis-ci.org>
Message-ID: <57ed2751afdda_33ff5cfb8d710369922@eae72b8c-fc4f-497d-b052-ab1ec79f5e24.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6221
Status: Errored

Duration: 38 minutes and 42 seconds
Commit: ac8cc3e (master)
Author: Matt Caswell
Message: Remove tls12_copy_sigalgs_old()

This was a temporary function needed during the conversion to WPACKET. All
callers have now been converted to the new way of doing this so this
function is no longer required.

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/25849a8f8bb6...ac8cc3efb26f

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163724235

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/d054c157/attachment.html>

From matt at openssl.org  Thu Sep 29 14:51:46 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 14:51:46 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475160706.638033.20170.nullmailer@dev.openssl.org>

The branch master has been updated
       via  e4e1aa903e624044d3319622fc50222f1b2c7328 (commit)
      from  0023baffb8f648c22d397bfa5e1cc8749749bd29 (commit)


- Log -----------------------------------------------------------------
commit e4e1aa903e624044d3319622fc50222f1b2c7328
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 15:32:35 2016 +0100

    Fix an mis-matched function code so that "make update" doesn't fail
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 3c3544c..b9eb634 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1610,7 +1610,7 @@ int tls_construct_server_key_exchange(SSL *s)
             || !ssl_set_handshake_header2(s, &pkt,
                                           SSL3_MT_SERVER_KEY_EXCHANGE)
             || !WPACKET_get_total_written(&pkt, &paramoffset)) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
+        SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
         goto f_err;
     }
 

From builds at travis-ci.org  Thu Sep 29 15:15:50 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 15:15:50 +0000
Subject: [openssl-commits] Broken: openssl/openssl#6222 (master - 0023baf)
In-Reply-To: <openssl/openssl+163728274+broken@travis-ci.org>
Message-ID: <57ed30266b3d3_33fa4b64894102526d4@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6222
Status: Broken

Duration: 49 minutes and 23 seconds
Commit: 0023baf (master)
Author: Matt Caswell
Message: Add an example of usage to the WPACKET_reserve_bytes() documentation

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/ac8cc3efb26f...0023baffb8f6

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163728274

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/d6dffed2/attachment.html>

From matt at openssl.org  Thu Sep 29 15:20:00 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 15:20:00 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475162400.767044.3726.nullmailer@dev.openssl.org>

The branch master has been updated
       via  83ae4661315d3d0ad52ddaa8fa5c8f1055c6c6f6 (commit)
      from  e4e1aa903e624044d3319622fc50222f1b2c7328 (commit)


- Log -----------------------------------------------------------------
commit 83ae4661315d3d0ad52ddaa8fa5c8f1055c6c6f6
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 15:38:44 2016 +0100

    Fix missing NULL checks in NewSessionTicket construction
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h    | 1 +
 ssl/ssl_err.c            | 2 ++
 ssl/statem/statem_srvr.c | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index d127c76..d741ece 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2233,6 +2233,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358
 # define SSL_F_TLS_CONSTRUCT_FINISHED                     359
 # define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373
+# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           428
 # define SSL_F_TLS_CONSTRUCT_NEXT_PROTO                   426
 # define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           374
 # define SSL_F_TLS_CONSTRUCT_SERVER_DONE                  375
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index ec550be..e6c7320 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -259,6 +259,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_FINISHED), "tls_construct_finished"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_HELLO_REQUEST),
      "tls_construct_hello_request"},
+    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET),
+     "tls_construct_new_session_ticket"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_NEXT_PROTO), "tls_construct_next_proto"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE),
      "tls_construct_server_certificate"},
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index b9eb634..eae0e3c 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2947,7 +2947,7 @@ int tls_construct_server_certificate(SSL *s)
 int tls_construct_new_session_ticket(SSL *s)
 {
     unsigned char *senc = NULL;
-    EVP_CIPHER_CTX *ctx;
+    EVP_CIPHER_CTX *ctx = NULL;
     HMAC_CTX *hctx = NULL;
     unsigned char *p, *macstart;
     const unsigned char *const_p;
@@ -2977,6 +2977,10 @@ int tls_construct_new_session_ticket(SSL *s)
 
     ctx = EVP_CIPHER_CTX_new();
     hctx = HMAC_CTX_new();
+    if (ctx == NULL || hctx == NULL) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
     p = senc;
     if (!i2d_SSL_SESSION(s->session, &p))

From matt at openssl.org  Thu Sep 29 15:20:12 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 15:20:12 +0000
Subject: [openssl-commits] [openssl]  OpenSSL_1_1_0-stable update
Message-ID: <1475162412.535767.4638.nullmailer@dev.openssl.org>

The branch OpenSSL_1_1_0-stable has been updated
       via  6b02b586c35359e338cfa151341e49aeb01590d0 (commit)
      from  9cb0c3a3cae638143af8bc66dd2b19f7593e3978 (commit)


- Log -----------------------------------------------------------------
commit 6b02b586c35359e338cfa151341e49aeb01590d0
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 15:38:44 2016 +0100

    Fix missing NULL checks in NewSessionTicket construction
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 83ae4661315d3d0ad52ddaa8fa5c8f1055c6c6f6)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h    | 1 +
 ssl/ssl_err.c            | 2 ++
 ssl/statem/statem_srvr.c | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 440b9a0..86ab912 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2231,6 +2231,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358
 # define SSL_F_TLS_CONSTRUCT_FINISHED                     359
 # define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373
+# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           428
 # define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           374
 # define SSL_F_TLS_CONSTRUCT_SERVER_DONE                  375
 # define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 376
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 85cb489..73e0ae1 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -256,6 +256,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_FINISHED), "tls_construct_finished"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_HELLO_REQUEST),
      "tls_construct_hello_request"},
+    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET),
+     "tls_construct_new_session_ticket"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE),
      "tls_construct_server_certificate"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_DONE), "tls_construct_server_done"},
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index a6b8a87..19ceda5 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2982,7 +2982,7 @@ int tls_construct_server_certificate(SSL *s)
 int tls_construct_new_session_ticket(SSL *s)
 {
     unsigned char *senc = NULL;
-    EVP_CIPHER_CTX *ctx;
+    EVP_CIPHER_CTX *ctx = NULL;
     HMAC_CTX *hctx = NULL;
     unsigned char *p, *macstart;
     const unsigned char *const_p;
@@ -3012,6 +3012,10 @@ int tls_construct_new_session_ticket(SSL *s)
 
     ctx = EVP_CIPHER_CTX_new();
     hctx = HMAC_CTX_new();
+    if (ctx == NULL || hctx == NULL) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
 
     p = senc;
     if (!i2d_SSL_SESSION(s->session, &p))

From steve at openssl.org  Thu Sep 29 15:23:19 2016
From: steve at openssl.org (Dr. Stephen Henson)
Date: Thu, 29 Sep 2016 15:23:19 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475162599.540060.7023.nullmailer@dev.openssl.org>

The branch master has been updated
       via  b1b4f0a5807d0462067a39daf39eb8bccd3bca2b (commit)
       via  73a9f60dd127df9ca05bec7afd835ff7c9bee9ae (commit)
       via  adffae15d3c6713ecd15d55d51b159b4262c20e6 (commit)
       via  2171a071aa16780962071e93c5c24ff148195c98 (commit)
       via  5fb1005987d3d0bc749d935e5af4a69323824b48 (commit)
       via  56501ebd09316941a6deba111e33ccc166641b25 (commit)
      from  83ae4661315d3d0ad52ddaa8fa5c8f1055c6c6f6 (commit)


- Log -----------------------------------------------------------------
commit b1b4f0a5807d0462067a39daf39eb8bccd3bca2b
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 28 16:59:54 2016 +0100

    make update
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 73a9f60dd127df9ca05bec7afd835ff7c9bee9ae
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 28 15:18:58 2016 +0100

    Print <ABSENT> if a STACK is NULL.
    
    If a STACK (corresponding to SEQUENCE OF or SET OF) is NULL then the
    field is absent as opposed to empty (present but has zero elements).
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit adffae15d3c6713ecd15d55d51b159b4262c20e6
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Sep 28 00:24:58 2016 +0100

    add item list support to d2i_test
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 2171a071aa16780962071e93c5c24ff148195c98
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Sep 27 22:39:12 2016 +0100

    ASN1_ITEM should use type name not structure name.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 5fb1005987d3d0bc749d935e5af4a69323824b48
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Sep 27 22:25:08 2016 +0100

    Add -item option to asn1parse
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 56501ebd09316941a6deba111e33ccc166641b25
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Sep 27 21:15:57 2016 +0100

    Add ASN1_ITEM lookup and enumerate functions.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/asn1pars.c                             |  45 +++++++++--
 crypto/asn1/asn1_item_list.c                |  40 +++++++++
 fuzz/asn1.c => crypto/asn1/asn1_item_list.h | 121 +++++++---------------------
 crypto/asn1/build.info                      |   2 +-
 crypto/asn1/tasn_prn.c                      |   3 +-
 doc/apps/asn1parse.pod                      |   6 ++
 doc/crypto/ASN1_ITEM_lookup.pod             |  39 +++++++++
 include/openssl/asn1.h                      |   3 +
 include/openssl/asn1t.h                     |   4 +-
 test/d2i_test.c                             |  22 ++---
 util/libcrypto.num                          |   2 +
 11 files changed, 172 insertions(+), 115 deletions(-)
 create mode 100644 crypto/asn1/asn1_item_list.c
 copy fuzz/asn1.c => crypto/asn1/asn1_item_list.h (71%)
 create mode 100644 doc/crypto/ASN1_ITEM_lookup.pod

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 1ac261c..0bc48e3 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -20,12 +20,14 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/asn1t.h>
 
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_INFORM, OPT_IN, OPT_OUT, OPT_INDENT, OPT_NOOUT,
     OPT_OID, OPT_OFFSET, OPT_LENGTH, OPT_DUMP, OPT_DLIMIT,
-    OPT_STRPARSE, OPT_GENSTR, OPT_GENCONF, OPT_STRICTPEM
+    OPT_STRPARSE, OPT_GENSTR, OPT_GENCONF, OPT_STRICTPEM,
+    OPT_ITEM
 } OPTION_CHOICE;
 
 OPTIONS asn1parse_options[] = {
@@ -49,6 +51,7 @@ OPTIONS asn1parse_options[] = {
     {OPT_MORE_STR, 0, 0, "(-inform  will be ignored)"},
     {"strictpem", OPT_STRICTPEM, 0,
      "do not attempt base64 decode outside PEM markers"},
+    {"item", OPT_ITEM, 's', "item to parse and print"},
     {NULL}
 };
 
@@ -71,6 +74,7 @@ int asn1parse_main(int argc, char **argv)
     unsigned char *tmpbuf;
     unsigned int length = 0;
     OPTION_CHOICE o;
+    const ASN1_ITEM *it = NULL;
 
     prog = opt_init(argc, argv, asn1parse_options);
 
@@ -134,6 +138,22 @@ int asn1parse_main(int argc, char **argv)
             strictpem = 1;
             informat = FORMAT_PEM;
             break;
+        case OPT_ITEM:
+            it = ASN1_ITEM_lookup(opt_arg());
+            if (it == NULL) {
+                size_t tmp;
+
+                BIO_printf(bio_err, "Unknown item name %s\n", opt_arg());
+                BIO_puts(bio_err, "Supported types:\n");
+                for (tmp = 0;; tmp++) {
+                    it = ASN1_ITEM_get(tmp);
+                    if (it == NULL)
+                        break;
+                    BIO_printf(bio_err, "    %s\n", it->sname);
+                }
+                goto end;
+            }
+            break;
         }
     }
     argc = opt_num_rest();
@@ -260,11 +280,24 @@ int asn1parse_main(int argc, char **argv)
             goto end;
         }
     }
-    if (!noout &&
-        !ASN1_parse_dump(bio_out, &(str[offset]), length,
-                         indent, dump)) {
-        ERR_print_errors(bio_err);
-        goto end;
+    if (!noout) {
+        const unsigned char *p = str + offset;
+
+        if (it != NULL) {
+            ASN1_VALUE *value = ASN1_item_d2i(NULL, &p, length, it);
+            if (value == NULL) {
+                BIO_printf(bio_err, "Error parsing item %s\n", it->sname);
+                ERR_print_errors(bio_err);
+                goto end;
+            }
+            ASN1_item_print(bio_out, value, 0, it, NULL);
+            ASN1_item_free(value, it);
+        } else {
+            if (!ASN1_parse_dump(bio_out, p, length, indent, dump)) {
+                ERR_print_errors(bio_err);
+                goto end;
+            }
+        }
     }
     ret = 0;
  end:
diff --git a/crypto/asn1/asn1_item_list.c b/crypto/asn1/asn1_item_list.c
new file mode 100644
index 0000000..eaeb34f
--- /dev/null
+++ b/crypto/asn1/asn1_item_list.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <stdio.h>
+#include "internal/cryptlib.h"
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+#include <openssl/cms.h>
+#include <openssl/ocsp.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pkcs12.h>
+#include <openssl/x509v3.h>
+
+#include "asn1_item_list.h"
+
+const ASN1_ITEM *ASN1_ITEM_lookup(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < OSSL_NELEM(asn1_item_list); i++) {
+        const ASN1_ITEM *it = ASN1_ITEM_ptr(asn1_item_list[i]);
+
+        if (strcmp(it->sname, name) == 0)
+            return it;
+    }
+    return NULL;
+}
+
+const ASN1_ITEM *ASN1_ITEM_get(size_t i)
+{
+    if (i >= OSSL_NELEM(asn1_item_list))
+        return NULL;
+    return ASN1_ITEM_ptr(asn1_item_list[i]);
+}
diff --git a/fuzz/asn1.c b/crypto/asn1/asn1_item_list.h
similarity index 71%
copy from fuzz/asn1.c
copy to crypto/asn1/asn1_item_list.h
index 5125f36..909ea3e 100644
--- a/fuzz/asn1.c
+++ b/crypto/asn1/asn1_item_list.h
@@ -1,40 +1,19 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
- * or in the file LICENSE in the source distribution.
  */
 
-/*
- * Fuzz ASN.1 parsing for various data structures. Specify which on the
- * command line:
- *
- * asn1 <data structure>
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/dh.h>
-#include <openssl/ec.h>
-#include <openssl/ocsp.h>
-#include <openssl/pkcs12.h>
-#include <openssl/rsa.h>
-#include <openssl/ts.h>
-#include <openssl/x509v3.h>
-#include <openssl/cms.h>
-#include "fuzzer.h"
+static ASN1_ITEM_EXP *asn1_item_list[] = {
 
-static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(ACCESS_DESCRIPTION),
 #ifndef OPENSSL_NO_RFC3779
+    ASN1_ITEM_ref(ASIdOrRange),
     ASN1_ITEM_ref(ASIdentifierChoice),
     ASN1_ITEM_ref(ASIdentifiers),
-    ASN1_ITEM_ref(ASIdOrRange),
 #endif
     ASN1_ITEM_ref(ASN1_ANY),
     ASN1_ITEM_ref(ASN1_BIT_STRING),
@@ -48,12 +27,12 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(ASN1_INTEGER),
     ASN1_ITEM_ref(ASN1_NULL),
     ASN1_ITEM_ref(ASN1_OBJECT),
-    ASN1_ITEM_ref(ASN1_OCTET_STRING),
     ASN1_ITEM_ref(ASN1_OCTET_STRING_NDEF),
-    ASN1_ITEM_ref(ASN1_PRINTABLE),
+    ASN1_ITEM_ref(ASN1_OCTET_STRING),
     ASN1_ITEM_ref(ASN1_PRINTABLESTRING),
-    ASN1_ITEM_ref(ASN1_SEQUENCE),
+    ASN1_ITEM_ref(ASN1_PRINTABLE),
     ASN1_ITEM_ref(ASN1_SEQUENCE_ANY),
+    ASN1_ITEM_ref(ASN1_SEQUENCE),
     ASN1_ITEM_ref(ASN1_SET_ANY),
     ASN1_ITEM_ref(ASN1_T61STRING),
     ASN1_ITEM_ref(ASN1_TBOOLEAN),
@@ -74,23 +53,23 @@ static ASN1_ITEM_EXP *item_type[] = {
 #ifndef OPENSSL_NO_CMS
     ASN1_ITEM_ref(CMS_ContentInfo),
     ASN1_ITEM_ref(CMS_ReceiptRequest),
-    ASN1_ITEM_ref(CRL_DIST_POINTS),
 #endif
+    ASN1_ITEM_ref(CRL_DIST_POINTS),
 #ifndef OPENSSL_NO_DH
     ASN1_ITEM_ref(DHparams),
 #endif
     ASN1_ITEM_ref(DIRECTORYSTRING),
     ASN1_ITEM_ref(DISPLAYTEXT),
-    ASN1_ITEM_ref(DIST_POINT),
     ASN1_ITEM_ref(DIST_POINT_NAME),
+    ASN1_ITEM_ref(DIST_POINT),
 #ifndef OPENSSL_NO_EC
     ASN1_ITEM_ref(ECPARAMETERS),
     ASN1_ITEM_ref(ECPKPARAMETERS),
 #endif
     ASN1_ITEM_ref(EDIPARTYNAME),
     ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
-    ASN1_ITEM_ref(GENERAL_NAME),
     ASN1_ITEM_ref(GENERAL_NAMES),
+    ASN1_ITEM_ref(GENERAL_NAME),
     ASN1_ITEM_ref(GENERAL_SUBTREE),
 #ifndef OPENSSL_NO_RFC3779
     ASN1_ITEM_ref(IPAddressChoice),
@@ -126,97 +105,59 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(PBE2PARAM),
     ASN1_ITEM_ref(PBEPARAM),
     ASN1_ITEM_ref(PBKDF2PARAM),
-    ASN1_ITEM_ref(PKCS12),
     ASN1_ITEM_ref(PKCS12_AUTHSAFES),
     ASN1_ITEM_ref(PKCS12_BAGS),
     ASN1_ITEM_ref(PKCS12_MAC_DATA),
-    ASN1_ITEM_ref(PKCS12_SAFEBAG),
     ASN1_ITEM_ref(PKCS12_SAFEBAGS),
-    ASN1_ITEM_ref(PKCS7),
+    ASN1_ITEM_ref(PKCS12_SAFEBAG),
+    ASN1_ITEM_ref(PKCS12),
     ASN1_ITEM_ref(PKCS7_ATTR_SIGN),
     ASN1_ITEM_ref(PKCS7_ATTR_VERIFY),
     ASN1_ITEM_ref(PKCS7_DIGEST),
-    ASN1_ITEM_ref(PKCS7_ENC_CONTENT),
     ASN1_ITEM_ref(PKCS7_ENCRYPT),
+    ASN1_ITEM_ref(PKCS7_ENC_CONTENT),
     ASN1_ITEM_ref(PKCS7_ENVELOPE),
     ASN1_ITEM_ref(PKCS7_ISSUER_AND_SERIAL),
     ASN1_ITEM_ref(PKCS7_RECIP_INFO),
     ASN1_ITEM_ref(PKCS7_SIGNED),
-    ASN1_ITEM_ref(PKCS7_SIGN_ENVELOPE),
     ASN1_ITEM_ref(PKCS7_SIGNER_INFO),
+    ASN1_ITEM_ref(PKCS7_SIGN_ENVELOPE),
+    ASN1_ITEM_ref(PKCS7),
     ASN1_ITEM_ref(PKCS8_PRIV_KEY_INFO),
     ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
-    ASN1_ITEM_ref(POLICY_CONSTRAINTS),
     ASN1_ITEM_ref(POLICYINFO),
-    ASN1_ITEM_ref(POLICY_MAPPING),
-    ASN1_ITEM_ref(POLICY_MAPPINGS),
     ASN1_ITEM_ref(POLICYQUALINFO),
+    ASN1_ITEM_ref(POLICY_CONSTRAINTS),
+    ASN1_ITEM_ref(POLICY_MAPPINGS),
+    ASN1_ITEM_ref(POLICY_MAPPING),
     ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
     ASN1_ITEM_ref(PROXY_POLICY),
-    ASN1_ITEM_ref(RSA_OAEP_PARAMS),
+#ifndef OPENSSL_NO_RSA
     ASN1_ITEM_ref(RSAPrivateKey),
-    ASN1_ITEM_ref(RSA_PSS_PARAMS),
     ASN1_ITEM_ref(RSAPublicKey),
-    ASN1_ITEM_ref(SXNET),
+    ASN1_ITEM_ref(RSA_OAEP_PARAMS),
+    ASN1_ITEM_ref(RSA_PSS_PARAMS),
+#endif
     ASN1_ITEM_ref(SXNETID),
-    /*ASN1_ITEM_ref(TS_RESP),  want to do this, but type is hidden, however d2i exists... */
+    ASN1_ITEM_ref(SXNET),
     ASN1_ITEM_ref(USERNOTICE),
-    ASN1_ITEM_ref(X509),
-    ASN1_ITEM_ref(X509_ALGOR),
     ASN1_ITEM_ref(X509_ALGORS),
+    ASN1_ITEM_ref(X509_ALGOR),
     ASN1_ITEM_ref(X509_ATTRIBUTE),
     ASN1_ITEM_ref(X509_CERT_AUX),
     ASN1_ITEM_ref(X509_CINF),
-    ASN1_ITEM_ref(X509_CRL),
     ASN1_ITEM_ref(X509_CRL_INFO),
-    ASN1_ITEM_ref(X509_EXTENSION),
+    ASN1_ITEM_ref(X509_CRL),
     ASN1_ITEM_ref(X509_EXTENSIONS),
-    ASN1_ITEM_ref(X509_NAME),
+    ASN1_ITEM_ref(X509_EXTENSION),
     ASN1_ITEM_ref(X509_NAME_ENTRY),
+    ASN1_ITEM_ref(X509_NAME),
     ASN1_ITEM_ref(X509_PUBKEY),
-    ASN1_ITEM_ref(X509_REQ),
     ASN1_ITEM_ref(X509_REQ_INFO),
+    ASN1_ITEM_ref(X509_REQ),
     ASN1_ITEM_ref(X509_REVOKED),
     ASN1_ITEM_ref(X509_SIG),
     ASN1_ITEM_ref(X509_VAL),
+    ASN1_ITEM_ref(X509),
     ASN1_ITEM_ref(ZLONG),
-    NULL
 };
-
-int FuzzerInitialize(int *argc, char ***argv) {
-    return 1;
-}
-
-int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
-    int n;
-
-    ASN1_PCTX *pctx = ASN1_PCTX_new();
-
-    ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT |
-        ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF |
-        ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
-    ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT |
-        ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
-
-    for (n = 0; item_type[n] != NULL; ++n) {
-        const uint8_t *b = buf;
-        unsigned char *der = NULL;
-        const ASN1_ITEM *i = ASN1_ITEM_ptr(item_type[n]);
-        ASN1_VALUE *o = ASN1_item_d2i(NULL, &b, len, i);
-
-        if (o != NULL) {
-            BIO *bio = BIO_new(BIO_s_null());
-            ASN1_item_print(bio, o, 4, i, pctx);
-            BIO_free(bio);
-
-            ASN1_item_i2d(o, &der, i);
-            OPENSSL_free(der);
-
-            ASN1_item_free(o, i);
-        }
-    }
-
-    ASN1_PCTX_free(pctx);
-
-    return 0;
-}
diff --git a/crypto/asn1/build.info b/crypto/asn1/build.info
index 02d1120..242dbb7 100644
--- a/crypto/asn1/build.info
+++ b/crypto/asn1/build.info
@@ -13,4 +13,4 @@ SOURCE[../../libcrypto]=\
         x_pkey.c bio_asn1.c bio_ndef.c asn_mime.c \
         asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_strnid.c \
         evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c \
-        asn_moid.c asn_mstbl.c
+        asn_moid.c asn_mstbl.c asn1_item_list.c
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index f53e905..b569806 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -315,7 +315,8 @@ static int asn1_template_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
                                      pctx))
                 return 0;
         }
-        if (!i && BIO_printf(out, "%*s<EMPTY>\n", indent + 2, "") <= 0)
+        if (i == 0 && BIO_printf(out, "%*s<%s>\n", indent + 2, "",
+                                 stack == NULL ? "ABSENT" : "EMPTY") <= 0)
             return 0;
         if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_SEQUENCE) {
             if (BIO_printf(out, "%*s}\n", indent, "") <= 0)
diff --git a/doc/apps/asn1parse.pod b/doc/apps/asn1parse.pod
index 10a5aba..ee09a83 100644
--- a/doc/apps/asn1parse.pod
+++ b/doc/apps/asn1parse.pod
@@ -22,6 +22,7 @@ B<openssl> B<asn1parse>
 [B<-genstr string>]
 [B<-genconf file>]
 [B<-strictpem>]
+[B<-item name>]
 
 =head1 DESCRIPTION
 
@@ -102,6 +103,11 @@ processed whether it has the normal PEM BEGIN and END markers or not. This
 option will ignore any data prior to the start of the BEGIN marker, or after an
 END marker in a PEM file.
 
+=item B<-item name>
+
+attempt to decode and print the data as B<ASN1_ITEM name>. This can be used to
+print out the fields of any supported ASN.1 structure if the type is known.
+
 =back
 
 =head2 Output
diff --git a/doc/crypto/ASN1_ITEM_lookup.pod b/doc/crypto/ASN1_ITEM_lookup.pod
new file mode 100644
index 0000000..9ba69c9d
--- /dev/null
+++ b/doc/crypto/ASN1_ITEM_lookup.pod
@@ -0,0 +1,39 @@
+=pod
+
+=head1 NAME
+
+ASN1_ITEM_lookup, ASN1_ITEM_get - lookup ASN.1 structures
+
+=head1 SYNOPSIS
+
+ #include <openssl/asn1.h>
+
+ const ASN1_ITEM *ASN1_ITEM_lookup(const char *name);
+ const ASN1_ITEM *ASN1_ITEM_get(size_t i);
+
+=head1 DESCRIPTION
+
+ASN1_ITEM_lookup() returns the B<ASN1_ITEM name>.
+
+ASN1_ITEM_get() returns the B<ASN1_ITEM> with index B<i>. This function
+returns B<NULL> if the index B<i> is out of range.
+
+=head1 RETURN VALUES
+
+ASN1_ITEM_lookup() and ASN1_ITEM_get() return a valid B<ASN1_ITEM> structure
+or B<NULL> if an error occurred.
+
+=head1 SEE ALSO
+
+L<ERR_get_error(3)>
+
+=head1 COPYRIGHT
+
+Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 7cf6116..665b952 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -870,6 +870,9 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
 int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
 int SMIME_text(BIO *in, BIO *out);
 
+const ASN1_ITEM *ASN1_ITEM_lookup(const char *name);
+const ASN1_ITEM *ASN1_ITEM_get(size_t i);
+
 /* BEGIN ERROR CODES */
 /*
  * The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 8eedfb3..0a7e375 100644
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -130,7 +130,7 @@ extern "C" {
                 sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
                 NULL,\
                 sizeof(stname),\
-                #stname \
+                #tname \
         ASN1_ITEM_end(tname)
 
 # define static_ASN1_SEQUENCE_END_name(stname, tname) \
@@ -208,7 +208,7 @@ extern "C" {
                 sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
                 &tname##_aux,\
                 sizeof(stname),\
-                #stname \
+                #tname \
         ASN1_ITEM_end(tname)
 # define static_ASN1_SEQUENCE_END_ref(stname, tname) \
         ;\
diff --git a/test/d2i_test.c b/test/d2i_test.c
index 8c99087..b173cc5 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -144,12 +144,6 @@ int main(int argc, char **argv)
     const char *expected_error_string;
 
     size_t i;
-    static ASN1_ITEM_EXP *items[] = {
-        ASN1_ITEM_ref(ASN1_ANY),
-        ASN1_ITEM_ref(X509),
-        ASN1_ITEM_ref(GENERAL_NAME),
-        ASN1_ITEM_ref(ASN1_INTEGER)
-    };
 
     static error_enum expected_errors[] = {
         {"OK", ASN1_OK},
@@ -169,18 +163,16 @@ int main(int argc, char **argv)
     expected_error_string = argv[2];
     test_file = argv[3];
 
-    for (i = 0; i < OSSL_NELEM(items); i++) {
-        const ASN1_ITEM *it = ASN1_ITEM_ptr(items[i]);
-        if (strcmp(test_type_name, it->sname) == 0) {
-            item_type = it;
-            break;
-        }
-    }
+    item_type = ASN1_ITEM_lookup(test_type_name);
+
     if (item_type == NULL) {
         fprintf(stderr, "Unknown type %s\n", test_type_name);
         fprintf(stderr, "Supported types:\n");
-        for (i = 0; i < OSSL_NELEM(items); i++) {
-            const ASN1_ITEM *it = ASN1_ITEM_ptr(items[i]);
+        for (i = 0;; i++) {
+            const ASN1_ITEM *it = ASN1_ITEM_get(i);
+
+            if (it == NULL)
+                break;
             fprintf(stderr, "\t%s\n", it->sname);
         }
         return 1;
diff --git a/util/libcrypto.num b/util/libcrypto.num
index db6732e..21d46d2 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4206,3 +4206,5 @@ ECPARAMETERS_new                        4156	1_1_0	EXIST::FUNCTION:EC
 OCSP_RESPID_set_by_name                 4157	1_1_0a	EXIST::FUNCTION:OCSP
 OCSP_RESPID_set_by_key                  4158	1_1_0a	EXIST::FUNCTION:OCSP
 OCSP_RESPID_match                       4159	1_1_0a	EXIST::FUNCTION:OCSP
+ASN1_ITEM_lookup                        4160	1_1_1	EXIST::FUNCTION:
+ASN1_ITEM_get                           4161	1_1_1	EXIST::FUNCTION:

From builds at travis-ci.org  Thu Sep 29 16:00:06 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 16:00:06 +0000
Subject: [openssl-commits] Passed: openssl/openssl#6223 (master - e4e1aa9)
In-Reply-To: <openssl/openssl+163741523+passed@travis-ci.org>
Message-ID: <57ed3a86bc346_33fb50ea8dee897047@51c89e3f-2d95-42b9-8b2e-6d08921155f2.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6223
Status: Passed

Duration: 31 minutes and 56 seconds
Commit: e4e1aa9 (master)
Author: Matt Caswell
Message: Fix an mis-matched function code so that "make update" doesn't fail

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/0023baffb8f6...e4e1aa903e62

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163741523

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/020c6936/attachment-0001.html>

From matt at openssl.org  Thu Sep 29 16:09:44 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 16:09:44 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475165384.571374.31658.nullmailer@dev.openssl.org>

The branch master has been updated
       via  cc59ad1073c49cbb173708d7377df06ad3786f4c (commit)
       via  f308416e27cc8b6639841497bbc782363c17b11d (commit)
       via  4346a8faa7dd660c053c8e65b9e566b6c934f010 (commit)
      from  b1b4f0a5807d0462067a39daf39eb8bccd3bca2b (commit)


- Log -----------------------------------------------------------------
commit cc59ad1073c49cbb173708d7377df06ad3786f4c
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 16:40:13 2016 +0100

    Convert CertStatus message construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit f308416e27cc8b6639841497bbc782363c17b11d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 16:39:32 2016 +0100

    Fix mis-named macro in packet_locl.h
    
    A couple of the WPACKET_sub_memcpy* macros were mis-named.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4346a8faa7dd660c053c8e65b9e566b6c934f010
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 15:14:33 2016 +0100

    Convert SeverDone construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h    |  1 +
 ssl/packet_locl.h        |  4 ++--
 ssl/ssl_err.c            |  1 +
 ssl/statem/statem_srvr.c | 62 ++++++++++++++++++++++--------------------------
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index d741ece..517716f 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2220,6 +2220,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS1_SET_SERVER_SIGALGS                    335
 # define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          354
 # define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          372
+# define SSL_F_TLS_CONSTRUCT_CERT_STATUS                  429
 # define SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC           427
 # define SSL_F_TLS_CONSTRUCT_CKE_DHE                      404
 # define SSL_F_TLS_CONSTRUCT_CKE_ECDHE                    405
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 8d3fd37..517c12d 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -779,9 +779,9 @@ int WPACKET_sub_memcpy__(WPACKET *pkt, const void *src, size_t len,
     WPACKET_sub_memcpy__((pkt), (src), (len), 1)
 #define WPACKET_sub_memcpy_u16(pkt, src, len) \
     WPACKET_sub_memcpy__((pkt), (src), (len), 2)
-#define WPACKET_sub_memcpy_bytes_u24(pkt, src, len) \
+#define WPACKET_sub_memcpy_u24(pkt, src, len) \
     WPACKET_sub_memcpy__((pkt), (src), (len), 3)
-#define WPACKET_sub_memcpy_bytes_u32(pkt, src, len) \
+#define WPACKET_sub_memcpy_u32(pkt, src, len) \
     WPACKET_sub_memcpy__((pkt), (src), (len), 4)
 
 /*
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index e6c7320..9539e67 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -239,6 +239,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "tls_client_key_exchange_post_work"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST),
      "tls_construct_certificate_request"},
+    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CERT_STATUS), "tls_construct_cert_status"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC),
      "tls_construct_change_cipher_spec"},
     {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CKE_DHE), "tls_construct_cke_dhe"},
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index eae0e3c..3fbc4ad 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1572,19 +1572,26 @@ int tls_construct_server_hello(SSL *s)
 
 int tls_construct_server_done(SSL *s)
 {
-    if (!ssl_set_handshake_header(s, SSL3_MT_SERVER_DONE, 0)) {
+    WPACKET pkt;
+
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt, SSL3_MT_SERVER_DONE)
+            || !ssl_close_construct_packet(s, &pkt)) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_DONE, ERR_R_INTERNAL_ERROR);
-        ossl_statem_set_error(s);
-        return 0;
+        goto err;
     }
 
     if (!s->s3->tmp.cert_request) {
-        if (!ssl3_digest_cached_records(s, 0)) {
-            ossl_statem_set_error(s);
-        }
+        if (!ssl3_digest_cached_records(s, 0))
+            goto err;
     }
-
     return 1;
+
+ err:
+    WPACKET_cleanup(&pkt);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+    ossl_statem_set_error(s);
+    return 0;
 }
 
 int tls_construct_server_key_exchange(SSL *s)
@@ -3118,36 +3125,23 @@ int tls_construct_new_session_ticket(SSL *s)
 
 int tls_construct_cert_status(SSL *s)
 {
-    unsigned char *p;
-    size_t msglen;
-
-    /*-
-     * Grow buffer if need be: the length calculation is as
-     * follows handshake_header_length +
-     * 1 (ocsp response type) + 3 (ocsp response length)
-     * + (ocsp response)
-     */
-    msglen = 4 + s->tlsext_ocsp_resplen;
-    if (!BUF_MEM_grow(s->init_buf, SSL_HM_HEADER_LENGTH(s) + msglen))
-        goto err;
-
-    p = ssl_handshake_start(s);
-
-    /* status type */
-    *(p++) = s->tlsext_status_type;
-    /* length of OCSP response */
-    l2n3(s->tlsext_ocsp_resplen, p);
-    /* actual response */
-    memcpy(p, s->tlsext_ocsp_resp, s->tlsext_ocsp_resplen);
+    WPACKET pkt;
 
-    if (!ssl_set_handshake_header(s, SSL3_MT_CERTIFICATE_STATUS, msglen))
-        goto err;
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt,
+                                          SSL3_MT_CERTIFICATE_STATUS)
+            || !WPACKET_put_bytes_u8(&pkt, s->tlsext_status_type)
+            || !WPACKET_sub_memcpy_u24(&pkt, s->tlsext_ocsp_resp,
+                                       s->tlsext_ocsp_resplen)
+            || !ssl_close_construct_packet(s, &pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CERT_STATUS, ERR_R_INTERNAL_ERROR);
+        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
+        ossl_statem_set_error(s);
+        WPACKET_cleanup(&pkt);
+        return 0;
+    }
 
     return 1;
-
- err:
-    ossl_statem_set_error(s);
-    return 0;
 }
 
 #ifndef OPENSSL_NO_NEXTPROTONEG

From builds at travis-ci.org  Thu Sep 29 16:41:57 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 16:41:57 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6224 (master - 83ae466)
In-Reply-To: <openssl/openssl+163749860+fixed@travis-ci.org>
Message-ID: <57ed445579462_33fa4b62fbae43536d9@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6224
Status: Fixed

Duration: 53 minutes and 57 seconds
Commit: 83ae466 (master)
Author: Matt Caswell
Message: Fix missing NULL checks in NewSessionTicket construction

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/e4e1aa903e62...83ae4661315d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163749860

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/4447e00b/attachment.html>

From builds at travis-ci.org  Thu Sep 29 16:51:33 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 16:51:33 +0000
Subject: [openssl-commits] Errored: mouse07410/openssl#58
	(OpenSSL_1_0_2-stable - 53a71b7)
In-Reply-To: <mouse07410/openssl+163758345+errored@travis-ci.org>
Message-ID: <57ed46aea50ca_33fa4b7a7a8b43640f1@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for mouse07410/openssl
-------------------------------------

Build: #58
Status: Errored

Duration: 8 minutes and 7 seconds
Commit: 53a71b7 (OpenSSL_1_0_2-stable)
Author: Richard Levitte
Message: apps/apps.c: initialize and de-initialize engine around key loading

Before loading a key from an engine, it may need to be initialized.
When done loading the key, we must de-initialize the engine.
(if the engine is already initialized somehow, only the reference
counter will be incremented then decremented)

Reviewed-by: Stephen Henson <steve at openssl.org>
(cherry picked from commit 49e476a5382602d0bad1139d6f1f66ddbc7959d6)

View the changeset: https://github.com/mouse07410/openssl/compare/4badd2b3c29c...53a71b7429a4

View the full build log and details: https://travis-ci.org/mouse07410/openssl/builds/163758345

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/3b5f668e/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 29 18:44:35 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 18:44:35 +0000
Subject: [openssl-commits] Fixed: openssl/openssl#6226 (master - b1b4f0a)
In-Reply-To: <openssl/openssl+163750924+fixed@travis-ci.org>
Message-ID: <57ed6112721fe_33ff5cfb905b4736377@eae72b8c-fc4f-497d-b052-ab1ec79f5e24.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6226
Status: Fixed

Duration: 16 minutes and 16 seconds
Commit: b1b4f0a (master)
Author: Dr. Stephen Henson
Message: make update

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/83ae4661315d...b1b4f0a5807d

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163750924

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/a97aabe1/attachment.html>

From builds at travis-ci.org  Thu Sep 29 18:45:11 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 18:45:11 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2082 (master - cc59ad1)
In-Reply-To: <FdaSilvaYY/openssl+163787749+fixed@travis-ci.org>
Message-ID: <57ed613772a80_33fa4b6488aec452696@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2082
Status: Fixed

Duration: 32 minutes and 55 seconds
Commit: cc59ad1 (master)
Author: Matt Caswell
Message: Convert CertStatus message construction to WPACKET

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/56e36bdaef44...cc59ad1073c4

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163787749

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/29c90f40/attachment.html>

From builds at travis-ci.org  Thu Sep 29 19:41:09 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 19:41:09 +0000
Subject: [openssl-commits] Errored: openssl/openssl#6227 (master - cc59ad1)
In-Reply-To: <openssl/openssl+163765312+errored@travis-ci.org>
Message-ID: <57ed6e5577853_33ff5cfbcbefc7979b2@eae72b8c-fc4f-497d-b052-ab1ec79f5e24.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6227
Status: Errored

Duration: 1 hour, 8 minutes, and 35 seconds
Commit: cc59ad1 (master)
Author: Matt Caswell
Message: Convert CertStatus message construction to WPACKET

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/b1b4f0a5807d...cc59ad1073c4

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163765312

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/c943a858/attachment-0001.html>

From builds at travis-ci.org  Thu Sep 29 19:41:22 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 19:41:22 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2083 (apps-speed-rework
	- 6cb9bb6)
In-Reply-To: <FdaSilvaYY/openssl+163788177+fixed@travis-ci.org>
Message-ID: <57ed6e615ff4b_33fa4b64888e44898fb@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2083
Status: Fixed

Duration: 27 minutes and 13 seconds
Commit: 6cb9bb6 (apps-speed-rework)
Author: FdaSilvaYY
Message: Reduce number of allocations

Simpilify misalignment limits

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/2103c7437c30...6cb9bb6f7bf8

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163788177

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/ce4c4e89/attachment.html>

From builds at travis-ci.org  Thu Sep 29 20:39:22 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 20:39:22 +0000
Subject: [openssl-commits] Errored: FdaSilvaYY/openssl#2084 (style_n_nit's -
	085f1b2)
In-Reply-To: <FdaSilvaYY/openssl+163789191+errored@travis-ci.org>
Message-ID: <57ed7bfa6254d_33fa4b64c9bf05282c9@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2084
Status: Errored

Duration: 1 hour, 9 minutes, and 6 seconds
Commit: 085f1b2 (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/f267cd272eb4...085f1b2c8dfb

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163789191

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/67cb80c8/attachment.html>

From matt at openssl.org  Thu Sep 29 21:28:29 2016
From: matt at openssl.org (Matt Caswell)
Date: Thu, 29 Sep 2016 21:28:29 +0000
Subject: [openssl-commits] [openssl]  master update
Message-ID: <1475184509.461081.28848.nullmailer@dev.openssl.org>

The branch master has been updated
       via  a00d75e1b21bc5c49817610b172bae440f526622 (commit)
       via  b36017fe5f2ee0a2cbc1028d842a183e0ac22da7 (commit)
      from  cc59ad1073c49cbb173708d7377df06ad3786f4c (commit)


- Log -----------------------------------------------------------------
commit a00d75e1b21bc5c49817610b172bae440f526622
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 18:00:37 2016 +0100

    Convert NewSessionTicket construction to WPACKET
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b36017fe5f2ee0a2cbc1028d842a183e0ac22da7
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Sep 29 18:00:01 2016 +0100

    Fix an error in packet_locl.h
    
    A convenience macro was using the wrong underlying function.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/packet_locl.h        |   2 +-
 ssl/statem/statem_srvr.c | 109 ++++++++++++++++++++++-------------------------
 2 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 517c12d..55e41bb 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -758,7 +758,7 @@ int WPACKET_put_bytes__(WPACKET *pkt, unsigned int val, size_t bytes);
 #define WPACKET_put_bytes_u24(pkt, val) \
     WPACKET_put_bytes__((pkt), (val), 3)
 #define WPACKET_put_bytes_u32(pkt, val) \
-    WPACKET_sub_allocate_bytes__((pkt), (val), 4)
+    WPACKET_put_bytes__((pkt), (val), 4)
 
 /* Set a maximum size that we will not allow the WPACKET to grow beyond */
 int WPACKET_set_max_size(WPACKET *pkt, size_t maxsize);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 3fbc4ad..c7d77ae 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2956,15 +2956,17 @@ int tls_construct_new_session_ticket(SSL *s)
     unsigned char *senc = NULL;
     EVP_CIPHER_CTX *ctx = NULL;
     HMAC_CTX *hctx = NULL;
-    unsigned char *p, *macstart;
+    unsigned char *p, *encdata1, *encdata2, *macdata1, *macdata2;
     const unsigned char *const_p;
-    int len, slen_full, slen;
+    int len, slen_full, slen, lenfinal;
     SSL_SESSION *sess;
     unsigned int hlen;
     SSL_CTX *tctx = s->initial_ctx;
     unsigned char iv[EVP_MAX_IV_LENGTH];
     unsigned char key_name[TLSEXT_KEYNAME_LENGTH];
     int iv_len;
+    size_t macoffset, macendoffset;
+    WPACKET pkt;
 
     /* get session encoding length */
     slen_full = i2d_SSL_SESSION(s->session, NULL);
@@ -2982,6 +2984,12 @@ int tls_construct_new_session_ticket(SSL *s)
         return 0;
     }
 
+    if (!WPACKET_init(&pkt, s->init_buf)
+            || !ssl_set_handshake_header2(s, &pkt, SSL3_MT_NEWSESSION_TICKET)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     ctx = EVP_CIPHER_CTX_new();
     hctx = HMAC_CTX_new();
     if (ctx == NULL || hctx == NULL) {
@@ -3014,21 +3022,6 @@ int tls_construct_new_session_ticket(SSL *s)
     }
     SSL_SESSION_free(sess);
 
-    /*-
-     * Grow buffer if need be: the length calculation is as
-     * follows handshake_header_length +
-     * 4 (ticket lifetime hint) + 2 (ticket length) +
-     * sizeof(keyname) + max_iv_len (iv length) +
-     * max_enc_block_size (max encrypted session * length) +
-     * max_md_size (HMAC) + session_length.
-     */
-    if (!BUF_MEM_grow(s->init_buf,
-                      SSL_HM_HEADER_LENGTH(s) + 6 + sizeof(key_name) +
-                      EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
-                      EVP_MAX_MD_SIZE + slen))
-        goto err;
-
-    p = ssl_handshake_start(s);
     /*
      * Initialize HMAC and cipher contexts. If callback present it does
      * all the work otherwise use generated values from parent ctx.
@@ -3039,11 +3032,15 @@ int tls_construct_new_session_ticket(SSL *s)
                                              hctx, 1);
 
         if (ret == 0) {
-            l2n(0, p);          /* timeout */
-            s2n(0, p);          /* length */
-            if (!ssl_set_handshake_header
-                (s, SSL3_MT_NEWSESSION_TICKET, p - ssl_handshake_start(s)))
+
+            /* Put timeout and length */
+            if (!WPACKET_put_bytes_u32(&pkt, 0)
+                    || !WPACKET_put_bytes_u16(&pkt, 0)
+                    || !ssl_close_construct_packet(s, &pkt)) {
+                SSLerr(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET,
+                       ERR_R_INTERNAL_ERROR);
                 goto err;
+            }
             OPENSSL_free(senc);
             EVP_CIPHER_CTX_free(ctx);
             HMAC_CTX_free(hctx);
@@ -3074,44 +3071,38 @@ int tls_construct_new_session_ticket(SSL *s)
      * for resumed session (for simplicity), and guess that tickets for
      * new sessions will live as long as their sessions.
      */
-    l2n(s->hit ? 0 : s->session->timeout, p);
-
-    /* Skip ticket length for now */
-    p += 2;
-    /* Output key name */
-    macstart = p;
-    memcpy(p, key_name, sizeof(key_name));
-    p += sizeof(key_name);
-    /* output IV */
-    memcpy(p, iv, iv_len);
-    p += iv_len;
-    /* Encrypt session data */
-    if (!EVP_EncryptUpdate(ctx, p, &len, senc, slen))
-        goto err;
-    p += len;
-    if (!EVP_EncryptFinal(ctx, p, &len))
-        goto err;
-    p += len;
-
-    if (!HMAC_Update(hctx, macstart, p - macstart))
-        goto err;
-    if (!HMAC_Final(hctx, p, &hlen))
-        goto err;
-
-    EVP_CIPHER_CTX_free(ctx);
-    HMAC_CTX_free(hctx);
-    ctx = NULL;
-    hctx = NULL;
-
-    p += hlen;
-    /* Now write out lengths: p points to end of data written */
-    /* Total length */
-    len = p - ssl_handshake_start(s);
-    /* Skip ticket lifetime hint */
-    p = ssl_handshake_start(s) + 4;
-    s2n(len - 6, p);
-    if (!ssl_set_handshake_header(s, SSL3_MT_NEWSESSION_TICKET, len))
+    if (!WPACKET_put_bytes_u32(&pkt, s->hit ? 0 : s->session->timeout)
+               /* Now the actual ticket data */
+            || !WPACKET_start_sub_packet_u16(&pkt)
+            || !WPACKET_get_total_written(&pkt, &macoffset)
+               /* Output key name */
+            || !WPACKET_memcpy(&pkt, key_name, sizeof(key_name))
+               /* output IV */
+            || !WPACKET_memcpy(&pkt, iv, iv_len)
+            || !WPACKET_reserve_bytes(&pkt, slen + EVP_MAX_BLOCK_LENGTH,
+                                      &encdata1)
+               /* Encrypt session data */
+            || !EVP_EncryptUpdate(ctx, encdata1, &len, senc, slen)
+            || !WPACKET_allocate_bytes(&pkt, len, &encdata2)
+            || encdata1 != encdata2
+            || !EVP_EncryptFinal(ctx, encdata1 + len, &lenfinal)
+            || !WPACKET_allocate_bytes(&pkt, lenfinal, &encdata2)
+            || encdata1 + len != encdata2
+            || len + lenfinal > slen + EVP_MAX_BLOCK_LENGTH
+            || !WPACKET_get_total_written(&pkt, &macendoffset)
+            || !HMAC_Update(hctx,
+                            (unsigned char *)s->init_buf->data + macoffset,
+                            macendoffset - macoffset)
+            || !WPACKET_reserve_bytes(&pkt, EVP_MAX_MD_SIZE, &macdata1)
+            || !HMAC_Final(hctx, macdata1, &hlen)
+            || hlen > EVP_MAX_MD_SIZE
+            || !WPACKET_allocate_bytes(&pkt, hlen, &macdata2)
+            || macdata1 != macdata2
+            || !WPACKET_close(&pkt)
+            || !ssl_close_construct_packet(s, &pkt)) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET, ERR_R_INTERNAL_ERROR);
         goto err;
+    }
     OPENSSL_free(senc);
 
     return 1;
@@ -3119,7 +3110,9 @@ int tls_construct_new_session_ticket(SSL *s)
     OPENSSL_free(senc);
     EVP_CIPHER_CTX_free(ctx);
     HMAC_CTX_free(hctx);
+    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
     ossl_statem_set_error(s);
+    WPACKET_cleanup(&pkt);
     return 0;
 }
 

From builds at travis-ci.org  Thu Sep 29 21:36:41 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 21:36:41 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2085
	(x509_crl_method-fix - 60d1a67)
In-Reply-To: <FdaSilvaYY/openssl+163834076+fixed@travis-ci.org>
Message-ID: <57ed89695271_33fa4b64886145658fa@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2085
Status: Fixed

Duration: 24 minutes and 19 seconds
Commit: 60d1a67 (x509_crl_method-fix)
Author: FdaSilvaYY
Message: Allow null in  X509_CRL_METHOD_free

and fix documentation.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/280cd179c1e3...60d1a67f0b02

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163834076

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/7ce6a5e9/attachment.html>

From builds at travis-ci.org  Thu Sep 29 22:35:03 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 22:35:03 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2086 (reduce_array -
	f64b19a)
In-Reply-To: <FdaSilvaYY/openssl+163834295+fixed@travis-ci.org>
Message-ID: <57ed971764010_33ff06edfca2053157b@1aef06b2-c22c-4970-b932-c1a6a56c6ed5.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2086
Status: Fixed

Duration: 1 hour, 14 minutes, and 11 seconds
Commit: f64b19a (reduce_array)
Author: FdaSilvaYY
Message: Discard last useless array item

only  &v3_ns_ia5_list[0...6 ] are used

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/4bb8bd6e01f2...f64b19a80100

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163834295

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/11d9c73e/attachment.html>

From builds at travis-ci.org  Thu Sep 29 23:28:55 2016
From: builds at travis-ci.org (Travis CI)
Date: Thu, 29 Sep 2016 23:28:55 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2087 (prn_nit - b02d066)
In-Reply-To: <FdaSilvaYY/openssl+163834573+fixed@travis-ci.org>
Message-ID: <57eda3b75e4b7_33ff06ef88c18590349@1aef06b2-c22c-4970-b932-c1a6a56c6ed5.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2087
Status: Fixed

Duration: 1 hour, 9 minutes, and 27 seconds
Commit: b02d066 (prn_nit)
Author: FdaSilvaYY
Message: Add error checking, small nit on ouput

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/41172709f812...b02d066de8d2

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163834573

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160929/6b883546/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 30 00:16:57 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 30 Sep 2016 00:16:57 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2088
	(check_bn_wexpand_retcode - 0de1d54)
In-Reply-To: <FdaSilvaYY/openssl+163834723+fixed@travis-ci.org>
Message-ID: <57edaf12d136b_33fa4b6488e3467807b@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2088
Status: Fixed

Duration: 59 minutes and 28 seconds
Commit: 0de1d54 (check_bn_wexpand_retcode)
Author: FdaSilvaYY
Message: Add missing checks on some conditional BN_copy return value

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/4ae28d9c87e9...0de1d544b74b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163834723

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160930/e4885c98/attachment.html>

From builds at travis-ci.org  Fri Sep 30 00:53:08 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 30 Sep 2016 00:53:08 +0000
Subject: [openssl-commits] Fixed: FdaSilvaYY/openssl#2089 (fix-ca-buf-usage
	- 920152e)
In-Reply-To: <FdaSilvaYY/openssl+163834911+fixed@travis-ci.org>
Message-ID: <57edb773eb4ae_33ff5cfb8cfcc10843e9@eae72b8c-fc4f-497d-b052-ab1ec79f5e24.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2089
Status: Fixed

Duration: 51 minutes and 1 second
Commit: 920152e (fix-ca-buf-usage)
Author: FdaSilvaYY
Message: Introduce PATH_MAX and NAME_MAX

 to define the certificate filename storage buffer.

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/99846cd6ea77...920152effb8c

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163834911

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160930/84d6fff4/attachment.html>

From builds at travis-ci.org  Fri Sep 30 01:47:24 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 30 Sep 2016 01:47:24 +0000
Subject: [openssl-commits] Failed: openssl/openssl#6235 (master - a00d75e)
In-Reply-To: <openssl/openssl+163849836+failed@travis-ci.org>
Message-ID: <57edc42c86394_33ff5cfbcbd0811153a6@eae72b8c-fc4f-497d-b052-ab1ec79f5e24.mail>

Build Update for openssl/openssl
-------------------------------------

Build: #6235
Status: Failed

Duration: 41 minutes and 30 seconds
Commit: a00d75e (master)
Author: Matt Caswell
Message: Convert NewSessionTicket construction to WPACKET

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/openssl/openssl/compare/cc59ad1073c4...a00d75e1b21b

View the full build log and details: https://travis-ci.org/openssl/openssl/builds/163849836

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160930/c3acce85/attachment-0001.html>

From builds at travis-ci.org  Fri Sep 30 07:53:45 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 30 Sep 2016 07:53:45 +0000
Subject: [openssl-commits] Failed: FdaSilvaYY/openssl#2090 (style_n_nit's -
	39f880e)
In-Reply-To: <FdaSilvaYY/openssl+163936885+failed@travis-ci.org>
Message-ID: <57ee1a084556a_33ff06ef8897094434e@1aef06b2-c22c-4970-b932-c1a6a56c6ed5.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2090
Status: Failed

Duration: 27 minutes and 23 seconds
Commit: 39f880e (style_n_nit's)
Author: FdaSilvaYY
Message: Fix some style and indent issue

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/085f1b2c8dfb...39f880e0d5c4

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163936885

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160930/98bdb90a/attachment.html>

From builds at travis-ci.org  Fri Sep 30 08:22:30 2016
From: builds at travis-ci.org (Travis CI)
Date: Fri, 30 Sep 2016 08:22:30 +0000
Subject: [openssl-commits] Broken: FdaSilvaYY/openssl#2091 (master - a00d75e)
In-Reply-To: <FdaSilvaYY/openssl+163936981+broken@travis-ci.org>
Message-ID: <57ee20c570836_33fa4b64c9b00909489@7c45dc43-e490-4966-bac3-ec24fb34f766.mail>

Build Update for FdaSilvaYY/openssl
-------------------------------------

Build: #2091
Status: Broken

Duration: 43 minutes and 14 seconds
Commit: a00d75e (master)
Author: Matt Caswell
Message: Convert NewSessionTicket construction to WPACKET

Reviewed-by: Rich Salz <rsalz at openssl.org>

View the changeset: https://github.com/FdaSilvaYY/openssl/compare/cc59ad1073c4...a00d75e1b21b

View the full build log and details: https://travis-ci.org/FdaSilvaYY/openssl/builds/163936981

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20160930/792aa321/attachment.html>