From a00b11221b559aee9a3412b78757173abeabaf77 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 10 Jun 2011 18:33:30 -0400 Subject: [PATCH] rxkad ticket5 function rewriting avoid conflicting with heimdal in environments where we might need bits of their asn1 library also Change-Id: Ib76c158297a331fcaf650c435c5696e5b5aaab8c Reviewed-on: http://gerrit.openafs.org/4834 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- src/rxkad/v5gen-rewrite.h | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/src/rxkad/v5gen-rewrite.h b/src/rxkad/v5gen-rewrite.h index 0ece563..ce9220f 100644 --- a/src/rxkad/v5gen-rewrite.h +++ b/src/rxkad/v5gen-rewrite.h @@ -1,3 +1,13 @@ +#define encode_krb5int32 _rxkad_v5_encode_krb5int32 +#define decode_krb5int32 _rxkad_v5_decode_krb5int32 +#define free_krb5int32 _rxkad_v5_free_krb5int32 +#define length_krb5int32 _rxkad_v5_length_krb5int32 +#define copy_krb5int32 _rxkad_v5_copy_krb5int32 +#define encode_AuthorizationDataElement _rxkad_v5_encode_AuthorizationDataElement +#define decode_AuthorizationDataElement _rxkad_v5_decode_AuthorizationDataElement +#define free_AuthorizationDataElement _rxkad_v5_free_AuthorizationDataElement +#define length_AuthorizationDataElement _rxkad_v5_length_AuthorizationDataElement +#define copy_AuthorizationDataElement _rxkad_v5_copy_AuthorizationDataElement #define encode_Ticket _rxkad_v5_encode_Ticket #define decode_Ticket _rxkad_v5_decode_Ticket #define free_Ticket _rxkad_v5_free_Ticket @@ -23,6 +33,8 @@ #define free_HostAddress _rxkad_v5_free_HostAddress #define length_HostAddress _rxkad_v5_length_HostAddress #define copy_HostAddress _rxkad_v5_copy_HostAddress +#define add_AuthorizationData _rxkad_v5_add_AuthorizationData +#define remove_AuthorizationData _rxkad_v5_remove_AuthorizationData #define encode_AuthorizationData _rxkad_v5_encode_AuthorizationData #define decode_AuthorizationData _rxkad_v5_decode_AuthorizationData #define free_AuthorizationData _rxkad_v5_free_AuthorizationData @@ -68,15 +80,79 @@ #define free_NAME_TYPE _rxkad_v5_free_NAME_TYPE #define length_NAME_TYPE _rxkad_v5_length_NAME_TYPE #define copy_NAME_TYPE _rxkad_v5_copy_NAME_TYPE +#define der_copy_bit_string _rxkad_v5_der_copy_bit_string +#define der_copy_bmp_string _rxkad_v5_der_copy_bmp_string +#define der_copy_general_string _rxkad_v5_der_copy_general_string +#define der_copy_generalized_time _rxkad_v5_der_copy_generalized_time +#define der_copy_heim_integer _rxkad_v5_der_copy_heim_integer +#define der_copy_ia5_string _rxkad_v5_der_copy_ia5_string +#define der_copy_integer _rxkad_v5_der_copy_integer +#define der_copy_octet_string _rxkad_v5_der_copy_octet_string +#define der_copy_oid _rxkad_v5_der_copy_oid +#define der_copy_printable_string _rxkad_v5_der_copy_printable_string +#define der_copy_universal_string _rxkad_v5_der_copy_universal_string +#define der_copy_unsigned _rxkad_v5_der_copy_unsigned +#define der_copy_utctime _rxkad_v5_der_copy_utctime +#define der_copy_utf8string _rxkad_v5_der_copy_utf8string +#define der_copy_visible_string _rxkad_v5_der_copy_visible_string +#define der_free_bit_string _rxkad_v5_der_free_bit_string +#define der_free_bmp_string _rxkad_v5_der_free_bmp_string +#define der_free_general_string _rxkad_v5_der_free_general_string +#define der_free_generalized_time _rxkad_v5_der_free_generalized_time +#define der_free_heim_integer _rxkad_v5_der_free_heim_integer +#define der_free_ia5_string _rxkad_v5_der_free_ia5_string +#define der_free_integer _rxkad_v5_der_free_integer +#define der_free_octet_string _rxkad_v5_der_free_octet_string +#define der_free_oid _rxkad_v5_der_free_oid +#define der_free_printable_string _rxkad_v5_der_free_printable_string +#define der_free_universal_string _rxkad_v5_der_free_universal_string +#define der_free_unsigned _rxkad_v5_der_free_unsigned +#define der_free_utctime _rxkad_v5_der_free_utctime +#define der_free_utf8string _rxkad_v5_der_free_utf8string +#define der_free_visible_string _rxkad_v5_der_free_visible_string +#define der_get_bit_string _rxkad_v5_der_get_bit_string +#define der_get_generalized_time _rxkad_v5_der_get_generalized_time +#define der_get_heim_integer _rxkad_v5_der_get_heim_integer +#define der_get_ia5_string _rxkad_v5_der_get_ia5_string +#define der_get_octet_string_ber _rxkad_v5_der_get_octet_string_ber +#define der_get_printable_string _rxkad_v5_der_get_printable_string +#define der_get_time _rxkad_v5_der_get_time +#define der_get_utf8string _rxkad_v5_der_get_utf8string +#define der_get_visible_string _rxkad_v5_der_get_visible_string +#define der_get_bmp_string _rxkad_v5_der_get_bmp_string +#define der_get_boolean _rxkad_v5_der_get_boolean #define der_get_unsigned _rxkad_v5_der_get_unsigned +#define der_get_integer _rxkad_v5_der_get_integer #define der_get_int _rxkad_v5_der_get_int #define der_get_length _rxkad_v5_der_get_length #define der_get_general_string _rxkad_v5_der_get_general_string #define der_get_octet_string _rxkad_v5_der_get_octet_string #define der_get_oid _rxkad_v5_der_get_oid #define der_get_tag _rxkad_v5_der_get_tag +#define der_get_universal_string _rxkad_v5_der_get_universal_string +#define der_get_utctime _rxkad_v5_der_get_utctime +#define der_length_bit_string _rxkad_v5_der_length_bit_string +#define der_length_bmp_string _rxkad_v5_der_length_bmp_string +#define der_length_boolean _rxkad_v5_der_length_boolean +#define der_length_enumerated _rxkad_v5_der_length_enumerated +#define der_length_general_string _rxkad_v5_der_length_general_string +#define der_length_generalized_time _rxkad_v5_der_length_generalized_time +#define der_length_heim_integer _rxkad_v5_der_length_heim_integer +#define der_length_ia5_string _rxkad_v5_der_length_ia5_string +#define der_length_integer _rxkad_v5_der_length_integer +#define der_length_len _rxkad_v5_der_length_len +#define der_length_octet_string _rxkad_v5_der_length_octet_string +#define der_length_oid _rxkad_v5_der_length_oid +#define der_length_printable_string _rxkad_v5_der_length_printable_string +#define der_length_tag _rxkad_v5_der_length_tag +#define der_length_universal_string _rxkad_v5_der_length_universal_string +#define der_length_unsigned _rxkad_v5_der_length_unsigned +#define der_length_utctime _rxkad_v5_der_length_utctime +#define der_length_utf8string _rxkad_v5_der_length_utf8string +#define der_length_visible_string _rxkad_v5_der_length_visible_string #define der_match_tag _rxkad_v5_der_match_tag #define der_match_tag_and_length _rxkad_v5_der_match_tag_and_length +#define der_match_tag2 _rxkad_v5_der_match_tag2 #define decode_integer _rxkad_v5_decode_integer #define decode_unsigned _rxkad_v5_decode_unsigned #define decode_enumerated _rxkad_v5_decode_enumerated @@ -85,14 +161,26 @@ #define decode_oid _rxkad_v5_decode_oid #define decode_generalized_time _rxkad_v5_decode_generalized_time #define fix_dce _rxkad_v5_fix_dce +#define der_put_bit_string _rxkad_v5_der_put_bit_string +#define der_put_generalized_time _rxkad_v5_der_put_generalized_time +#define der_put_heim_integer _rxkad_v5_der_put_heim_integer +#define der_put_ia5_string _rxkad_v5_der_put_ia5_string +#define der_put_printable_string _rxkad_v5_der_put_printable_string +#define der_put_utf8string _rxkad_v5_der_put_utf8string +#define der_put_visible_string _rxkad_v5_der_put_visible_string +#define der_put_bmp_string _rxkad_v5_der_put_bmp_string +#define der_put_boolean _rxkad_v5_der_put_boolean #define der_put_unsigned _rxkad_v5_der_put_unsigned #define der_put_int _rxkad_v5_der_put_int +#define der_put_integer _rxkad_v5_der_put_integer #define der_put_length _rxkad_v5_der_put_length #define der_put_general_string _rxkad_v5_der_put_general_string #define der_put_octet_string _rxkad_v5_der_put_octet_string #define der_put_oid _rxkad_v5_der_put_oid #define der_put_tag _rxkad_v5_der_put_tag #define der_put_length_and_tag _rxkad_v5_der_put_length_and_tag +#define der_put_universal_string _rxkad_v5_der_put_universal_string +#define der_put_utctime _rxkad_v5_der_put_utctime #define encode_integer _rxkad_v5_encode_integer #define encode_unsigned _rxkad_v5_encode_unsigned #define encode_enumerated _rxkad_v5_encode_enumerated @@ -123,3 +211,9 @@ #ifndef HAVE_TIMEGM #define timegm _rxkad_timegm #endif +#define _heim_fix_dce _rxkad_v5__heim_fix_dce +#define _der_timegm _rxkad_v5__der_timegm +#define _heim_der_set_sort _rxkad_v5__heim_der_set_sort +#define _heim_len_int _rxkad_v5__heim_len_int +#define _heim_len_unsigned _rxkad_v5__heim_len_unsigned +#define _heim_time2generalizedtime _rxkad_v5__heim_time2generalizedtime -- 1.9.4