[openssl] master update

Richard Levitte levitte at openssl.org
Fri Jan 21 13:45:25 UTC 2022


The branch master has been updated
       via  8c2e588bcf0de61880ec8a956ef57ad6b8a50163 (commit)
       via  fbe88706a4f93f9e1940a07062d77c81b7fdf04d (commit)
      from  f59d72f027da90edcccad5cc78c94d3099fadecf (commit)


- Log -----------------------------------------------------------------
commit 8c2e588bcf0de61880ec8a956ef57ad6b8a50163
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 11 18:30:20 2022 +0100

    LEGACY PROV: Reimplement the ERR building blocks in upcall terms
    
    This involves the following functions:
    
    ERR_new(), ERR_set_debug(), ERR_set_error(), ERR_vset_error(),
    ERR_set_mark(), ERR_clear_last_mark(), ERR_pop_to_mark(void)
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17474)

commit fbe88706a4f93f9e1940a07062d77c81b7fdf04d
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 11 18:27:23 2022 +0100

    ERR: Move ERR_set_mark(), ERR_pop_to_mark() and ERR_clear_last_mark()
    
    Move them to their own source file, so they end up in a separate
    object file.  This allows providers to override their implementation
    to use the corresponding OSSL_FUNC upcalls without having to
    reimplement everything from crypto/err/err.c.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17474)

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

Summary of changes:
 crypto/err/build.info  |   2 +-
 crypto/err/err.c       |  55 --------------------------
 crypto/err/err_mark.c  |  69 +++++++++++++++++++++++++++++++++
 providers/legacyprov.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 172 insertions(+), 56 deletions(-)
 create mode 100644 crypto/err/err_mark.c

diff --git a/crypto/err/build.info b/crypto/err/build.info
index 98f8801e34..ee37938418 100644
--- a/crypto/err/build.info
+++ b/crypto/err/build.info
@@ -1,3 +1,3 @@
 LIBS=../../libcrypto
 SOURCE[../../libcrypto]=\
-        err_blocks.c err.c err_all.c err_all_legacy.c err_prn.c
+        err_blocks.c err_mark.c err.c err_all.c err_all_legacy.c err_prn.c
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 59ca4114db..63cf682382 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -847,61 +847,6 @@ void ERR_add_error_vdata(int num, va_list args)
         OPENSSL_free(str);
 }
 
