diff options
| author | Gaël PORTAY <gael.portay@gmail.com> | 2015-05-05 20:42:38 +0200 |
|---|---|---|
| committer | Gaël PORTAY <gael.portay@gmail.com> | 2015-05-05 20:42:38 +0200 |
| commit | 9fdab3ced8374b991bfadce0056cf5bdf7cfb3d6 (patch) | |
| tree | 5da161bb2372d7a203dd39c616701ae090bb730d /keyimport.c | |
| parent | ef0aac432c986f52a1b973bcd73ddf7324e0e70f (diff) | |
| parent | 6e15e75391fc117125f50efd9f3d8ed646596da9 (diff) | |
Merge branch 'fix-pointer-sign-warnings' into fix-warnings
Diffstat (limited to 'keyimport.c')
| -rw-r--r-- | keyimport.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/keyimport.c b/keyimport.c index d8c0f5c..b7490aa 100644 --- a/keyimport.c +++ b/keyimport.c @@ -193,7 +193,7 @@ out: static void base64_encode_fp(FILE * fp, unsigned char *data, int datalen, int cpl) { - char out[100]; + unsigned char out[100]; int n; unsigned long outlen; int rawcpl; @@ -445,7 +445,7 @@ static struct openssh_key *load_openssh_key(const char *filename) ret->keyblob_size); } outlen = ret->keyblob_size - ret->keyblob_len; - if (base64_decode(buffer, len, + if (base64_decode((const unsigned char *)buffer, len, ret->keyblob + ret->keyblob_len, &outlen) != CRYPT_OK){ errmsg = "Error decoding base64"; goto error; @@ -507,7 +507,7 @@ static sign_key *openssh_read(const char *filename, char * UNUSED(passphrase)) int i, num_integers = 0; sign_key *retval = NULL; char *errmsg; - char *modptr = NULL; + unsigned char *modptr = NULL; int modlen = -9999; enum signkey_type type; @@ -602,13 +602,13 @@ static sign_key *openssh_read(const char *filename, char * UNUSED(passphrase)) #ifdef DROPBEAR_DSS if (key->type == OSSH_DSA) { - buf_putstring(blobbuf, "ssh-dss", 7); + buf_putstring(blobbuf, (const unsigned char *)"ssh-dss", 7); retkey->type = DROPBEAR_SIGNKEY_DSS; } #endif #ifdef DROPBEAR_RSA if (key->type == OSSH_RSA) { - buf_putstring(blobbuf, "ssh-rsa", 7); + buf_putstring(blobbuf, (const unsigned char *)"ssh-rsa", 7); retkey->type = DROPBEAR_SIGNKEY_RSA; } #endif @@ -646,7 +646,7 @@ static sign_key *openssh_read(const char *filename, char * UNUSED(passphrase)) */ if (i == 1) { /* Save the details for after we deal with number 2. */ - modptr = (char *)p; + modptr = p; modlen = len; } else if (i >= 2 && i <= 5) { buf_putstring(blobbuf, p, len); |