X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/231ee168f3732ad79bdc8772ab91393f109b8f53..86916870d36cb70e7ef0ea760e75a6ae8b2d83a5:/sshpubk.c

diff --git a/sshpubk.c b/sshpubk.c
index 85e0e49f..f8cb38b0 100644
--- a/sshpubk.c
+++ b/sshpubk.c
@@ -105,7 +105,7 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
      */
     if (ciphertype) {
 	MD5Init(&md5c);
-	MD5Update(&md5c, passphrase, strlen(passphrase));
+	MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
 	MD5Final(keybuf, &md5c);
 	des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
 	memset(keybuf, 0, sizeof(keybuf));	/* burn the evidence */
@@ -155,7 +155,7 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
 int loadrsakey(char *filename, struct RSAKey *key, char *passphrase)
 {
     FILE *fp;
-    unsigned char buf[64];
+    char buf[64];
 
     fp = fopen(filename, "rb");
     if (!fp)
@@ -183,7 +183,7 @@ int loadrsakey(char *filename, struct RSAKey *key, char *passphrase)
 int rsakey_encrypted(char *filename, char **comment)
 {
     FILE *fp;
-    unsigned char buf[64];
+    char buf[64];
 
     fp = fopen(filename, "rb");
     if (!fp)
@@ -208,7 +208,7 @@ int rsakey_encrypted(char *filename, char **comment)
 int rsakey_pubblob(char *filename, void **blob, int *bloblen)
 {
     FILE *fp;
-    unsigned char buf[64];
+    char buf[64];
     struct RSAKey key;
     int ret;
 
@@ -321,7 +321,7 @@ int saversakey(char *filename, struct RSAKey *key, char *passphrase)
      */
     if (passphrase) {
 	MD5Init(&md5c);
-	MD5Update(&md5c, passphrase, strlen(passphrase));
+	MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
 	MD5Final(keybuf, &md5c);
 	des3_encrypt_pubkey(keybuf, estart, p - estart);
 	memset(keybuf, 0, sizeof(keybuf));	/* burn the evidence */
@@ -529,7 +529,7 @@ int base64_decode_atom(char *atom, unsigned char *out)
     return len;
 }
 
-static char *read_blob(FILE * fp, int nlines, int *bloblen)
+static unsigned char *read_blob(FILE * fp, int nlines, int *bloblen)
 {
     unsigned char *blob;
     char *line;
@@ -873,7 +873,7 @@ char *ssh2_userkey_loadpub(char *filename, char **algorithm,
 	*pub_blob_len = public_blob_len;
     if (algorithm)
 	*algorithm = alg->name;
-    return public_blob;
+    return (char *)public_blob;
 
     /*
      * Error processing.
@@ -949,47 +949,25 @@ int base64_lines(int datalen)
     return (datalen + 47) / 48;
 }
 
-void base64_encode_atom(unsigned char *data, int n, char *out)
-{
-    static const char base64_chars[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    unsigned word;
-
-    word = data[0] << 16;
-    if (n > 1)
-	word |= data[1] << 8;
-    if (n > 2)
-	word |= data[2];
-    out[0] = base64_chars[(word >> 18) & 0x3F];
-    out[1] = base64_chars[(word >> 12) & 0x3F];
-    if (n > 1)
-	out[2] = base64_chars[(word >> 6) & 0x3F];
-    else
-	out[2] = '=';
-    if (n > 2)
-	out[3] = base64_chars[word & 0x3F];
-    else
-	out[3] = '=';
-}
-
-void base64_encode(FILE * fp, unsigned char *data, int datalen)
+void base64_encode(FILE * fp, unsigned char *data, int datalen, int cpl)
 {
     int linelen = 0;
     char out[4];
-    int n;
+    int n, i;
 
     while (datalen > 0) {
-	if (linelen >= 64) {
-	    linelen = 0;
-	    fputc('\n', fp);
-	}
 	n = (datalen < 3 ? datalen : 3);
 	base64_encode_atom(data, n, out);
 	data += n;
 	datalen -= n;
-	fwrite(out, 1, 4, fp);
-	linelen += 4;
+	for (i = 0; i < 4; i++) {
+	    if (linelen >= cpl) {
+		linelen = 0;
+		fputc('\n', fp);
+	    }
+	    fputc(out[i], fp);
+	    linelen++;
+	}
     }
     fputc('\n', fp);
 }
@@ -1078,7 +1056,7 @@ int ssh2_save_userkey(char *filename, struct ssh2_userkey *key,
     }
 
     if (passphrase) {
-	char key[40];
+	unsigned char key[40];
 	SHA_State s;
 
 	passlen = strlen(passphrase);
@@ -1105,9 +1083,9 @@ int ssh2_save_userkey(char *filename, struct ssh2_userkey *key,
     fprintf(fp, "Encryption: %s\n", cipherstr);
     fprintf(fp, "Comment: %s\n", key->comment);
     fprintf(fp, "Public-Lines: %d\n", base64_lines(pub_blob_len));
-    base64_encode(fp, pub_blob, pub_blob_len);
+    base64_encode(fp, pub_blob, pub_blob_len, 64);
     fprintf(fp, "Private-Lines: %d\n", base64_lines(priv_encrypted_len));
-    base64_encode(fp, priv_blob_encrypted, priv_encrypted_len);
+    base64_encode(fp, priv_blob_encrypted, priv_encrypted_len, 64);
     fprintf(fp, "Private-MAC: ");
     for (i = 0; i < 20; i++)
 	fprintf(fp, "%02x", priv_mac[i]);