- 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@

1 files changed, 7 insertions, 6 deletions

diff --git a/cipher.h b/cipher.h
index 8cb57c3e5..b878d50f4 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.39 2013/01/08 18:49:04 markus Exp $ */
+/* $OpenBSD: cipher.h,v 1.40 2013/04/19 01:06:50 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -66,21 +66,22 @@ struct CipherContext {
         int     plaintext;
         int     encrypt;
         EVP_CIPHER_CTX evp;
-        Cipher *cipher;
+        const Cipher *cipher;
 };
 
 u_int    cipher_mask_ssh1(int);
-Cipher  *cipher_by_name(const char *);
-Cipher  *cipher_by_number(int);
+const Cipher    *cipher_by_name(const char *);
+const Cipher    *cipher_by_number(int);
 int      cipher_number(const char *);
 char    *cipher_name(int);
 int      ciphers_valid(const char *);
-void     cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
+char    *cipher_alg_list(void);
+void     cipher_init(CipherContext *, const Cipher *, const u_char *, u_int,
     const u_char *, u_int, int);
 void     cipher_crypt(CipherContext *, u_char *, const u_char *,
     u_int, u_int, u_int);
 void     cipher_cleanup(CipherContext *);
-void     cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
+void     cipher_set_key_string(CipherContext *, const Cipher *, const char *, int);
 u_int    cipher_blocksize(const Cipher *);
 u_int    cipher_keylen(const Cipher *);
 u_int    cipher_authlen(const Cipher *);