[openssl-commits] [openssl] master update

[bernd . edlinger]

The branch master has been updated
   via  4de3fe5381b647de4b93436c5138ad16e575056c (commit)
  from  c8c250333cd254ab3f4d709ebc5ed86a7c065721 (commit)


- Log -
commit 4de3fe5381b647de4b93436c5138ad16e575056c
Author: Bernd Edlinger 
Date:   Sat May 26 17:08:03 2018 +0200

Try to work around ubuntu gcc-5 ubsan build failure

[extended tests]

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

---

Summary of changes:
 .travis.yml | 24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4affefd..7092953 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,16 +93,16 @@ matrix:
 - os: linux
   compiler: clang
   env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 
enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION 
-D__NO_STRING_INLINES -Wno-unused-command-line-argument"
-#- os: linux
-#  addons:
-#  apt:
-#  packages:
-#  - gcc-5
-#  - g++-5
-#  sources:
-#  - ubuntu-toolchain-r-test
-#  compiler: gcc-5
-#  env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan 
enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
+- os: linux
+  addons:
+  apt:
+  packages:
+  - gcc-5
+  - g++-5
+  sources:
+  - ubuntu-toolchain-r-test
+  compiler: gcc-5
+  env: UBUNTU_GCC_HACK="yes" EXTENDED_TEST="yes" CONFIG_OPTS="--debug 
no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
 - os: linux
   addons:
   apt:
@@ -141,6 +141,10 @@ before_script:
   srcdir=.;
   top=.;
   fi
+- if [ -n "$UBUNTU_GCC_HACK" ]; then
+  $CC -dumpspecs | sed "s/--push-state//g; 
s/--pop-state/--as-needed/g" > gcc-specs.txt;
+  CC="$CC -specs=gcc-specs.txt";
+  fi
 - if [ "$CC" = i686-w64-mingw32-gcc ]; then
   export CROSS_COMPILE=${CC%%gcc}; unset CC;
   $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build completed: openssl master.18188

[AppVeyor]

Build openssl master.18188 completed



Commit 95a3b52dc6 by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18187

[AppVeyor]

Build openssl master.18187 failed


Commit f31ff4b2fa by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18186

[AppVeyor]

Build openssl master.18186 failed


Commit 8d0c19fdcf by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18185

[AppVeyor]

Build openssl master.18185 failed


Commit f7af2e2674 by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18184

[AppVeyor]

Build openssl master.18184 failed


Commit 2fd833ea1b by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18183

[AppVeyor]

Build openssl master.18183 failed


Commit 395a54ae0c by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18182

[AppVeyor]

Build openssl master.18182 failed


Commit 7bac107ce4 by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build failed: openssl master.18181

[AppVeyor]

Build openssl master.18181 failed


Commit 019aabea6a by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] Build completed: openssl master.18180

[AppVeyor]

Build openssl master.18180 completed



Commit baa4d727ca by Bernd Edlinger on 5/26/2018 3:08 PM:

Try to work around ubuntu gcc-5 ubsan build failure


Configure your notification preferences

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

[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
   via  c8c250333cd254ab3f4d709ebc5ed86a7c065721 (commit)
   via  bbbf752a3c8b5a966bcb48fc71a3dc03832e7b27 (commit)
  from  1bb829300a9a941b75e8d5ae6ea8f53b3845ac4c (commit)


- Log -
commit c8c250333cd254ab3f4d709ebc5ed86a7c065721
Author: Nick Mathewson 
Date:   Thu May 24 15:23:15 2018 -0400

Improve the example getpass() implementation to show an error return

Also, modernize the code, so that it isn't trying to store a size_t
into an int, and then check the int's sign. :/

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

commit bbbf752a3c8b5a966bcb48fc71a3dc03832e7b27
Author: Nick Mathewson 
Date:   Wed May 16 11:07:48 2018 -0400

Update documentation for PEM callback: error is now -1.

In previous versions of OpenSSL, the documentation for PEM_read_*
said:

   The callback B return the number of characters in the
   passphrase or 0 if an error occurred.

But since c82c3462267afdbbaa5, 0 is now treated as a non-error
return value.  Applications that want to indicate an error need to
return -1 instead.

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

---

Summary of changes:
 doc/man3/PEM_read_bio_PrivateKey.pod | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/man3/PEM_read_bio_PrivateKey.pod 
b/doc/man3/PEM_read_bio_PrivateKey.pod
index 9f62140..744a46f 100644
--- a/doc/man3/PEM_read_bio_PrivateKey.pod
+++ b/doc/man3/PEM_read_bio_PrivateKey.pod
@@ -295,7 +295,7 @@ for it twice) if B is 1. The B parameter has the 
same
 value as the B parameter passed to the PEM routine. It allows
 arbitrary data to be passed to the callback by the application
 (for example a window handle in a GUI application). The callback
-B return the number of characters in the passphrase or 0 if
+B return the number of characters in the passphrase or -1 if
 an error occurred.
 
 =head1 EXAMPLES
@@ -346,17 +346,16 @@ Skeleton pass phrase callback:
 
  int pass_cb(char *buf, int size, int rwflag, void *u)
  {
- int len;
- char *tmp;
 
  /* We'd probably do something else if 'rwflag' is 1 */
  printf("Enter pass phrase for \"%s\"\n", (char *)u);
 
  /* get pass phrase, length 'len' into 'tmp' */
- tmp = "hello";
- len = strlen(tmp);
- if (len <= 0)
- return 0;
+ char *tmp = "hello";
+ if (tmp == NULL) /* An error occurred */
+ return -1;
+
+ size_t len = strlen(tmp);
 
  if (len > size)
  len = size;
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits