1 files changed, 26 insertions, 30 deletions
diff --git a/src/lib/cert/x509/cert_status.h b/src/lib/cert/x509/cert_status.h
index d343d2e58..3b80253dc 100644
--- a/src/lib/cert/x509/cert_status.h
+++ b/src/lib/cert/x509/cert_status.h
@@ -8,50 +8,46 @@
 #ifndef BOTAN_X509_PATH_RESULT_H__
 #define BOTAN_X509_PATH_RESULT_H__
 
-#include <string>
-
 namespace Botan {
 
-enum Certificate_Status_Code {
-   VERIFIED,
-   UNKNOWN_X509_ERROR,
-   CANNOT_ESTABLISH_TRUST,
-   CERT_CHAIN_TOO_LONG,
-   SIGNATURE_ERROR,
-   POLICY_ERROR,
-   INVALID_USAGE,
+enum class Certificate_Status_Code {
+   VERIFIED = 0x00000000,
+   OCSP_RESPONSE_GOOD,
+   NO_REVOCATION_DATA,
 
-   SIGNATURE_METHOD_TOO_WEAK,
+   // Local policy failures
+   SIGNATURE_METHOD_TOO_WEAK = 1000,
    UNTRUSTED_HASH,
 
-   CERT_MULTIPLE_ISSUERS_FOUND,
-
-   CERT_FORMAT_ERROR,
-   CERT_ISSUER_NOT_FOUND,
-   CERT_NOT_YET_VALID,
+   // Time problems
+   CERT_NOT_YET_VALID = 2000,
    CERT_HAS_EXPIRED,
-   CERT_IS_REVOKED,
-
-   NO_REVOCATION_DATA,
-
-   CRL_FORMAT_ERROR,
+   OCSP_NOT_YET_VALID,
+   OCSP_HAS_EXPIRED,
    CRL_NOT_YET_VALID,
    CRL_HAS_EXPIRED,
-   CRL_NOT_FOUND,
-   CRL_BAD_SIGNATURE,
 
+   // Chain generation problems
+   CERT_ISSUER_NOT_FOUND = 3000,
+   CANNOT_ESTABLISH_TRUST,
+
+   // Validation errors
+   POLICY_ERROR = 4000,
+   INVALID_USAGE,
+   CERT_CHAIN_TOO_LONG,
+   CA_CERT_NOT_FOR_CERT_ISSUER,
+
+   // Revocation errors
+   CA_CERT_NOT_FOR_CRL_ISSUER,
    OCSP_CERT_NOT_LISTED,
-   OCSP_NOT_YET_VALID,
-   OCSP_EXPIRED,
    OCSP_BAD_STATUS,
-   OCSP_RESPONSE_GOOD,
 
-   CA_CERT_CANNOT_SIGN,
-   CA_CERT_NOT_FOR_CERT_ISSUER,
-   CA_CERT_NOT_FOR_CRL_ISSUER
+   // Hard failures
+   CERT_IS_REVOKED = 5000,
+   CRL_BAD_SIGNATURE,
+   SIGNATURE_ERROR,
 };
 
-
 }
 
 #endif