From beff1cb600b8b47547fe39bdcbbb61c7ab19557c Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 22 Nov 2021 18:35:08 +0000
Subject: [PATCH] testcrypt: move TD_foo declarations up the file.

A completely trivial change which I only put in its own commit so that
the next one will have a less confusing-looking diff.
---
 testcrypt.c | 56 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/testcrypt.c b/testcrypt.c
index 2fc2ffbf..c6d8fc97 100644
--- a/testcrypt.c
+++ b/testcrypt.c
@@ -200,6 +200,34 @@ static ptrlen get_word(BinarySource *in)
     return toret;
 }
 
+typedef uintmax_t TD_uint;
+typedef bool TD_boolean;
+typedef ptrlen TD_val_string_ptrlen;
+typedef char *TD_val_string_asciz;
+typedef BinarySource *TD_val_string_binarysource;
+typedef unsigned *TD_out_uint;
+typedef BinarySink *TD_out_val_string_binarysink;
+typedef const char *TD_opt_val_string_asciz;
+typedef char **TD_out_val_string_asciz;
+typedef char **TD_out_opt_val_string_asciz;
+typedef const char **TD_out_opt_val_string_asciz_const;
+typedef ssh_hash *TD_consumed_val_hash;
+typedef const ssh_hashalg *TD_hashalg;
+typedef const ssh2_macalg *TD_macalg;
+typedef const ssh_keyalg *TD_keyalg;
+typedef const ssh_cipheralg *TD_cipheralg;
+typedef const ssh_kex *TD_dh_group;
+typedef const ssh_kex *TD_ecdh_alg;
+typedef RsaSsh1Order TD_rsaorder;
+typedef key_components *TD_keycomponents;
+typedef const PrimeGenerationPolicy *TD_primegenpolicy;
+typedef struct mpint_list TD_mpint_list;
+typedef PockleStatus TD_pocklestatus;
+typedef struct mr_result TD_mr_result;
+typedef Argon2Flavour TD_argon2flavour;
+typedef FingerprintType TD_fptype;
+typedef HttpDigestHash TD_httpdigesthash;
+
 static const ssh_hashalg *get_hashalg(BinarySource *in)
 {
     static const struct {
@@ -1335,34 +1363,6 @@ OPTIONAL_PTR_FUNC(cipher)
 OPTIONAL_PTR_FUNC(mpint)
 OPTIONAL_PTR_FUNC(string)
 
-typedef uintmax_t TD_uint;
-typedef bool TD_boolean;
-typedef ptrlen TD_val_string_ptrlen;
-typedef char *TD_val_string_asciz;
-typedef BinarySource *TD_val_string_binarysource;
-typedef unsigned *TD_out_uint;
-typedef BinarySink *TD_out_val_string_binarysink;
-typedef const char *TD_opt_val_string_asciz;
-typedef char **TD_out_val_string_asciz;
-typedef char **TD_out_opt_val_string_asciz;
-typedef const char **TD_out_opt_val_string_asciz_const;
-typedef ssh_hash *TD_consumed_val_hash;
-typedef const ssh_hashalg *TD_hashalg;
-typedef const ssh2_macalg *TD_macalg;
-typedef const ssh_keyalg *TD_keyalg;
-typedef const ssh_cipheralg *TD_cipheralg;
-typedef const ssh_kex *TD_dh_group;
-typedef const ssh_kex *TD_ecdh_alg;
-typedef RsaSsh1Order TD_rsaorder;
-typedef key_components *TD_keycomponents;
-typedef const PrimeGenerationPolicy *TD_primegenpolicy;
-typedef struct mpint_list TD_mpint_list;
-typedef PockleStatus TD_pocklestatus;
-typedef struct mr_result TD_mr_result;
-typedef Argon2Flavour TD_argon2flavour;
-typedef FingerprintType TD_fptype;
-typedef HttpDigestHash TD_httpdigesthash;
-
 /*
  * HERE BE DRAGONS: the horrible C preprocessor business that reads
  * testcrypt.h and generates a marshalling wrapper for each exported