Initial support for Certificate Policies extension: print out works but setting

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

diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index 3fb21fbe2561188e493947ce46e9323d7406d0f3..e3686b627559d2ac13d1143c3c2da72e13d157fd 100644 (file)
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -57,26 +57,25 @@
  */
 /* X509 v3 extension utilities */
 
-#include <stdlib.h>
-#include <pem.h>
-#include <conf.h>
-#include <err.h>
+#include <stdio.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 static STACK *ext_list = NULL;
 
-static ext_cmp(X509V3_EXT_METHOD **a, X509V3_EXT_METHOD **b);
+static int ext_cmp(X509V3_EXT_METHOD **a, X509V3_EXT_METHOD **b);
 static void ext_list_free(X509V3_EXT_METHOD *ext);
 
 int X509V3_EXT_add(ext)
 X509V3_EXT_METHOD *ext;
 {
        if(!ext_list && !(ext_list = sk_new(ext_cmp))) {
-               X509V3err(X509V3_F_X509V3_ADD_EXT,ERR_R_MALLOC_FAILURE);
+               X509V3err(X509V3_F_X509V3_EXT_ADD,ERR_R_MALLOC_FAILURE);
                return 0;
        }
        if(!sk_push(ext_list, (char *)ext)) {
-               X509V3err(X509V3_F_X509V3_ADD_EXT,ERR_R_MALLOC_FAILURE);
+               X509V3err(X509V3_F_X509V3_EXT_ADD,ERR_R_MALLOC_FAILURE);
                return 0;
        }
        return 1;
@@ -147,8 +146,11 @@ X509V3_EXT_METHOD *ext;
 }
 
 extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
+extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet;
 extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;
 
+extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_cpols;
+
 int X509V3_add_standard_extensions()
 {
        X509V3_EXT_add_list(v3_ns_ia5_list);
@@ -159,5 +161,23 @@ int X509V3_add_standard_extensions()
        X509V3_EXT_add(&v3_ext_ku);
        X509V3_EXT_add(&v3_skey_id);
        X509V3_EXT_add(&v3_akey_id);
+       X509V3_EXT_add(&v3_pkey_usage_period);
+       X509V3_EXT_add(&v3_crl_num);
+       X509V3_EXT_add(&v3_sxnet);
+       X509V3_EXT_add(&v3_crl_reason);
+       X509V3_EXT_add(&v3_cpols);
        return 1;
 }
+
+/* Return an extension internal structure */
+
+char *X509V3_EXT_d2i(ext)
+X509_EXTENSION *ext;
+{
+       X509V3_EXT_METHOD *method;
+       unsigned char *p;
+       if(!(method = X509V3_EXT_get(ext)) || !method->d2i) return NULL;
+       p = ext->value->data;
+       return method->d2i(NULL, &p, ext->value->length);
+}
+