Match upstream's error codes for the old sigalg code.
People seem to condition on these a lot. Since this code has now been moved
twice, just make them all cross-module errors rather than leave a trail of
renamed error codes in our wake.
Change-Id: Iea18ab3d320f03cf29a64a27acca119768c4115c
Reviewed-on: https://boringssl-review.googlesource.com/7431
Reviewed-by: Emily Stark (Dunn) <estark@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 8296ca4..2291641 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -1165,5 +1165,10 @@
#define ASN1_R_UNSUPPORTED_TYPE 184
#define ASN1_R_WRONG_TAG 185
#define ASN1_R_WRONG_TYPE 186
+#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 187
+#define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM 188
+#define ASN1_R_WRONG_PUBLIC_KEY_TYPE 189
+#define ASN1_R_CONTEXT_NOT_INITIALISED 190
+#define ASN1_R_UNSUPPORTED_ALGORITHM 191
#endif
diff --git a/include/openssl/base.h b/include/openssl/base.h
index b685ec3..0379b74 100644
--- a/include/openssl/base.h
+++ b/include/openssl/base.h
@@ -109,6 +109,7 @@
#define OPENSSL_IS_BORINGSSL
#define BORINGSSL_201512
+#define BORINGSSL_201603
#define OPENSSL_VERSION_NUMBER 0x10002000
#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index df75af0..dbbe635 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -637,5 +637,8 @@
#define RSA_R_BAD_ENCODING 143
#define RSA_R_ENCODE_ERROR 144
#define RSA_R_BAD_VERSION 145
+#define RSA_R_INVALID_PSS_PARAMETERS 146
+#define RSA_R_INVALID_SALT_LENGTH 147
+#define RSA_R_INVALID_TRAILER 148
#endif /* OPENSSL_HEADER_RSA_H */
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 3b21c14..480355b 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -1244,29 +1244,20 @@
#define X509_R_KEY_VALUES_MISMATCH 115
#define X509_R_LOADING_CERT_DIR 116
#define X509_R_LOADING_DEFAULTS 117
-#define X509_R_METHOD_NOT_SUPPORTED 118
-#define X509_R_NEWER_CRL_NOT_NEWER 119
-#define X509_R_NOT_PKCS7_SIGNED_DATA 120
-#define X509_R_NO_CERTIFICATES_INCLUDED 121
-#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY 122
+#define X509_R_NEWER_CRL_NOT_NEWER 118
+#define X509_R_NOT_PKCS7_SIGNED_DATA 119
+#define X509_R_NO_CERTIFICATES_INCLUDED 120
+#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY 121
+#define X509_R_NO_CRLS_INCLUDED 122
#define X509_R_NO_CRL_NUMBER 123
#define X509_R_PUBLIC_KEY_DECODE_ERROR 124
#define X509_R_PUBLIC_KEY_ENCODE_ERROR 125
#define X509_R_SHOULD_RETRY 126
-#define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN 127
-#define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY 128
-#define X509_R_UNKNOWN_KEY_TYPE 129
-#define X509_R_UNKNOWN_NID 130
-#define X509_R_UNKNOWN_PURPOSE_ID 131
-#define X509_R_UNKNOWN_TRUST_ID 132
-#define X509_R_UNSUPPORTED_ALGORITHM 133
-#define X509_R_WRONG_LOOKUP_TYPE 134
-#define X509_R_WRONG_TYPE 135
-#define X509_R_NO_CRLS_INCLUDED 136
-#define X509_R_CONTEXT_NOT_INITIALISED 137
-#define X509_R_INVALID_PSS_PARAMETERS 138
-#define X509_R_INVALID_SALT_LENGTH 139
-#define X509_R_INVALID_TRAILER 140
-#define X509_R_WRONG_PUBLIC_KEY_TYPE 141
+#define X509_R_UNKNOWN_KEY_TYPE 127
+#define X509_R_UNKNOWN_NID 128
+#define X509_R_UNKNOWN_PURPOSE_ID 129
+#define X509_R_UNKNOWN_TRUST_ID 130
+#define X509_R_WRONG_LOOKUP_TYPE 131
+#define X509_R_WRONG_TYPE 132
#endif
