mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

const correct new API

This commit is contained in:
toddouska 2011-11-01 14:55:28 -07:00
parent 948a901cfc
commit ef72bae2ff
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cyassl/ssl.h
View File

@ -673,18 +673,18 @@ CYASSL_API char* CyaSSL_X509_get_subjectCN(CYASSL_X509*);
CYASSL_API int CyaSSL_connect_cert(CYASSL* ssl); CYASSL_API int CyaSSL_connect_cert(CYASSL* ssl);
/* server Diffie-Hellman parameters */ /* server Diffie-Hellman parameters */
CYASSL_API int CyaSSL_SetTmpDH(CYASSL*, unsigned char* p, int pSz, CYASSL_API int CyaSSL_SetTmpDH(CYASSL*, const unsigned char* p, int pSz,
unsigned char* g, int gSz); const unsigned char* g, int gSz);
CYASSL_API int CyaSSL_SetTmpDH_buffer(CYASSL*, unsigned char* b, long sz, CYASSL_API int CyaSSL_SetTmpDH_buffer(CYASSL*, const unsigned char* b, long sz,
int format); int format);
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
CYASSL_API int CyaSSL_SetTmpDH_file(CYASSL*, const char* f, int format); CYASSL_API int CyaSSL_SetTmpDH_file(CYASSL*, const char* f, int format);
#endif #endif
/* server ctx Diffie-Hellman parameters */ /* server ctx Diffie-Hellman parameters */
CYASSL_API int CyaSSL_CTX_SetTmpDH(CYASSL_CTX*, unsigned char* p, int pSz, CYASSL_API int CyaSSL_CTX_SetTmpDH(CYASSL_CTX*, const unsigned char* p,
unsigned char* g, int gSz); int pSz, const unsigned char* g, int gSz);
CYASSL_API int CyaSSL_CTX_SetTmpDH_buffer(CYASSL_CTX*, unsigned char* b, CYASSL_API int CyaSSL_CTX_SetTmpDH_buffer(CYASSL_CTX*, const unsigned char* b,
long sz, int format); long sz, int format);
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
CYASSL_API int CyaSSL_CTX_SetTmpDH_file(CYASSL_CTX*, const char* f, CYASSL_API int CyaSSL_CTX_SetTmpDH_file(CYASSL_CTX*, const char* f,

17
src/ssl.c
View File

@ -168,8 +168,8 @@ int CyaSSL_negotiate(CYASSL* ssl)
/* server Diffie-Hellman parameters */ /* server Diffie-Hellman parameters */
int CyaSSL_SetTmpDH(CYASSL* ssl, unsigned char* p, int pSz, unsigned char* g, int CyaSSL_SetTmpDH(CYASSL* ssl, const unsigned char* p, int pSz,
int gSz) const unsigned char* g, int gSz)
{ {
byte havePSK = 0; byte havePSK = 0;
@ -1192,7 +1192,7 @@ int CyaSSL_use_certificate_chain_file(CYASSL* ssl, const char* file)
/* server wrapper for ctx or ssl Diffie-Hellman parameters */ /* server wrapper for ctx or ssl Diffie-Hellman parameters */
static int CyaSSL_SetTmpDH_buffer_wrapper(CYASSL_CTX* ctx, CYASSL* ssl, static int CyaSSL_SetTmpDH_buffer_wrapper(CYASSL_CTX* ctx, CYASSL* ssl,
unsigned char* buf, long sz, int format) const unsigned char* buf, long sz, int format)
{ {
buffer der; buffer der;
int ret; int ret;
@ -1234,15 +1234,16 @@ static int CyaSSL_SetTmpDH_buffer_wrapper(CYASSL_CTX* ctx, CYASSL* ssl,
} }
/* server Diffie-Hellman parameters */ /* server Diffie-Hellman parameters */
int CyaSSL_SetTmpDH_buffer(CYASSL* ssl, unsigned char* buf, long sz, int format) int CyaSSL_SetTmpDH_buffer(CYASSL* ssl, const unsigned char* buf, long sz,
int format)
{ {
return CyaSSL_SetTmpDH_buffer_wrapper(ssl->ctx, ssl, buf, sz, format); return CyaSSL_SetTmpDH_buffer_wrapper(ssl->ctx, ssl, buf, sz, format);
} }
/* server ctx Diffie-Hellman parameters */ /* server ctx Diffie-Hellman parameters */
int CyaSSL_CTX_SetTmpDH_buffer(CYASSL_CTX* ctx, unsigned char* buf, long sz, int CyaSSL_CTX_SetTmpDH_buffer(CYASSL_CTX* ctx, const unsigned char* buf,
int format) long sz, int format)
{ {
return CyaSSL_SetTmpDH_buffer_wrapper(ctx, NULL, buf, sz, format); return CyaSSL_SetTmpDH_buffer_wrapper(ctx, NULL, buf, sz, format);
} }
@ -3676,8 +3677,8 @@ int CyaSSL_set_compression(CYASSL* ssl)
/* server ctx Diffie-Hellman parameters */ /* server ctx Diffie-Hellman parameters */
int CyaSSL_CTX_SetTmpDH(CYASSL_CTX* ctx, unsigned char* p, int pSz, int CyaSSL_CTX_SetTmpDH(CYASSL_CTX* ctx, const unsigned char* p, int pSz,
unsigned char* g, int gSz) const unsigned char* g, int gSz)
{ {
CYASSL_ENTER("CyaSSL_CTX_SetTmpDH"); CYASSL_ENTER("CyaSSL_CTX_SetTmpDH");
if (ctx == NULL || p == NULL || g == NULL) return BAD_FUNC_ARG; if (ctx == NULL || p == NULL || g == NULL) return BAD_FUNC_ARG;