Akkariin/wrk
1
0
Fork 0
mirror of https://github.com/wg/wrk synced 2025-02-15 15:52:57 +08:00
Code Issues Releases Wiki Activity

require openssl 1.1.0+

Browse Source
This commit is contained in:
Will 2017-02-05 14:05:52 +09:00
parent 50305ed1d8
commit 45e4625353
5 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,3 +1,7 @@
master
* Require OpenSSL 1.1.0+
wrk 4.0.2 wrk 4.0.2
* Send hostname using TLS SNI. * Send hostname using TLS SNI.

7
Makefile
View File

@ -74,7 +74,7 @@ $(ODIR)/%.o : %.c
LUAJIT := $(notdir $(patsubst %.tar.gz,%,$(wildcard deps/LuaJIT*.tar.gz))) LUAJIT := $(notdir $(patsubst %.tar.gz,%,$(wildcard deps/LuaJIT*.tar.gz)))
OPENSSL := $(notdir $(patsubst %.tar.gz,%,$(wildcard deps/openssl*.tar.gz))) OPENSSL := $(notdir $(patsubst %.tar.gz,%,$(wildcard deps/openssl*.tar.gz)))
OPENSSL_OPTS = no-shared no-ssl2 no-psk no-srp no-dtls no-idea --prefix=$(abspath $(ODIR)) OPENSSL_OPTS = no-shared no-psk no-srp no-dtls no-idea --prefix=$(abspath $(ODIR))
$(ODIR)/$(LUAJIT): deps/$(LUAJIT).tar.gz | $(ODIR) $(ODIR)/$(LUAJIT): deps/$(LUAJIT).tar.gz | $(ODIR)
@tar -C $(ODIR) -xf $< @tar -C $(ODIR) -xf $<
@ -93,7 +93,10 @@ ifeq ($(TARGET), darwin)
else else
@$(SHELL) -c "cd $< && ./config $(OPENSSL_OPTS)" @$(SHELL) -c "cd $< && ./config $(OPENSSL_OPTS)"
endif endif
@$(MAKE) -C $< depend install @$(MAKE) -C $< depend
@$(MAKE) -C $<
@$(MAKE) -C $< install_sw
@touch $@
# ------------ # ------------

BIN
deps/openssl-1.0.2g.tar.gz vendored
View File

Binary file not shown.

BIN
deps/openssl-1.1.0d.tar.gz vendored Normal file
View File

Binary file not shown.

34
src/ssl.c
View File

@ -8,21 +8,6 @@
#include "ssl.h" #include "ssl.h"
static pthread_mutex_t *locks;
static void ssl_lock(int mode, int n, const char *file, int line) {
pthread_mutex_t *lock = &locks[n];
if (mode & CRYPTO_LOCK) {
pthread_mutex_lock(lock);
} else {
pthread_mutex_unlock(lock);
}
}
static unsigned long ssl_id() {
return (unsigned long) pthread_self();
}
SSL_CTX *ssl_init() { SSL_CTX *ssl_init() {
SSL_CTX *ctx = NULL; SSL_CTX *ctx = NULL;
@ -30,20 +15,11 @@ SSL_CTX *ssl_init() {
SSL_library_init(); SSL_library_init();
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
if ((locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t)))) { if ((ctx = SSL_CTX_new(SSLv23_client_method()))) {
for (int i = 0; i < CRYPTO_num_locks(); i++) { SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
pthread_mutex_init(&locks[i], NULL); SSL_CTX_set_verify_depth(ctx, 0);
} SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT);
CRYPTO_set_locking_callback(ssl_lock);
CRYPTO_set_id_callback(ssl_id);
if ((ctx = SSL_CTX_new(SSLv23_client_method()))) {
SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
SSL_CTX_set_verify_depth(ctx, 0);
SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT);
}
} }
return ctx; return ctx;