diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-07 12:54:25 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-08 15:28:31 +0200 |
| commit | 37b80e92613de0e56b1558d09298899276b56217 (patch) | |
| tree | 256d59ee344290d825e5b0216cd638418c8a89e3 /src | |
| parent | 01c4b713dc57d16612c3b61e1857fb982623dd12 (diff) | |
| download | libssh-37b80e92613de0e56b1558d09298899276b56217.tar.gz libssh-37b80e92613de0e56b1558d09298899276b56217.tar.xz libssh-37b80e92613de0e56b1558d09298899276b56217.zip | |
pki: Move keyfiles to pki_gcrypt.c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/pki_gcrypt.c (renamed from src/keyfiles.c) | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 103b007a..ef745620 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,7 +91,6 @@ set(libssh_SRCS gzip.c init.c kex.c - keyfiles.c keys.c known_hosts.c legacy.c @@ -104,6 +103,7 @@ set(libssh_SRCS packet.c pcap.c pki.c + pki_gcrypt.c poll.c session.c scp.c diff --git a/src/keyfiles.c b/src/pki_gcrypt.c index dba80130..480478a7 100644 --- a/src/keyfiles.c +++ b/src/pki_gcrypt.c @@ -361,7 +361,7 @@ static int privatekey_dek_header(const char *header, unsigned int header_len, else /* calculate length */ \ for(p += len, len = 0; p[len] && p[len] != '\n' \ && p[len] != '\r'; len++); \ - } + } static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type, ssh_auth_callback cb, void *userdata, const char *desc) { @@ -942,7 +942,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename, return NULL; } file = fopen(filename,"r"); - + if (file == NULL) { ssh_set_error(session, SSH_REQUEST_DENIED, "Error opening %s: %s", filename, strerror(errno)); @@ -1280,10 +1280,10 @@ int ssh_publickey_to_file(ssh_session session, const char *file, size_t len; int rc; if(session==NULL) - return SSH_ERROR; + return SSH_ERROR; if(file==NULL || pubkey==NULL){ - ssh_set_error(session, SSH_FATAL, "Invalid parameters"); - return SSH_ERROR; + ssh_set_error(session, SSH_FATAL, "Invalid parameters"); + return SSH_ERROR; } pubkey_64 = bin_to_base64(pubkey->string, ssh_string_len(pubkey)); if (pubkey_64 == NULL) { |