diff options
author | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-05 23:58:12 +0100 |
commit | 0556ea972b15607b7e13ff31bc05840881c91dd3 (patch) | |
tree | d6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /cipher.h | |
parent | db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff) | |
parent | 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff) |
New upstream release (7.6p1)
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 29 |
1 files changed, 1 insertions, 28 deletions
@@ -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.52 2017/05/07 23:12:57 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 | ||
65 | struct sshcipher; | 48 | struct sshcipher; |
66 | struct sshcipher_ctx; | 49 | struct sshcipher_ctx; |
67 | 50 | ||
68 | u_int cipher_mask_ssh1(int); | ||
69 | const struct sshcipher *cipher_by_name(const char *); | 51 | const struct sshcipher *cipher_by_name(const char *); |
70 | const struct sshcipher *cipher_by_number(int); | ||
71 | int cipher_number(const char *); | ||
72 | char *cipher_name(int); | ||
73 | const char *cipher_warning_message(const struct sshcipher_ctx *); | 52 | const char *cipher_warning_message(const struct sshcipher_ctx *); |
74 | int ciphers_valid(const char *); | 53 | int ciphers_valid(const char *); |
75 | char *cipher_alg_list(char, int); | 54 | char *cipher_alg_list(char, int); |
@@ -80,8 +59,6 @@ int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *, | |||
80 | int cipher_get_length(struct sshcipher_ctx *, u_int *, u_int, | 59 | int cipher_get_length(struct sshcipher_ctx *, u_int *, u_int, |
81 | const u_char *, u_int); | 60 | const u_char *, u_int); |
82 | void cipher_free(struct sshcipher_ctx *); | 61 | void cipher_free(struct sshcipher_ctx *); |
83 | int cipher_set_key_string(struct sshcipher_ctx **, | ||
84 | const struct sshcipher *, const char *, int); | ||
85 | u_int cipher_blocksize(const struct sshcipher *); | 62 | u_int cipher_blocksize(const struct sshcipher *); |
86 | u_int cipher_keylen(const struct sshcipher *); | 63 | u_int cipher_keylen(const struct sshcipher *); |
87 | u_int cipher_seclen(const struct sshcipher *); | 64 | u_int cipher_seclen(const struct sshcipher *); |
@@ -90,13 +67,9 @@ u_int cipher_ivlen(const struct sshcipher *); | |||
90 | u_int cipher_is_cbc(const struct sshcipher *); | 67 | u_int cipher_is_cbc(const struct sshcipher *); |
91 | 68 | ||
92 | u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *); | 69 | u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *); |
93 | u_int cipher_ctx_get_number(struct sshcipher_ctx *); | ||
94 | 70 | ||
95 | u_int cipher_get_number(const struct sshcipher *); | ||
96 | int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int); | 71 | int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int); |
97 | int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *); | 72 | int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *); |
98 | int cipher_get_keyiv_len(const struct sshcipher_ctx *); | 73 | int cipher_get_keyiv_len(const struct sshcipher_ctx *); |
99 | int cipher_get_keycontext(const struct sshcipher_ctx *, u_char *); | ||
100 | void cipher_set_keycontext(struct sshcipher_ctx *, const u_char *); | ||
101 | 74 | ||
102 | #endif /* CIPHER_H */ | 75 | #endif /* CIPHER_H */ |