From 78ca419366e9abba574ab7d7727f9035844fa3cb Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 9 Mar 1997 21:30:53 +0000
Subject: [PATCH] correct types

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1337 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/der_get.c | 12 ++++--------
 lib/asn1/der_put.c | 14 ++++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/asn1/der_get.c b/lib/asn1/der_get.c
index 2a51dc401..9563a17c0 100644
--- a/lib/asn1/der_get.c
+++ b/lib/asn1/der_get.c
@@ -128,9 +128,8 @@ der_match_tag (unsigned char *p, int len, Der_class class, Der_type type,
 }
 
 int
-decode_integer (unsigned char *p, int len, void *data)
+decode_integer (unsigned char *p, int len, unsigned *num)
 {
-  unsigned *num = (unsigned *)data;
   int ret = 0;
   int l, reallen;
 
@@ -156,9 +155,8 @@ decode_integer (unsigned char *p, int len, void *data)
 }
 
 int
-decode_general_string (unsigned char *p, int len, void *data)
+decode_general_string (unsigned char *p, int len, char **str)
 {
-  char **str = (char **)data;
   int ret = 0;
   int l;
 
@@ -178,9 +176,8 @@ decode_general_string (unsigned char *p, int len, void *data)
 }
 
 int
-decode_octet_string (unsigned char *p, int len, void *data)
+decode_octet_string (unsigned char *p, int len, krb5_data *k)
 {
-  krb5_data *k = (krb5_data *)data;
   int ret = 0;
   int l;
 
@@ -222,9 +219,8 @@ generalizedtime2time (char *s, time_t *t)
 }
 
 int
-decode_generalized_time (unsigned char *p, int len, void *data)
+decode_generalized_time (unsigned char *p, int len, time_t *t)
 {
-  time_t *t = (time_t *)data;
   krb5_data k;
   char times[32]; /* XXX */
   int ret = 0;
diff --git a/lib/asn1/der_put.c b/lib/asn1/der_put.c
index b9844b5a0..ce0ae29b2 100644
--- a/lib/asn1/der_put.c
+++ b/lib/asn1/der_put.c
@@ -105,9 +105,9 @@ der_put_tag (unsigned char *p, int len, Der_class class, Der_type type,
 }
 
 int
-encode_integer (unsigned char *p, int len, void *data)
+encode_integer (unsigned char *p, int len, unsigned *data)
 {
-  unsigned num = *((unsigned *)data);
+  unsigned num = *data;
   int ret = 0;
   int l;
 
@@ -133,9 +133,9 @@ encode_integer (unsigned char *p, int len, void *data)
 }
 
 int
-encode_general_string (unsigned char *p, int len, void *data)
+encode_general_string (unsigned char *p, int len, char **data)
 {
-  char *str = *((char **)data);
+  char *str = *data;
   int ret = 0;
   int l;
 
@@ -155,9 +155,8 @@ encode_general_string (unsigned char *p, int len, void *data)
 }
 
 int
-encode_octet_string (unsigned char *p, int len, void *data)
+encode_octet_string (unsigned char *p, int len, krb5_data *k)
 {
-  krb5_data *k = (krb5_data *)data;
   int ret = 0;
   int l;
 
@@ -190,9 +189,8 @@ time2generalizedtime (time_t t, krb5_data *s)
 }
 
 int
-encode_generalized_time (unsigned char *p, int len, void *data)
+encode_generalized_time (unsigned char *p, int len, time_t *t)
 {
-  time_t *t = (time_t *)data;
   krb5_data k;
   int l;
   int ret = 0;