[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  069c3c0908dfa8418753d0c25890a9d4fb67178d (commit)
       via  b6a8916102b9bf84b33ade2030079d76d9ba60f6 (commit)
      from  7c96dbcdab959fef74c4caae63cdebaa354ab252 (commit)


- Log -----------------------------------------------------------------
commit 069c3c0908dfa8418753d0c25890a9d4fb67178d
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Thu Feb 25 20:55:51 2016 +0100

    fix "no-engine" build of test fixture
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b6a8916102b9bf84b33ade2030079d76d9ba60f6
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Thu Feb 25 20:54:40 2016 +0100

    Add some 'no-engine' builds to travis, for test
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 .travis.yml             | 16 ++++++++++++++++
 test/dtlsv1listentest.c |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 49cf782..cf8c442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,6 +49,15 @@ matrix:
         - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2"
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="no-engine"
+        - os: linux
+          compiler: gcc
+          env: CONFIG_OPTS="no-engine"
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="no-engine"
     exclude:
         - os: osx
           compiler: clang-3.6
@@ -85,6 +94,12 @@ matrix:
           env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
         - compiler: x86_64-w64-mingw32-gcc
           env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
+        - compiler: clang-3.6
+          env: CONFIG_OPTS="no-engine"
+        - compiler: gcc-5
+          env: CONFIG_OPTS="no-engine"
+        - compiler: gcc
+          env: CONFIG_OPTS="no-engine"
 
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
@@ -113,3 +128,4 @@ script:
 notifications:
     email:
         - openssl-commits at openssl.org
+
diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c
index 78ac83a..6eef1b5 100644
--- a/test/dtlsv1listentest.c
+++ b/test/dtlsv1listentest.c
@@ -60,7 +60,9 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
+#endif
 #include "e_os.h"
 
 /* Just a ClientHello without a cookie */