shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make the cipher table more readable.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@520 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-17 13:01:56 +00:00
parent 845615cdd8
commit 09fdf0e8e6
1 changed files with 155 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
libssh/wrapper.c
View File

@@ -305,15 +305,83 @@ static void des3_1_decrypt(struct crypto_struct *cipher, void *in,
/* the table of supported ciphers */ /* the table of supported ciphers */
static struct crypto_struct ssh_ciphertab[] = { static struct crypto_struct ssh_ciphertab[] = {
{ "blowfish-cbc", 8 ,sizeof (gcry_cipher_hd_t),NULL,128,blowfish_set_key,blowfish_set_key,blowfish_encrypt, blowfish_decrypt}, {
{ "aes128-cbc",16,sizeof(gcry_cipher_hd_t),NULL,128,aes_set_key,aes_set_key,aes_encrypt,aes_decrypt}, .name = "blowfish-cbc",
{ "aes192-cbc",16,sizeof(gcry_cipher_hd_t),NULL,192,aes_set_key,aes_set_key,aes_encrypt,aes_decrypt}, .blocksize = 8,
{ "aes256-cbc",16,sizeof(gcry_cipher_hd_t),NULL,256,aes_set_key,aes_set_key,aes_encrypt,aes_decrypt}, .keylen = sizeof(gcry_cipher_hd_t),
{ "3des-cbc",8,sizeof(gcry_cipher_hd_t),NULL,192,des3_set_key, .key = NULL,
des3_set_key,des3_encrypt, des3_decrypt}, .keysize = 128,
{ "3des-cbc-ssh1",8,sizeof(gcry_cipher_hd_t)*3,NULL,192,des3_1_set_key, .set_encrypt_key = blowfish_set_key,
des3_1_set_key,des3_1_encrypt, des3_1_decrypt}, .set_decrypt_key = blowfish_set_key,
{ NULL,0,0,NULL,0,NULL,NULL,NULL,NULL } .cbc_encrypt = blowfish_encrypt,
.cbc_decrypt = blowfish_decrypt
},
{
.name = "aes128-cbc",
.blocksize = 16,
.keylen = sizeof(gcry_cipher_hd_t),
.key = NULL,
.keysize = 128,
.set_encrypt_key = aes_set_key,
.set_decrypt_key = aes_set_key,
.cbc_encrypt = aes_encrypt,
.cbc_decrypt = aes_decrypt
},
{
.name = "aes192-cbc",
.blocksize = 16,
.keylen = sizeof(gcry_cipher_hd_t),
.key = NULL,
.keysize = 192,
.set_encrypt_key = aes_set_key,
.set_decrypt_key = aes_set_key,
.cbc_encrypt = aes_encrypt,
.cbc_decrypt = aes_decrypt
},
{
.name = "aes256-cbc",
.blocksize = 16,
.keylen = sizeof(gcry_cipher_hd_t),
.key = NULL,
.keysize = 256,
.set_encrypt_key = aes_set_key,
.set_decrypt_key = aes_set_key,
.cbc_encrypt = aes_encrypt,
.cbc_decrypt = aes_decrypt
},
{
.name = "3des-cbc",
.blocksize = 8,
.keylen = sizeof(gcry_cipher_hd_t),
.key = NULL,
.keysize = 192,
.set_encrypt_key = des3_set_key,
.set_decrypt_key = des3_set_key,
.cbc_encrypt = des3_encrypt,
.cbc_decrypt = des3_decrypt
},
{
.name = "3des-cbc-ssh1",
.blocksize = 8,
.keylen = sizeof(gcry_cipher_hd_t) * 3,
.key = NULL,
.keysize = 192,
.set_encrypt_key = des3_1_set_key,
.set_decrypt_key = des3_1_set_key,
.cbc_encrypt = des3_1_encrypt,
.cbc_decrypt = des3_1_decrypt
},
{
.name = NULL,
.blocksize = 0,
.keylen = 0,
.key = NULL,
.keysize = 0,
.set_encrypt_key = NULL,
.set_decrypt_key = NULL,
.cbc_encrypt = NULL,
.cbc_decrypt = NULL
}
}; };
#elif defined HAVE_LIBCRYPTO #elif defined HAVE_LIBCRYPTO
#include <openssl/sha.h> #include <openssl/sha.h>
@@ -554,24 +622,88 @@ static void des3_1_decrypt(struct crypto_struct *cipher, void *in,
/* the table of supported ciphers */ /* the table of supported ciphers */
static struct crypto_struct ssh_ciphertab[] = { static struct crypto_struct ssh_ciphertab[] = {
#ifdef HAS_BLOWFISH #ifdef HAS_BLOWFISH
{ "blowfish-cbc", 8 ,sizeof (BF_KEY),NULL,128,blowfish_set_key, {
blowfish_set_key,blowfish_encrypt, blowfish_decrypt}, .name = "blowfish-cbc",
.blocksize = 8,
.keylen = sizeof (BF_KEY),
.key = NULL,
.keysize = 128,
.set_encrypt_key = blowfish_set_key,
.set_decrypt_key = blowfish_set_key,
.cbc_encrypt = blowfish_encrypt,
.cbc_decrypt = blowfish_decrypt
},
#endif #endif
#ifdef HAS_AES #ifdef HAS_AES
{ "aes128-cbc",16,sizeof(AES_KEY),NULL,128,aes_set_encrypt_key, {
aes_set_decrypt_key,aes_encrypt,aes_decrypt}, .name = "aes128-cbc",
{ "aes192-cbc",16,sizeof(AES_KEY),NULL,192,aes_set_encrypt_key, .blocksize = 16,
aes_set_decrypt_key,aes_encrypt,aes_decrypt}, .keylen = sizeof(AES_KEY),
{ "aes256-cbc",16,sizeof(AES_KEY),NULL,256,aes_set_encrypt_key, .key = NULL,
aes_set_decrypt_key,aes_encrypt,aes_decrypt}, .keysize = 128,
.set_encrypt_key = aes_set_encrypt_key,
.set_decrypt_key = aes_set_decrypt_key,
.cbc_encrypt = aes_encrypt,
.cbc_decrypt = aes_decrypt
},
{
.name = "aes192-cbc",
.blocksize = 16,
.keylen = sizeof(AES_KEY),
.key = NULL,
.keysize = 192,
.set_encrypt_key = aes_set_encrypt_key,
.set_decrypt_key = aes_set_decrypt_key,
.cbc_encrypt = aes_encrypt,
.cbc_decrypt = aes_decrypt
},
{
.name = "aes256-cbc",
.blocksize = 16,
.keylen = sizeof(AES_KEY),
.key = NULL,
.keysize = 256,
.set_encrypt_key = aes_set_encrypt_key,
.set_decrypt_key = aes_set_decrypt_key,
.cbc_encrypt = aes_encrypt,
.cbc_decrypt = aes_decrypt
},
#endif #endif
#ifdef HAS_DES #ifdef HAS_DES
{ "3des-cbc",8,sizeof(DES_key_schedule)*3,NULL,192,des3_set_key, {
des3_set_key,des3_encrypt, des3_decrypt}, .name = "3des-cbc",
{ "3des-cbc-ssh1",8,sizeof(DES_key_schedule)*3,NULL,192,des3_set_key, .blocksize = 8,
des3_set_key,des3_1_encrypt, des3_1_decrypt}, .keylen = sizeof(DES_key_schedule) * 3,
.key = NULL,
.keysize = 192,
.set_encrypt_key = des3_set_key,
.set_decrypt_key = des3_set_key,
.cbc_encrypt = des3_encrypt,
.cbc_decrypt = des3_decrypt
},
{
.name = "3des-cbc-ssh1",
.blocksize = 8,
.keylen = sizeof(DES_key_schedule) * 3,
.key = NULL,
.keysize = 192,
.set_encrypt_key = des3_set_key,
.set_decrypt_key = des3_set_key,
.cbc_encrypt = des3_1_encrypt,
.cbc_decrypt = des3_1_decrypt
},
#endif #endif
{ NULL,0,0,NULL,0,NULL,NULL,NULL,NULL} {
.name = NULL,
.blocksize = 0,
.keylen = 0,
.key = NULL,
.keysize = 0,
.set_encrypt_key = NULL,
.set_decrypt_key = NULL,
.cbc_encrypt = NULL,
.cbc_decrypt = NULL
}
}; };
#endif /* OPENSSL_CRYPTO */ #endif /* OPENSSL_CRYPTO */