Change #include filenames from <foo.h> to <openssl.h>.

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

diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
index e7918d6b3cda16cf74dab7fe43b53a1276eb8a25..1a58f73ab2fa384ba6641824d4523e74e594637d 100644 (file)
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509v3/v3_genn.c
@@ -59,19 +59,17 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
-#include "asn1_mac.h"
-#include "conf.h"
-#include "x509v3.h"
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
 
 /*
  * ASN1err(ASN1_F_GENERAL_NAME_NEW,ERR_R_MALLOC_FAILURE);
  * ASN1err(ASN1_F_D2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
  */
 
-int i2d_GENERAL_NAME(a,pp)
-GENERAL_NAME *a;
-unsigned char **pp;
+int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp)
 {
        unsigned char *p;
        int ret;
@@ -131,10 +129,8 @@ GENERAL_NAME *GENERAL_NAME_new()
        M_ASN1_New_Error(ASN1_F_GENERAL_NAME_NEW);
 }
 
-GENERAL_NAME *d2i_GENERAL_NAME(a,pp,length)
-GENERAL_NAME **a;
-unsigned char **pp;
-long length;
+GENERAL_NAME *d2i_GENERAL_NAME(GENERAL_NAME **a, unsigned char **pp,
+                                                                long length)
 {
        unsigned char _tmp;
        M_ASN1_D2I_vars(a,GENERAL_NAME *,GENERAL_NAME_new);
@@ -181,8 +177,7 @@ long length;
        M_ASN1_D2I_Finish(a, GENERAL_NAME_free, ASN1_F_D2I_GENERAL_NAME);
 }
 
-void GENERAL_NAME_free(a)
-GENERAL_NAME *a;
+void GENERAL_NAME_free(GENERAL_NAME *a)
 {
        if (a == NULL) return;
        switch(a->type) {
@@ -219,30 +214,29 @@ GENERAL_NAME *a;
  * an explicit functions.
  */
 
-STACK *GENERAL_NAMES_new()
+STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new()
 {
-       return sk_new(NULL);
+       return sk_GENERAL_NAME_new(NULL);
 }
 
-void GENERAL_NAMES_free(a)
-STACK *a;
+void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a)
 {
-       sk_pop_free(a, GENERAL_NAME_free);
+       sk_GENERAL_NAME_pop_free(a, GENERAL_NAME_free);
 }
 
-STACK *d2i_GENERAL_NAMES(a,pp,length)
-STACK **a;
-unsigned char **pp;
-long length;
+STACK_OF(GENERAL_NAME) *d2i_GENERAL_NAMES(STACK_OF(GENERAL_NAME) **a,
+                                        unsigned char **pp, long length)
 {
-return d2i_ASN1_SET(a, pp, length, (char *(*)())d2i_GENERAL_NAME,
+return d2i_ASN1_SET_OF_GENERAL_NAME(a, pp, length, d2i_GENERAL_NAME,
                         GENERAL_NAME_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
 }
 
-int i2d_GENERAL_NAMES(a,pp)
-STACK *a;
-unsigned char **pp;
+int i2d_GENERAL_NAMES(STACK_OF(GENERAL_NAME) *a, unsigned char **pp)
 {
-return i2d_ASN1_SET(a, pp, i2d_GENERAL_NAME, V_ASN1_SEQUENCE,
+return i2d_ASN1_SET_OF_GENERAL_NAME(a, pp, i2d_GENERAL_NAME, V_ASN1_SEQUENCE,
                                                 V_ASN1_UNIVERSAL, IS_SEQUENCE);
 }
+
+IMPLEMENT_STACK_OF(GENERAL_NAME)
+IMPLEMENT_ASN1_SET_OF(GENERAL_NAME)
+