ports/libssh2
ports/libssh2
1
1
Форкнуть 0
Код Релизы 1 Активность

openssl.c: minor changes of coding style (#454)

Просмотр исходного кода 
File: openssl.c

Notes:
minor changes of coding style and align preprocessor conditional for #439

Credit:
Tseng Jun
Этот коммит содержится в:
Tseng Jun 2020-03-04 03:57:21 +08:00 коммит произвёл GitHub
родитель b3b45813d6
Коммит ee3abe0408
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 10 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
src/openssl.c
Просмотреть файл

@ -433,12 +433,6 @@ _libssh2_cipher_crypt(_libssh2_cipher_ctx * ctx,
return ret == 1 ? 0 : 1; return ret == 1 ? 0 : 1;
} }
#ifndef HAVE_EVP_AES_128_CTR
static EVP_CIPHER * aes_128_ctr_cipher = NULL;
static EVP_CIPHER * aes_192_ctr_cipher = NULL;
static EVP_CIPHER * aes_256_ctr_cipher = NULL;
#endif
#if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR) #if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR)
#include <openssl/aes.h> #include <openssl/aes.h>
@ -451,6 +445,10 @@ typedef struct
unsigned char ctr[AES_BLOCK_SIZE]; unsigned char ctr[AES_BLOCK_SIZE];
} aes_ctr_ctx; } aes_ctr_ctx;
static EVP_CIPHER * aes_128_ctr_cipher = NULL;
static EVP_CIPHER * aes_192_ctr_cipher = NULL;
static EVP_CIPHER * aes_256_ctr_cipher = NULL;
static int static int
aes_ctr_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, aes_ctr_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) /* init key */ const unsigned char *iv, int enc) /* init key */
@ -642,7 +640,7 @@ _libssh2_EVP_aes_256_ctr(void)
#endif #endif
} }
#endif /* LIBSSH2_AES_CTR */ #endif /* LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR) */
void _libssh2_openssl_crypto_init(void) void _libssh2_openssl_crypto_init(void)
{ {
@ -661,16 +659,16 @@ void _libssh2_openssl_crypto_init(void)
ENGINE_register_all_complete(); ENGINE_register_all_complete();
#endif #endif
#endif #endif
#ifndef HAVE_EVP_AES_128_CTR #if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR)
aes_128_ctr_cipher = (EVP_CIPHER *) _libssh2_EVP_aes_128_ctr(); aes_128_ctr_cipher = (EVP_CIPHER *) _libssh2_EVP_aes_128_ctr();
aes_192_ctr_cipher = (EVP_CIPHER *) _libssh2_EVP_aes_192_ctr(); aes_192_ctr_cipher = (EVP_CIPHER *) _libssh2_EVP_aes_192_ctr();
aes_256_ctr_cipher = (EVP_CIPHER *) _libssh2_EVP_aes_256_ctr(); aes_256_ctr_cipher = (EVP_CIPHER *) _libssh2_EVP_aes_256_ctr();
#endif #endif
} }
void _libssh2_openssl_crypto_exit(void) void _libssh2_openssl_crypto_exit(void)
{ {
#ifndef HAVE_EVP_AES_128_CTR #if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR)
#ifdef HAVE_OPAQUE_STRUCTS #ifdef HAVE_OPAQUE_STRUCTS
if(aes_128_ctr_cipher) { if(aes_128_ctr_cipher) {
EVP_CIPHER_meth_free(aes_128_ctr_cipher); EVP_CIPHER_meth_free(aes_128_ctr_cipher);