generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comp.c only as a single _libssh2_ function, no external one

Browse Source
This commit is contained in:
Daniel Stenberg 2009-03-26 22:09:35 +00:00
parent eabe072496
commit fc28f33384
4 changed files with 126 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile.am
View File

@ -1,10 +1,9 @@
# $Id: Makefile.am,v 1.17 2009/03/26 15:41:17 bagder Exp $ # $Id: Makefile.am,v 1.18 2009/03/26 22:09:35 bagder Exp $
AUTOMAKE_OPTIONS = foreign nostdinc AUTOMAKE_OPTIONS = foreign nostdinc
libssh2_la_SOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c \ libssh2_la_SOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c misc.c \
misc.c packet.c publickey.c scp.c session.c sftp.c userauth.c \ packet.c publickey.c scp.c session.c sftp.c userauth.c libssh2_priv.h \
libssh2_priv.h openssl.h libgcrypt.h transport.c version.c transport.h \ openssl.h libgcrypt.h transport.c version.c transport.h channel.h comp.h
channel.h
if LIBGCRYPT if LIBGCRYPT
libssh2_la_SOURCES += libgcrypt.c pem.c libssh2_la_SOURCES += libgcrypt.c pem.c

54
src/comp.c
View File

@ -40,6 +40,8 @@
# include <zlib.h> # include <zlib.h>
#endif #endif
#include "comp.h"
/* ******** /* ********
* none * * none *
******** */ ******** */
@ -71,7 +73,7 @@ comp_method_none_comp(LIBSSH2_SESSION * session,
return 0; return 0;
} }
/* }}} */
static const LIBSSH2_COMP_METHOD comp_method_none = { static const LIBSSH2_COMP_METHOD comp_method_none = {
"none", "none",
@ -85,13 +87,13 @@ static const LIBSSH2_COMP_METHOD comp_method_none = {
* zlib * * zlib *
******** */ ******** */
/* {{{ Memory management wrappers /* Memory management wrappers
* Yes, I realize we're doing a callback to a callback, * Yes, I realize we're doing a callback to a callback,
* Deal... * Deal...
*/ */
static voidpf static voidpf
libssh2_comp_method_zlib_alloc(voidpf opaque, uInt items, uInt size) comp_method_zlib_alloc(voidpf opaque, uInt items, uInt size)
{ {
LIBSSH2_SESSION *session = (LIBSSH2_SESSION *) opaque; LIBSSH2_SESSION *session = (LIBSSH2_SESSION *) opaque;
@ -99,20 +101,20 @@ libssh2_comp_method_zlib_alloc(voidpf opaque, uInt items, uInt size)
} }
static void static void
libssh2_comp_method_zlib_free(voidpf opaque, voidpf address) comp_method_zlib_free(voidpf opaque, voidpf address)
{ {
LIBSSH2_SESSION *session = (LIBSSH2_SESSION *) opaque; LIBSSH2_SESSION *session = (LIBSSH2_SESSION *) opaque;
LIBSSH2_FREE(session, address); LIBSSH2_FREE(session, address);
} }
/* }}} */
/* {{{ libssh2_comp_method_zlib_init
/* libssh2_comp_method_zlib_init
* All your bandwidth are belong to us (so save some) * All your bandwidth are belong to us (so save some)
*/ */
static int static int
libssh2_comp_method_zlib_init(LIBSSH2_SESSION * session, int compress, comp_method_zlib_init(LIBSSH2_SESSION * session, int compress,
void **abstract) void **abstract)
{ {
z_stream *strm; z_stream *strm;
@ -128,8 +130,8 @@ libssh2_comp_method_zlib_init(LIBSSH2_SESSION * session, int compress,
memset(strm, 0, sizeof(z_stream)); memset(strm, 0, sizeof(z_stream));
strm->opaque = (voidpf) session; strm->opaque = (voidpf) session;
strm->zalloc = (alloc_func) libssh2_comp_method_zlib_alloc; strm->zalloc = (alloc_func) comp_method_zlib_alloc;
strm->zfree = (free_func) libssh2_comp_method_zlib_free; strm->zfree = (free_func) comp_method_zlib_free;
if (compress) { if (compress) {
/* deflate */ /* deflate */
status = deflateInit(strm, Z_DEFAULT_COMPRESSION); status = deflateInit(strm, Z_DEFAULT_COMPRESSION);
@ -147,13 +149,13 @@ libssh2_comp_method_zlib_init(LIBSSH2_SESSION * session, int compress,
return 0; return 0;
} }
/* }}} */
/* {{{ libssh2_comp_method_zlib_comp
/* libssh2_comp_method_zlib_comp
* zlib, a compression standard for all occasions * zlib, a compression standard for all occasions
*/ */
static int static int
libssh2_comp_method_zlib_comp(LIBSSH2_SESSION * session, comp_method_zlib_comp(LIBSSH2_SESSION * session,
int compress, int compress,
unsigned char **dest, unsigned char **dest,
unsigned long *dest_len, unsigned long *dest_len,
@ -231,8 +233,9 @@ libssh2_comp_method_zlib_comp(LIBSSH2_SESSION * session,
compress ? (strm->avail_in + 4) : (2 * strm->avail_in); compress ? (strm->avail_in + 4) : (2 * strm->avail_in);
} else } else
while (!strm->avail_out) { while (!strm->avail_out) {
/* Done with input, might be a byte or two in internal buffer during compress /* Done with input, might be a byte or two in internal buffer
* Or potentially many bytes if it's a decompress * during compress. Or potentially many bytes if it's a
* decompress
*/ */
int grow_size = compress ? 8 : 1024; int grow_size = compress ? 8 : 1024;
char *newout; char *newout;
@ -285,13 +288,12 @@ libssh2_comp_method_zlib_comp(LIBSSH2_SESSION * session,
return 0; return 0;
} }
/* }}} */
/* {{{ libssh2_comp_method_zlib_dtor /* libssh2_comp_method_zlib_dtor
* All done, no more compression for you * All done, no more compression for you
*/ */
static int static int
libssh2_comp_method_zlib_dtor(LIBSSH2_SESSION * session, int compress, comp_method_zlib_dtor(LIBSSH2_SESSION * session, int compress,
void **abstract) void **abstract)
{ {
z_stream *strm = *abstract; z_stream *strm = *abstract;
@ -313,13 +315,11 @@ libssh2_comp_method_zlib_dtor(LIBSSH2_SESSION * session, int compress,
return 0; return 0;
} }
/* }}} */ static const LIBSSH2_COMP_METHOD comp_method_zlib = {
static const LIBSSH2_COMP_METHOD libssh2_comp_method_zlib = {
"zlib", "zlib",
libssh2_comp_method_zlib_init, comp_method_zlib_init,
libssh2_comp_method_zlib_comp, comp_method_zlib_comp,
libssh2_comp_method_zlib_dtor, comp_method_zlib_dtor,
}; };
#endif /* LIBSSH2_HAVE_ZLIB */ #endif /* LIBSSH2_HAVE_ZLIB */
@ -327,16 +327,16 @@ static const LIBSSH2_COMP_METHOD libssh2_comp_method_zlib = {
* Compression Methods * * Compression Methods *
*********************** */ *********************** */
static const LIBSSH2_COMP_METHOD *_libssh2_comp_methods[] = { static const LIBSSH2_COMP_METHOD *comp_methods[] = {
&comp_method_none, &comp_method_none,
#ifdef LIBSSH2_HAVE_ZLIB #ifdef LIBSSH2_HAVE_ZLIB
&libssh2_comp_method_zlib, &comp_method_zlib,
#endif /* LIBSSH2_HAVE_ZLIB */ #endif /* LIBSSH2_HAVE_ZLIB */
NULL NULL
}; };
const LIBSSH2_COMP_METHOD ** const LIBSSH2_COMP_METHOD **
libssh2_comp_methods(void) _libssh2_comp_methods(void)
{ {
return _libssh2_comp_methods; return comp_methods;
} }

46
src/comp.h Normal file
View File

@ -0,0 +1,46 @@
#ifndef __LIBSSH2_COMP_H
#define __LIBSSH2_COMP_H
/* Copyright (C) 2009 by Daniel Stenberg
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
*
* Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* Neither the name of the copyright holder nor the names
* of any other contributors may be used to endorse or
* promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
*/
#include "libssh2_priv.h"
const LIBSSH2_COMP_METHOD **_libssh2_comp_methods(void);
#endif /* __LIBSSH2_COMP_H */

80
src/kex.c
View File

@ -38,6 +38,7 @@
#include "libssh2_priv.h" #include "libssh2_priv.h"
#include "transport.h" #include "transport.h"
#include "comp.h"
/* TODO: Switch this to an inline and handle alloc() failures */ /* TODO: Switch this to an inline and handle alloc() failures */
/* Helper macro called from kex_method_diffie_hellman_group1_sha1_key_exchange */ /* Helper macro called from kex_method_diffie_hellman_group1_sha1_key_exchange */
@ -67,7 +68,7 @@
} \ } \
} }
/* {{{ kex_method_diffie_hellman_groupGP_sha1_key_exchange /* kex_method_diffie_hellman_groupGP_sha1_key_exchange
* Diffie Hellman Key Exchange, Group Agnostic * Diffie Hellman Key Exchange, Group Agnostic
*/ */
static int static int
@ -649,9 +650,9 @@ kex_method_diffie_hellman_groupGP_sha1_key_exchange(LIBSSH2_SESSION *session,
return ret; return ret;
} }
/* }}} */
/* {{{ kex_method_diffie_hellman_group1_sha1_key_exchange
/* kex_method_diffie_hellman_group1_sha1_key_exchange
* Diffie-Hellman Group1 (Actually Group2) Key Exchange using SHA1 * Diffie-Hellman Group1 (Actually Group2) Key Exchange using SHA1
*/ */
static int static int
@ -717,9 +718,9 @@ kex_method_diffie_hellman_group1_sha1_key_exchange(LIBSSH2_SESSION *session,
return ret; return ret;
} }
/* }}} */
/* {{{ kex_method_diffie_hellman_group14_sha1_key_exchange
/* kex_method_diffie_hellman_group14_sha1_key_exchange
* Diffie-Hellman Group14 Key Exchange using SHA1 * Diffie-Hellman Group14 Key Exchange using SHA1
*/ */
static int static int
@ -800,9 +801,9 @@ kex_method_diffie_hellman_group14_sha1_key_exchange(LIBSSH2_SESSION *session,
return ret; return ret;
} }
/* }}} */
/* {{{ kex_method_diffie_hellman_group_exchange_sha1_key_exchange
/* kex_method_diffie_hellman_group_exchange_sha1_key_exchange
* Diffie-Hellman Group Exchange Key Exchange using SHA1 * Diffie-Hellman Group Exchange Key Exchange using SHA1
* Negotiates random(ish) group for secret derivation * Negotiates random(ish) group for secret derivation
*/ */
@ -904,7 +905,7 @@ kex_method_diffie_hellman_group_exchange_sha1_key_exchange
return ret; return ret;
} }
/* }}} */
#define LIBSSH2_KEX_METHOD_FLAG_REQ_ENC_HOSTKEY 0x0001 #define LIBSSH2_KEX_METHOD_FLAG_REQ_ENC_HOSTKEY 0x0001
#define LIBSSH2_KEX_METHOD_FLAG_REQ_SIGN_HOSTKEY 0x0002 #define LIBSSH2_KEX_METHOD_FLAG_REQ_SIGN_HOSTKEY 0x0002
@ -940,7 +941,7 @@ typedef struct _LIBSSH2_COMMON_METHOD
const char *name; const char *name;
} LIBSSH2_COMMON_METHOD; } LIBSSH2_COMMON_METHOD;
/* {{{ kex_method_strlen /* kex_method_strlen
* Calculate the length of a particular method list's resulting string * Calculate the length of a particular method list's resulting string
* Includes SUM(strlen() of each individual method plus 1 (for coma)) - 1 (because the last coma isn't used) * Includes SUM(strlen() of each individual method plus 1 (for coma)) - 1 (because the last coma isn't used)
* Another sign of bad coding practices gone mad. Pretend you don't see this. * Another sign of bad coding practices gone mad. Pretend you don't see this.
@ -962,9 +963,9 @@ kex_method_strlen(LIBSSH2_COMMON_METHOD ** method)
return len - 1; return len - 1;
} }
/* }}} */
/* {{{ kex_method_list
/* kex_method_list
* Generate formatted preference list in buf * Generate formatted preference list in buf
*/ */
static size_t static size_t
@ -989,7 +990,7 @@ kex_method_list(unsigned char *buf, size_t list_strlen,
return list_strlen + 4; return list_strlen + 4;
} }
/* }}} */
#define LIBSSH2_METHOD_PREFS_LEN(prefvar, defaultvar) \ #define LIBSSH2_METHOD_PREFS_LEN(prefvar, defaultvar) \
((prefvar) ? strlen(prefvar) : \ ((prefvar) ? strlen(prefvar) : \
@ -1006,7 +1007,7 @@ kex_method_list(unsigned char *buf, size_t list_strlen,
(LIBSSH2_COMMON_METHOD**)(defaultvar)); \ (LIBSSH2_COMMON_METHOD**)(defaultvar)); \
} }
/* {{{ kexinit /* kexinit
* Send SSH_MSG_KEXINIT packet * Send SSH_MSG_KEXINIT packet
*/ */
static int kexinit(LIBSSH2_SESSION * session) static int kexinit(LIBSSH2_SESSION * session)
@ -1042,10 +1043,10 @@ static int kexinit(LIBSSH2_SESSION * session)
libssh2_mac_methods()); libssh2_mac_methods());
comp_cs_len = comp_cs_len =
LIBSSH2_METHOD_PREFS_LEN(session->local.comp_prefs, LIBSSH2_METHOD_PREFS_LEN(session->local.comp_prefs,
libssh2_comp_methods()); _libssh2_comp_methods());
comp_sc_len = comp_sc_len =
LIBSSH2_METHOD_PREFS_LEN(session->remote.comp_prefs, LIBSSH2_METHOD_PREFS_LEN(session->remote.comp_prefs,
libssh2_comp_methods()); _libssh2_comp_methods());
lang_cs_len = lang_cs_len =
LIBSSH2_METHOD_PREFS_LEN(session->local.lang_prefs, NULL); LIBSSH2_METHOD_PREFS_LEN(session->local.lang_prefs, NULL);
lang_sc_len = lang_sc_len =
@ -1083,9 +1084,9 @@ static int kexinit(LIBSSH2_SESSION * session)
LIBSSH2_METHOD_PREFS_STR(s, mac_sc_len, session->remote.mac_prefs, LIBSSH2_METHOD_PREFS_STR(s, mac_sc_len, session->remote.mac_prefs,
libssh2_mac_methods()); libssh2_mac_methods());
LIBSSH2_METHOD_PREFS_STR(s, comp_cs_len, session->local.comp_prefs, LIBSSH2_METHOD_PREFS_STR(s, comp_cs_len, session->local.comp_prefs,
libssh2_comp_methods()); _libssh2_comp_methods());
LIBSSH2_METHOD_PREFS_STR(s, comp_sc_len, session->remote.comp_prefs, LIBSSH2_METHOD_PREFS_STR(s, comp_sc_len, session->remote.comp_prefs,
libssh2_comp_methods()); _libssh2_comp_methods());
LIBSSH2_METHOD_PREFS_STR(s, lang_cs_len, session->local.lang_prefs, LIBSSH2_METHOD_PREFS_STR(s, lang_cs_len, session->local.lang_prefs,
NULL); NULL);
LIBSSH2_METHOD_PREFS_STR(s, lang_sc_len, session->remote.lang_prefs, LIBSSH2_METHOD_PREFS_STR(s, lang_sc_len, session->remote.lang_prefs,
@ -1166,7 +1167,7 @@ static int kexinit(LIBSSH2_SESSION * session)
/* }}} */ /* }}} */
/* {{{ kex_agree_instr /* kex_agree_instr
* Kex specific variant of strstr() * Kex specific variant of strstr()
* Needle must be preceed by BOL or ',', and followed by ',' or EOL * Needle must be preceed by BOL or ',', and followed by ',' or EOL
*/ */
@ -1204,9 +1205,9 @@ kex_agree_instr(unsigned char *haystack, unsigned long haystack_len,
return NULL; return NULL;
} }
/* }}} */
/* {{{ kex_get_method_by_name
/* kex_get_method_by_name
*/ */
static const LIBSSH2_COMMON_METHOD * static const LIBSSH2_COMMON_METHOD *
kex_get_method_by_name(const char *name, size_t name_len, kex_get_method_by_name(const char *name, size_t name_len,
@ -1222,9 +1223,9 @@ kex_get_method_by_name(const char *name, size_t name_len,
return NULL; return NULL;
} }
/* }}} */
/* {{{ kex_agree_hostkey
/* kex_agree_hostkey
* Agree on a Hostkey which works with this kex * Agree on a Hostkey which works with this kex
*/ */
static int kex_agree_hostkey(LIBSSH2_SESSION * session, static int kex_agree_hostkey(LIBSSH2_SESSION * session,
@ -1299,9 +1300,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session,
return -1; return -1;
} }
/* }}} */
/* {{{ kex_agree_kex_hostkey
/* kex_agree_kex_hostkey
* Agree on a Key Exchange method and a hostkey encoding type * Agree on a Key Exchange method and a hostkey encoding type
*/ */
static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex,
@ -1374,9 +1375,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex,
return -1; return -1;
} }
/* }}} */
/* {{{ kex_agree_crypt
/* kex_agree_crypt
* Agree on a cipher algo * Agree on a cipher algo
*/ */
static int kex_agree_crypt(LIBSSH2_SESSION * session, static int kex_agree_crypt(LIBSSH2_SESSION * session,
@ -1431,9 +1432,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session,
return -1; return -1;
} }
/* }}} */
/* {{{ kex_agree_mac
/* kex_agree_mac
* Agree on a message authentication hash * Agree on a message authentication hash
*/ */
static int kex_agree_mac(LIBSSH2_SESSION * session, static int kex_agree_mac(LIBSSH2_SESSION * session,
@ -1484,16 +1485,16 @@ static int kex_agree_mac(LIBSSH2_SESSION * session,
return -1; return -1;
} }
/* }}} */
/* {{{ kex_agree_comp
/* kex_agree_comp
* Agree on a compression scheme * Agree on a compression scheme
*/ */
static int kex_agree_comp(LIBSSH2_SESSION * session, static int kex_agree_comp(LIBSSH2_SESSION * session,
libssh2_endpoint_data * endpoint, unsigned char *comp, libssh2_endpoint_data * endpoint, unsigned char *comp,
unsigned long comp_len) unsigned long comp_len)
{ {
const LIBSSH2_COMP_METHOD **compp = libssh2_comp_methods(); const LIBSSH2_COMP_METHOD **compp = _libssh2_comp_methods();
unsigned char *s; unsigned char *s;
(void) session; (void) session;
@ -1538,13 +1539,13 @@ static int kex_agree_comp(LIBSSH2_SESSION * session,
return -1; return -1;
} }
/* }}} */
/* TODO: When in server mode we need to turn this logic on its head /* TODO: When in server mode we need to turn this logic on its head
* The Client gets to make the final call on "agreed methods" * The Client gets to make the final call on "agreed methods"
*/ */
/* {{{ kex_agree_methods /* kex_agree_methods
* Decide which specific method to use of the methods offered by each party * Decide which specific method to use of the methods offered by each party
*/ */
static int kex_agree_methods(LIBSSH2_SESSION * session, unsigned char *data, static int kex_agree_methods(LIBSSH2_SESSION * session, unsigned char *data,
@ -1662,9 +1663,9 @@ static int kex_agree_methods(LIBSSH2_SESSION * session, unsigned char *data,
return 0; return 0;
} }
/* }}} */
/* {{{ libssh2_kex_exchange
/* libssh2_kex_exchange
* Exchange keys * Exchange keys
* Returns 0 on success, non-zero on failure * Returns 0 on success, non-zero on failure
*/ */
@ -1795,9 +1796,9 @@ libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange,
return rc; return rc;
} }
/* }}} */
/* {{{ libssh2_session_method_pref
/* libssh2_session_method_pref
* Set preferred method * Set preferred method
*/ */
LIBSSH2_API int LIBSSH2_API int
@ -1841,12 +1842,12 @@ libssh2_session_method_pref(LIBSSH2_SESSION * session, int method_type,
case LIBSSH2_METHOD_COMP_CS: case LIBSSH2_METHOD_COMP_CS:
prefvar = &session->local.comp_prefs; prefvar = &session->local.comp_prefs;
mlist = (const LIBSSH2_COMMON_METHOD **) libssh2_comp_methods(); mlist = (const LIBSSH2_COMMON_METHOD **) _libssh2_comp_methods();
break; break;
case LIBSSH2_METHOD_COMP_SC: case LIBSSH2_METHOD_COMP_SC:
prefvar = &session->remote.comp_prefs; prefvar = &session->remote.comp_prefs;
mlist = (const LIBSSH2_COMMON_METHOD **) libssh2_comp_methods(); mlist = (const LIBSSH2_COMMON_METHOD **) _libssh2_comp_methods();
break; break;
case LIBSSH2_METHOD_LANG_CS: case LIBSSH2_METHOD_LANG_CS:
@ -1909,4 +1910,3 @@ libssh2_session_method_pref(LIBSSH2_SESSION * session, int method_type,
return 0; return 0;
} }
/* }}} */