Add RFC 3779 support.

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

diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index d5fc5839a1008166857275c3cd4f476806adff58..20b937d71815461e1a63a5523fb05bc85dc37c1f 100644 (file)
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -1,5 +1,5 @@
 /* crypto/x509/x509_txt.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,23 +59,20 @@
 #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)
-int n;
+const char *X509_verify_cert_error_string(long n)
        {
        static char buf[100];
 
-       switch (n)
+       switch ((int)n)
                {
        case X509_V_OK:
                return("ok");
@@ -86,7 +83,7 @@ int 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,16 +95,16 @@ int 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:
                return("format error in certificate's notBefore field");
        case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
                return("format error in certificate's notAfter field");
-       case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FILED:
+       case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD:
                return("format error in CRL's lastUpdate field");
-       case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FILED:
+       case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
                return("format error in CRL's nextUpdate field");
        case X509_V_ERR_OUT_OF_MEM:
                return("out of memory");
@@ -121,8 +118,58 @@ int 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_INVALID_NON_CA:
+               return ("invalid non-CA certificate (has CA markings)");
+       case X509_V_ERR_PATH_LENGTH_EXCEEDED:
+               return ("path length constraint exceeded");
+       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");
+       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");
+       case X509_V_ERR_KEYUSAGE_NO_CRL_SIGN:
+               return("key usage does not include CRL signing");
+       case X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE:
+               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_DIFFERENT_CRL_SCOPE:
+       return("Different CRL scope");
+       case X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE:
+       return("Unsupported extension feature");
+       case X509_V_ERR_UNNESTED_RESOURCE:
+               return("RFC 3779 resource not subset of parent's resources");
        default:
-               sprintf(buf,"error number %d",n);
+               BIO_snprintf(buf,sizeof buf,"error number %ld",n);
                return(buf);
                }
        }