[openssl-commits] Fixed: openssl/openssl#5273 (OpenSSL_1_0_2-stable - 134ab51)

2016-08-02 Thread Travis CI
Build Update for openssl/openssl
-

Build: #5273
Status: Fixed

Duration: 17 minutes and 8 seconds
Commit: 134ab51 (OpenSSL_1_0_2-stable)
Author: Dr. Stephen Henson
Message: include 

Reviewed-by: Rich Salz 

View the changeset: 
https://github.com/openssl/openssl/compare/ff8b6b92f44c...134ab5139a8d

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

--

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

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

2016-08-02 Thread Dr . Stephen Henson
The branch OpenSSL_1_0_1-stable has been updated
   via  c648bdcc4cd8a7d1699081d339ff33deda69a3be (commit)
  from  7149c709a24802f044f15e6a8e47d3926a547c2d (commit)


- Log -
commit c648bdcc4cd8a7d1699081d339ff33deda69a3be
Author: Dr. Stephen Henson 
Date:   Tue Aug 2 23:41:45 2016 +0100

include 

Reviewed-by: Rich Salz 
(cherry picked from commit 134ab5139a8d41455a81d9fcc31b3edb8a4b2f5c)

---

Summary of changes:
 crypto/asn1/tasn_enc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index 255b11e..081a9d5 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -59,6 +59,7 @@
 
 #include 
 #include 
+#include 
 #include "cryptlib.h"
 #include 
 #include 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] Errored: FdaSilvaYY/openssl#1619 (pack_argv_options - 1fbc12c)

2016-08-02 Thread Travis CI
Build Update for FdaSilvaYY/openssl
-

Build: #1619
Status: Errored

Duration: 33 minutes and 44 seconds
Commit: 1fbc12c (pack_argv_options)
Author: FdaSilvaYY
Message: Fix branch

View the changeset: 
https://github.com/FdaSilvaYY/openssl/compare/55ee22541e85...1fbc12c83257

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

--

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

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] [web] master update

2016-08-02 Thread Rich Salz
The branch master has been updated
   via  00bd611e7746aa69bc83b56f64e9c358c94a78c5 (commit)
  from  62d4a80dbd2ff6e8babb69ea5bf8da2d81a454df (commit)


- Log -
commit 00bd611e7746aa69bc83b56f64e9c358c94a78c5
Author: Rich Salz 
Date:   Tue Aug 2 12:45:18 2016 -0400

Fix "last updated" date

---

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

diff --git a/policies/releasestrat.html b/policies/releasestrat.html
index 6126801..71b7353 100644
--- a/policies/releasestrat.html
+++ b/policies/releasestrat.html
@@ -13,7 +13,7 @@
  Release Strategy
  
First issued 23rd December 2014
-   Last modified 3rd March 2016
+   Last modified 2nd August 2016
  

 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] [openssl] master update

2016-08-02 Thread Richard Levitte
The branch master has been updated
   via  f37c159aed4bca0b7d3ea4657c450826850c8e75 (commit)
  from  f4947bf10ed505f54dcae11fd028a3ec98ee4f3b (commit)


- Log -
commit f37c159aed4bca0b7d3ea4657c450826850c8e75
Author: Richard Levitte 
Date:   Tue Aug 2 13:27:39 2016 +0200

80-test_ssl_new.t: only skip on $no_tls if no other skip conditions defined

Reviewed-by: Matt Caswell 

---

Summary of changes:
 test/recipes/80-test_ssl_new.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 941ace7..17e22f0 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -62,7 +62,7 @@ foreach my $conf (@conf_files) {
 subtest "Test configuration $conf" => sub {
 test_conf($conf,
   $conf_dependent_tests{$conf} || $^O eq "VMS" ?  0 : 1,
-  $skip{$conf} || $no_tls);
+  defined($skip{$conf}) ? $skip{$conf} : $no_tls);
 }
 }
 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] [openssl] master update

2016-08-02 Thread Richard Levitte
The branch master has been updated
   via  f4947bf10ed505f54dcae11fd028a3ec98ee4f3b (commit)
  from  ee94aeee7d3e246adae59e1d0b2a59acc44ae9b5 (commit)


- Log -
commit f4947bf10ed505f54dcae11fd028a3ec98ee4f3b
Author: Richard Levitte 
Date:   Tue Aug 2 11:19:07 2016 +0200

In 80-test_ssl_new, more "plan tests" to a more useful position

Reviewed-by: Matt Caswell 

---

Summary of changes:
 test/recipes/80-test_ssl_new.t | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 29aa950..941ace7 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -26,6 +26,10 @@ map { s/;.*// } @conf_srcs if $^O eq "VMS";
 my @conf_files = map { basename($_) } @conf_srcs;
 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 => 11;  # = scalar @conf_srcs
+
 # Some test results depend on the configuration of enabled protocols. We only
 # verify generated sources in the default configuration.
 my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&
@@ -62,10 +66,6 @@ foreach my $conf (@conf_files) {
 }
 }
 
