Move prototypes for base64_decode_atom(), base64_lines(), and base64_encode()

from import.c to ssh.h, so that the implementation can see them.  This
necessitates ssh.h's including <stdio.h>.
Also remove a spare prototype for base64_encode_atom() from import.c.

[originally from svn r2481]

diff --git a/import.c b/import.c
index ff4381610b0eab9fafdb7c8482cb2560620b754c..2ec1fa2de90c89f8954f95496bbc9dcfaf2b4e8f 100644 (file)
--- a/import.c
+++ b/import.c
@@ -122,11 +122,6 @@ int export_ssh2(char *filename, int type,
                          (c) == '+' || (c) == '/' || (c) == '=' \
                          )
 
-extern int base64_decode_atom(char *atom, unsigned char *out);
-extern int base64_lines(int datalen);
-extern void base64_encode_atom(unsigned char *data, int n, char *out);
-extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl);
-
 /*
  * Read an ASN.1/BER identifier and length pair.
  * 

diff --git a/ssh.h b/ssh.h
index 41cc5038f1bb10c24a70b49e84679d997a6d96cb..659a543105463a9ef1e8a87c6992022f48851f75 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 
 #include "puttymem.h"
@@ -316,7 +317,10 @@ int rsakey_pubblob(char *filename, void **blob, int *bloblen);
 
 int saversakey(char *filename, struct RSAKey *key, char *passphrase);
 
-void base64_encode_atom(unsigned char *data, int n, char *out);
+extern int base64_decode_atom(char *atom, unsigned char *out);
+extern int base64_lines(int datalen);
+extern void base64_encode_atom(unsigned char *data, int n, char *out);
+extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl);
 
 /* ssh2_load_userkey can return this as an error */
 extern struct ssh2_userkey ssh2_wrong_passphrase;