diff options
| -rw-r--r-- | libssh/keyfiles.c | 2 | ||||
| -rw-r--r-- | libssh/keys.c | 30 | ||||
| -rw-r--r-- | libssh/wrapper.c | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c index 2a197aad..cb3edd2e 100644 --- a/libssh/keyfiles.c +++ b/libssh/keyfiles.c @@ -166,7 +166,7 @@ static int asn1_check_sequence(ssh_buffer buffer) { size = asn1_get_len(buffer); if ((padding = buffer_get_len(buffer) - buffer->pos - size) > 0) { for (i = buffer_get_len(buffer) - buffer->pos - size, - j = buffer_get(buffer) + size + buffer->pos; + j = (unsigned char*)buffer_get(buffer) + size + buffer->pos; i; i--, j++) { diff --git a/libssh/keys.c b/libssh/keys.c index 2fcc6750..eea217c3 100644 --- a/libssh/keys.c +++ b/libssh/keys.c @@ -101,10 +101,10 @@ ssh_public_key publickey_make_dss(ssh_session session, ssh_buffer buffer) { #ifdef HAVE_LIBGCRYPT gcry_sexp_build(&key->dsa_pub, NULL, "(public-key(dsa(p %b)(q %b)(g %b)(y %b)))", - string_len(p), p->string, - string_len(q), q->string, - string_len(g), g->string, - string_len(pubkey), pubkey->string); + string_len(p), string_data(p), + string_len(q), string_data(q), + string_len(g), string_data(g), + string_len(pubkey), string_data(pubkey)); if (key->dsa_pub == NULL) { goto error; } @@ -183,8 +183,8 @@ ssh_public_key publickey_make_rsa(ssh_session session, ssh_buffer buffer, #ifdef HAVE_LIBGCRYPT gcry_sexp_build(&key->rsa_pub, NULL, "(public-key(rsa(n %b)(e %b)))", - string_len(n), n->string, - string_len(e),e->string); + string_len(n), string_data(n), + string_len(e),string_data(e)); if (key->rsa_pub == NULL) { goto error; } @@ -374,10 +374,10 @@ ssh_public_key publickey_from_privatekey(ssh_private_key prv) { gcry_sexp_build(&key->dsa_pub, NULL, "(public-key(dsa(p %b)(q %b)(g %b)(y %b)))", - string_len(p), p->string, - string_len(q), q->string, - string_len(g), g->string, - string_len(y), y->string); + string_len(p), string_data(p), + string_len(q), string_data(q), + string_len(g), string_data(g), + string_len(y), string_data(y)); string_burn(p); string_free(p); @@ -433,8 +433,8 @@ ssh_public_key publickey_from_privatekey(ssh_private_key prv) { gcry_sexp_build(&key->rsa_pub, NULL, "(public-key(rsa(n %b)(e %b)))", - string_len(n), n->string, - string_len(e), e->string); + string_len(n), string_data(n), + string_len(e), string_data(e)); if (key->rsa_pub == NULL) { goto error; } @@ -930,7 +930,7 @@ SIGNATURE *signature_from_string(ssh_session session, ssh_string signature, * them to bignums (ou pas ;) */ #ifdef HAVE_LIBGCRYPT if (gcry_sexp_build(&sig, NULL, "(sig-val(dsa(r %b)(s %b)))", - 20 ,rs->string, 20, rs->string + 20)) { + 20 ,string_data(rs), 20,(unsigned char *)string_data(rs) + 20)) { string_free(rs); signature_free(sign); return NULL; @@ -1008,7 +1008,7 @@ SIGNATURE *signature_from_string(ssh_session session, ssh_string signature, sign->type = TYPE_RSA; #ifdef HAVE_LIBGCRYPT if (gcry_sexp_build(&sig, NULL, "(sig-val(rsa(s %b)))", - string_len(e), e->string)) { + string_len(e), string_data(e))) { signature_free(sign); string_free(e); return NULL; @@ -1327,7 +1327,7 @@ ssh_string ssh_encrypt_rsa1(ssh_session session, ssh_string data, ssh_public_key gcry_sexp_t data_sexp; if (gcry_sexp_build(&data_sexp, NULL, "(data(flags pkcs1)(value %b))", - len, data->string)) { + len, string_data(data))) { ssh_set_error(session, SSH_FATAL, "RSA1 encrypt: libgcrypt error"); return NULL; } diff --git a/libssh/wrapper.c b/libssh/wrapper.c index 3dd497f7..2dc67e1c 100644 --- a/libssh/wrapper.c +++ b/libssh/wrapper.c @@ -263,11 +263,11 @@ static int des3_1_set_key(struct crypto_struct *cipher, void *key, void *IV) { SAFE_FREE(cipher->key); return -1; } - if (gcry_cipher_setkey(cipher->key[1], key + 8, 8)) { + if (gcry_cipher_setkey(cipher->key[1], (unsigned char *)key + 8, 8)) { SAFE_FREE(cipher->key); return -1; } - if (gcry_cipher_setiv(cipher->key[1], IV + 8, 8)) { + if (gcry_cipher_setiv(cipher->key[1], (unsigned char *)IV + 8, 8)) { SAFE_FREE(cipher->key); return -1; } @@ -277,11 +277,11 @@ static int des3_1_set_key(struct crypto_struct *cipher, void *key, void *IV) { SAFE_FREE(cipher->key); return -1; } - if (gcry_cipher_setkey(cipher->key[2], key + 16, 8)) { + if (gcry_cipher_setkey(cipher->key[2], (unsigned char *)key + 16, 8)) { SAFE_FREE(cipher->key); return -1; } - if (gcry_cipher_setiv(cipher->key[2], IV + 16, 8)) { + if (gcry_cipher_setiv(cipher->key[2], (unsigned char *)IV + 16, 8)) { SAFE_FREE(cipher->key); return -1; } |