-# We hard-code the number of tests to double-check that the globbing above
-# finds all files as expected.
-plan tests => 11;  # = scalar @conf_srcs
-
 sub test_conf {
 plan tests => 3;
 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] [openssl] master update

2016-08-02 Thread Matt Caswell
The branch master has been updated
   via  ee94aeee7d3e246adae59e1d0b2a59acc44ae9b5 (commit)
  from  700b814549c8c158c82466116cfc545b00f647c3 (commit)


- Log -
commit ee94aeee7d3e246adae59e1d0b2a59acc44ae9b5
Author: Matt Caswell 
Date:   Tue Aug 2 10:19:56 2016 +0100

Fix tests for no-nextprotoneg

Fix the 80-test_ssl_test_ctx and 80-test_ssl_new tests when used with the
no-nextprotoneg option

Reviewed-by: Richard Levitte 

---

Summary of changes:
 test/recipes/80-test_ssl_new.t | 1 +
 test/ssl_test_ctx.c| 4 
 test/ssl_test_ctx.h| 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 1010665..29aa950 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -49,6 +49,7 @@ my %conf_dependent_tests = (
 my %skip = (
   "07-dtls-protocol-version.conf" => $no_dtls,
   "08-npn.conf" => $no_tls || $no_npn,
+  "09-alpn.conf" => $no_tls || $no_npn,
   "10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
   "11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
 );
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index 24b11e5..4d2bdba 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -295,7 +295,6 @@ const char *ssl_test_method_name(ssl_test_method_t method)
 /* NPN and ALPN options */
 //
 
-#ifndef OPENSSL_NO_NEXTPROTONEG
 IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(client_npn_protocols)
 IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server_npn_protocols)
 IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server2_npn_protocols)
@@ -304,7 +303,6 @@ IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(client_alpn_protocols)
 IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server_alpn_protocols)
 IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server2_alpn_protocols)
 IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(expected_alpn_protocol)
-#endif
 
 /***/
 /* Handshake mode  */
