diff options
author | Damien Miller <djm@mindrot.org> | 2013-04-23 19:24:32 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-04-23 19:24:32 +1000 |
commit | ea11119eee3c5e2429b1f5f8688b25b028fa991a (patch) | |
tree | 5916295fcefb8665088f59a5431cb0c792fbf327 /packet.c | |
parent | a56086b9903b62c1c4fdedf01b68338fe4dc90e4 (diff) |
- djm@cvs.openbsd.org 2013/04/19 01:06:50
[authfile.c cipher.c cipher.h kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c]
[key.c key.h mac.c mac.h packet.c ssh.1 ssh.c]
add the ability to query supported ciphers, MACs, key type and KEX
algorithms to ssh. Includes some refactoring of KEX and key type handling
to be table-driven; ok markus@
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.182 2013/04/11 02:27:50 djm Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.183 2013/04/19 01:06:50 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -215,7 +215,7 @@ alloc_session_state(void) | |||
215 | void | 215 | void |
216 | packet_set_connection(int fd_in, int fd_out) | 216 | packet_set_connection(int fd_in, int fd_out) |
217 | { | 217 | { |
218 | Cipher *none = cipher_by_name("none"); | 218 | const Cipher *none = cipher_by_name("none"); |
219 | 219 | ||
220 | if (none == NULL) | 220 | if (none == NULL) |
221 | fatal("packet_set_connection: cannot load cipher 'none'"); | 221 | fatal("packet_set_connection: cannot load cipher 'none'"); |
@@ -545,7 +545,7 @@ packet_start_compression(int level) | |||
545 | void | 545 | void |
546 | packet_set_encryption_key(const u_char *key, u_int keylen, int number) | 546 | packet_set_encryption_key(const u_char *key, u_int keylen, int number) |
547 | { | 547 | { |
548 | Cipher *cipher = cipher_by_number(number); | 548 | const Cipher *cipher = cipher_by_number(number); |
549 | 549 | ||
550 | if (cipher == NULL) | 550 | if (cipher == NULL) |
551 | fatal("packet_set_encryption_key: unknown cipher number %d", number); | 551 | fatal("packet_set_encryption_key: unknown cipher number %d", number); |