make update (libeay.num has been edited to match 0.9.7-stable)

[openssl.git] / crypto / x509 / x509_ext.c

diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
index 723b1d4d542cb14af3f63355eb0e3f0de505d9c7..e7fdacb5e45a243994e47ce1d363957d44f304be 100644 (file)
--- a/crypto/x509/x509_ext.c
+++ b/crypto/x509/x509_ext.c
@@ -57,12 +57,14 @@
  */
 
 #include <stdio.h>
-#include "stack.h"
+#include <openssl/stack.h>
 #include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
 
 int X509_CRL_get_ext_count(X509_CRL *x)
        {
@@ -94,6 +96,17 @@ X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc)
        return(X509v3_delete_ext(x->crl->extensions,loc));
        }
 
+void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx)
+{
+       return X509V3_get_d2i(x->crl->extensions, nid, crit, idx);
+}
+
+int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
+                                                       unsigned long flags)
+{
+       return X509V3_add1_i2d(&x->crl->extensions, nid, value, crit, flags);
+}
+
 int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc)
        {
        return(X509v3_add_ext(&(x->crl->extensions),ex,loc) != NULL);
@@ -134,6 +147,18 @@ int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
        return(X509v3_add_ext(&(x->cert_info->extensions),ex,loc) != NULL);
        }
 
+void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)
+{
+       return X509V3_get_d2i(x->cert_info->extensions, nid, crit, idx);
+}
+
+int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
+                                                       unsigned long flags)
+{
+       return X509V3_add1_i2d(&x->cert_info->extensions, nid, value, crit,
+                                                       flags);
+}
+
 int X509_REVOKED_get_ext_count(X509_REVOKED *x)
        {
        return(X509v3_get_ext_count(x->extensions));
@@ -170,3 +195,16 @@ int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
        return(X509v3_add_ext(&(x->extensions),ex,loc) != NULL);
        }
 
+void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx)
+{
+       return X509V3_get_d2i(x->extensions, nid, crit, idx);
+}
+
+int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
+                                                       unsigned long flags)
+{
+       return X509V3_add1_i2d(&x->extensions, nid, value, crit, flags);
+}
+
+IMPLEMENT_STACK_OF(X509_EXTENSION)
+IMPLEMENT_ASN1_SET_OF(X509_EXTENSION)