diff options
| author | Andreas Schneider <mail@cynapses.org> | 2009-04-05 10:00:41 +0000 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2009-04-05 10:00:41 +0000 |
| commit | f8ef75c5105e7cf6348495dd3498c990827fd3ca (patch) | |
| tree | 81e2e2bfb6876e9280610fd18b1e8e092926321a | |
| parent | b7c65baef3d073e3afbee9724e5d9ca5aff0d95b (diff) | |
| download | libssh-f8ef75c5105e7cf6348495dd3498c990827fd3ca.tar.gz libssh-f8ef75c5105e7cf6348495dd3498c990827fd3ca.tar.xz libssh-f8ef75c5105e7cf6348495dd3498c990827fd3ca.zip | |
Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@396 7dcaeef0-15fb-0310-b436-a5af3365683c
| -rw-r--r-- | include/libssh/priv.h | 6 | ||||
| -rw-r--r-- | libssh/keyfiles.c | 9 | ||||
| -rw-r--r-- | libssh/keys.c | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index a2f9a3d..f84fde9 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -179,7 +179,7 @@ typedef struct kex_struct { struct public_key_struct { int type; - char *type_c; /* Don't free it ! it is static */ + const char *type_c; /* Don't free it ! it is static */ #ifdef HAVE_LIBGCRYPT gcry_sexp_t dsa_pub; gcry_sexp_t rsa_pub; @@ -577,7 +577,7 @@ char *ssh_find_matching(const char *in_d, const char *what_d); PRIVATE_KEY *_privatekey_from_file(void *session,char *filename,int type); /* in keys.c */ -char *ssh_type_to_char(int type); +const char *ssh_type_to_char(int type); int ssh_type_from_name(char *name); PRIVATE_KEY *privatekey_make_dss(SSH_SESSION *session, BUFFER *buffer); @@ -586,7 +586,7 @@ PRIVATE_KEY *privatekey_make_rsa(SSH_SESSION *session, BUFFER *buffer, PRIVATE_KEY *privatekey_from_string(SSH_SESSION *session, STRING *privkey_s); PUBLIC_KEY *publickey_make_dss(SSH_SESSION *session, BUFFER *buffer); -PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, BUFFER *buffer,char *type); +PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, BUFFER *buffer, const char *type); PUBLIC_KEY *publickey_from_string(SSH_SESSION *session, STRING *pubkey_s); SIGNATURE *signature_from_string(SSH_SESSION *session, STRING *signature,PUBLIC_KEY *pubkey,int needed_type); void signature_free(SIGNATURE *sign); diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c index fde2086..3ec936a 100644 --- a/libssh/keyfiles.c +++ b/libssh/keyfiles.c @@ -744,8 +744,8 @@ STRING *publickey_from_next_file(SSH_SESSION *session, const char **pub_keys_pat static char *home=NULL; char public[256]; char private[256]; - char *priv; - char *pub; + const char *priv; + const char *pub; STRING *pubkey; if(!home) home=ssh_get_user_home_dir(); @@ -843,7 +843,8 @@ static void tokens_free(char **tokens) { * \returns found_type type of key (ie "dsa","ssh-rsa1"). Don't free that value. */ -static char **ssh_get_knownhost_line(SSH_SESSION *session,FILE **file, char *filename,char **found_type){ +static char **ssh_get_knownhost_line(SSH_SESSION *session, FILE **file, + const char *filename, const char **found_type) { char buffer[4096]; char *ptr; char **tokens; @@ -1057,7 +1058,7 @@ int ssh_is_server_known(SSH_SESSION *session){ char **tokens; char *host; - char *type; + const char *type; int match; FILE *file=NULL; int ret=SSH_SERVER_NOT_KNOWN; diff --git a/libssh/keys.c b/libssh/keys.c index c57a45f..b1a9cc0 100644 --- a/libssh/keys.c +++ b/libssh/keys.c @@ -36,7 +36,7 @@ */ /* Public key decoding functions */ -char *ssh_type_to_char(int type){ +const char *ssh_type_to_char(int type) { switch(type){ case TYPE_DSS: return "ssh-dss"; @@ -111,7 +111,8 @@ PUBLIC_KEY *publickey_make_dss(SSH_SESSION *session, BUFFER *buffer){ return key; } -PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, BUFFER *buffer, char *type){ +PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, BUFFER *buffer, + const char *type) { STRING *e,*n; PUBLIC_KEY *key; |