summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 12:43:25 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 12:43:25 +0000
commit626f1d986ff72aa514da63e34744e1de9cf21b9a (patch)
treed215a5280bc2e57251e4a9e08bfd3674ad824a94 /packet.h
parent6ed622cb6fe8f71bbe0d998cdd12280410bfb420 (diff)
parent0970072c89b079b022538e3c366fbfa2c53fc821 (diff)
* New upstream release (http://www.openssh.org/txt/release-5.7):
- Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer better performance than plain DH and DSA at the same equivalent symmetric key length, as well as much shorter keys. - sftp(1)/sftp-server(8): add a protocol extension to support a hard link operation. It is available through the "ln" command in the client. The old "ln" behaviour of creating a symlink is available using its "-s" option or through the preexisting "symlink" command. - scp(1): Add a new -3 option to scp: Copies between two remote hosts are transferred through the local host (closes: #508613). - ssh(1): "atomically" create the listening mux socket by binding it on a temporary name and then linking it into position after listen() has succeeded. This allows the mux clients to determine that the server socket is either ready or stale without races (closes: #454784). Stale server sockets are now automatically removed (closes: #523250). - ssh(1): install a SIGCHLD handler to reap expired child process (closes: #594687). - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent temporary directories (closes: #357469, although only if you arrange for ssh-agent to actually see $TMPDIR since the setgid bit will cause it to be stripped off).
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/packet.h b/packet.h
index 33523d750..d516aae8d 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.h,v 1.52 2009/06/27 09:29:06 andreas Exp $ */ 1/* $OpenBSD: packet.h,v 1.55 2010/11/13 23:27:50 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -19,6 +19,9 @@
19#include <termios.h> 19#include <termios.h>
20 20
21#include <openssl/bn.h> 21#include <openssl/bn.h>
22#ifdef OPENSSL_HAS_ECC
23#include <openssl/ec.h>
24#endif
22 25
23void packet_set_connection(int, int); 26void packet_set_connection(int, int);
24void packet_set_timeout(int, int); 27void packet_set_timeout(int, int);
@@ -31,7 +34,7 @@ u_int packet_get_encryption_key(u_char *);
31void packet_set_protocol_flags(u_int); 34void packet_set_protocol_flags(u_int);
32u_int packet_get_protocol_flags(void); 35u_int packet_get_protocol_flags(void);
33void packet_start_compression(int); 36void packet_start_compression(int);
34void packet_set_interactive(int); 37void packet_set_interactive(int, int, int);
35int packet_is_interactive(void); 38int packet_is_interactive(void);
36void packet_set_server(void); 39void packet_set_server(void);
37void packet_set_authenticated(void); 40void packet_set_authenticated(void);
@@ -42,6 +45,9 @@ void packet_put_int(u_int value);
42void packet_put_int64(u_int64_t value); 45void packet_put_int64(u_int64_t value);
43void packet_put_bignum(BIGNUM * value); 46void packet_put_bignum(BIGNUM * value);
44void packet_put_bignum2(BIGNUM * value); 47void packet_put_bignum2(BIGNUM * value);
48#ifdef OPENSSL_HAS_ECC
49void packet_put_ecpoint(const EC_GROUP *, const EC_POINT *);
50#endif
45void packet_put_string(const void *buf, u_int len); 51void packet_put_string(const void *buf, u_int len);
46void packet_put_cstring(const char *str); 52void packet_put_cstring(const char *str);
47void packet_put_raw(const void *buf, u_int len); 53void packet_put_raw(const void *buf, u_int len);
@@ -59,8 +65,12 @@ u_int packet_get_int(void);
59u_int64_t packet_get_int64(void); 65u_int64_t packet_get_int64(void);
60void packet_get_bignum(BIGNUM * value); 66void packet_get_bignum(BIGNUM * value);
61void packet_get_bignum2(BIGNUM * value); 67void packet_get_bignum2(BIGNUM * value);
68#ifdef OPENSSL_HAS_ECC
69void packet_get_ecpoint(const EC_GROUP *, EC_POINT *);
70#endif
62void *packet_get_raw(u_int *length_ptr); 71void *packet_get_raw(u_int *length_ptr);
63void *packet_get_string(u_int *length_ptr); 72void *packet_get_string(u_int *length_ptr);
73char *packet_get_cstring(u_int *length_ptr);
64void *packet_get_string_ptr(u_int *length_ptr); 74void *packet_get_string_ptr(u_int *length_ptr);
65void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2))); 75void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
66void packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2))); 76void packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));