From e02a84bfd6affef56e2d6ef398d78016fca6a027 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kou=C5=99il?= Date: Wed, 10 Aug 2005 15:49:14 +0000 Subject: [PATCH] don't maintain internal copies of VOMS headers --- org.glite.security.proxyrenewal/src/acstack.h | 79 ---------- org.glite.security.proxyrenewal/src/newformat.h | 195 ------------------------ 2 files changed, 274 deletions(-) delete mode 100755 org.glite.security.proxyrenewal/src/acstack.h delete mode 100755 org.glite.security.proxyrenewal/src/newformat.h diff --git a/org.glite.security.proxyrenewal/src/acstack.h b/org.glite.security.proxyrenewal/src/acstack.h deleted file mode 100755 index a833a31..0000000 --- a/org.glite.security.proxyrenewal/src/acstack.h +++ /dev/null @@ -1,79 +0,0 @@ -/********************************************************************* - * - * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini@cnaf.infn.it - * - * Copyright (c) 2002, 2003 INFN-CNAF on behalf of the EU DataGrid. - * For license conditions see LICENSE file or - * http://www.edg.org/license.html - * - * Parts of this code may be based upon or even include verbatim pieces, - * originally written by other people, in which case the original header - * follows. - * - *********************************************************************/ -#ifndef _ACSTACK_H -#define _ACSTACK_H - -#include -#include -#include - -#define IMPL_STACK(type) \ - DECLARE_STACK_OF(type) \ - STACK_OF(type) *sk_##type##_new (int (*cmp)(const type * const *, const type * const *)) \ - { return sk_new ( (int (*)(const char * const *, const char * const *))cmp);} \ - STACK_OF(type) *sk_##type##_new_null () { return sk_new_null(); } \ - void sk_##type##_free (STACK_OF(type) *st) { sk_free(st); } \ - int sk_##type##_num (const STACK_OF(type) *st) { return sk_num(st); } \ - type *sk_##type##_value (const STACK_OF(type) *st, int i) { return (type *)sk_value(st, i); } \ - type *sk_##type##_set (STACK_OF(type) *st, int i, type *val) { return ((type *)sk_set(st, i, (char *)val)); } \ - void sk_##type##_zero (STACK_OF(type) *st) { sk_zero(st);} \ - int sk_##type##_push (STACK_OF(type) *st, type *val) { return sk_push(st, (char *)val); } \ - int sk_##type##_unshift (STACK_OF(type) *st, type *val) { return sk_unshift(st, (char *)val); } \ - int sk_##type##_find (STACK_OF(type) *st, type *val) { return sk_find(st, (char *)val); } \ - type *sk_##type##_delete (STACK_OF(type) *st, int i) { return (type *)sk_delete(st, i); } \ - type *sk_##type##_delete_ptr (STACK_OF(type) *st, type *ptr) { return (type *)sk_delete_ptr(st, (char *)ptr); } \ - int sk_##type##_insert (STACK_OF(type) *st, type *val, int i) { return sk_insert(st, (char *)val, i); } \ - int (*sk_##type##_set_cmp_func (STACK_OF(type) *st, int (*cmp)(const type * const *, const type * const *)))(const type * const *, const type * const *) \ - { return (int ((*)(const type * const *, const type * const *)))sk_set_cmp_func (st, (int (*)(const char * const *, const char * const *))cmp); } \ - STACK_OF(type) *sk_##type##_dup (STACK_OF(type) *st) { return sk_dup(st); } \ - void sk_##type##_pop_free (STACK_OF(type) *st, void (*func)(type *)) { sk_pop_free(st, (void (*)(void *))func); } \ - type *sk_##type##_shift (STACK_OF(type) *st) { return (type *)sk_shift(st); } \ - type *sk_##type##_pop (STACK_OF(type) *st) { return (type *)sk_pop(st); } \ - void sk_##type##_sort (STACK_OF(type) *st) { sk_sort(st); } \ - STACK_OF(type) *d2i_ASN1_SET_OF_##type (STACK_OF(type) **st, unsigned char **pp, long length, type *(*d2ifunc)(), void (*freefunc)(type *), int ex_tag, int ex_class) \ - { return d2i_ASN1_SET(st, pp, length, (char *(*)())d2ifunc, (void (*)(void *))freefunc, ex_tag, ex_class); } \ - int i2d_ASN1_SET_OF_##type (STACK_OF(type) *st, unsigned char **pp, int (*i2dfunc)(), int ex_tag, int ex_class, int is_set) \ - { return i2d_ASN1_SET(st, pp, i2dfunc, ex_tag, ex_class, is_set); } \ - unsigned char *ASN1_seq_pack_##type (STACK_OF(type) *st, int (*i2d)(), unsigned char **buf, int *len) { return ASN1_seq_pack(st, i2d, buf, len); } \ - STACK_OF(type) *ASN1_seq_unpack_##type (unsigned char *buf, int len, type *(*d2i)(), void (*freefunc)(type *)) \ - { return ASN1_seq_unpack(buf, len, (char *(*)())d2i, (void (*)(void *))freefunc); } - - -#define DECL_STACK(type) \ - DECLARE_STACK_OF(type) \ - extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \ - extern STACK_OF(type) *sk_##type##_new_null (); \ - extern void sk_##type##_free (STACK_OF(type) *); \ - extern int sk_##type##_num (const STACK_OF(type) *); \ - extern type *sk_##type##_value (const STACK_OF(type) *, int); \ - extern type *sk_##type##_set (STACK_OF(type) *, int, type *); \ - extern void sk_##type##_zero (STACK_OF(type) *); \ - extern int sk_##type##_push (STACK_OF(type) *, type *); \ - extern int sk_##type##_unshift (STACK_OF(type) *, type *); \ - extern int sk_##type##_find (STACK_OF(type) *, type *); \ - extern type *sk_##type##_delete (STACK_OF(type) *, int); \ - extern type *sk_##type##_delete_ptr (STACK_OF(type) *, type *); \ - extern int sk_##type##_insert (STACK_OF(type) *, type *, int); \ - extern int (*sk_##type##_set_cmp_func (STACK_OF(type) *, int (*)(const type * const *, const type * const *)))(const type * const *, const type * const *); \ - extern STACK_OF(type) *sk_##type##_dup (STACK_OF(type) *); \ - extern void sk_##type##_pop_free (STACK_OF(type) *, void (*)(type *)); \ - extern type *sk_##type##_shift (STACK_OF(type) *); \ - extern type *sk_##type##_pop (STACK_OF(type) *); \ - extern void sk_##type##_sort (STACK_OF(type) *); \ - extern STACK_OF(type) *d2i_ASN1_SET_OF_##type (STACK_OF(type) **, unsigned char **, long, type *(*)(), void (*)(type *), int, int); \ - extern int i2d_ASN1_SET_OF_##type (STACK_OF(type) *, unsigned char **, int (*)(), int, int, int); \ - extern unsigned char *ASN1_seq_pack_##type (STACK_OF(type) *, int (*)(), unsigned char **, int *); \ - extern STACK_OF(type) *ASN1_seq_unpack_##type (unsigned char *, int, type *(*)(), void (*)(type *)) ; - -#endif diff --git a/org.glite.security.proxyrenewal/src/newformat.h b/org.glite.security.proxyrenewal/src/newformat.h deleted file mode 100755 index 0efeb7e..0000000 --- a/org.glite.security.proxyrenewal/src/newformat.h +++ /dev/null @@ -1,195 +0,0 @@ -/********************************************************************* - * - * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini@cnaf.infn.it - * - * Copyright (c) 2002, 2003 INFN-CNAF on behalf of the EU DataGrid. - * For license conditions see LICENSE file or - * http://www.edg.org/license.html - * - * Parts of this code may be based upon or even include verbatim pieces, - * originally written by other people, in which case the original header - * follows. - * - *********************************************************************/ -#ifndef _NEW_FORMAT_H -#define _NEW_FORMAT_H -#include -#include -#include -#include -#include -#include -#include - -#include "acstack.h" -#if 0 -static STACK_OF(CRYPT_EX_DATA_FUNS) *AC_meth = NULL; - -static AC_METHOD meth = { - (int (*)()) i2d_AC, - (char *(*)())d2i_AC, - (char *(*)())AC_new, - (void (*)()) AC_free}; -a -ASN1_METHOD *AC_asn1_meth(void) -{ - return &meth; -} -#endif - -typedef struct ACDIGEST { - ASN1_ENUMERATED *type; - ASN1_OBJECT *oid; - X509_ALGOR *algor; - ASN1_BIT_STRING *digest; -} AC_DIGEST; - -typedef struct ACIS { - STACK_OF(GENERAL_NAME) *issuer; - ASN1_INTEGER *serial; - ASN1_BIT_STRING *uid; -} AC_IS; - -typedef struct ACFORM { - STACK_OF(GENERAL_NAME) *names; - AC_IS *is; - AC_DIGEST *digest; -} AC_FORM; - -typedef struct ACACI { - STACK_OF(GENERAL_NAME) *names; - AC_FORM *form; -} AC_ACI; - -typedef struct ACHOLDER { - AC_IS *baseid; - STACK_OF(GENERAL_NAMES) *name; - AC_DIGEST *digest; -} AC_HOLDER; - -typedef struct ACVAL { - ASN1_GENERALIZEDTIME *notBefore; - ASN1_GENERALIZEDTIME *notAfter; -} AC_VAL; - -typedef struct asn1_string_st AC_IETFATTRVAL; - -typedef struct ACIETFATTR { - STACK_OF(GENERAL_NAMES) *names; - STACK_OF(AC_IETFATTRVAL) *values; -} AC_IETFATTR; - -typedef struct ACTARGET { - GENERAL_NAME *name; - GENERAL_NAME *group; - AC_IS *cert; -} AC_TARGET; - -typedef struct ACTARGETS { - STACK_OF(AC_TARGET) *targets; -} AC_TARGETS; - -typedef struct ACATTR { - ASN1_OBJECT *type; - STACK_OF(AC_IETFATTR) *ietfattr; -} AC_ATTR; - -typedef struct ACINFO { - ASN1_INTEGER *version; - AC_HOLDER *holder; - AC_FORM *form; - X509_ALGOR *alg; - ASN1_INTEGER *serial; - AC_VAL *validity; - STACK_OF(AC_ATTR) *attrib; - ASN1_BIT_STRING *id; - STACK_OF(X509_EXTENSION) *exts; -} AC_INFO; - -typedef struct ACC { - AC_INFO *acinfo; - X509_ALGOR *sig_alg; - ASN1_BIT_STRING *signature; -} AC; - -typedef struct ACSEQ { - STACK_OF(AC) *acs; -} AC_SEQ; - -DECL_STACK(AC_TARGET) -DECL_STACK(AC_TARGETS) -DECL_STACK(AC_IETFATTR) -DECL_STACK(AC_IETFATTRVAL) -DECL_STACK(AC_ATTR) -DECL_STACK(AC); -DECL_STACK(AC_INFO); -DECL_STACK(AC_VAL); -DECL_STACK(AC_HOLDER); -DECL_STACK(AC_ACI); -DECL_STACK(AC_FORM); -DECL_STACK(AC_IS); -DECL_STACK(AC_DIGEST); - -extern int i2d_AC_ATTR(AC_ATTR *a, unsigned char **pp); -extern AC_ATTR *d2i_AC_ATTR(AC_ATTR **a, unsigned char **p, long length); -extern AC_ATTR *AC_ATTR_new(); -extern void AC_ATTR_free(AC_ATTR *a); -extern int i2d_AC_IETFATTR(AC_IETFATTR *a, unsigned char **pp); -extern AC_IETFATTR *d2i_AC_IETFATTR(AC_IETFATTR **a, unsigned char **p, long length); -extern AC_IETFATTR *AC_IETFATTR_new(); -extern void AC_IETFATTR_free (AC_IETFATTR *a); -extern int i2d_AC_IETFATTRVAL(AC_IETFATTRVAL *a, unsigned char **pp); -extern AC_IETFATTRVAL *d2i_AC_IETFATTRVAL(AC_IETFATTRVAL **a, unsigned char **pp, long length); -extern AC_IETFATTRVAL *AC_IETFATTRVAL_new(); -extern void AC_IETFATTRVAL_free(AC_IETFATTRVAL *a); -extern int i2d_AC_DIGEST(AC_DIGEST *a, unsigned char **pp); -extern AC_DIGEST *d2i_AC_DIGEST(AC_DIGEST **a, unsigned char **pp, long length);; -extern AC_DIGEST *AC_DIGEST_new(void); -extern void AC_DIGEST_free(AC_DIGEST *a); -extern int i2d_AC_IS(AC_IS *a, unsigned char **pp); -extern AC_IS *d2i_AC_IS(AC_IS **a, unsigned char **pp, long length); -extern AC_IS *AC_IS_new(void); -extern void AC_IS_free(AC_IS *a); -extern int i2d_AC_FORM(AC_FORM *a, unsigned char **pp); -extern AC_FORM *d2i_AC_FORM(AC_FORM **a, unsigned char **pp, long length); -extern AC_FORM *AC_FORM_new(void); -extern void AC_FORM_free(AC_FORM *a); -extern int i2d_AC_ACI(AC_ACI *a, unsigned char **pp); -extern AC_ACI *d2i_AC_ACI(AC_ACI **a, unsigned char **pp, long length); -extern AC_ACI *AC_ACI_new(void); -extern void AC_ACI_free(AC_ACI *a); - -extern int i2d_AC_HOLDER(AC_HOLDER *a, unsigned char **pp); -extern AC_HOLDER *d2i_AC_HOLDER(AC_HOLDER **a, unsigned char **pp, long length); -extern AC_HOLDER *AC_HOLDER_new(void); -extern void AC_HOLDER_free(AC_HOLDER *a); - -/* new AC_VAL functions by Valerio */ -extern int i2d_AC_VAL(AC_VAL *a, unsigned char **pp); -extern AC_VAL *d2i_AC_VAL(AC_VAL **a, unsigned char **pp, long length); -extern AC_VAL *AC_VAL_new(void); -extern void AC_VAL_free(AC_VAL *a); -/* end*/ - -extern int i2d_AC_INFO(AC_INFO *a, unsigned char **pp); -extern AC_INFO *d2i_AC_INFO(AC_INFO **a, unsigned char **p, long length); -extern AC_INFO *AC_INFO_new(void); -extern void AC_INFO_free(AC_INFO *a); -extern int i2d_AC(AC *a, unsigned char **pp) ; -extern AC *d2i_AC(AC **a, unsigned char **pp, long length); -extern AC *AC_new(void); -extern void AC_free(AC *a); -extern int i2d_AC_TARGETS(AC_TARGETS *a, unsigned char **pp) ; -extern AC_TARGETS *d2i_AC_TARGETS(AC_TARGETS **a, unsigned char **pp, long length); -extern AC_TARGETS *AC_TARGETS_new(void); -extern void AC_TARGETS_free(AC_TARGETS *a); -extern int i2d_AC_TARGET(AC_TARGET *a, unsigned char **pp) ; -extern AC_TARGET *d2i_AC_TARGET(AC_TARGET **a, unsigned char **pp, long length); -extern AC_TARGET *AC_TARGET_new(void); -extern void AC_TARGET_free(AC_TARGET *a); -extern int i2d_AC_SEQ(AC_SEQ *a, unsigned char **pp) ; -extern AC_SEQ *d2i_AC_SEQ(AC_SEQ **a, unsigned char **pp, long length); -extern AC_SEQ *AC_SEQ_new(void); -extern void AC_SEQ_free(AC_SEQ *a); - -#endif -- 1.8.2.3