[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  97043e46aa7083c787a1efd72ac31ca97ed41610 (commit)
      from  cd3fe0e09c97700005ed96c8113907cbdfc45edf (commit)


- Log -----------------------------------------------------------------
commit 97043e46aa7083c787a1efd72ac31ca97ed41610
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Dec 16 09:24:00 2016 +0100

    e_afalg: Don't warn about kernel version when pedantic
    
    When built with --strict-warnings and the Linux kernel headers don't
    match the kernel version, the preprocessor warnings in
    engines/afalg/e_afalg.c cause compilation errors.  Use the macro
    PEDANTIC to avoid those warnings in that case.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2095)

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

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

diff --git a/engines/afalg/e_afalg.c b/engines/afalg/e_afalg.c
index 8e019d4..9837cae 100644
--- a/engines/afalg/e_afalg.c
+++ b/engines/afalg/e_afalg.c
@@ -26,8 +26,10 @@
 #define K_MIN2  0
 #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"
+# ifndef PEDANTIC
+#  warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
+#  warning "Skipping Compilation of AFALG engine"
+# endif
 void engine_load_afalg_int(void);
 void engine_load_afalg_int(void)
 {