Mercurial > dropbear

comparison session.h @ 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 cc0fc5131c5c
children e0871128e61f
comparison
equal deleted inserted replaced
1671:5c8913b7464c 1672:3a97f14c0235
39 #include "dbutil.h" 39 #include "dbutil.h"
40 #include "netio.h" 40 #include "netio.h"
41 #if DROPBEAR_PLUGIN 41 #if DROPBEAR_PLUGIN
42 #include "pubkeyapi.h" 42 #include "pubkeyapi.h"
43 #endif 43 #endif
44 #include "gcm.h"
45 #include "chachapoly.h"
44 46
45 void common_session_init(int sock_in, int sock_out); 47 void common_session_init(int sock_in, int sock_out);
46 void session_loop(void(*loophandler)(void)) ATTRIB_NORETURN; 48 void session_loop(void(*loophandler)(void)) ATTRIB_NORETURN;
47 void session_cleanup(void); 49 void session_cleanup(void);
48 void send_session_identification(void); 50 void send_session_identification(void);
78 /* actual keys */ 80 /* actual keys */
79 union { 81 union {
80 symmetric_CBC cbc; 82 symmetric_CBC cbc;
81 #if DROPBEAR_ENABLE_CTR_MODE 83 #if DROPBEAR_ENABLE_CTR_MODE
82 symmetric_CTR ctr; 84 symmetric_CTR ctr;
85 #endif
86 #if DROPBEAR_ENABLE_GCM_MODE
87 dropbear_gcm_state gcm;
88 #endif
89 #if DROPBEAR_CHACHA20POLY1305
90 dropbear_chachapoly_state chachapoly;
83 #endif 91 #endif
84 } cipher_state; 92 } cipher_state;
85 unsigned char mackey[MAX_MAC_LEN]; 93 unsigned char mackey[MAX_MAC_LEN];
86 int valid; 94 int valid;
87 }; 95 };