Security-177.tar.gz

[apple/security.git] / AppleX509CL / CLCertExtensions.h

diff --git a/AppleX509CL/CLCertExtensions.h b/AppleX509CL/CLCertExtensions.h
index acfc01f94ec267536fac28203968621b2dbbf4bd..31d1b9575f7cc4a5879953c29a6db75acf3c6331 100644 (file)
--- a/AppleX509CL/CLCertExtensions.h
+++ b/AppleX509CL/CLCertExtensions.h
@@ -28,6 +28,7 @@
 #define _CL_CERT_EXTENSIONS_H_
 
 #include "DecodedCert.h"
+#include "CLFieldsCommon.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,26 +37,21 @@ extern "C" {
 /*
  * Functions to map OID --> {get,set,free}field
  */
-typedef bool (getFieldFcn) (
-       const DecodedCert       &cert,
-       unsigned                        index,                  // which occurrence (0 = first)
-       uint32                          &numFields,             // RETURNED
-       CssmOwnedData           &fieldValue);   // RETURNED
-typedef void (setFieldFcn) (
-       DecodedCert                     &cert,
-       const CssmData          &fieldValue);
-typedef void (freeFieldFcn) (
-       CssmOwnedData           &fieldValue);
-
-getFieldFcn getFieldKeyUsage, getFieldBasicConstraints, getFieldExtKeyUsage,
+getItemFieldFcn getFieldKeyUsage, getFieldBasicConstraints, 
+       getFieldExtKeyUsage,
        getFieldSubjectKeyId, getFieldAuthorityKeyId, getFieldSubjAltName,
-       getFieldCertPolicies, getFieldNetscapeCertType, getFieldUnknownExt;
-setFieldFcn setFieldKeyUsage, setFieldBasicConstraints, setFieldExtKeyUsage,
-       setFieldSubjectKeyId, setFieldAuthorityKeyId, setFieldSubjAltName,
-       setFieldCertPolicies, setFieldNetscapeCertType, setFieldUnknownExt;
-freeFieldFcn freeFieldSimpleExtension, freeFieldExtKeyUsage, freeFieldSubjectKeyId,
-       freeFieldAuthorityKeyId, freeFieldSubjAltName, freeFieldCertPolicies, 
-       freeFieldUnknownExt;
+       getFieldIssuerAltName,
+       getFieldCertPolicies, getFieldNetscapeCertType, getFieldCrlDistPoints,
+       getFieldUnknownExt;
+setItemFieldFcn setFieldKeyUsage, setFieldBasicConstraints, 
+       setFieldExtKeyUsage,
+       setFieldSubjectKeyId, setFieldAuthorityKeyId, setFieldSubjIssuerAltName,
+       setFieldCertPolicies, setFieldNetscapeCertType, setFieldCrlDistPoints,
+       setFieldUnknownExt;
+freeFieldFcn freeFieldExtKeyUsage, freeFieldSubjectKeyId,
+       freeFieldAuthorityKeyId, freeFieldSubjIssuerAltName, 
+       freeFieldCertPolicies, 
+       freeFieldCrlDistPoints, freeFieldUnknownExt;
        
 #ifdef __cplusplus
 }