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 /authfile.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 'authfile.c')
-rw-r--r-- | authfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/authfile.c b/authfile.c index 3544d170b..91812bf87 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.c,v 1.95 2013/01/08 18:49:04 markus Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.96 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 |
@@ -89,7 +89,7 @@ key_private_rsa1_to_blob(Key *key, Buffer *blob, const char *passphrase, | |||
89 | u_char buf[100], *cp; | 89 | u_char buf[100], *cp; |
90 | int i, cipher_num; | 90 | int i, cipher_num; |
91 | CipherContext ciphercontext; | 91 | CipherContext ciphercontext; |
92 | Cipher *cipher; | 92 | const Cipher *cipher; |
93 | u_int32_t rnd; | 93 | u_int32_t rnd; |
94 | 94 | ||
95 | /* | 95 | /* |
@@ -421,7 +421,7 @@ key_parse_private_rsa1(Buffer *blob, const char *passphrase, char **commentp) | |||
421 | Buffer decrypted; | 421 | Buffer decrypted; |
422 | u_char *cp; | 422 | u_char *cp; |
423 | CipherContext ciphercontext; | 423 | CipherContext ciphercontext; |
424 | Cipher *cipher; | 424 | const Cipher *cipher; |
425 | Key *prv = NULL; | 425 | Key *prv = NULL; |
426 | Buffer copy; | 426 | Buffer copy; |
427 | 427 | ||