[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  b24b72d109eab6f06380002796b89bb0f04af874 (commit)
       via  35bc387b97a51343456d1d72e19a64779d2224f3 (commit)
       via  a350e3ef3899c012cd52a1130ffd5be9288f6f18 (commit)
      from  20c2876f24d0ccf9581ace08c7882d544d2588ea (commit)


- Log -----------------------------------------------------------------
commit b24b72d109eab6f06380002796b89bb0f04af874
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 29 18:55:01 2021 +0200

    EVP: One stray comma removed in crypto/evp/ctrl_params_translate.c
    
    Commas at the end of a list of items isn't allowed by ANSI C.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14729)

commit 35bc387b97a51343456d1d72e19a64779d2224f3
Author: Randall S. Becker <rsbecker at nexbridge.com>
Date:   Mon Mar 29 10:26:10 2021 -0600

    Added guarding #ifndef/#define to avoid duplicate include of crypto/types.h
    
    Fixes #14730
    
    CLA: The author has the permission to grant the OpenSSL Team the right to use this change.
    
    Signed-off-by: Randall S. Becker <rsbecker at nexbridge.com>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14729)

commit a350e3ef3899c012cd52a1130ffd5be9288f6f18
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 29 16:04:21 2021 +0200

    Re-implement ANSI C building with a Github workflow
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14729)

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

Summary of changes:
 .github/workflows/ci.yml           | 12 ++++++++++++
 crypto/evp/ctrl_params_translate.c |  2 +-
 include/crypto/types.h             | 14 ++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad24aaa5b8..85fbe952dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,18 @@ jobs:
     - name: make doc-nits
       run: make doc-nits
 
+  # This checks that we use ANSI C language syntax and semantics.
+  # We are not as strict with libraries, but rather adapt to what's
+  # expected to be available in a certain version of each platform.
+  check-ansi:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout at v2
+    - name: config
+      run: CPPFLAGS=-ansi ./config no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump
+    - name: make
+      run: make -s -j4
+
   basic_gcc:
     runs-on: ubuntu-latest
     steps:
diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c
index c13a40a95f..995e37a4e8 100644
--- a/crypto/evp/ctrl_params_translate.c
+++ b/crypto/evp/ctrl_params_translate.c
@@ -149,7 +149,7 @@ enum state {
     PKEY,
     PRE_CTRL_TO_PARAMS, POST_CTRL_TO_PARAMS, CLEANUP_CTRL_TO_PARAMS,
     PRE_CTRL_STR_TO_PARAMS, POST_CTRL_STR_TO_PARAMS, CLEANUP_CTRL_STR_TO_PARAMS,
-    PRE_PARAMS_TO_CTRL, POST_PARAMS_TO_CTRL, CLEANUP_PARAMS_TO_CTRL,
+    PRE_PARAMS_TO_CTRL, POST_PARAMS_TO_CTRL, CLEANUP_PARAMS_TO_CTRL
 };
 enum action {
     NONE = 0, GET = 1, SET = 2
diff --git a/include/crypto/types.h b/include/crypto/types.h
index 13a5f9ce1d..0d81404091 100644
--- a/include/crypto/types.h
+++ b/include/crypto/types.h
@@ -9,15 +9,21 @@
 
 /* When removal is simulated, we still need the type internally */
 
-#ifdef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OSSL_CRYPTO_TYPES_H
+# define OSSL_CRYPTO_TYPES_H
+# pragma once
+
+# ifdef OPENSSL_NO_DEPRECATED_3_0
 typedef struct rsa_st RSA;
 typedef struct rsa_meth_st RSA_METHOD;
-# ifndef OPENSSL_NO_EC
+#  ifndef OPENSSL_NO_EC
 typedef struct ec_key_st EC_KEY;
 typedef struct ec_key_method_st EC_KEY_METHOD;
+#  endif
 # endif
-#endif
 
-#ifndef OPENSSL_NO_EC
+# ifndef OPENSSL_NO_EC
 typedef struct ecx_key_st ECX_KEY;
+# endif
+
 #endif