diff options
author | richard.freedman%sun.com <devnull@localhost> | 2006-05-26 18:53:20 +0000 |
---|---|---|
committer | richard.freedman%sun.com <devnull@localhost> | 2006-05-26 18:53:20 +0000 |
commit | 5ef967aa8519bd2c9ed02ed921174b8ca981f7d4 (patch) | |
tree | 5073def5cbe925183f579a234f3cb36ed4300a01 | |
parent | b8170208304d2e7ffae3c19a6b5cd99b4f1ed2ff (diff) | |
download | nss-hg-5ef967aa8519bd2c9ed02ed921174b8ca981f7d4.tar.gz |
Reduce the opportunity for human error by defining type numbers automatically,
via a macro, the same way that error numbers are defined.
-rwxr-xr-x | security/nss/lib/libpkix/include/pkixt.h | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/security/nss/lib/libpkix/include/pkixt.h b/security/nss/lib/libpkix/include/pkixt.h index 9cdf17d39..e4f735e05 100755 --- a/security/nss/lib/libpkix/include/pkixt.h +++ b/security/nss/lib/libpkix/include/pkixt.h @@ -191,73 +191,73 @@ typedef int PKIX_Boolean; * * Every reference-counted PKIX_PL_Object is associated with an integer type. */ - -#define PKIX_OBJECT_TYPE ((PKIX_UInt32) 0) -#define PKIX_BIGINT_TYPE ((PKIX_UInt32) 1) -#define PKIX_BYTEARRAY_TYPE ((PKIX_UInt32) 2) -#define PKIX_ERROR_TYPE ((PKIX_UInt32) 3) -#define PKIX_HASHTABLE_TYPE ((PKIX_UInt32) 4) -#define PKIX_LIST_TYPE ((PKIX_UInt32) 5) -#define PKIX_LOGGER_TYPE ((PKIX_UInt32) 6) -#define PKIX_MUTEX_TYPE ((PKIX_UInt32) 7) -#define PKIX_OID_TYPE ((PKIX_UInt32) 8) -#define PKIX_RWLOCK_TYPE ((PKIX_UInt32) 9) -#define PKIX_STRING_TYPE ((PKIX_UInt32) 10) - -#define PKIX_CERTBASICCONSTRAINTS_TYPE ((PKIX_UInt32) 11) -#define PKIX_CERT_TYPE ((PKIX_UInt32) 12) -#define PKIX_HTTPCLIENT_TYPE ((PKIX_UInt32) 13) -#define PKIX_CRL_TYPE ((PKIX_UInt32) 14) -#define PKIX_CRLENTRY_TYPE ((PKIX_UInt32) 15) -#define PKIX_DATE_TYPE ((PKIX_UInt32) 16) -#define PKIX_GENERALNAME_TYPE ((PKIX_UInt32) 17) -#define PKIX_CERTNAMECONSTRAINTS_TYPE ((PKIX_UInt32) 18) -#define PKIX_PUBLICKEY_TYPE ((PKIX_UInt32) 19) -#define PKIX_TRUSTANCHOR_TYPE ((PKIX_UInt32) 20) - -#define PKIX_X500NAME_TYPE ((PKIX_UInt32) 21) -#define PKIX_HTTPCERTSTORECONTEXT_TYPE ((PKIX_UInt32) 22) -#define PKIX_BUILDRESULT_TYPE ((PKIX_UInt32) 23) -#define PKIX_PROCESSINGPARAMS_TYPE ((PKIX_UInt32) 24) -#define PKIX_VALIDATEPARAMS_TYPE ((PKIX_UInt32) 25) -#define PKIX_VALIDATERESULT_TYPE ((PKIX_UInt32) 26) -#define PKIX_CERTSTORE_TYPE ((PKIX_UInt32) 27) -#define PKIX_CERTCHAINCHECKER_TYPE ((PKIX_UInt32) 28) -#define PKIX_REVOCATIONCHECKER_TYPE ((PKIX_UInt32) 29) -#define PKIX_CERTSELECTOR_TYPE ((PKIX_UInt32) 30) - -#define PKIX_COMCERTSELPARAMS_TYPE ((PKIX_UInt32) 31) -#define PKIX_CRLSELECTOR_TYPE ((PKIX_UInt32) 32) -#define PKIX_COMCRLSELPARAMS_TYPE ((PKIX_UInt32) 33) -#define PKIX_CERTPOLICYINFO_TYPE ((PKIX_UInt32) 34) -#define PKIX_CERTPOLICYQUALIFIER_TYPE ((PKIX_UInt32) 35) -#define PKIX_CERTPOLICYMAP_TYPE ((PKIX_UInt32) 36) -#define PKIX_CERTPOLICYNODE_TYPE ((PKIX_UInt32) 37) -#define PKIX_TARGETCERTCHECKERSTATE_TYPE ((PKIX_UInt32) 38) -#define PKIX_BASICCONSTRAINTSCHECKERSTATE_TYPE ((PKIX_UInt32) 39) -#define PKIX_CERTPOLICYCHECKERSTATE_TYPE ((PKIX_UInt32) 40) - -#define PKIX_COLLECTIONCERTSTORECONTEXT_TYPE ((PKIX_UInt32) 41) -#define PKIX_DEFAULTCRLCHECKERSTATE_TYPE ((PKIX_UInt32) 42) -#define PKIX_FORWARDBUILDERSTATE_TYPE ((PKIX_UInt32) 43) -#define PKIX_SIGNATURECHECKERSTATE_TYPE ((PKIX_UInt32) 44) -#define PKIX_CERTNAMECONSTRAINTSCHECKERSTATE_TYPE ((PKIX_UInt32) 45) -#define PKIX_DEFAULTREVOCATIONCHECKER_TYPE ((PKIX_UInt32) 46) -#define PKIX_LDAPREQUEST_TYPE ((PKIX_UInt32) 47) -#define PKIX_LDAPRESPONSE_TYPE ((PKIX_UInt32) 48) -#define PKIX_LDAPDEFAULTCLIENT_TYPE ((PKIX_UInt32) 49) -#define PKIX_SOCKET_TYPE ((PKIX_UInt32) 50) - -#define PKIX_RESOURCELIMITS_TYPE ((PKIX_UInt32) 51) -#define PKIX_MONITORLOCK_TYPE ((PKIX_UInt32) 52) -#define PKIX_INFOACCESS_TYPE ((PKIX_UInt32) 53) -#define PKIX_AIAMGR_TYPE ((PKIX_UInt32) 54) -#define PKIX_OCSPCHECKER_TYPE ((PKIX_UInt32) 55) -#define PKIX_OCSPREQUEST_TYPE ((PKIX_UInt32) 56) -#define PKIX_OCSPRESPONSE_TYPE ((PKIX_UInt32) 57) -#define PKIX_HTTPDEFAULTCLIENT_TYPE ((PKIX_UInt32) 58) - -#define PKIX_NUMTYPES ((PKIX_UInt32) 59) +#define PKIX_TYPES \ + TYPEMACRO(OBJECT), \ + TYPEMACRO(BIGINT), \ + TYPEMACRO(BYTEARRAY), \ + TYPEMACRO(ERROR), \ + TYPEMACRO(HASHTABLE), \ + TYPEMACRO(LIST), \ + TYPEMACRO(LOGGER), \ + TYPEMACRO(MUTEX), \ + TYPEMACRO(OID), \ + TYPEMACRO(RWLOCK), \ + TYPEMACRO(STRING), \ + TYPEMACRO(CERTBASICCONSTRAINTS), \ + TYPEMACRO(CERT), \ + TYPEMACRO(HTTPCLIENT), \ + TYPEMACRO(CRL), \ + TYPEMACRO(CRLENTRY), \ + TYPEMACRO(DATE), \ + TYPEMACRO(GENERALNAME), \ + TYPEMACRO(CERTNAMECONSTRAINTS), \ + TYPEMACRO(PUBLICKEY), \ + TYPEMACRO(TRUSTANCHOR), \ + TYPEMACRO(X500NAME), \ + TYPEMACRO(HTTPCERTSTORECONTEXT), \ + TYPEMACRO(BUILDRESULT), \ + TYPEMACRO(PROCESSINGPARAMS), \ + TYPEMACRO(VALIDATEPARAMS), \ + TYPEMACRO(VALIDATERESULT), \ + TYPEMACRO(CERTSTORE), \ + TYPEMACRO(CERTCHAINCHECKER), \ + TYPEMACRO(REVOCATIONCHECKER), \ + TYPEMACRO(CERTSELECTOR), \ + TYPEMACRO(COMCERTSELPARAMS), \ + TYPEMACRO(CRLSELECTOR), \ + TYPEMACRO(COMCRLSELPARAMS), \ + TYPEMACRO(CERTPOLICYINFO), \ + TYPEMACRO(CERTPOLICYQUALIFIER), \ + TYPEMACRO(CERTPOLICYMAP), \ + TYPEMACRO(CERTPOLICYNODE), \ + TYPEMACRO(TARGETCERTCHECKERSTATE), \ + TYPEMACRO(BASICCONSTRAINTSCHECKERSTATE), \ + TYPEMACRO(CERTPOLICYCHECKERSTATE), \ + TYPEMACRO(COLLECTIONCERTSTORECONTEXT), \ + TYPEMACRO(DEFAULTCRLCHECKERSTATE), \ + TYPEMACRO(FORWARDBUILDERSTATE), \ + TYPEMACRO(SIGNATURECHECKERSTATE), \ + TYPEMACRO(CERTNAMECONSTRAINTSCHECKERSTATE), \ + TYPEMACRO(DEFAULTREVOCATIONCHECKER), \ + TYPEMACRO(LDAPREQUEST), \ + TYPEMACRO(LDAPRESPONSE), \ + TYPEMACRO(LDAPDEFAULTCLIENT), \ + TYPEMACRO(SOCKET), \ + TYPEMACRO(RESOURCELIMITS), \ + TYPEMACRO(MONITORLOCK), \ + TYPEMACRO(INFOACCESS), \ + TYPEMACRO(AIAMGR), \ + TYPEMACRO(OCSPCHECKER), \ + TYPEMACRO(OCSPREQUEST), \ + TYPEMACRO(OCSPRESPONSE), \ + TYPEMACRO(HTTPDEFAULTCLIENT) + +#define TYPEMACRO(type) PKIX_ ## type ## _TYPE + +typedef enum { /* Now invoke all those TYPEMACROs to assign the numbers */ + PKIX_TYPES, + PKIX_NUMTYPES /* This gets PKIX_NUMTYPES defined as the total number */ +} PKIX_TYPENUM; /* User Define Object Types * @@ -346,7 +346,7 @@ typedef int PKIX_Boolean; #define ERRMACRO(type) PKIX_ ## type ## _ERROR -typedef enum { +typedef enum { /* Now invoke all those ERRMACROs to assign the numbers */ PKIX_ERRORS, PKIX_NUMERRORS /* This gets PKIX_NUMERRORS defined as the total number */ } PKIX_ERRORNUM; @@ -379,7 +379,7 @@ typedef enum { /* Key Usages * - * These typess specify supported Key Usages + * These types specify supported Key Usages */ #define PKIX_DIGITAL_SIGNATURE 0x001 |