@@ -374,7 +372,6 @@ static const ssl_test_ctx_option ssl_test_ctx_options[] = {
 { "ServerNameCallback", _servername_callback },
 { "SessionTicketExpected", _session_ticket },
 { "Method", _test_method },
-#ifndef OPENSSL_NO_NEXTPROTONEG
 { "ClientNPNProtocols", _client_npn_protocols },
 { "ServerNPNProtocols", _server_npn_protocols },
 { "Server2NPNProtocols", _server2_npn_protocols },
@@ -383,7 +380,6 @@ static const ssl_test_ctx_option ssl_test_ctx_options[] = {
 { "ServerALPNProtocols", _server_alpn_protocols },
 { "Server2ALPNProtocols", _server2_alpn_protocols },
 { "ExpectedALPNProtocol", _expected_alpn_protocol },
-#endif
 { "HandshakeMode", _handshake_mode },
 { "ResumptionExpected", _resumption_expected },
 };
diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h
index 83850e4..047ea8b 100644
--- a/test/ssl_test_ctx.h
+++ b/test/ssl_test_ctx.h
@@ -92,7 +92,7 @@ typedef struct ssl_test_ctx {
 ssl_session_ticket_t session_ticket_expected;
 /* Whether the server/client CTX should use DTLS or TLS. */
 ssl_test_method_t method;
-#ifndef OPENSSL_NO_NEXTPROTONEG
+
 /*
  * NPN and ALPN protocols supported by the client, server, and second
  * (SNI) server. A comma-separated list.
@@ -105,7 +105,7 @@ typedef struct ssl_test_ctx {
 char *server_alpn_protocols;
 char *server2_alpn_protocols;
 char *expected_alpn_protocol;
-#endif
+
 /* Whether to test a resumed/renegotiated handshake. */
 ssl_handshake_mode_t handshake_mode;
 /* Whether the second handshake is resumed or a full handshake (boolean). 
*/
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] [openssl] master update

2016-08-02 Thread Richard Levitte
The branch master has been updated
   via  700b814549c8c158c82466116cfc545b00f647c3 (commit)
  from  cb926df2fa42bd1e396a600ff6212ee4f4e04118 (commit)


- Log -
commit 700b814549c8c158c82466116cfc545b00f647c3
Author: FdaSilvaYY 
Date:   Thu Jul 28 21:15:52 2016 +0200

Fix some style issues...

 extra spacing and 80 cols

Reviewed-by: Rich Salz 
Reviewed-by: Richard Levitte 
(Merged from https://github.com/openssl/openssl/pull/1366)

---

Summary of changes:
 apps/progs.h |  2 +-
 apps/speed.c | 26 +-
 crypto/bio/bio_cb.c  |  2 +-
 crypto/bn/bn_lib.c   |  4 ++--
 crypto/ct/ct_sct.c   |  2 +-
 crypto/ec/ec_key.c   |  2 +-
 crypto/engine/eng_ctrl.c | 16 +++-
 crypto/evp/e_chacha20_poly1305.c |  8 +---
 crypto/mem_clr.c |  2 +-
 crypto/ppccap.c  |  4 ++--
 doc/crypto/BIO_s_fd.pod  |  2 +-
 doc/crypto/X509_STORE_set_verify_cb_func.pod |  2 +-
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/apps/progs.h b/apps/progs.h
index ac9d208..5f6f07f 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -18,7 +18,7 @@ typedef enum FUNC_TYPE {
 typedef struct function_st {
 FUNC_TYPE type;
 const char *name;
-int (*func)(int argc,char *argv[]);
+int (*func)(int argc, char *argv[]);
 const OPTIONS *help;
 } FUNCTION;
 
diff --git a/apps/speed.c b/apps/speed.c
index 6a62ab7..e04a440 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -371,7 +371,7 @@ OPTIONS speed_options[] = {
 {"decrypt", OPT_DECRYPT, '-',
  "Time decryption instead of encryption (only EVP)"},
 {"mr", OPT_MR, '-', "Produce machine readable output"},
-{"mb", OPT_MB, '-', 
+{"mb", OPT_MB, '-',
 "Enable (tls1.1) multi-block mode on evp_cipher requested with -evp"},
 {"misalign", OPT_MISALIGN, 'n', "Amount to mis-align buffers"},
 {"elapsed", OPT_ELAPSED, '-',
@@ -1066,16 +1066,16 @@ static void *KDF1_SHA1(const void *in, size_t inlen, 
void *out,
 *outlen = SHA_DIGEST_LENGTH;
 return SHA1(in, inlen, out);
 }
-
 #endif  /* ndef OPENSSL_NO_EC */
 
 
-static int run_benchmark(int async_jobs, int (*loop_function)(void *), 
loopargs_t *loopargs)
+static int run_benchmark(int async_jobs,
+ int (*loop_function)(void *), loopargs_t *loopargs)
 {
 int job_op_count = 0;
 int total_op_count = 0;
 int num_inprogress = 0;
-int error = 0, i = 0, async = 0;
+int error = 0, i = 0, ret = 0;
 OSSL_ASYNC_FD job_fd = 0;
 size_t num_job_fds = 0;
 
@@ -1086,10 +1086,10 @@ static int run_benchmark(int async_jobs, int 
(*loop_function)(void *), loopargs_
 }
 
 for (i = 0; i < async_jobs && !error; i++) {
-async = ASYNC_start_job(&(loopargs[i].inprogress_job), 
loopargs[i].wait_ctx,
-_op_count, loop_function,
-(void *)(loopargs + i), sizeof(loopargs_t));
-switch (async) {
+ret = ASYNC_start_job([i].inprogress_job, 
loopargs[i].wait_ctx,
+  _op_count, loop_function,
+  (void *)(loopargs + i), sizeof(loopargs_t));
+switch (ret) {
 case ASYNC_PAUSE:
 ++num_inprogress;
 break;
@@ -1179,15 +1179,15 @@ static int run_benchmark(int async_jobs, int 
(*loop_function)(void *), loopargs_
 continue;
 #elif defined(OPENSSL_SYS_WINDOWS)
 if (num_job_fds == 1
-&& !PeekNamedPipe(job_fd, NULL, 0, NULL, , NULL) 
+&& !PeekNamedPipe(job_fd, NULL, 0, NULL, , NULL)
 && avail > 0)
 continue;
 #endif
 
-async = ASYNC_start_job(&(loopargs[i].inprogress_job), 
loopargs[i].wait_ctx,
-_op_count, loop_function, (void *)(loopargs + i),
-sizeof(loopargs_t));
-switch (async) {
+ret = ASYNC_start_job([i].inprogress_job, 
+loopargs[i].wait_ctx, _op_count, loop_function, 
+(void *)(loopargs + i), sizeof(loopargs_t));
+switch (ret) {
 case ASYNC_PAUSE:
 break;
 case ASYNC_FINISH:
diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 860208b..69ea3d0 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -27,7 +27,7 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
 if (BIO_CB_RETURN & cmd)
 r = ret;
 
-len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio);
+len 

[openssl-commits] Passed: FdaSilvaYY/openssl#1615 (oss_builds_options_check - 684d827)

2016-08-02 Thread Travis CI
Build Update for FdaSilvaYY/openssl
-

Build: #1615
Status: Passed

Duration: 39 minutes and 4 seconds
Commit: 684d827 (oss_builds_options_check)
Author: FdaSilvaYY
Message: Add a full no-* options build

View the changeset: 
https://github.com/FdaSilvaYY/openssl/compare/dddb3068ce22...684d827db069

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

--

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

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] Build completed: openssl 1.0.888

2016-08-02 Thread AppVeyor


Build openssl 1.0.888 completed



Commit a4c757925f by FdaSilvaYY on 8/2/2016 6:58 AM:

Constify some ASN1_OBJECT *obj input parameters


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits