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

define wolfSSL_OPENSSL_add_all_alogrithms_noconf alias for wolfSSL_OpenSSL_add_all_algorithms_noconf and some fixes

Browse Source
This commit is contained in:
Go Hosohara
2018-09-19 15:05:09 +09:00
parent 71863c462e
commit ff5506faf2
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ssl.c
View File

@@ -29572,7 +29572,6 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
return x509;
}
#include "stdio.h"
#if defined(HAVE_CRL) && !defined(NO_FILESYSTEM)
static void* wolfSSL_PEM_read_X509_ex(XFILE fp, void **x,

4
wolfcrypt/src/asn.c
View File

@@ -2933,8 +2933,6 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
(void)rng;
return totalSz + sz;
(void)rng;
}
@@ -3285,8 +3283,6 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
(void)rng;
return totalSz;
(void)rng;
}

1
wolfssl/openssl/evp.h
View File

@@ -586,6 +586,7 @@ typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX;
#define OpenSSL_add_all_ciphers() wolfCrypt_Init()
#define OpenSSL_add_all_algorithms wolfSSL_add_all_algorithms
#define OpenSSL_add_all_algorithms_noconf wolfSSL_OpenSSL_add_all_algorithms_noconf
#define wolfSSL_OPENSSL_add_all_algorithms_noconf wolfSSL_OpenSSL_add_all_algorithms_noconf
#define PKCS5_PBKDF2_HMAC_SHA1 wolfSSL_PKCS5_PBKDF2_HMAC_SHA1

2
wolfssl/openssl/pem.h
View File

@@ -131,7 +131,7 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key,
#if !defined(NO_FILESYSTEM)
WOLFSSL_API
WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(XFILE fp, EVP_PKEY **x,
pem_password_cb *cb, void *u);
pem_password_cb *cb, void *u);
WOLFSSL_API
WOLFSSL_X509 *wolfSSL_PEM_read_X509(XFILE fp, WOLFSSL_X509 **x,
pem_password_cb *cb, void *u);