Mercurial > dropbear

comparison chachapoly.c @ 1672:3a97f14c0235

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) * Add Chacha20-Poly1305 authenticated encryption * Add general AEAD approach. * Add [email protected] algo using LibTomCrypt chacha and poly1305 routines. Chacha20-Poly1305 is generally faster than AES256 on CPU w/o dedicated AES instructions, having the same key size. Compiling in will add ~5,5kB to binary size on x86-64. function old new delta chacha_crypt - 1397 +1397 _poly1305_block - 608 +608 poly1305_done - 595 +595 dropbear_chachapoly_crypt - 457 +457 .rodata 26976 27392 +416 poly1305_process - 290 +290 poly1305_init - 221 +221 chacha_setup - 218 +218 encrypt_packet 1068 1270 +202 dropbear_chachapoly_getlength - 147 +147 decrypt_packet 756 897 +141 chacha_ivctr64 - 137 +137 read_packet 543 637 +94 dropbear_chachapoly_start - 94 +94 read_kex_algos 792 880 +88 chacha_keystream - 69 +69 dropbear_mode_chachapoly - 48 +48 sshciphers 280 320 +40 dropbear_mode_none 24 48 +24 dropbear_mode_ctr 24 48 +24 dropbear_mode_cbc 24 48 +24 dropbear_chachapoly_mac - 24 +24 dropbear_chachapoly - 24 +24 gen_new_keys 848 854 +6 ------------------------------------------------------------------------------ (add/remove: 14/0 grow/shrink: 10/0 up/down: 5388/0) Total: 5388 bytes * Add AES128-GCM and AES256-GCM authenticated encryption * Add general AES-GCM mode. * Add [email protected] and [email protected] algo using LibTomCrypt gcm routines. AES-GCM is combination of AES CTR mode and GHASH, slower than AES-CTR on CPU w/o dedicated AES/GHASH instructions therefore disabled by default. Compiling in will add ~6kB to binary size on x86-64. function old new delta gcm_process - 1060 +1060 .rodata 26976 27808 +832 gcm_gf_mult - 820 +820 gcm_add_aad - 660 +660 gcm_shift_table - 512 +512 gcm_done - 471 +471 gcm_add_iv - 384 +384 gcm_init - 347 +347 dropbear_gcm_crypt - 309 +309 encrypt_packet 1068 1270 +202 decrypt_packet 756 897 +141 gcm_reset - 118 +118 read_packet 543 637 +94 read_kex_algos 792 880 +88 sshciphers 280 360 +80 gcm_mult_h - 80 +80 dropbear_gcm_start - 62 +62 dropbear_mode_gcm - 48 +48 dropbear_mode_none 24 48 +24 dropbear_mode_ctr 24 48 +24 dropbear_mode_cbc 24 48 +24 dropbear_ghash - 24 +24 dropbear_gcm_getlength - 24 +24 gen_new_keys 848 854 +6 ------------------------------------------------------------------------------ (add/remove: 14/0 grow/shrink: 10/0 up/down: 6434/0) Total: 6434 bytes
author Vladislav Grishenko <themiron@users.noreply.github.com>
date Mon, 25 May 2020 20:50:25 +0500
parents
children 5b701bf529aa
comparison
equal deleted inserted replaced
1671:5c8913b7464c 1672:3a97f14c0235
1 /*
2 * Dropbear SSH
3 *
4 * Copyright (c) 2002,2003 Matt Johnston
5 * Copyright (c) 2020 by Vladislav Grishenko
6 * All rights reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a copy
9 * of this software and associated documentation files (the "Software"), to deal
10 * in the Software without restriction, including without limitation the rights
11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12 * copies of the Software, and to permit persons to whom the Software is
13 * furnished to do so, subject to the following conditions:
14 *
15 * The above copyright notice and this permission notice shall be included in
16 * all copies or substantial portions of the Software.
17 *
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24 * SOFTWARE. */
25
26 #include "includes.h"
27 #include "algo.h"
28 #include "dbutil.h"
29 #include "chachapoly.h"
30
31 #if DROPBEAR_CHACHA20POLY1305
32
33 #define CHACHA20_KEY_LEN 32
34 #define CHACHA20_BLOCKSIZE 8
35 #define POLY1305_KEY_LEN 32
36 #define POLY1305_TAG_LEN 16
37
38 static const struct ltc_cipher_descriptor dummy = {.name = NULL};
39
40 static const struct dropbear_hash dropbear_chachapoly_mac =
41 {NULL, POLY1305_KEY_LEN, POLY1305_TAG_LEN};
42
43 const struct dropbear_cipher dropbear_chachapoly =
44 {&dummy, CHACHA20_KEY_LEN*2, CHACHA20_BLOCKSIZE};
45
46 static int dropbear_chachapoly_start(int UNUSED(cipher), const unsigned char* UNUSED(IV),
47 const unsigned char *key, int keylen,
48 int UNUSED(num_rounds), dropbear_chachapoly_state *state) {
49 int err;
50
51 TRACE2(("enter dropbear_chachapoly_start"))
52
53 if (keylen != CHACHA20_KEY_LEN*2) {
54 return CRYPT_ERROR;
55 }
56
57 if ((err = chacha_setup(&state->chacha, key,
58 CHACHA20_KEY_LEN, 20)) != CRYPT_OK) {
59 return err;
60 }
61
62 if ((err = chacha_setup(&state->header, key + CHACHA20_KEY_LEN,
63 CHACHA20_KEY_LEN, 20) != CRYPT_OK)) {
64 return err;
65 }
66
67 TRACE2(("leave dropbear_chachapoly_start"))
68 return CRYPT_OK;
69 }
70
71 static int dropbear_chachapoly_crypt(unsigned int seq,
72 const unsigned char *in, unsigned char *out,
73 unsigned long len, unsigned long taglen,
74 dropbear_chachapoly_state *state, int direction) {
75 poly1305_state poly;
76 unsigned char seqbuf[8], key[POLY1305_KEY_LEN], tag[POLY1305_TAG_LEN];
77 int err;
78
79 TRACE2(("enter dropbear_chachapoly_crypt"))
80
81 if (len < 4 || taglen != POLY1305_TAG_LEN) {
82 return CRYPT_ERROR;
83 }
84
85 STORE64H(seq, seqbuf);
86 chacha_ivctr64(&state->chacha, seqbuf, sizeof(seqbuf), 0);
87 if ((err = chacha_keystream(&state->chacha, key, sizeof(key))) != CRYPT_OK) {
88 return err;
89 }
90
91 poly1305_init(&poly, key, sizeof(key));
92 if (direction == LTC_DECRYPT) {
93 poly1305_process(&poly, in, len);
94 poly1305_done(&poly, tag, &taglen);
95 if (constant_time_memcmp(in + len, tag, taglen) != 0) {
96 return CRYPT_ERROR;
97 }
98 }
99
100 chacha_ivctr64(&state->header, seqbuf, sizeof(seqbuf), 0);
101 if ((err = chacha_crypt(&state->header, in, 4, out)) != CRYPT_OK) {
102 return err;
103 }
104
105 chacha_ivctr64(&state->chacha, seqbuf, sizeof(seqbuf), 1);
106 if ((err = chacha_crypt(&state->chacha, in + 4, len - 4, out + 4)) != CRYPT_OK) {
107 return err;
108 }
109
110 if (direction == LTC_ENCRYPT) {
111 poly1305_process(&poly, out, len);
112 poly1305_done(&poly, out + len, &taglen);
113 }
114
115 TRACE2(("leave dropbear_chachapoly_crypt"))
116 return CRYPT_OK;
117 }
118
119 static int dropbear_chachapoly_getlength(unsigned int seq,
120 const unsigned char *in, unsigned int *outlen,
121 unsigned long len, dropbear_chachapoly_state *state) {
122 unsigned char seqbuf[8], buf[4];
123 int err;
124
125 TRACE2(("enter dropbear_chachapoly_parse"))
126
127 if (len < sizeof(buf)) {
128 return CRYPT_ERROR;
129 }
130
131 STORE64H(seq, seqbuf);
132 chacha_ivctr64(&state->header, seqbuf, sizeof(seqbuf), 0);
133 if ((err = chacha_crypt(&state->header, in, sizeof(buf), buf)) != CRYPT_OK) {
134 return err;
135 }
136
137 LOAD32H(*outlen, buf);
138
139 TRACE2(("leave dropbear_chachapoly_parse"))
140 return CRYPT_OK;
141 }
142
143 const struct dropbear_cipher_mode dropbear_mode_chachapoly =
144 {(void *)dropbear_chachapoly_start, NULL, NULL,
145 (void *)dropbear_chachapoly_crypt,
146 (void *)dropbear_chachapoly_getlength, &dropbear_chachapoly_mac};
147
148 #endif /* DROPBEAR_CHACHA20POLY1305 */