diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto.c | 7 | ||||
| -rw-r--r-- | src/common/fakepoll.c | 6 | ||||
| -rw-r--r-- | src/common/test.h | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 2a5d62ddc7..2608c22a29 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -93,6 +93,13 @@ struct crypto_dh_env_t { DH *dh; }; +/* Prototypes for functions only used by tortls.c */ +crypto_pk_env_t *_crypto_new_pk_env_rsa(RSA *rsa); +RSA *_crypto_pk_env_get_rsa(crypto_pk_env_t *env); +EVP_PKEY *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private); +DH *_crypto_dh_env_get_dh(crypto_dh_env_t *dh); + + /** Return the number of bytes added by padding method <b>padding</b>. */ static INLINE int diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c index 52359fb27c..0f39d81eeb 100644 --- a/src/common/fakepoll.c +++ b/src/common/fakepoll.c @@ -26,12 +26,6 @@ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif -#if _MSC_VER > 1300 -#include <winsock2.h> -#include <ws2tcpip.h> -#elif defined(_MSC_VER) -#include <winsock.h> -#endif #include <assert.h> #include <stdlib.h> diff --git a/src/common/test.h b/src/common/test.h index 81d54b88f3..656d9ba517 100644 --- a/src/common/test.h +++ b/src/common/test.h @@ -108,7 +108,7 @@ extern int have_failed; #define test_memeq(expr1, expr2, len) \ STMT_BEGIN \ - void *v1=(expr1), *v2=(expr2); \ + const void *v1=(expr1), *v2=(expr2); \ if(!memcmp(v1,v2,(len))) { printf("."); fflush(stdout); } else { \ have_failed = 1; \ printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n", \ |