From 71c07ed930e0e8c9402c7dc259650e08dd36eb4d Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Wed, 24 Aug 2005 16:43:29 +0000
Subject: [PATCH] Make a variables static - Patch from Andreas Mohr
--HG--
extra : convert_revision : de230e99968203f63995d49e9123b3ac45feab71
---
common-algo.c | 12 ++++++------
common-kex.c | 5 +++--
kex.h | 5 -----
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/common-algo.c b/common-algo.c
index ea9c3114..31902d18 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -33,19 +33,19 @@
{&cipher_desc, keysize, blocksize} */
#ifdef DROPBEAR_AES128_CBC
-const struct dropbear_cipher dropbear_aes128 =
+static const struct dropbear_cipher dropbear_aes128 =
{&aes_desc, 16, 16};
#endif
#ifdef DROPBEAR_BLOWFISH_CBC
-const struct dropbear_cipher dropbear_blowfish =
+static const struct dropbear_cipher dropbear_blowfish =
{&blowfish_desc, 16, 8};
#endif
#ifdef DROPBEAR_TWOFISH128_CBC
-const struct dropbear_cipher dropbear_twofish128 =
+static const struct dropbear_cipher dropbear_twofish128 =
{&twofish_desc, 16, 16};
#endif
#ifdef DROPBEAR_3DES_CBC
-const struct dropbear_cipher dropbear_3des =
+static const struct dropbear_cipher dropbear_3des =
{&des3_desc, 24, 8};
#endif
@@ -57,11 +57,11 @@ const struct dropbear_cipher dropbear_nocipher =
{&hash_desc, keysize, hashsize} */
#ifdef DROPBEAR_SHA1_HMAC
-const struct dropbear_hash dropbear_sha1 =
+static const struct dropbear_hash dropbear_sha1 =
{&sha1_desc, 20, 20};
#endif
#ifdef DROPBEAR_MD5_HMAC
-const struct dropbear_hash dropbear_md5 =
+static const struct dropbear_hash dropbear_md5 =
{&md5_desc, 16, 16};
#endif
diff --git a/common-kex.c b/common-kex.c
index 8a8aa932..a0c7b7e3 100644
--- a/common-kex.c
+++ b/common-kex.c
@@ -35,7 +35,7 @@
#include "random.h"
/* diffie-hellman-group1-sha1 value for p */
-const unsigned char dh_p_val[] = {
+static const unsigned char dh_p_val[] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
@@ -47,8 +47,9 @@ const unsigned char dh_p_val[] = {
0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+#define DH_P_LEN sizeof(dh_p_val)
-const int DH_G_VAL = 2;
+static const int DH_G_VAL = 2;
static void kexinitialise();
void gen_new_keys();
diff --git a/kex.h b/kex.h
index 92b6c428..448ad1b0 100644
--- a/kex.h
+++ b/kex.h
@@ -42,11 +42,6 @@ void recv_msg_kexdh_init(); /* server */
void send_msg_kexdh_init(); /* client */
void recv_msg_kexdh_reply(); /* client */
-extern const unsigned char dh_p_val[];
-#define DH_P_LEN 128 /* The length of the dh_p_val array */
-
-extern const int DH_G_VAL; /* == 2 */
-
struct KEXState {
unsigned sentkexinit : 1; /*set when we've sent/recv kexinit packet */
--
GitLab