summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:15:04 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 10:04:58 +1000
commitcdccebdf85204bf7542b7fcc1aa2ea3f36661833 (patch)
treefd07acdcdebd7da5dc027e58261a446a807466ba /cipher.h
parent97f4d3083b036ce3e68d6346a6140a22123d5864 (diff)
upstream commit
remove SSHv1 ciphers; ok markus@ Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h25
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 @@
1/* $OpenBSD: cipher.h,v 1.49 2016/08/03 05:41:57 djm Exp $ */ 1/* $OpenBSD: cipher.h,v 1.50 2017/04/30 23:15:04 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -42,34 +42,13 @@
42#include "cipher-chachapoly.h" 42#include "cipher-chachapoly.h"
43#include "cipher-aesctr.h" 43#include "cipher-aesctr.h"
44 44
45/*
46 * Cipher types for SSH-1. New types can be added, but old types should not
47 * be removed for compatibility. The maximum allowed value is 31.
48 */
49#define SSH_CIPHER_SSH2 -3
50#define SSH_CIPHER_INVALID -2 /* No valid cipher selected. */
51#define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */
52#define SSH_CIPHER_NONE 0 /* no encryption */
53#define SSH_CIPHER_IDEA 1 /* IDEA CFB */
54#define SSH_CIPHER_DES 2 /* DES CBC */
55#define SSH_CIPHER_3DES 3 /* 3DES CBC */
56#define SSH_CIPHER_BROKEN_TSS 4 /* TRI's Simple Stream encryption CBC */
57#define SSH_CIPHER_BROKEN_RC4 5 /* Alleged RC4 */
58#define SSH_CIPHER_BLOWFISH 6
59#define SSH_CIPHER_RESERVED 7
60#define SSH_CIPHER_MAX 31
61
62#define CIPHER_ENCRYPT 1 45#define CIPHER_ENCRYPT 1
63#define CIPHER_DECRYPT 0 46#define CIPHER_DECRYPT 0
64 47
65struct sshcipher; 48struct sshcipher;
66struct sshcipher_ctx; 49struct sshcipher_ctx;
67 50
68u_int cipher_mask_ssh1(int);
69const struct sshcipher *cipher_by_name(const char *); 51const struct sshcipher *cipher_by_name(const char *);
70const struct sshcipher *cipher_by_number(int);
71int cipher_number(const char *);
72char *cipher_name(int);
73const char *cipher_warning_message(const struct sshcipher_ctx *); 52const char *cipher_warning_message(const struct sshcipher_ctx *);
74int ciphers_valid(const char *); 53int ciphers_valid(const char *);
75char *cipher_alg_list(char, int); 54char *cipher_alg_list(char, int);
@@ -90,9 +69,7 @@ u_int cipher_ivlen(const struct sshcipher *);
90u_int cipher_is_cbc(const struct sshcipher *); 69u_int cipher_is_cbc(const struct sshcipher *);
91 70
92u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *); 71u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *);
93u_int cipher_ctx_get_number(struct sshcipher_ctx *);
94 72
95u_int cipher_get_number(const struct sshcipher *);
96int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int); 73int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int);
97int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *); 74int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *);
98int cipher_get_keyiv_len(const struct sshcipher_ctx *); 75int cipher_get_keyiv_len(const struct sshcipher_ctx *);