upstream commit

remove SSHv1 ciphers; ok markus@

Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890

1 files changed, 1 insertions, 24 deletions

diff --git a/cipher.h b/cipher.h
index f4bca6285..312bbc8a0 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.49 2016/08/03 05:41:57 djm Exp $ */
+/* $OpenBSD: cipher.h,v 1.50 2017/04/30 23:15:04 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -42,34 +42,13 @@
 #include "cipher-chachapoly.h"
 #include "cipher-aesctr.h"
 
-/*
- * Cipher types for SSH-1.  New types can be added, but old types should not
- * be removed for compatibility.  The maximum allowed value is 31.
- */
-#define SSH_CIPHER_SSH2         -3
-#define SSH_CIPHER_INVALID      -2      /* No valid cipher selected. */
-#define SSH_CIPHER_NOT_SET      -1      /* None selected (invalid number). */
-#define SSH_CIPHER_NONE         0       /* no encryption */
-#define SSH_CIPHER_IDEA         1       /* IDEA CFB */
-#define SSH_CIPHER_DES          2       /* DES CBC */
-#define SSH_CIPHER_3DES         3       /* 3DES CBC */
-#define SSH_CIPHER_BROKEN_TSS   4       /* TRI's Simple Stream encryption CBC */
-#define SSH_CIPHER_BROKEN_RC4   5       /* Alleged RC4 */
-#define SSH_CIPHER_BLOWFISH     6
-#define SSH_CIPHER_RESERVED     7
-#define SSH_CIPHER_MAX          31
-
 #define CIPHER_ENCRYPT          1
 #define CIPHER_DECRYPT          0
 
 struct sshcipher;
 struct sshcipher_ctx;
 
-u_int    cipher_mask_ssh1(int);
 const struct sshcipher *cipher_by_name(const char *);
-const struct sshcipher *cipher_by_number(int);
-int      cipher_number(const char *);
-char    *cipher_name(int);
 const char *cipher_warning_message(const struct sshcipher_ctx *);
 int      ciphers_valid(const char *);
 char    *cipher_alg_list(char, int);
@@ -90,9 +69,7 @@ u_int	 cipher_ivlen(const struct sshcipher *);
 u_int    cipher_is_cbc(const struct sshcipher *);
 
 u_int    cipher_ctx_is_plaintext(struct sshcipher_ctx *);
-u_int    cipher_ctx_get_number(struct sshcipher_ctx *);
 
-u_int    cipher_get_number(const struct sshcipher *);
 int      cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int);
 int      cipher_set_keyiv(struct sshcipher_ctx *, const u_char *);
 int      cipher_get_keyiv_len(const struct sshcipher_ctx *);