aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-09-17 20:05:58 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-09-18 21:37:17 +0200
commitb785014a15f18a77dd348b7d696983f08f0b68a3 (patch)
tree3ce27c7fb484204886f3816729a6d548b4acb8e0
parentacfc8ea83fcaa424f2800acda627f919a45e6bb2 (diff)
downloadlibssh-b785014a15f18a77dd348b7d696983f08f0b68a3.tar.gz
libssh-b785014a15f18a77dd348b7d696983f08f0b68a3.tar.xz
libssh-b785014a15f18a77dd348b7d696983f08f0b68a3.zip
crypt: Rename to packet_crypt.
-rw-r--r--include/libssh/packet.h16
-rw-r--r--include/libssh/poll.h2
-rw-r--r--include/libssh/priv.h16
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/packet_crypt.c (renamed from src/crypt.c)2
5 files changed, 20 insertions, 18 deletions
diff --git a/include/libssh/packet.h b/include/libssh/packet.h
index 414c0ac0..22138e49 100644
--- a/include/libssh/packet.h
+++ b/include/libssh/packet.h
@@ -22,6 +22,8 @@
#ifndef PACKET_H_
#define PACKET_H_
+struct ssh_socket_struct;
+
/* this structure should go someday */
typedef struct packet_struct {
int valid;
@@ -58,5 +60,19 @@ int ssh_packet_send_unimplemented(ssh_session session, uint32_t seqnum);
int ssh_packet_parse_type(ssh_session session);
//int packet_flush(ssh_session session, int enforce_blocking);
+int ssh_packet_socket_callback(const void *data, size_t len, void *user);
+void ssh_packet_register_socket_callback(ssh_session session, struct ssh_socket_struct *s);
+void ssh_packet_set_callbacks(ssh_session session, ssh_packet_callbacks callbacks);
+void ssh_packet_set_default_callbacks(ssh_session session);
+void ssh_packet_process(ssh_session session, uint8_t type);
+
+/* PACKET CRYPT */
+uint32_t packet_decrypt_len(ssh_session session, char *crypted);
+int packet_decrypt(ssh_session session, void *packet, unsigned int len);
+unsigned char *packet_encrypt(ssh_session session,
+ void *packet,
+ unsigned int len);
+int packet_hmac_verify(ssh_session session,ssh_buffer buffer,
+ unsigned char *mac);
#endif /* PACKET_H_ */
diff --git a/include/libssh/poll.h b/include/libssh/poll.h
index 88a16a1e..6c5dbbe2 100644
--- a/include/libssh/poll.h
+++ b/include/libssh/poll.h
@@ -21,6 +21,7 @@
#ifndef POLL_H_
#define POLL_H_
+
#include "config.h"
#ifdef HAVE_POLL
@@ -135,6 +136,7 @@ typedef struct ssh_poll_handle_struct *ssh_poll_handle;
typedef int (*ssh_poll_callback)(ssh_poll_handle p, socket_t fd, int revents,
void *userdata);
+struct ssh_socket_struct;
ssh_poll_handle ssh_poll_new(socket_t fd, short events, ssh_poll_callback cb,
void *userdata);
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 522f56bf..44ec43d5 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -184,22 +184,6 @@ SSH_PACKET_CALLBACK(ssh_packet_dh_reply);
SSH_PACKET_CALLBACK(ssh_packet_newkeys);
SSH_PACKET_CALLBACK(ssh_packet_service_accept);
-/* in crypt.c */
-uint32_t packet_decrypt_len(ssh_session session,char *crypted);
-int packet_decrypt(ssh_session session, void *packet,unsigned int len);
-unsigned char *packet_encrypt(ssh_session session,void *packet,unsigned int len);
- /* it returns the hmac buffer if exists*/
-struct ssh_poll_handle_struct;
-
-int packet_hmac_verify(ssh_session session,ssh_buffer buffer,unsigned char *mac);
-
-struct ssh_socket_struct;
-
-int ssh_packet_socket_callback(const void *data, size_t len, void *user);
-void ssh_packet_register_socket_callback(ssh_session session, struct ssh_socket_struct *s);
-void ssh_packet_set_callbacks(ssh_session session, ssh_packet_callbacks callbacks);
-void ssh_packet_set_default_callbacks(ssh_session session);
-void ssh_packet_process(ssh_session session, uint8_t type);
/* connect.c */
socket_t ssh_connect_host(ssh_session session, const char *host,const char
*bind_addr, int port, long timeout, long usec);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1504b76d..d783e7ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,6 @@ set(libssh_SRCS
client.c
config.c
connect.c
- crypt.c
dh.c
ecdh.c
error.c
@@ -99,6 +98,7 @@ set(libssh_SRCS
misc.c
options.c
packet.c
+ packet_crypt.c
pcap.c
pki.c
poll.c
diff --git a/src/crypt.c b/src/packet_crypt.c
index 5acb126a..6f78138a 100644
--- a/src/crypt.c
+++ b/src/packet_crypt.c
@@ -111,7 +111,7 @@ unsigned char *packet_encrypt(ssh_session session, void *data, uint32_t len) {
seq = ntohl(session->send_seq);
crypto = session->current_crypto->out_cipher;
- ssh_log(session, SSH_LOG_PACKET,
+ ssh_log(session, SSH_LOG_PACKET,
"Encrypting packet with seq num: %d, len: %d",
session->send_seq,len);