# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1128315450 0
# Node ID 036bd21c5560fabf163fab9b61d89624469e9004
# Parent  944dadd281618dd794f09d64bfc12b6adb8340af
[gaim-migrate @ 13867]
Fix some declarations in cipher.c to be static and rename des_setkey
to make FreeBSD happier.

committer: Tailor Script <tailor@pidgin.im>

diff -r 944dadd28161 -r 036bd21c5560 src/cipher.c
--- a/src/cipher.c	Mon Oct 03 03:17:46 2005 +0000
+++ b/src/cipher.c	Mon Oct 03 04:57:30 2005 +0000
@@ -811,7 +811,7 @@
  *    		    with calculated subkeys.
  *     
  **/
-	static void
+static void
 des_key_schedule (const guint8 * rawkey, guint32 * subkey)
 {
 	guint32 left, right, work;
@@ -896,8 +896,8 @@
  *  Does not check parity bits, but simply ignore them.
  *  Does not check for weak keys.
  **/
-void
-des_setkey (GaimCipherContext *context, guchar * key)
+static void
+des_set_key (GaimCipherContext *context, guchar * key)
 {
 	struct _des_ctx *ctx = gaim_cipher_context_get_data(context);
 	int i;
@@ -917,7 +917,7 @@
  *  Electronic Codebook Mode DES encryption/decryption of data according
  *  to 'mode'.
  **/
-int
+static int
 des_ecb_crypt (struct _des_ctx *ctx, const guint8 * from, guint8 * to, int mode)
 {
 	guint32 left, right, work;
@@ -943,7 +943,9 @@
 		return 0;
 }
 
-gint des_encrypt(GaimCipherContext *context, const guchar data[],                       size_t len, guchar output[], size_t *outlen) {
+static gint
+des_encrypt(GaimCipherContext *context, const guchar data[],
+	    size_t len, guchar output[], size_t *outlen) {
 	int offset = 0;
 	int i = 0;
 	int tmp;
@@ -1002,7 +1004,7 @@
 	NULL,                   /* decrypt */
 	NULL,                   /* set salt */
 	NULL,                   /* get salt size */
-	des_setkey,		/* set key */
+	des_set_key,		/* set key */
 	NULL                    /* get key size */
 };