feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

update const type compatibility

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-04-13 13:27:05 -06:00
parent 60ea23a6de
commit ca50d13149
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl.c
View File

@@ -13198,8 +13198,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
/* return WOLFSSL_SUCCESS on ok, 0 on failure to match API compatibility */ /* return WOLFSSL_SUCCESS on ok, 0 on failure to match API compatibility */
int wolfSSL_EVP_CipherInit(WOLFSSL_EVP_CIPHER_CTX* ctx, int wolfSSL_EVP_CipherInit(WOLFSSL_EVP_CIPHER_CTX* ctx,
const WOLFSSL_EVP_CIPHER* type, byte* key, const WOLFSSL_EVP_CIPHER* type, const byte* key,
byte* iv, int enc) const byte* iv, int enc)
{ {
int ret = -1; /* failure local, during function 0 means success int ret = -1; /* failure local, during function 0 means success
because internal functions work that way */ because internal functions work that way */
@@ -18528,7 +18528,7 @@ int wolfSSL_get_ex_data_X509_STORE_CTX_idx(void)
* f callback function to use * f callback function to use
*/ */
void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX* ctx, void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX* ctx,
void (*f)(WOLFSSL* ssl, int type, int val)) void (*f)(const WOLFSSL* ssl, int type, int val))
{ {
WOLFSSL_ENTER("wolfSSL_CTX_set_info_callback"); WOLFSSL_ENTER("wolfSSL_CTX_set_info_callback");
if (ctx == NULL) { if (ctx == NULL) {

3
wolfcrypt/src/evp.c
View File

@@ -151,7 +151,8 @@ WOLFSSL_API int wolfSSL_EVP_EncryptFinal(WOLFSSL_EVP_CIPHER_CTX *ctx,
WOLFSSL_API int wolfSSL_EVP_CipherInit_ex(WOLFSSL_EVP_CIPHER_CTX* ctx, WOLFSSL_API int wolfSSL_EVP_CipherInit_ex(WOLFSSL_EVP_CIPHER_CTX* ctx,
const WOLFSSL_EVP_CIPHER* type, const WOLFSSL_EVP_CIPHER* type,
WOLFSSL_ENGINE *impl, WOLFSSL_ENGINE *impl,
unsigned char* key, unsigned char* iv, const unsigned char* key,
const unsigned char* iv,
int enc) int enc)
{ {
(void)impl; (void)impl;

6
wolfssl/openssl/evp.h
View File

@@ -270,12 +270,14 @@ WOLFSSL_API int wolfSSL_EVP_Cipher_key_length(const WOLFSSL_EVP_CIPHER* c);
WOLFSSL_API int wolfSSL_EVP_CipherInit(WOLFSSL_EVP_CIPHER_CTX* ctx, WOLFSSL_API int wolfSSL_EVP_CipherInit(WOLFSSL_EVP_CIPHER_CTX* ctx,
const WOLFSSL_EVP_CIPHER* type, const WOLFSSL_EVP_CIPHER* type,
unsigned char* key, unsigned char* iv, const unsigned char* key,
const unsigned char* iv,
int enc); int enc);
WOLFSSL_API int wolfSSL_EVP_CipherInit_ex(WOLFSSL_EVP_CIPHER_CTX* ctx, WOLFSSL_API int wolfSSL_EVP_CipherInit_ex(WOLFSSL_EVP_CIPHER_CTX* ctx,
const WOLFSSL_EVP_CIPHER* type, const WOLFSSL_EVP_CIPHER* type,
WOLFSSL_ENGINE *impl, WOLFSSL_ENGINE *impl,
unsigned char* key, unsigned char* iv, const unsigned char* key,
const unsigned char* iv,
int enc); int enc);
WOLFSSL_API int wolfSSL_EVP_EncryptInit(WOLFSSL_EVP_CIPHER_CTX* ctx, WOLFSSL_API int wolfSSL_EVP_EncryptInit(WOLFSSL_EVP_CIPHER_CTX* ctx,
const WOLFSSL_EVP_CIPHER* type, const WOLFSSL_EVP_CIPHER* type,

4
wolfssl/ssl.h
View File

@@ -588,7 +588,7 @@ WOLFSSL_API
typedef int (*VerifyCallback)(int, WOLFSSL_X509_STORE_CTX*); typedef int (*VerifyCallback)(int, WOLFSSL_X509_STORE_CTX*);
typedef int (pem_password_cb)(char*, int, int, void*); typedef int (pem_password_cb)(char*, int, int, void*);
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
typedef void (CallbackInfoState)(WOLFSSL*, int, int); typedef void (CallbackInfoState)(const WOLFSSL*, int, int);
typedef struct WOLFSSL_CRYPTO_EX_DATA { typedef struct WOLFSSL_CRYPTO_EX_DATA {
WOLFSSL_STACK* data; WOLFSSL_STACK* data;
@@ -959,7 +959,7 @@ WOLFSSL_API void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX*,
WOLFSSL_API void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX*, WOLFSSL_API void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX*,
void (*)(WOLFSSL* ssl, int type, int val)); void (*)(const WOLFSSL* ssl, int type, int val));
WOLFSSL_API unsigned long wolfSSL_ERR_peek_error(void); WOLFSSL_API unsigned long wolfSSL_ERR_peek_error(void);
WOLFSSL_API int wolfSSL_GET_REASON(int); WOLFSSL_API int wolfSSL_GET_REASON(int);