From: Sam Hartman Date: Mon, 19 Sep 2011 00:34:44 +0000 (+0000) Subject: In order for asn1_encode_oid to be called from DEFLENFNTYPE it needs X-Git-Tag: krb5-1.10-alpha1~187 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c65b97433bbf1503670a9fb9260799e699e9bf56;p=thirdparty%2Fkrb5.git In order for asn1_encode_oid to be called from DEFLENFNTYPE it needs to take void * like all the other string encoders. asn1_encode_oid: take void not asn1_octet git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25188 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c index d31cefa5ff..7eb646e03c 100644 --- a/src/lib/krb5/asn.1/asn1_encode.c +++ b/src/lib/krb5/asn.1/asn1_encode.c @@ -176,7 +176,7 @@ encode_bytestring_with_tag(asn1buf *buf, unsigned int len, } asn1_error_code -asn1_encode_oid(asn1buf *buf, unsigned int len, const asn1_octet *val, +asn1_encode_oid(asn1buf *buf, unsigned int len, const void *val, unsigned int *retlen) { return encode_bytestring_with_tag(buf, len, val, ASN1_OBJECTIDENTIFIER, diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index 04d92fc90a..97256a73ae 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -90,7 +90,7 @@ asn1_error_code asn1_encode_octetstring(asn1buf *buf, unsigned int len, #define asn1_encode_charstring asn1_encode_octetstring asn1_error_code asn1_encode_oid(asn1buf *buf, unsigned int len, - const asn1_octet *val, unsigned int *retlen); + const void *val, unsigned int *retlen); /* * requires *buf is allocated * modifies *buf, *retlen