5 files changed, 19 insertions, 4 deletions
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 0ac48956e..1e0a00736 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,13 @@
+Mon Mar 30 13:51:58 1998  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* ktest_equal.h: Add prototypes for ktest_equal_sam_challenge and 
+	ktest_equal_sam_response
+
+	* ktest.c (ktest_make_sample_sam_response): Remove unused variable.
+
+	* krb5_decode_test.c, krb5_decode_test.c (main): Declare main as
+        int not void.
+
 Wed Feb 18 16:27:56 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index 0c9d507db..1df59f7a5 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -10,7 +10,7 @@
 krb5_context test_context;
 int error_count = 0;
 
-void main(argc, argv)
+int main(argc, argv)
 	int argc;
 	char **argv;
 {
@@ -497,6 +497,7 @@ void main(argc, argv)
   }
   
   exit(error_count);
+  return(error_count);
 }
 
 
diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
index 9cc3e93e8..95bdab630 100644
--- a/src/tests/asn.1/krb5_encode_test.c
+++ b/src/tests/asn.1/krb5_encode_test.c
@@ -11,6 +11,7 @@
 krb5_context test_context;
 int error_count = 0;
 int do_trval = 0;
+int trval2();
 
 void encoder_print_results(code, typestring, description)
 	krb5_data *code;
@@ -82,7 +83,8 @@ void PRS(argc, argv)
 	print_context_shortcut = 1;
 }
 
-void main(argc, argv)
+int
+main(argc, argv)
 	int	argc;
 	char	**argv;
 {
@@ -588,6 +590,7 @@ void main(argc, argv)
 #endif
 
   exit(error_count);
+  return(error_count);
 }
 
 
diff --git a/src/tests/asn.1/ktest.c b/src/tests/asn.1/ktest.c
index a4a2e069a..8e60c181d 100644
--- a/src/tests/asn.1/ktest.c
+++ b/src/tests/asn.1/ktest.c
@@ -716,8 +716,6 @@ krb5_error_code ktest_make_sample_sam_challenge(p)
 krb5_error_code ktest_make_sample_sam_response(p)
      krb5_sam_response * p;
 {
-  krb5_error_code retval;
-
   p->magic = KV5M_SAM_RESPONSE;
   p->sam_type = 42; /* information */
   p->sam_flags = KRB5_SAM_USE_SAD_AS_KEY; /* KRB5_SAM_* values */
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index 9f9d5cb90..5ffa30925 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -55,6 +55,9 @@ generic(ktest_equal_krb5_pwd_data,krb5_pwd_data);
 generic(ktest_equal_krb5_alt_method,krb5_alt_method);
 generic(ktest_equal_krb5_pa_enc_ts,krb5_pa_enc_ts);
 
+generic(ktest_equal_sam_challenge,krb5_sam_challenge);
+generic(ktest_equal_sam_response,krb5_sam_response);
+
 int ktest_equal_last_req
 	KRB5_PROTOTYPE((krb5_last_req_entry **ref, krb5_last_req_entry **var));
 int ktest_equal_sequence_of_ticket