diff --git a/src/axtls/.config b/src/axtls/.config deleted file mode 100644 index 7b11ae9..0000000 --- a/src/axtls/.config +++ /dev/null @@ -1,117 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y -CONFIG_PLATFORM_LINUX=y -# CONFIG_PLATFORM_CYGWIN is not set -# CONFIG_PLATFORM_WIN32 is not set - -# -# General Configuration -# -PREFIX="/usr/local" -# CONFIG_DEBUG is not set -CONFIG_STRIP_UNWANTED_SECTIONS=y -# CONFIG_VISUAL_STUDIO_7_0 is not set -# CONFIG_VISUAL_STUDIO_8_0 is not set -# CONFIG_VISUAL_STUDIO_10_0 is not set -CONFIG_VISUAL_STUDIO_7_0_BASE="" -CONFIG_VISUAL_STUDIO_8_0_BASE="" -CONFIG_VISUAL_STUDIO_10_0_BASE="" -CONFIG_EXTRA_CFLAGS_OPTIONS="" -CONFIG_EXTRA_LDFLAGS_OPTIONS="" - -# -# SSL Library -# -# CONFIG_SSL_SERVER_ONLY is not set -# CONFIG_SSL_CERT_VERIFICATION is not set -# CONFIG_SSL_ENABLE_CLIENT is not set -CONFIG_SSL_FULL_MODE=y -# CONFIG_SSL_SKELETON_MODE is not set -# CONFIG_SSL_PROT_LOW is not set -CONFIG_SSL_PROT_MEDIUM=y -# CONFIG_SSL_PROT_HIGH is not set -CONFIG_SSL_USE_DEFAULT_KEY=y -CONFIG_SSL_PRIVATE_KEY_LOCATION="" -CONFIG_SSL_PRIVATE_KEY_PASSWORD="" -CONFIG_SSL_X509_CERT_LOCATION="" -# CONFIG_SSL_GENERATE_X509_CERT is not set -CONFIG_SSL_X509_COMMON_NAME="" -CONFIG_SSL_X509_ORGANIZATION_NAME="" -CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME="" -CONFIG_SSL_HAS_PEM=y -CONFIG_SSL_USE_PKCS12=y -CONFIG_SSL_EXPIRY_TIME=24 -CONFIG_X509_MAX_CA_CERTS=150 -CONFIG_SSL_MAX_CERTS=3 -# CONFIG_SSL_CTX_MUTEXING is not set -CONFIG_USE_DEV_URANDOM=y -# CONFIG_WIN32_USE_CRYPTO_LIB is not set -# CONFIG_OPENSSL_COMPATIBLE is not set -# CONFIG_PERFORMANCE_TESTING is not set -# CONFIG_SSL_TEST is not set -# CONFIG_AXTLSWRAP is not set -# CONFIG_AXHTTPD is not set -# CONFIG_HTTP_STATIC_BUILD is not set -CONFIG_HTTP_PORT=0 -CONFIG_HTTP_HTTPS_PORT=0 -CONFIG_HTTP_SESSION_CACHE_SIZE=0 -CONFIG_HTTP_WEBROOT="" -CONFIG_HTTP_TIMEOUT=0 -# CONFIG_HTTP_HAS_CGI is not set -CONFIG_HTTP_CGI_EXTENSIONS="" -# CONFIG_HTTP_ENABLE_LUA is not set -CONFIG_HTTP_LUA_PREFIX="" -# CONFIG_HTTP_BUILD_LUA is not set -CONFIG_HTTP_CGI_LAUNCHER="" -# CONFIG_HTTP_DIRECTORIES is not set -# CONFIG_HTTP_HAS_AUTHORIZATION is not set -# CONFIG_HTTP_HAS_IPV6 is not set -# CONFIG_HTTP_ENABLE_DIFFERENT_USER is not set -CONFIG_HTTP_USER="" -# CONFIG_HTTP_VERBOSE is not set -# CONFIG_HTTP_IS_DAEMON is not set - -# -# Language Bindings -# -# CONFIG_BINDINGS is not set -# CONFIG_CSHARP_BINDINGS is not set -# CONFIG_VBNET_BINDINGS is not set -CONFIG_DOT_NET_FRAMEWORK_BASE="" -# CONFIG_JAVA_BINDINGS is not set -CONFIG_JAVA_HOME="" -# CONFIG_PERL_BINDINGS is not set -CONFIG_PERL_CORE="" -CONFIG_PERL_LIB="" -# CONFIG_LUA_BINDINGS is not set -CONFIG_LUA_CORE="" - -# -# Samples -# -# CONFIG_SAMPLES is not set -# CONFIG_C_SAMPLES is not set -# CONFIG_CSHARP_SAMPLES is not set -# CONFIG_VBNET_SAMPLES is not set -# CONFIG_JAVA_SAMPLES is not set -# CONFIG_PERL_SAMPLES is not set -# CONFIG_LUA_SAMPLES is not set - -# -# BigInt Options -# -# CONFIG_BIGINT_CLASSICAL is not set -# CONFIG_BIGINT_MONTGOMERY is not set -CONFIG_BIGINT_BARRETT=y -CONFIG_BIGINT_CRT=y -# CONFIG_BIGINT_KARATSUBA is not set -MUL_KARATSUBA_THRESH=0 -SQU_KARATSUBA_THRESH=0 -CONFIG_BIGINT_SLIDING_WINDOW=y -CONFIG_BIGINT_SQUARE=y -# CONFIG_BIGINT_CHECK_ON is not set -CONFIG_INTEGER_32BIT=y -# CONFIG_INTEGER_16BIT is not set -# CONFIG_INTEGER_8BIT is not set diff --git a/src/axtls/PKGBUILD b/src/axtls/PKGBUILD deleted file mode 100644 index 5b9b662..0000000 --- a/src/axtls/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Versus Void -pkgname=axtls -pkgver=2.1.4 -pkgrel=1 -pkgdesc="Highly configurable client/server TLSv1.2 library" -arch=(x86_64 i686) -url="http://axtls.sourceforge.net/" -license=('BSD') -groups=() -makedepends=() -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/axTLS-${pkgver}.tar.gz" - "config.h" - ".config" - ) -#noextract=() -sha256sums=("e53dd20e2b619349bc48b631176a38742ea600333fd0349df83c6366b7be05bb" - "b9f276b4b04daa3e36cb3fa71771796327904fa2c5e55d205d3148cae8bf17d5" - "ae1d08b8b3bcc4ab9dccb62902f2c5e35d435eba3f9fe81da523fe3a2bc87b53" - ) - -prepare() { - cd "axtls-code" - cp "$srcdir/config.h" config/ - cp "$srcdir/.config" config/ - sed -i '/rm $(PREFIX)\/include\/axTLS\/os_port.h/d' Makefile -} - -build() { - cd "axtls-code" - make -} - -package() { - cd "axtls-code" - mkdir -p "$pkgdir/usr" - sed "s#PREFIX=.*#PREFIX=\"$pkgdir/usr\"#g" -i config/.config - make install -} diff --git a/src/axtls/axtls-sni.patch b/src/axtls/axtls-sni.patch deleted file mode 100644 index b080397..0000000 --- a/src/axtls/axtls-sni.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rU 4 a/ssl/Config.in b/ssl/Config.in ---- a/ssl/Config.in 2014-10-27 13:30:33.000000000 +0300 -+++ b/ssl/Config.in 2015-06-09 18:32:26.000000000 +0300 -@@ -314,8 +314,15 @@ - - Note: not all the API is implemented, so parts may still break. And - it's definitely not 100% compatible. - -+config CONFIG_SSL_SNI -+ bool "Enable SNI" -+ default y -+ help -+ An extension to the TLS. -+ See 3.1 Server Name Indication at RFC 3546. -+ - config CONFIG_PERFORMANCE_TESTING - bool "Build the bigint performance test tool" - default n - depends on CONFIG_SSL_CERT_VERIFICATION -diff -rU 4 a/ssl/tls1_clnt.c b/ssl/tls1_clnt.c ---- a/ssl/tls1_clnt.c 2014-11-07 03:24:28.000000000 +0300 -+++ b/ssl/tls1_clnt.c 2015-06-09 18:32:26.000000000 +0300 -@@ -218,8 +218,30 @@ - } - - buf[offset++] = 1; /* no compression */ - buf[offset++] = 0; -+ -+#ifdef CONFIG_SSL_SNI -+ if (ssl->host_name != NULL) { -+ unsigned int host_len = strlen(ssl->host_name); -+ -+ buf[offset++] = 0; -+ buf[offset++] = host_len+9; /* extensions length */ -+ -+ buf[offset++] = 0; -+ buf[offset++] = 0; /* server_name(0) (65535) */ -+ buf[offset++] = 0; -+ buf[offset++] = host_len+5; /* server_name length */ -+ buf[offset++] = 0; -+ buf[offset++] = host_len+3; /* server_list length */ -+ buf[offset++] = 0; /* host_name(0) (255) */ -+ buf[offset++] = 0; -+ buf[offset++] = host_len; /* host_name length */ -+ strncpy((char*) &buf[offset], ssl->host_name, host_len); -+ offset += host_len; -+ } -+#endif -+ - buf[3] = offset - 4; /* handshake size */ - - return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset); - } -diff -rU 4 a/ssl/tls1.h b/ssl/tls1.h ---- a/ssl/tls1.h 2015-04-30 08:41:49.000000000 +0300 -+++ b/ssl/tls1.h 2015-06-09 18:32:26.000000000 +0300 -@@ -195,8 +195,12 @@ - uint8_t server_mac[SHA1_SIZE]; /* for HMAC verification */ - uint8_t read_sequence[8]; /* 64 bit sequence number */ - uint8_t write_sequence[8]; /* 64 bit sequence number */ - uint8_t hmac_header[SSL_RECORD_SIZE]; /* rx hmac */ -+ -+#ifdef CONFIG_SSL_SNI -+ const char* host_name; -+#endif - }; - - typedef struct _SSL SSL; - diff --git a/src/axtls/config.h b/src/axtls/config.h deleted file mode 100644 index bcbea10..0000000 --- a/src/axtls/config.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Automatically generated header file: don't edit - */ - -#define HAVE_DOT_CONFIG 1 -#define CONFIG_PLATFORM_LINUX 1 -#undef CONFIG_PLATFORM_CYGWIN -#undef CONFIG_PLATFORM_WIN32 - -/* - * General Configuration - */ -#define PREFIX "/usr/local" -#undef CONFIG_DEBUG -#define CONFIG_STRIP_UNWANTED_SECTIONS 1 -#undef CONFIG_VISUAL_STUDIO_7_0 -#undef CONFIG_VISUAL_STUDIO_8_0 -#undef CONFIG_VISUAL_STUDIO_10_0 -#define CONFIG_VISUAL_STUDIO_7_0_BASE "" -#define CONFIG_VISUAL_STUDIO_8_0_BASE "" -#define CONFIG_VISUAL_STUDIO_10_0_BASE "" -#define CONFIG_EXTRA_CFLAGS_OPTIONS "" -#define CONFIG_EXTRA_LDFLAGS_OPTIONS "" - -/* - * SSL Library - */ -#undef CONFIG_SSL_SERVER_ONLY -#undef CONFIG_SSL_CERT_VERIFICATION -#undef CONFIG_SSL_ENABLE_CLIENT -#define CONFIG_SSL_FULL_MODE 1 -#undef CONFIG_SSL_SKELETON_MODE -#undef CONFIG_SSL_PROT_LOW -#define CONFIG_SSL_PROT_MEDIUM 1 -#undef CONFIG_SSL_PROT_HIGH -#define CONFIG_SSL_USE_DEFAULT_KEY 1 -#define CONFIG_SSL_PRIVATE_KEY_LOCATION "" -#define CONFIG_SSL_PRIVATE_KEY_PASSWORD "" -#define CONFIG_SSL_X509_CERT_LOCATION "" -#undef CONFIG_SSL_GENERATE_X509_CERT -#define CONFIG_SSL_X509_COMMON_NAME "" -#define CONFIG_SSL_X509_ORGANIZATION_NAME "" -#define CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME "" -#define CONFIG_SSL_HAS_PEM 1 -#define CONFIG_SSL_USE_PKCS12 1 -#define CONFIG_SSL_EXPIRY_TIME 24 -#define CONFIG_X509_MAX_CA_CERTS 150 -#define CONFIG_SSL_MAX_CERTS 3 -#undef CONFIG_SSL_CTX_MUTEXING -#define CONFIG_USE_DEV_URANDOM 1 -#undef CONFIG_WIN32_USE_CRYPTO_LIB -#undef CONFIG_OPENSSL_COMPATIBLE -#undef CONFIG_PERFORMANCE_TESTING -#undef CONFIG_SSL_TEST -#undef CONFIG_AXTLSWRAP -#undef CONFIG_AXHTTPD -#undef CONFIG_HTTP_STATIC_BUILD -#define CONFIG_HTTP_PORT -#define CONFIG_HTTP_HTTPS_PORT -#define CONFIG_HTTP_SESSION_CACHE_SIZE -#define CONFIG_HTTP_WEBROOT "" -#define CONFIG_HTTP_TIMEOUT -#undef CONFIG_HTTP_HAS_CGI -#define CONFIG_HTTP_CGI_EXTENSIONS "" -#undef CONFIG_HTTP_ENABLE_LUA -#define CONFIG_HTTP_LUA_PREFIX "" -#undef CONFIG_HTTP_BUILD_LUA -#define CONFIG_HTTP_CGI_LAUNCHER "" -#undef CONFIG_HTTP_DIRECTORIES -#undef CONFIG_HTTP_HAS_AUTHORIZATION -#undef CONFIG_HTTP_HAS_IPV6 -#undef CONFIG_HTTP_ENABLE_DIFFERENT_USER -#define CONFIG_HTTP_USER "" -#undef CONFIG_HTTP_VERBOSE -#undef CONFIG_HTTP_IS_DAEMON - -/* - * Language Bindings - */ -#undef CONFIG_BINDINGS -#undef CONFIG_CSHARP_BINDINGS -#undef CONFIG_VBNET_BINDINGS -#define CONFIG_DOT_NET_FRAMEWORK_BASE "" -#undef CONFIG_JAVA_BINDINGS -#define CONFIG_JAVA_HOME "" -#undef CONFIG_PERL_BINDINGS -#define CONFIG_PERL_CORE "" -#define CONFIG_PERL_LIB "" -#undef CONFIG_LUA_BINDINGS -#define CONFIG_LUA_CORE "" - -/* - * Samples - */ -#undef CONFIG_SAMPLES -#undef CONFIG_C_SAMPLES -#undef CONFIG_CSHARP_SAMPLES -#undef CONFIG_VBNET_SAMPLES -#undef CONFIG_JAVA_SAMPLES -#undef CONFIG_PERL_SAMPLES -#undef CONFIG_LUA_SAMPLES - -/* - * BigInt Options - */ -#undef CONFIG_BIGINT_CLASSICAL -#undef CONFIG_BIGINT_MONTGOMERY -#define CONFIG_BIGINT_BARRETT 1 -#define CONFIG_BIGINT_CRT 1 -#undef CONFIG_BIGINT_KARATSUBA -#define MUL_KARATSUBA_THRESH -#define SQU_KARATSUBA_THRESH -#define CONFIG_BIGINT_SLIDING_WINDOW 1 -#define CONFIG_BIGINT_SQUARE 1 -#undef CONFIG_BIGINT_CHECK_ON -#define CONFIG_INTEGER_32BIT 1 -#undef CONFIG_INTEGER_16BIT -#undef CONFIG_INTEGER_8BIT