Add CommonCrypto support, split out all hcrypto specific code to hcrypto module
This commit is contained in:
@@ -74,12 +74,7 @@
|
||||
#define EVP_aes_128_cbc hc_EVP_aes_128_cbc
|
||||
#define EVP_aes_192_cbc hc_EVP_aes_192_cbc
|
||||
#define EVP_aes_256_cbc hc_EVP_aes_256_cbc
|
||||
#define EVP_hcrypto_aes_128_cbc hc_EVP_hcrypto_aes_128_cbc
|
||||
#define EVP_hcrypto_aes_192_cbc hc_EVP_hcrypto_aes_192_cbc
|
||||
#define EVP_hcrypto_aes_256_cbc hc_EVP_hcrypto_aes_256_cbc
|
||||
#define EVP_hcrypto_aes_128_cts hc_EVP_hcrypto_aes_128_cts
|
||||
#define EVP_hcrypto_aes_192_cts hc_EVP_hcrypto_aes_192_cts
|
||||
#define EVP_hcrypto_aes_256_cts hc_EVP_hcrypto_aes_256_cts
|
||||
|
||||
#define EVP_des_cbc hc_EVP_des_cbc
|
||||
#define EVP_des_ede3_cbc hc_EVP_des_ede3_cbc
|
||||
#define EVP_enc_null hc_EVP_enc_null
|
||||
@@ -203,11 +198,16 @@ struct hc_evp_md {
|
||||
#define HC_DEPRECATED_CRYPTO HC_DEPRECATED
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#ifdef __cplusplus
|
||||
#define HC_CPP_BEGIN extern "C" {
|
||||
#define HC_CPP_END }
|
||||
#else
|
||||
#define HC_CPP_BEGIN
|
||||
#define HC_CPP_END
|
||||
#endif
|
||||
|
||||
HC_CPP_BEGIN
|
||||
|
||||
/*
|
||||
* Avaible crypto algs
|
||||
*/
|
||||
@@ -216,19 +216,13 @@ const EVP_MD *EVP_md_null(void);
|
||||
const EVP_MD *EVP_md2(void) HC_DEPRECATED_CRYPTO;
|
||||
const EVP_MD *EVP_md4(void) HC_DEPRECATED_CRYPTO;
|
||||
const EVP_MD *EVP_md5(void) HC_DEPRECATED_CRYPTO;
|
||||
const EVP_MD *EVP_sha(void);
|
||||
const EVP_MD *EVP_sha(void) HC_DEPRECATED;
|
||||
const EVP_MD *EVP_sha1(void);
|
||||
const EVP_MD *EVP_sha256(void);
|
||||
|
||||
const EVP_CIPHER * EVP_aes_128_cbc(void);
|
||||
const EVP_CIPHER * EVP_aes_192_cbc(void);
|
||||
const EVP_CIPHER * EVP_aes_256_cbc(void);
|
||||
const EVP_CIPHER * EVP_hcrypto_aes_128_cbc(void);
|
||||
const EVP_CIPHER * EVP_hcrypto_aes_192_cbc(void);
|
||||
const EVP_CIPHER * EVP_hcrypto_aes_256_cbc(void);
|
||||
const EVP_CIPHER * EVP_hcrypto_aes_128_cts(void);
|
||||
const EVP_CIPHER * EVP_hcrypto_aes_192_cts(void);
|
||||
const EVP_CIPHER * EVP_hcrypto_aes_256_cts(void);
|
||||
const EVP_CIPHER * EVP_des_cbc(void) HC_DEPRECATED_CRYPTO;
|
||||
const EVP_CIPHER * EVP_des_ede3_cbc(void);
|
||||
const EVP_CIPHER * EVP_enc_null(void);
|
||||
@@ -241,10 +235,6 @@ const EVP_CIPHER * EVP_camellia_128_cbc(void);
|
||||
const EVP_CIPHER * EVP_camellia_192_cbc(void);
|
||||
const EVP_CIPHER * EVP_camellia_256_cbc(void);
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
size_t EVP_MD_size(const EVP_MD *);
|
||||
size_t EVP_MD_block_size(const EVP_MD *);
|
||||
|
||||
@@ -318,8 +308,6 @@ void OpenSSL_add_all_algorithms(void);
|
||||
void OpenSSL_add_all_algorithms_conf(void);
|
||||
void OpenSSL_add_all_algorithms_noconf(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
HC_CPP_END
|
||||
|
||||
#endif /* HEIM_EVP_H */
|
||||
|
Reference in New Issue
Block a user