[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[Paul I. Dale]

The branch OpenSSL_1_1_1-stable has been updated
       via  4978ecb26e6cda98cff002d7ecece1a2bc147499 (commit)
      from  9b977afc0b25f57021f9e4721cb56bd63548c838 (commit)


- Log -----------------------------------------------------------------
commit 4978ecb26e6cda98cff002d7ecece1a2bc147499
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Sep 17 08:09:25 2018 +1000

    Add a compile time test to verify that openssl/rsa.h and complex.h can
    coexist.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7233)
    
    (cherry picked from commit da5fac72b1cba5651b871902eea234e693cf01e5)

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

Summary of changes:
 .gitignore         |  1 +
 test/build.info    |  5 ++++-
 test/rsa_complex.c | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/rsa_complex.c

diff --git a/.gitignore b/.gitignore
index d618cd6..1b0f25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ Makefile
 /test/v3ext
 /test/versions
 /test/ossl_shim/ossl_shim
+/test/rsa_complex
 
 # Certain files that get created by tests on the fly
 /test/test-runs
diff --git a/test/build.info b/test/build.info
index 08657c8..df448d0 100644
--- a/test/build.info
+++ b/test/build.info
@@ -26,7 +26,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
   PROGRAMS_NO_INST=\
           versions \
           aborttest test_test \
-          sanitytest exdatatest bntest \
+          sanitytest rsa_complex exdatatest bntest \
           ectest ecstresstest ecdsatest gmdifftest pbelutest ideatest \
           md2test \
           hmactest \
@@ -64,6 +64,9 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
   INCLUDE[sanitytest]=../include
   DEPEND[sanitytest]=../libcrypto libtestutil.a
 
+  SOURCE[rsa_complex]=rsa_complex.c
+  INCLUDE[rsa_complex]=../include
+
   SOURCE[test_test]=test_test.c
   INCLUDE[test_test]=../include
   DEPEND[test_test]=../libcrypto libtestutil.a
diff --git a/test/rsa_complex.c b/test/rsa_complex.c
new file mode 100644
index 0000000..fac5812
--- /dev/null
+++ b/test/rsa_complex.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2018 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
+ */
+
+/*
+ * Check to see if there is a conflict between complex.h and openssl/rsa.h.
+ * The former defines "I" as a macro and earlier versions of the latter use
+ * for function arguments.
+ */
+#if defined(__STDC_VERSION__)
+# if __STDC_VERSION__ >= 199901L
+#  include <complex.h>
+# endif
+#endif
+#include <openssl/rsa.h>
+#include <stdlib.h>
+
+int main(int argc, char *argv[])
+{
+    /* There are explicitly no run time checks for this one */
+    return EXIT_SUCCESS;
+}