Add missing ERR_LIB_TRUST_TOKEN constants.
Also fix the numbering. ERR_LIB_USER probably ought to be last.
Change-Id: I2eb94dc129aa40b36711a7c20a9dfedf9944fc21
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/40846
Reviewed-by: Steven Valdez <svaldez@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/crypto/err/err.c b/crypto/err/err.c
index a432ce3..7973a0e 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -495,38 +495,39 @@
static const char *const kLibraryNames[ERR_NUM_LIBS] = {
"invalid library (0)",
- "unknown library", // ERR_LIB_NONE
- "system library", // ERR_LIB_SYS
- "bignum routines", // ERR_LIB_BN
- "RSA routines", // ERR_LIB_RSA
- "Diffie-Hellman routines", // ERR_LIB_DH
- "public key routines", // ERR_LIB_EVP
- "memory buffer routines", // ERR_LIB_BUF
- "object identifier routines", // ERR_LIB_OBJ
- "PEM routines", // ERR_LIB_PEM
- "DSA routines", // ERR_LIB_DSA
- "X.509 certificate routines", // ERR_LIB_X509
- "ASN.1 encoding routines", // ERR_LIB_ASN1
- "configuration file routines", // ERR_LIB_CONF
- "common libcrypto routines", // ERR_LIB_CRYPTO
- "elliptic curve routines", // ERR_LIB_EC
- "SSL routines", // ERR_LIB_SSL
- "BIO routines", // ERR_LIB_BIO
- "PKCS7 routines", // ERR_LIB_PKCS7
- "PKCS8 routines", // ERR_LIB_PKCS8
- "X509 V3 routines", // ERR_LIB_X509V3
- "random number generator", // ERR_LIB_RAND
- "ENGINE routines", // ERR_LIB_ENGINE
- "OCSP routines", // ERR_LIB_OCSP
- "UI routines", // ERR_LIB_UI
- "COMP routines", // ERR_LIB_COMP
- "ECDSA routines", // ERR_LIB_ECDSA
- "ECDH routines", // ERR_LIB_ECDH
- "HMAC routines", // ERR_LIB_HMAC
- "Digest functions", // ERR_LIB_DIGEST
- "Cipher functions", // ERR_LIB_CIPHER
- "HKDF functions", // ERR_LIB_HKDF
- "User defined functions", // ERR_LIB_USER
+ "unknown library", // ERR_LIB_NONE
+ "system library", // ERR_LIB_SYS
+ "bignum routines", // ERR_LIB_BN
+ "RSA routines", // ERR_LIB_RSA
+ "Diffie-Hellman routines", // ERR_LIB_DH
+ "public key routines", // ERR_LIB_EVP
+ "memory buffer routines", // ERR_LIB_BUF
+ "object identifier routines", // ERR_LIB_OBJ
+ "PEM routines", // ERR_LIB_PEM
+ "DSA routines", // ERR_LIB_DSA
+ "X.509 certificate routines", // ERR_LIB_X509
+ "ASN.1 encoding routines", // ERR_LIB_ASN1
+ "configuration file routines", // ERR_LIB_CONF
+ "common libcrypto routines", // ERR_LIB_CRYPTO
+ "elliptic curve routines", // ERR_LIB_EC
+ "SSL routines", // ERR_LIB_SSL
+ "BIO routines", // ERR_LIB_BIO
+ "PKCS7 routines", // ERR_LIB_PKCS7
+ "PKCS8 routines", // ERR_LIB_PKCS8
+ "X509 V3 routines", // ERR_LIB_X509V3
+ "random number generator", // ERR_LIB_RAND
+ "ENGINE routines", // ERR_LIB_ENGINE
+ "OCSP routines", // ERR_LIB_OCSP
+ "UI routines", // ERR_LIB_UI
+ "COMP routines", // ERR_LIB_COMP
+ "ECDSA routines", // ERR_LIB_ECDSA
+ "ECDH routines", // ERR_LIB_ECDH
+ "HMAC routines", // ERR_LIB_HMAC
+ "Digest functions", // ERR_LIB_DIGEST
+ "Cipher functions", // ERR_LIB_CIPHER
+ "HKDF functions", // ERR_LIB_HKDF
+ "Trust Token functions", // ERR_LIB_TRUST_TOKEN
+ "User defined functions", // ERR_LIB_USER
};
const char *ERR_lib_error_string(uint32_t packed_error) {
diff --git a/crypto/err/err_data_generate.go b/crypto/err/err_data_generate.go
index 153768d..e8aefd8 100644
--- a/crypto/err/err_data_generate.go
+++ b/crypto/err/err_data_generate.go
@@ -63,8 +63,8 @@
"DIGEST",
"CIPHER",
"HKDF",
- "USER",
"TRUST_TOKEN",
+ "USER",
}
// stringList is a map from uint32 -> string which can output data for a sorted
diff --git a/include/openssl/err.h b/include/openssl/err.h
index 0f6824e..0960d80 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -319,8 +319,8 @@
ERR_LIB_DIGEST,
ERR_LIB_CIPHER,
ERR_LIB_HKDF,
- ERR_LIB_USER,
ERR_LIB_TRUST_TOKEN,
+ ERR_LIB_USER,
ERR_NUM_LIBS
};
@@ -363,6 +363,7 @@
#define ERR_R_DIGEST_LIB ERR_LIB_DIGEST
#define ERR_R_CIPHER_LIB ERR_LIB_CIPHER
#define ERR_R_HKDF_LIB ERR_LIB_HKDF
+#define ERR_R_TRUST_TOKEN_LIB ERR_LIB_TRUST_TOKEN
// The following values are global reason codes. They may occur in any library.
#define ERR_R_FATAL 64
