Updates from 1.0.0-stable.

[openssl.git] / crypto / x509v3 / v3_enum.c

diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509v3/v3_enum.c
index 835bde919f278ad2b2a46358b15557d318904f9a..c0575e368d316ca539c9eb82d5d9575f7c987ce8 100644 (file)
--- a/crypto/x509v3/v3_enum.c
+++ b/crypto/x509v3/v3_enum.c
@@ -1,5 +1,5 @@
 /* v3_enum.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
@@ -58,45 +58,39 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "x509v3.h"
-
-static ASN1_ENUMERATED *asn1_enumerated_new();
+#include <openssl/x509v3.h>
 
 static ENUMERATED_NAMES crl_reasons[] = {
-{0, "Unspecified", "unspecified"},
-{1, "Key Compromise", "keyCompromise"},
-{2, "CA Compromise", "CACompromise"},
-{3, "Affiliation Changed", "affiliationChanged"},
-{4, "Superseded", "superseded"},
-{5, "Cessation Of Operation", "cessationOfOperation"},
-{6, "Certificate Hold", "certificateHold"},
-{8, "Remove From CRL", "removeFromCRL"},
+{CRL_REASON_UNSPECIFIED,        "Unspecified", "unspecified"},
+{CRL_REASON_KEY_COMPROMISE,     "Key Compromise", "keyCompromise"},
+{CRL_REASON_CA_COMPROMISE,      "CA Compromise", "CACompromise"},
+{CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed", "affiliationChanged"},
+{CRL_REASON_SUPERSEDED,         "Superseded", "superseded"},
+{CRL_REASON_CESSATION_OF_OPERATION,
+                       "Cessation Of Operation", "cessationOfOperation"},
+{CRL_REASON_CERTIFICATE_HOLD,   "Certificate Hold", "certificateHold"},
+{CRL_REASON_REMOVE_FROM_CRL,    "Remove From CRL", "removeFromCRL"},
+{CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn", "privilegeWithdrawn"},
+{CRL_REASON_AA_COMPROMISE,      "AA Compromise", "AACompromise"},
 {-1, NULL, NULL}
 };
 
-X509V3_EXT_METHOD v3_crl_reason = { 
-NID_crl_reason, 0,
-(X509V3_EXT_NEW)asn1_enumerated_new, ASN1_STRING_free,
-(X509V3_EXT_D2I)d2i_ASN1_ENUMERATED,
-i2d_ASN1_ENUMERATED,
+const X509V3_EXT_METHOD v3_crl_reason = { 
+NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED),
+0,0,0,0,
 (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,
-(X509V3_EXT_S2I)NULL,
-NULL, NULL, NULL, (char *)crl_reasons};
-
+0,
+0,0,0,0,
+crl_reasons};
 
-static ASN1_ENUMERATED *asn1_enumerated_new()
-{
-       return ASN1_ENUMERATED_new();
-}
 
-char *i2s_ASN1_ENUMERATED_TABLE(method, e)
-X509V3_EXT_METHOD *method;
-ASN1_ENUMERATED *e;
+char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method,
+            ASN1_ENUMERATED *e)
 {
        ENUMERATED_NAMES *enam;
        long strval;
        strval = ASN1_ENUMERATED_get(e);
-       for(enam =(ENUMERATED_NAMES *)method->usr_data; enam->lname; enam++) {
+       for(enam = method->usr_data; enam->lname; enam++) {
                if(strval == enam->bitnum) return BUF_strdup(enam->lname);
        }
        return i2s_ASN1_ENUMERATED(method, e);