1 files changed, 36 insertions, 12 deletions

diff --git a/src/lib/libcrypto/x509/x509_txt.c b/src/lib/libcrypto/x509/x509_txt.c
index 408d1c277c..4f83db8ba2 100644
--- a/src/lib/libcrypto/x509/x509_txt.c
+++ b/src/lib/libcrypto/x509/x509_txt.c
@@ -59,19 +59,16 @@
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
-#include <sys/types.h>
 
 #include "cryptlib.h"
-#include "lhash.h"
-#include "buffer.h"
-#include "evp.h"
-#include "asn1.h"
-#include "x509.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/objects.h>
 
-char *X509_verify_cert_error_string(n)
-long n;
+const char *X509_verify_cert_error_string(long n)
         {
         static char buf[100];
 
@@ -86,7 +83,7 @@ long n;
         case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
                 return("unable to decrypt certificate's signature");
         case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
-                return("unable to decrypt CRL's's signature");
+                return("unable to decrypt CRL's signature");
         case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
                 return("unable to decode issuer public key");
         case X509_V_ERR_CERT_SIGNATURE_FAILURE:
@@ -98,7 +95,7 @@ long n;
         case X509_V_ERR_CRL_NOT_YET_VALID:
                 return("CRL is not yet valid");
         case X509_V_ERR_CERT_HAS_EXPIRED:
-                return("Certificate has expired");
+                return("certificate has expired");
         case X509_V_ERR_CRL_HAS_EXPIRED:
                 return("CRL has expired");
         case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
@@ -121,8 +118,35 @@ long n;
                 return("unable to verify the first certificate");
         case X509_V_ERR_CERT_CHAIN_TOO_LONG:
                 return("certificate chain too long");
+        case X509_V_ERR_CERT_REVOKED:
+                return("certificate revoked");
+        case X509_V_ERR_INVALID_CA:
+                return ("invalid CA certificate");
+        case X509_V_ERR_PATH_LENGTH_EXCEEDED:
+                return ("path length constraint exceeded");
+        case X509_V_ERR_INVALID_PURPOSE:
+                return ("unsupported certificate purpose");
+        case X509_V_ERR_CERT_UNTRUSTED:
+                return ("certificate not trusted");
+        case X509_V_ERR_CERT_REJECTED:
+                return ("certificate rejected");
         case X509_V_ERR_APPLICATION_VERIFICATION:
                 return("application verification failure");
+        case X509_V_ERR_SUBJECT_ISSUER_MISMATCH:
+                return("subject issuer mismatch");
+        case X509_V_ERR_AKID_SKID_MISMATCH:
+                return("authority and subject key identifier mismatch");
+        case X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH:
+                return("authority and issuer serial number mismatch");
+        case X509_V_ERR_KEYUSAGE_NO_CERTSIGN:
+                return("key usage does not include certificate signing");
+
+        case X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER:
+                return("unable to get CRL issuer certificate");
+
+        case X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION:
+                return("unhandled critical extension");
+
         default:
                 sprintf(buf,"error number %ld",n);
                 return(buf);