Updates from 1.0.0-stable.

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

diff --git a/crypto/x509v3/v3_int.c b/crypto/x509v3/v3_int.c
index 637dd5e1288bfc7fd1a50e6e6bc306845aaf427d..4bfd14cf46b93109ecbf623079b46b9493277abe 100644 (file)
--- a/crypto/x509v3/v3_int.c
+++ b/crypto/x509v3/v3_int.c
@@ -1,9 +1,9 @@
 /* v3_int.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.
  */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,20 +60,30 @@
 #include "cryptlib.h"
 #include <openssl/x509v3.h>
 
-static ASN1_INTEGER *asn1_integer_new(void);
+const X509V3_EXT_METHOD v3_crl_num = { 
+       NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER),
+       0,0,0,0,
+       (X509V3_EXT_I2S)i2s_ASN1_INTEGER,
+       0,
+       0,0,0,0, NULL};
 
-X509V3_EXT_METHOD v3_crl_num = { 
-NID_crl_number, 0,
-(X509V3_EXT_NEW)asn1_integer_new,
-(X509V3_EXT_FREE)ASN1_STRING_free,
-(X509V3_EXT_D2I)d2i_ASN1_INTEGER,
-(X509V3_EXT_I2D)i2d_ASN1_INTEGER,
-(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
-(X509V3_EXT_S2I)NULL,
-NULL, NULL, NULL, NULL, NULL};
+const X509V3_EXT_METHOD v3_delta_crl = { 
+       NID_delta_crl, 0, ASN1_ITEM_ref(ASN1_INTEGER),
+       0,0,0,0,
+       (X509V3_EXT_I2S)i2s_ASN1_INTEGER,
+       0,
+       0,0,0,0, NULL};
+
+static void * s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *value)
+       {
+       return s2i_ASN1_INTEGER(meth, value);
+       }
+
+const X509V3_EXT_METHOD v3_inhibit_anyp = { 
+       NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER),
+       0,0,0,0,
+       (X509V3_EXT_I2S)i2s_ASN1_INTEGER,
+       (X509V3_EXT_S2I)s2i_asn1_int,
+       0,0,0,0, NULL};
 
 
-static ASN1_INTEGER *asn1_integer_new(void)
-{
-       return ASN1_INTEGER_new();
-}