summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2011-09-19 00:34:44 +0000
committerSam Hartman <hartmans@mit.edu>2011-09-19 00:34:44 +0000
commitc65b97433bbf1503670a9fb9260799e699e9bf56 (patch)
treec546cfc1a7fe4b3b044c6fd69ce15788c1755e5e
parent1e1b5d76c466978c53dc8f1e79517243d78f8361 (diff)
downloadkrb5-c65b97433bbf1503670a9fb9260799e699e9bf56.tar.gz
krb5-c65b97433bbf1503670a9fb9260799e699e9bf56.tar.xz
krb5-c65b97433bbf1503670a9fb9260799e699e9bf56.zip
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
-rw-r--r--src/lib/krb5/asn.1/asn1_encode.c2
-rw-r--r--src/lib/krb5/asn.1/asn1_encode.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
index d31cefa5f..7eb646e03 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 04d92fc90..97256a73a 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