diff options
| author | Andreas Schneider <mail@cynapses.org> | 2009-04-20 07:26:50 +0000 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2009-04-20 07:26:50 +0000 |
| commit | 9704df65e3adc6eea7c8b70e366d63ec0a3cd478 (patch) | |
| tree | 3e0fb9f3adbc8fdea4190b96dee80799cf9107ae /libssh/server.c | |
| parent | a3c820cf948c25afd36c85a2302ecfdeb82a0cf4 (diff) | |
| download | libssh-9704df65e3adc6eea7c8b70e366d63ec0a3cd478.tar.gz libssh-9704df65e3adc6eea7c8b70e366d63ec0a3cd478.tar.xz libssh-9704df65e3adc6eea7c8b70e366d63ec0a3cd478.zip | |
Rename privatekey_free() to be consistent with publickey_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@563 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/server.c')
| -rw-r--r-- | libssh/server.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libssh/server.c b/libssh/server.c index b1f5e3b..fd13274 100644 --- a/libssh/server.c +++ b/libssh/server.c @@ -159,7 +159,7 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){ rsa=_privatekey_from_file(ssh_bind,ssh_bind->options->rsakey,TYPE_RSA); if(!rsa){ if(dsa) - private_key_free(dsa); + privatekey_free(dsa); return NULL; } } @@ -168,9 +168,9 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){ ssh_set_error(ssh_bind,SSH_FATAL,"Accepting a new connection: %s", strerror(errno)); if(dsa) - private_key_free(dsa); + privatekey_free(dsa); if(rsa) - private_key_free(rsa); + privatekey_free(rsa); return NULL; } session=ssh_new(); @@ -180,9 +180,9 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){ if (session->options == NULL) { ssh_set_error(ssh_bind, SSH_FATAL, "No space left"); if (dsa) - private_key_free(dsa); + privatekey_free(dsa); if (rsa) - private_key_free(rsa); + privatekey_free(rsa); ssh_cleanup(session); return NULL; } @@ -191,9 +191,9 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){ session->socket=ssh_socket_new(session); if (session->socket == NULL) { if (dsa) - private_key_free(dsa); + privatekey_free(dsa); if (rsa) - private_key_free(rsa); + privatekey_free(rsa); ssh_cleanup(session); return NULL; } @@ -310,11 +310,11 @@ static int dh_handshake_server(SSH_SESSION *session){ buffer_free(buf); /* free private keys as they should not be readable past this point */ if(session->rsa_key){ - private_key_free(session->rsa_key); + privatekey_free(session->rsa_key); session->rsa_key=NULL; } if(session->dsa_key){ - private_key_free(session->dsa_key); + privatekey_free(session->dsa_key); session->dsa_key=NULL; } buffer_add_u8(session->out_buffer,SSH2_MSG_KEXDH_REPLY); |