-int ERR_set_mark(void)
-{
-    ERR_STATE *es;
-
-    es = ossl_err_get_state_int();
-    if (es == NULL)
-        return 0;
-
-    if (es->bottom == es->top)
-        return 0;
-    es->err_marks[es->top]++;
-    return 1;
-}
-
-int ERR_pop_to_mark(void)
-{
-    ERR_STATE *es;
-
-    es = ossl_err_get_state_int();
-    if (es == NULL)
-        return 0;
-
-    while (es->bottom != es->top
-           && es->err_marks[es->top] == 0) {
-        err_clear(es, es->top, 0);
-        es->top = es->top > 0 ? es->top - 1 : ERR_NUM_ERRORS - 1;
-    }
-
-    if (es->bottom == es->top)
-        return 0;
-    es->err_marks[es->top]--;
-    return 1;
-}
-
-int ERR_clear_last_mark(void)
-{
-    ERR_STATE *es;
-    int top;
-
-    es = ossl_err_get_state_int();
-    if (es == NULL)
-        return 0;
-
-    top = es->top;
-    while (es->bottom != top
-           && es->err_marks[top] == 0) {
-        top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
-    }
-
-    if (es->bottom == top)
-        return 0;
-    es->err_marks[top]--;
-    return 1;
-}
-
 void err_clear_last_constant_time(int clear)
 {
     ERR_STATE *es;
diff --git a/crypto/err/err_mark.c b/crypto/err/err_mark.c
new file mode 100644
index 0000000000..cc1baba7a3
--- /dev/null
+++ b/crypto/err/err_mark.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2003-2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (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
+ */
+
+#define OSSL_FORCE_ERR_STATE
+
+#include <openssl/err.h>
+#include "err_local.h"
+
+int ERR_set_mark(void)
+{
+    ERR_STATE *es;
+
+    es = ossl_err_get_state_int();
+    if (es == NULL)
+        return 0;
+
+    if (es->bottom == es->top)
+        return 0;
+    es->err_marks[es->top]++;
+    return 1;
+}
+
+int ERR_pop_to_mark(void)
+{
+    ERR_STATE *es;
+
+    es = ossl_err_get_state_int();
+    if (es == NULL)
+        return 0;
+
+    while (es->bottom != es->top
+           && es->err_marks[es->top] == 0) {
+        err_clear(es, es->top, 0);
+        es->top = es->top > 0 ? es->top - 1 : ERR_NUM_ERRORS - 1;
+    }
+
+    if (es->bottom == es->top)
+        return 0;
+    es->err_marks[es->top]--;
+    return 1;
+}
+
+int ERR_clear_last_mark(void)
+{
+    ERR_STATE *es;
+    int top;
+
+    es = ossl_err_get_state_int();
+    if (es == NULL)
+        return 0;
+
+    top = es->top;
+    while (es->bottom != top
+           && es->err_marks[top] == 0) {
+        top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
+    }
+
+    if (es->bottom == top)
+        return 0;
+    es->err_marks[top]--;
+    return 1;
+}
+
diff --git a/providers/legacyprov.c b/providers/legacyprov.c
index 93c4223a15..ad5d05d739 100644
--- a/providers/legacyprov.c
+++ b/providers/legacyprov.c
@@ -12,6 +12,7 @@
 #include <openssl/core.h>
 #include <openssl/core_dispatch.h>
 #include <openssl/core_names.h>
+#include <openssl/err.h>
 #include <openssl/params.h>
 #include "prov/provider_ctx.h"
 #include "prov/implementations.h"
@@ -33,6 +34,22 @@ OSSL_provider_init_fn ossl_legacy_provider_init;
 # define OSSL_provider_init ossl_legacy_provider_init
 #endif
 
+#ifndef STATIC_LEGACY
+/*
+ * Should these function pointers be stored in the provider side provctx?
+ * Could they ever be different from one init to the next? We assume not for
+ * now.
+ */
+
+/* Functions provided by the core */
+static OSSL_FUNC_core_new_error_fn *c_new_error;
+static OSSL_FUNC_core_set_error_debug_fn *c_set_error_debug;
+static OSSL_FUNC_core_vset_error_fn *c_vset_error;
+static OSSL_FUNC_core_set_error_mark_fn *c_set_error_mark;
+static OSSL_FUNC_core_clear_last_error_mark_fn *c_clear_last_error_mark;
+static OSSL_FUNC_core_pop_error_to_mark_fn *c_pop_error_to_mark;
+#endif
+
 /* Parameters we provide to the core */
 static const OSSL_PARAM legacy_param_types[] = {
     OSSL_PARAM_DEFN(OSSL_PROV_PARAM_NAME, OSSL_PARAM_UTF8_PTR, NULL, 0),
@@ -185,6 +202,41 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
                        void **provctx)
 {
     OSSL_LIB_CTX *libctx = NULL;
+#ifndef STATIC_LEGACY
+    const OSSL_DISPATCH *tmp;
+#endif
+
+#ifndef STATIC_LEGACY
+    for (tmp = in; tmp->function_id != 0; tmp++) {
+        /*
+         * We do not support the scenario of an application linked against
+         * multiple versions of libcrypto (e.g. one static and one dynamic),
+         * but sharing a single legacy.so. We do a simple sanity check here.
+         */
+#define set_func(c, f) if (c == NULL) c = f; else if (c != f) return 0;
+        switch (tmp->function_id) {
+        case OSSL_FUNC_CORE_NEW_ERROR:
+            set_func(c_new_error, OSSL_FUNC_core_new_error(tmp));
+            break;
+        case OSSL_FUNC_CORE_SET_ERROR_DEBUG:
+            set_func(c_set_error_debug, OSSL_FUNC_core_set_error_debug(tmp));
+            break;
+        case OSSL_FUNC_CORE_VSET_ERROR:
+            set_func(c_vset_error, OSSL_FUNC_core_vset_error(tmp));
+            break;
+        case OSSL_FUNC_CORE_SET_ERROR_MARK:
+            set_func(c_set_error_mark, OSSL_FUNC_core_set_error_mark(tmp));
+            break;
+        case OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK:
+            set_func(c_clear_last_error_mark,
+                     OSSL_FUNC_core_clear_last_error_mark(tmp));
+            break;
+        case OSSL_FUNC_CORE_POP_ERROR_TO_MARK:
+            set_func(c_pop_error_to_mark, OSSL_FUNC_core_pop_error_to_mark(tmp));
+            break;
+        }
+    }
+#endif
 
     if ((*provctx = ossl_prov_ctx_new()) == NULL
         || (libctx = OSSL_LIB_CTX_new_child(handle, in)) == NULL) {
@@ -200,3 +252,53 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
 
     return 1;
 }
+
+#ifndef STATIC_LEGACY
+/*
+ * Provider specific implementation of libcrypto functions in terms of
+ * upcalls.
+ */
+
+/*
+ * For ERR functions, we pass a NULL context.  This is valid to do as long
+ * as only error codes that the calling libcrypto supports are used.
+ */
+void ERR_new(void)
+{
+    c_new_error(NULL);
+}
+
+void ERR_set_debug(const char *file, int line, const char *func)
+{
+    c_set_error_debug(NULL, file, line, func);
+}
+
+void ERR_set_error(int lib, int reason, const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    c_vset_error(NULL, ERR_PACK(lib, 0, reason), fmt, args);
+    va_end(args);
+}
+
+void ERR_vset_error(int lib, int reason, const char *fmt, va_list args)
+{
+    c_vset_error(NULL, ERR_PACK(lib, 0, reason), fmt, args);
+}
+
+int ERR_set_mark(void)
+{
+    return c_set_error_mark(NULL);
+}
+
+int ERR_clear_last_mark(void)
+{
+    return c_clear_last_error_mark(NULL);
+}
+
+int ERR_pop_to_mark(void)
+{
+    return c_pop_error_to_mark(NULL);
+}
+#endif


More information about the openssl-commits mailing list