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

Merge branch 'master' of github.com:wolfssl/wolfssl

Browse Source
This commit is contained in:
toddouska
2015-07-15 16:36:58 -07:00
parent 84a5087bd7 8cb1949203
commit 7f155d64d5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl.c
View File

@ -11514,11 +11514,11 @@ int wolfSSL_BN_add(WOLFSSL_BIGNUM *r, WOLFSSL_BIGNUM *a, WOLFSSL_BIGNUM *b)
int wolfSSL_BN_is_prime_ex(const WOLFSSL_BIGNUM *bn, int nbchecks,
WOLFSSL_BN_CTX *ctx, WOLFSSL_BN_GENCB *cb)
{
int res;
(void)ctx;
(void)cb;
int res;
WOLFSSL_MSG("wolfSSL_BN_is_prime_ex");
if (bn == NULL || bn->internal == NULL) {
@ -13150,13 +13150,13 @@ int wolfSSL_PEM_write_buf_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
unsigned char* passwd, int len,
byte **pem, int *plen)
{
byte *der, *tmp;
int der_max_len = 0, derSz = 0;
(void)cipher;
(void)passwd;
(void)len;
byte *der, *tmp;
int der_max_len = 0, derSz = 0;
WOLFSSL_MSG("wolfSSL_PEM_write_buf_RSAPrivateKey");
if (pem == NULL || plen == NULL || rsa == NULL || rsa->internal == NULL) {
@ -13231,15 +13231,15 @@ int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa,
unsigned char *kstr, int klen,
pem_password_cb *cb, void *u)
{
byte* pem;
int plen, ret;
(void)enc;
(void)kstr;
(void)klen;
(void)cb;
(void)u;
byte *pem;
int plen, ret;
WOLFSSL_MSG("wolfSSL_PEM_write_RSAPrivateKey");
if (fp == NULL || rsa == NULL || rsa->internal == NULL) {

2
wolfssl/openssl/ecdh.h
View File

@ -7,7 +7,7 @@
#include <wolfssl/openssl/bn.h>
#ifdef __cplusplus
extern C {
extern "C" {
#endif