mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-12-02 01:17:52 +03:00
moved libcrypto structs to c99 notation
This commit is contained in:
194
src/libcrypto.c
194
src/libcrypto.c
@@ -825,150 +825,118 @@ static void des1_1_decrypt(struct ssh_cipher_struct *cipher, void *in, void *out
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* The table of supported ciphers
|
* The table of supported ciphers
|
||||||
*
|
|
||||||
* WARNING: If you modify ssh_cipher_struct, you must make sure the order is
|
|
||||||
* correct!
|
|
||||||
*/
|
*/
|
||||||
static struct ssh_cipher_struct ssh_ciphertab[] = {
|
static struct ssh_cipher_struct ssh_ciphertab[] = {
|
||||||
#ifdef HAS_BLOWFISH
|
#ifdef HAS_BLOWFISH
|
||||||
{
|
{
|
||||||
"blowfish-cbc",
|
.name = "blowfish-cbc",
|
||||||
8,
|
.blocksize = 8,
|
||||||
sizeof (BF_KEY),
|
.keylen = sizeof(BF_KEY),
|
||||||
NULL,
|
.keysize = 128,
|
||||||
NULL,
|
.set_encrypt_key = blowfish_set_key,
|
||||||
128,
|
.set_decrypt_key = blowfish_set_key,
|
||||||
blowfish_set_key,
|
.encrypt = blowfish_encrypt,
|
||||||
blowfish_set_key,
|
.decrypt = blowfish_decrypt
|
||||||
blowfish_encrypt,
|
|
||||||
blowfish_decrypt
|
|
||||||
},
|
},
|
||||||
#endif /* HAS_BLOWFISH */
|
#endif /* HAS_BLOWFISH */
|
||||||
#ifdef HAS_AES
|
#ifdef HAS_AES
|
||||||
#ifndef BROKEN_AES_CTR
|
#ifndef BROKEN_AES_CTR
|
||||||
{
|
{
|
||||||
"aes128-ctr",
|
.name = "aes128-ctr",
|
||||||
16,
|
.blocksize = 16,
|
||||||
sizeof(AES_KEY),
|
.keylen = 16,
|
||||||
NULL,
|
.keysize = 128,
|
||||||
NULL,
|
.set_encrypt_key = aes_set_encrypt_key,
|
||||||
128,
|
.set_decrypt_key = aes_set_encrypt_key,
|
||||||
aes_set_encrypt_key,
|
.encrypt = aes_ctr128_encrypt,
|
||||||
aes_set_encrypt_key,
|
.decrypt = aes_ctr128_encrypt
|
||||||
aes_ctr128_encrypt,
|
|
||||||
aes_ctr128_encrypt
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"aes192-ctr",
|
.name = "aes192-ctr",
|
||||||
16,
|
.blocksize = 16,
|
||||||
sizeof(AES_KEY),
|
.keylen = 24,
|
||||||
NULL,
|
.keysize = 192,
|
||||||
NULL,
|
.set_encrypt_key = aes_set_encrypt_key,
|
||||||
192,
|
.set_decrypt_key = aes_set_encrypt_key,
|
||||||
aes_set_encrypt_key,
|
.encrypt = aes_ctr128_encrypt,
|
||||||
aes_set_encrypt_key,
|
.decrypt = aes_ctr128_encrypt
|
||||||
aes_ctr128_encrypt,
|
|
||||||
aes_ctr128_encrypt
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"aes256-ctr",
|
.name = "aes256-ctr",
|
||||||
16,
|
.blocksize = 16,
|
||||||
sizeof(AES_KEY),
|
.keylen = 32,
|
||||||
NULL,
|
.keysize = 256,
|
||||||
NULL,
|
.set_encrypt_key = aes_set_encrypt_key,
|
||||||
256,
|
.set_decrypt_key = aes_set_encrypt_key,
|
||||||
aes_set_encrypt_key,
|
.encrypt = aes_ctr128_encrypt,
|
||||||
aes_set_encrypt_key,
|
.decrypt = aes_ctr128_encrypt
|
||||||
aes_ctr128_encrypt,
|
|
||||||
aes_ctr128_encrypt
|
|
||||||
},
|
},
|
||||||
#endif /* BROKEN_AES_CTR */
|
#endif /* BROKEN_AES_CTR */
|
||||||
{
|
{
|
||||||
"aes128-cbc",
|
.name = "aes128-cbc",
|
||||||
16,
|
.blocksize = 16,
|
||||||
sizeof(AES_KEY),
|
.keylen = 16,
|
||||||
NULL,
|
.keysize = 128,
|
||||||
NULL,
|
.set_encrypt_key = aes_set_encrypt_key,
|
||||||
128,
|
.set_decrypt_key = aes_set_decrypt_key,
|
||||||
aes_set_encrypt_key,
|
.encrypt = aes_encrypt,
|
||||||
aes_set_decrypt_key,
|
.decrypt = aes_decrypt
|
||||||
aes_encrypt,
|
|
||||||
aes_decrypt
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"aes192-cbc",
|
.name = "aes192-cbc",
|
||||||
16,
|
.blocksize = 16,
|
||||||
sizeof(AES_KEY),
|
.keylen = 24,
|
||||||
NULL,
|
.keysize = 192,
|
||||||
NULL,
|
.set_encrypt_key = aes_set_encrypt_key,
|
||||||
192,
|
.set_decrypt_key = aes_set_decrypt_key,
|
||||||
aes_set_encrypt_key,
|
.encrypt = aes_encrypt,
|
||||||
aes_set_decrypt_key,
|
.decrypt = aes_decrypt
|
||||||
aes_encrypt,
|
|
||||||
aes_decrypt
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"aes256-cbc",
|
.name = "aes256-cbc",
|
||||||
16,
|
.blocksize = 16,
|
||||||
sizeof(AES_KEY),
|
.keylen = 32,
|
||||||
NULL,
|
.keysize = 256,
|
||||||
NULL,
|
.set_encrypt_key = aes_set_encrypt_key,
|
||||||
256,
|
.set_decrypt_key = aes_set_decrypt_key,
|
||||||
aes_set_encrypt_key,
|
.encrypt = aes_encrypt,
|
||||||
aes_set_decrypt_key,
|
.decrypt = aes_decrypt
|
||||||
aes_encrypt,
|
|
||||||
aes_decrypt
|
|
||||||
},
|
},
|
||||||
#endif /* HAS_AES */
|
#endif /* HAS_AES */
|
||||||
#ifdef HAS_DES
|
#ifdef HAS_DES
|
||||||
{
|
{
|
||||||
"3des-cbc",
|
.name = "3des-cbc",
|
||||||
8,
|
.blocksize = 8,
|
||||||
sizeof(DES_key_schedule) * 3,
|
.keylen = 24,
|
||||||
NULL,
|
.keysize = 192,
|
||||||
NULL,
|
.set_encrypt_key = des3_set_key,
|
||||||
192,
|
.set_decrypt_key = des3_set_key,
|
||||||
des3_set_key,
|
.encrypt = des3_encrypt,
|
||||||
des3_set_key,
|
.decrypt = des3_decrypt
|
||||||
des3_encrypt,
|
|
||||||
des3_decrypt
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"3des-cbc-ssh1",
|
.name = "3des-cbc-ssh1",
|
||||||
8,
|
.blocksize = 8,
|
||||||
sizeof(DES_key_schedule) * 3,
|
.keylen = 24,
|
||||||
NULL,
|
.keysize = 192,
|
||||||
NULL,
|
.set_encrypt_key = des3_set_key,
|
||||||
192,
|
.set_decrypt_key = des3_set_key,
|
||||||
des3_set_key,
|
.encrypt = des3_1_encrypt,
|
||||||
des3_set_key,
|
.decrypt = des3_1_decrypt
|
||||||
des3_1_encrypt,
|
|
||||||
des3_1_decrypt
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"des-cbc-ssh1",
|
.name = "des-cbc-ssh1",
|
||||||
8,
|
.blocksize = 8,
|
||||||
sizeof(DES_key_schedule),
|
.keylen = 8,
|
||||||
NULL,
|
.keysize = 64,
|
||||||
NULL,
|
.set_encrypt_key = des1_set_key,
|
||||||
64,
|
.set_decrypt_key = des1_set_key,
|
||||||
des1_set_key,
|
.encrypt = des1_1_encrypt,
|
||||||
des1_set_key,
|
.decrypt = des1_1_decrypt
|
||||||
des1_1_encrypt,
|
|
||||||
des1_1_decrypt
|
|
||||||
},
|
},
|
||||||
#endif /* HAS_DES */
|
#endif /* HAS_DES */
|
||||||
{
|
{
|
||||||
NULL,
|
.name = NULL
|
||||||
0,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user