diff options
| author | Andreas Schneider <mail@cynapses.org> | 2009-03-08 12:05:11 +0000 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2009-03-08 12:05:11 +0000 |
| commit | 4b8eb385867177a0005ae4baf15e40c9527699e5 (patch) | |
| tree | 07906fa956ee361027e836987a29b4316951d9d8 | |
| parent | d3e64a744e9b847f8b316bd5ff1805bb79f9a5ac (diff) | |
| download | libssh-4b8eb385867177a0005ae4baf15e40c9527699e5.tar.gz libssh-4b8eb385867177a0005ae4baf15e40c9527699e5.tar.xz libssh-4b8eb385867177a0005ae4baf15e40c9527699e5.zip | |
Fix build errors.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@241 7dcaeef0-15fb-0310-b436-a5af3365683c
| -rw-r--r-- | libssh/keyfiles.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c index 45cb42a4..b9775c77 100644 --- a/libssh/keyfiles.c +++ b/libssh/keyfiles.c @@ -212,7 +212,7 @@ int privatekey_decrypt(int algo, int mode, unsigned int key_len, return 0; } } else if (cb == NULL && userdata != NULL) { - sprintf(buf, MAX_PASSPHRASE_SIZE, "%s", userdata); + sprintf(passphrase, MAX_PASSPHRASE_SIZE, "%s", userdata); } passphrase_to_key(passphrase, strlen(passphrase), iv, key, key_len); if (gcry_cipher_open(&cipher, algo, mode, 0) @@ -421,7 +421,7 @@ int read_rsa_privatekey(FILE *fp, gcry_sexp_t *r, return 1; } -int read_dsa_privatekey(FILE *fp, gcry_sexp_t *r, ssh_auth_callback cb, void *userdata; char *desc) +int read_dsa_privatekey(FILE *fp, gcry_sexp_t *r, ssh_auth_callback cb, void *userdata, char *desc) { STRING *p; STRING *q; @@ -606,7 +606,7 @@ PRIVATE_KEY *_privatekey_from_file(void *session,char *filename,int type){ } if(type==TYPE_DSS){ #ifdef HAVE_LIBGCRYPT - valid=read_dsa_privatekey(file,&dsa,NULL,NULL); + valid=read_dsa_privatekey(file,&dsa,NULL,NULL,NULL); fclose(file); if(!valid){ ssh_set_error(session,SSH_FATAL,"parsing private key %s" @@ -623,7 +623,7 @@ PRIVATE_KEY *_privatekey_from_file(void *session,char *filename,int type){ } else if (type==TYPE_RSA){ #ifdef HAVE_LIBGCRYPT - valid=read_rsa_privatekey(file,&rsa,NULL,NULL); + valid=read_rsa_privatekey(file,&rsa,NULL,NULL,NULL); fclose(file); if(!valid){ ssh_set_error(session,SSH_FATAL,"parsing private key %s" |