*BIG* verify code reorganisation.

[openssl.git] / crypto / x509 / x509_txt.c

diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index 871cc33637cae7554141c6588f9dc13b65bc582c..cfb478d4bc5bfd925433a8ba791c7e3315130271 100644 (file)
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -59,18 +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 <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];
 
@@ -120,8 +118,29 @@ 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");
+
        default:
                sprintf(buf,"error number %ld",n);
                return(buf);