Changeset 94082 in vbox for trunk/src/libs/openssl-3.0.1/include/crypto/sm2err.h

Timestamp:

Mar 3, 2022 7:17:34 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150325

Message:

libs/openssl-3.0.1: started applying and adjusting our OpenSSL changes to 3.0.1. bugref:10128

Location:

trunk/src/libs/openssl-3.0.1

Files:

• . (modified) (1 prop)
• include/crypto/sm2err.h (modified) (3 diffs)

trunk/src/libs/openssl-3.0.1

@@ -12 +12 @@
 /vendor/openssl/1.1.1c:131722-131725
 /vendor/openssl/1.1.1k:145841-145843
+/vendor/openssl/3.0.1:150323-150324
+/vendor/openssl/current:147554-150322

@@ -12 +12 @@
 /vendor/openssl/1.1.1c:131722-131725
 /vendor/openssl/1.1.1k:145841-145843
+/vendor/openssl/3.0.1:150323-150324
+/vendor/openssl/current:147554-150322

trunk/src/libs/openssl-3.0.1/include/crypto/sm2err.h

@@ -1 +1 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * 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
@@ -11 +11 @@
 #ifndef OSSL_CRYPTO_SM2ERR_H
 # define OSSL_CRYPTO_SM2ERR_H
-
-# ifndef HEADER_SYMHACKS_H
-#  include <openssl/symhacks.h>
-# endif
+# pragma once
 
 # include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef  __cplusplus
+extern "C" {
+# endif
 
 # ifndef OPENSSL_NO_SM2
 
-#  ifdef  __cplusplus
-extern "C"
-#  endif
-int ERR_load_SM2_strings(void);
-
-/*
- * SM2 function codes.
- */
-#  define SM2_F_PKEY_SM2_COPY                              115
-#  define SM2_F_PKEY_SM2_CTRL                              109
-#  define SM2_F_PKEY_SM2_CTRL_STR                          110
-#  define SM2_F_PKEY_SM2_DIGEST_CUSTOM                     114
-#  define SM2_F_PKEY_SM2_INIT                              111
-#  define SM2_F_PKEY_SM2_SIGN                              112
-#  define SM2_F_SM2_COMPUTE_MSG_HASH                       100
-#  define SM2_F_SM2_COMPUTE_USERID_DIGEST                  101
-#  define SM2_F_SM2_COMPUTE_Z_DIGEST                       113
-#  define SM2_F_SM2_DECRYPT                                102
-#  define SM2_F_SM2_ENCRYPT                                103
-#  define SM2_F_SM2_PLAINTEXT_SIZE                         104
-#  define SM2_F_SM2_SIGN                                   105
-#  define SM2_F_SM2_SIG_GEN                                106
-#  define SM2_F_SM2_SIG_VERIFY                             107
-#  define SM2_F_SM2_VERIFY                                 108
+int ossl_err_load_SM2_strings(void);
 
 /*
@@ -59 +38 @@
 #  define SM2_R_INVALID_ENCODING                           104
 #  define SM2_R_INVALID_FIELD                              105
+#  define SM2_R_INVALID_PRIVATE_KEY                        113
 #  define SM2_R_NO_PARAMETERS_SET                          109
 #  define SM2_R_USER_ID_TOO_LARGE                          106
 
 # endif
+
+# ifdef  __cplusplus
+}
+# endif
 #endif

@@ -12 +12 @@
 /vendor/openssl/1.1.1c:131722-131725
 /vendor/openssl/1.1.1k:145841-145843
+/vendor/openssl/3.0.1:150323-150324
+/vendor/openssl/current:147554-150322