diff options
Diffstat (limited to 'regress/lib/libssl')
| -rw-r--r-- | regress/lib/libssl/ssl/Makefile | 4 | ||||
| -rw-r--r-- | regress/lib/libssl/ssl/ssltest.c | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/regress/lib/libssl/ssl/Makefile b/regress/lib/libssl/ssl/Makefile index 35a7a9a6be5..b7359155da0 100644 --- a/regress/lib/libssl/ssl/Makefile +++ b/regress/lib/libssl/ssl/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2014/05/24 14:56:32 jsing Exp $ +# $OpenBSD: Makefile,v 1.2 2014/06/01 14:47:14 miod Exp $ PROG= ssltest LDADD= -lcrypto -lssl DPADD= ${LIBCRYPTO} ${LIBSSL} +WARNINGS= Yes +CFLAGS+= -Werror REGRESS_TARGETS=regress-ssltest diff --git a/regress/lib/libssl/ssl/ssltest.c b/regress/lib/libssl/ssl/ssltest.c index 879bf4b3eda..38c70906bb5 100644 --- a/regress/lib/libssl/ssl/ssltest.c +++ b/regress/lib/libssl/ssl/ssltest.c @@ -458,16 +458,6 @@ main(int argc, char *argv[]) CRYPTO_set_locking_callback(lock_dbg_cb); - /* enable memory leak checking unless explicitly disabled */ - if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))) { - CRYPTO_malloc_debug_init(); - CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL); - } else { - /* OPENSSL_DEBUG_MEMORY=off */ - CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0); - } - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE|BIO_FP_TEXT); argc--; @@ -2148,7 +2138,7 @@ psk_client_callback(SSL *ssl, const char *hint, char *identity, unsigned int psk_len = 0; ret = snprintf(identity, max_identity_len, "Client_identity"); - if (ret >= max_identity_len || ret == -1) + if (ret == -1 || (unsigned int)ret >= max_identity_len) goto out_err; if (debug) fprintf(stderr, "client: created identity '%s' len=%d\n", identity, ret); |