The majority of the OCSP code from CertCo.

[openssl.git] / crypto / asn1 / asn1.h

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 9cf0fc0d01d2d266d679f24f05c514e9f5bd9739..3daf4e483a200217d974b98de03503d76a9703dc 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -67,9 +67,7 @@
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
 
-#ifdef VMS
-#include <openssl/vms_idhacks.h>
-#endif
+#include <openssl/symhacks.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -85,6 +83,7 @@ extern "C" {
 #define V_ASN1_PRIMATIVE_TAG           0x1f
 
 #define V_ASN1_APP_CHOOSE              -2      /* let the recipient choose */
+#define V_ASN1_OTHER                   -3      /* used in ASN1_TYPE */
 
 #define V_ASN1_NEG                     0x100   /* negative flag */
 
@@ -306,7 +305,7 @@ typedef int ASN1_NULL;
 #define ASN1_STRFLGS_IGNORE_TYPE       0x20
 
 /* If this is set we include the string type in the output */
-#define ASN1_STRFLGS_SHOW_NAME         0x40
+#define ASN1_STRFLGS_SHOW_TYPE         0x40
 
 /* This determines which strings to display and which to
  * 'dump' (hex dump of content octets or DER encoding). We can
@@ -655,7 +654,10 @@ ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a,unsigned char **pp,
 int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
 ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);
 int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, char *str); 
+int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
+#if 0
 time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
+#endif
 
 int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);
@@ -809,6 +811,8 @@ int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x);
 int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
 #endif
 
+int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
+
 #ifndef NO_BIO
 char *ASN1_d2i_bio(char *(*xnew)(),char *(*d2i)(),BIO *bp,unsigned char **x);
 int ASN1_i2d_bio(int (*i2d)(),BIO *out,unsigned char *x);
@@ -952,6 +956,21 @@ void ASN1_STRING_TABLE_cleanup(void);
 #define ASN1_F_D2I_NETSCAPE_SPKAC                       143
 #define ASN1_F_D2I_NETSCAPE_SPKI                        144
 #define ASN1_F_D2I_NOTICEREF                            268
+#define ASN1_F_D2I_OCSP_BASICRESP                       293
+#define ASN1_F_D2I_OCSP_CERTID                          294
+#define ASN1_F_D2I_OCSP_CERTSTATUS                      295
+#define ASN1_F_D2I_OCSP_CRLID                           296
+#define ASN1_F_D2I_OCSP_ONEREQ                          297
+#define ASN1_F_D2I_OCSP_REQINFO                                 298
+#define ASN1_F_D2I_OCSP_REQUEST                                 299
+#define ASN1_F_D2I_OCSP_RESPBYTES                       300
+#define ASN1_F_D2I_OCSP_RESPDATA                        301
+#define ASN1_F_D2I_OCSP_RESPID                          302
+#define ASN1_F_D2I_OCSP_RESPONSE                        303
+#define ASN1_F_D2I_OCSP_REVOKEDINFO                     304
+#define ASN1_F_D2I_OCSP_SERVICELOC                      305
+#define ASN1_F_D2I_OCSP_SIGNATURE                       306
+#define ASN1_F_D2I_OCSP_SINGLERESP                      307
 #define ASN1_F_D2I_OTHERNAME                            287
 #define ASN1_F_D2I_PBE2PARAM                            262
 #define ASN1_F_D2I_PBEPARAM                             249
@@ -1023,6 +1042,21 @@ void ASN1_STRING_TABLE_cleanup(void);
 #define ASN1_F_NETSCAPE_SPKAC_NEW                       190
 #define ASN1_F_NETSCAPE_SPKI_NEW                        191
 #define ASN1_F_NOTICEREF_NEW                            272
+#define ASN1_F_OCSP_BASICRESP_NEW                       308
+#define ASN1_F_OCSP_CERTID_NEW                          309
+#define ASN1_F_OCSP_CERTSTATUS_NEW                      310
+#define ASN1_F_OCSP_CRLID_NEW                           311
+#define ASN1_F_OCSP_ONEREQ_NEW                          312
+#define ASN1_F_OCSP_REQINFO_NEW                                 313
+#define ASN1_F_OCSP_REQUEST_NEW                                 314
+#define ASN1_F_OCSP_RESPBYTES_NEW                       315
+#define ASN1_F_OCSP_RESPDATA_NEW                        316
+#define ASN1_F_OCSP_RESPID_NEW                          317
+#define ASN1_F_OCSP_RESPONSE_NEW                        318
+#define ASN1_F_OCSP_REVOKEDINFO_NEW                     319
+#define ASN1_F_OCSP_SERVICELOC_NEW                      320
+#define ASN1_F_OCSP_SIGNATURE_NEW                       321
+#define ASN1_F_OCSP_SINGLERESP_NEW                      322
 #define ASN1_F_OTHERNAME_NEW                            288
 #define ASN1_F_PBE2PARAM_NEW                            264
 #define ASN1_F_PBEPARAM_NEW                             251