resolve conflicts

1 files changed, 9 insertions, 1 deletions

diff --git a/src/lib/libcrypto/x509/x509_txt.c b/src/lib/libcrypto/x509/x509_txt.c
index f19e66a238..73a8ec726f 100644
--- a/src/lib/libcrypto/x509/x509_txt.c
+++ b/src/lib/libcrypto/x509/x509_txt.c
@@ -129,7 +129,7 @@ const char *X509_verify_cert_error_string(long n)
         case X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED:
                 return("proxy path length constraint exceeded");
         case X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED:
-                return("proxy cerificates not allowed, please set the appropriate flag");
+                return("proxy certificates not allowed, please set the appropriate flag");
         case X509_V_ERR_INVALID_PURPOSE:
                 return ("unsupported certificate purpose");
         case X509_V_ERR_CERT_UNTRUSTED:
@@ -156,6 +156,14 @@ const char *X509_verify_cert_error_string(long n)
                 return("key usage does not include digital signature");
         case X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION:
                 return("unhandled critical CRL extension");
+        case X509_V_ERR_INVALID_EXTENSION:
+                return("invalid or inconsistent certificate extension");
+        case X509_V_ERR_INVALID_POLICY_EXTENSION:
+                return("invalid or inconsistent certificate policy extension");
+        case X509_V_ERR_NO_EXPLICIT_POLICY:
+                return("no explicit policy");
+        case X509_V_ERR_UNNESTED_RESOURCE:
+                return("RFC 3779 resource not subset of parent's resources");
         default:
                 BIO_snprintf(buf,sizeof buf,"error number %ld",n);
                 return(buf);