arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-12 01:53:07 +03:00
Code Activity

fixed win32 build

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@117 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich
2007-08-29 13:22:46 +00:00
parent f9ee197cff
commit 2bbf4cfd92
15 changed files with 144 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ssl/Makefile
View File

@ -16,8 +16,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
include ../config/.config
include ../config/makefile.conf
AXTLS_HOME=..
include $(AXTLS_HOME)/config/.config
include $(AXTLS_HOME)/config/makefile.conf
all: libs
ifdef CONFIG_PERFORMANCE_TESTING
@ -29,76 +31,79 @@ endif
endif
ifndef CONFIG_PLATFORM_WIN32
TARGET1=../$(STAGE)/libaxtls.a
TARGET1=$(AXTLS_HOME)/$(STAGE)/libaxtls.a
BASETARGET=libaxtls.so
CRYPTO_PATH=$(AXTLS_HOME)/crypto/
ifdef CONFIG_PLATFORM_CYGWIN
TARGET2=../$(STAGE)/libaxtls.dll.a
TARGET2=$(AXTLS_HOME)/$(STAGE)/libaxtls.dll.a
else
TARGET2=../$(STAGE)/$(LIBMINOR)
TARGET2=$(AXTLS_HOME)/$(STAGE)/$(LIBMINOR)
endif
# shared library major/minor numbers
LIBMAJOR=$(BASETARGET).1
LIBMINOR=$(BASETARGET).1.1
else
TARGET1=axtls.lib
TARGET2=../$(STAGE)/axtls.dll
STATIC_LIB=../$(STAGE)/axtls.static.lib
TARGET1=$(AXTLS_HOME)/axtls.lib
TARGET2=$(AXTLS_HOME)/$(STAGE)/axtls.dll
STATIC_LIB=$(AXTLS_HOME)/$(STAGE)/axtls.static.lib
CRYPTO_PATH=$(AXTLS_HOME)\\crypto\\
endif
libs: $(TARGET1) $(TARGET2)
AXTLS_HOME=..
CRYPTO_OBJ=\
$(CRYPTO_PATH)aes.o \
$(CRYPTO_PATH)hmac.o \
$(CRYPTO_PATH)md5.o \
$(CRYPTO_PATH)rc4.o \
$(CRYPTO_PATH)sha1.o
OBJ=\
../crypto/aes.o \
asn1.o \
x509.o \
bigint.o \
crypto_misc.o \
../crypto/hmac.o \
os_port.o \
loader.o \
../crypto/md5.o \
openssl.o \
p12.o \
rsa.o \
../crypto/rc4.o \
../crypto/sha1.o \
tls1.o \
tls1_svr.o \
tls1_clnt.o
include ../config/makefile.post
include $(AXTLS_HOME)/config/makefile.post
ifndef CONFIG_PLATFORM_WIN32 # Linux/Unix/Cygwin
$(TARGET1) : $(OBJ)
$(AR) -r $@ $(OBJ)
$(AR) -r $@ $(CRYPTO_OBJ) $(OBJ)
$(TARGET2) : $(OBJ)
ifndef CONFIG_PLATFORM_CYGWIN
$(LD) $(LDFLAGS) $(LDSHARED) -Wl,-soname,$(LIBMAJOR) -o ../$(STAGE)/$(LIBMINOR) $(OBJ)
cd ../$(STAGE); ln -sf $(LIBMINOR) $(LIBMAJOR); ln -sf $(LIBMAJOR) $(BASETARGET); cd -
$(LD) $(LDFLAGS) $(LDSHARED) -Wl,-soname,$(LIBMAJOR) -o $(AXTLS_HOME)/$(STAGE)/$(LIBMINOR) $(CRYPTO_OBJ) $(OBJ)
cd $(AXTLS_HOME)/$(STAGE); ln -sf $(LIBMINOR) $(LIBMAJOR); ln -sf $(LIBMAJOR) $(BASETARGET); cd -
else
$(LD) $(LDFLAGS) $(LDSHARED) -o ../$(STAGE)/cygaxtls.dll \
-Wl,--out-implib=../$(STAGE)/libaxtls.dll.a \
$(LD) $(LDFLAGS) $(LDSHARED) -o $(AXTLS_HOME)/$(STAGE)/cygaxtls.dll \
-Wl,--out-implib=$(AXTLS_HOME)/$(STAGE)/libaxtls.dll.a \
-Wl,--export-all-symbols \
-Wl,--enable-auto-import $(OBJ)
-Wl,--enable-auto-import $(CRYPTO_OBJ) $(OBJ)
endif
else # Win32
CRYPTO_OBJ:=$(CRYPTO_OBJ:.o=.obj)
$(TARGET1) : $(OBJ)
$(AR) /out:$@ $(OBJ)
$(AR) /out:$@ $(CRYPTO_OBJ) $(OBJ)
$(TARGET2) : $(OBJ)
cp $(TARGET1) $(STATIC_LIB)
$(LD) $(LDFLAGS) $(LDSHARED) /out:$@ $(OBJ)
$(LD) $(LDFLAGS) $(LDSHARED) /out:$@ $(CRYPTO_OBJ) $(OBJ)
endif
clean::
$(MAKE) -C test clean
-@rm -f ../$(STAGE)/* *.a *.lib
-@rm -f $(AXTLS_HOME)/$(STAGE)/* *.a $(TARGET1) $(TARGET2)

64
ssl/test/Makefile
View File

@ -18,8 +18,10 @@
all:
include ../../config/.config
include ../../config/makefile.conf
AXTLS_HOME=../..
include $(AXTLS_HOME)/config/.config
include $(AXTLS_HOME)/config/makefile.conf
ifdef CONFIG_PERFORMANCE_TESTING
all: performance
@ -29,37 +31,53 @@ ifdef CONFIG_SSL_TEST
all: ssltesting
endif
ifndef CONFIG_PLATFORM_WIN32
performance: ../../$(STAGE)/perf_bigint
ssltesting: ../../$(STAGE)/ssltest
LIBS=../../$(STAGE)
CFLAGS += -I../../ssl -I../../config -I../../crypto
include $(AXTLS_HOME)/config/makefile.post
../../$(STAGE)/perf_bigint: perf_bigint.o $(LIBS)/libaxtls.a
ifndef CONFIG_PLATFORM_WIN32
performance: $(AXTLS_HOME)/$(STAGE)/perf_bigint
ssltesting: $(AXTLS_HOME)/$(STAGE)/ssltest
LIBS=$(AXTLS_HOME)/$(STAGE)
$(AXTLS_HOME)/$(STAGE)/perf_bigint: perf_bigint.o $(LIBS)/libaxtls.a
$(CC) $(LDFLAGS) -o $@ $^ -L $(LIBS) -laxtls
../../$(STAGE)/ssltest: ssltest.o $(LIBS)/libaxtls.a
$(AXTLS_HOME)/$(STAGE)/ssltest: ssltest.o $(LIBS)/libaxtls.a
$(CC) $(LDFLAGS) -o $@ $^ -lpthread -L $(LIBS) -laxtls
else
performance: ../../$(STAGE)/perf_bigint.exe
ssltesting: ../../$(STAGE)/ssltest.exe
CFLAGS += /I".." /I"../../config"
performance: $(AXTLS_HOME)/$(STAGE)/perf_bigint.exe
ssltesting: $(AXTLS_HOME)/$(STAGE)/ssltest.exe
%.obj : %.c
$(CC) $(CFLAGS) $<
CRYPTO_PATH="$(AXTLS_INCLUDE)crypto\\"
AXTLS_SSL_PATH="$(AXTLS_INCLUDE)ssl\\"
OBJLIST=..\aes.obj ..\asn1.obj ..\bigint.obj ..\crypto_misc.obj ..\hmac.obj \
..\md5.obj ..\loader.obj ..\p12.obj ..\os_port.obj ..\rc4.obj \
..\rsa.obj ..\sha1.obj ..\tls1.obj ..\tls1_clnt.obj ..\tls1_svr.obj
CRYPTO_OBJ=\
$(CRYPTO_PATH)aes.obj \
$(CRYPTO_PATH)hmac.obj \
$(CRYPTO_PATH)md5.obj \
$(CRYPTO_PATH)rc4.obj \
$(CRYPTO_PATH)sha1.obj
../../$(STAGE)/perf_bigint.exe: perf_bigint.obj $(OBJLIST)
$(LD) $(LDFLAGS) /out:$@ $^
OBJ=\
$(AXTLS_SSL_PATH)asn1.obj \
$(AXTLS_SSL_PATH)x509.obj \
$(AXTLS_SSL_PATH)bigint.obj \
$(AXTLS_SSL_PATH)crypto_misc.obj \
$(AXTLS_SSL_PATH)os_port.obj \
$(AXTLS_SSL_PATH)loader.obj \
$(AXTLS_SSL_PATH)openssl.obj \
$(AXTLS_SSL_PATH)p12.obj \
$(AXTLS_SSL_PATH)rsa.obj \
$(AXTLS_SSL_PATH)tls1.obj \
$(AXTLS_SSL_PATH)tls1_svr.obj \
$(AXTLS_SSL_PATH)tls1_clnt.obj
../../$(STAGE)/ssltest.exe: ssltest.obj $(OBJLIST)
$(LD) $(LDFLAGS) /out:$@ $^
$(AXTLS_HOME)/$(STAGE)/perf_bigint.exe: perf_bigint.obj
$(LD) $(LDFLAGS) /out:$@ $? $(CRYPTO_OBJ) $(OBJ)
$(AXTLS_HOME)/$(STAGE)/ssltest.exe: ssltest.obj
$(LD) $(LDFLAGS) /out:$@ $? $(CRYPTO_OBJ) $(OBJ)
endif
clean::
-@rm -f ../../$(STAGE)/perf_bigint* ../../$(STAGE)/ssltest*
-@rm -f $(AXTLS_HOME)/$(STAGE)/perf_bigint* $(AXTLS_HOME)/$(STAGE)/ssltest*
include ../../config/makefile.post

2
ssl/test/test_axssl.sh
View File

@ -106,6 +106,8 @@ fi
if [ -x ./axssl.vbnet.exe ]; then
echo "######################## VB.NET SAMPLE ###########################"
echo $SERVER_ARGS
echo $CLIENT_ARGS
./axssl.vbnet $SERVER_ARGS &
echo "VB.NET Test passed" | ./axssl.vbnet.exe $CLIENT_ARGS
kill %1

4
ssl/tls1_clnt.c
View File

@ -88,7 +88,9 @@ int do_clnt_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
if ((ret = send_certificate(ssl)) == SSL_OK &&
(ret = send_client_key_xchg(ssl)) == SSL_OK)
{
ret = send_cert_verify(ssl);
ret = (ssl->chain_length == 0) ?
SSL_ERROR_INVALID_HANDSHAKE :
send_cert_verify(ssl);
}
}
else

14
ssl/tls1_svr.c
View File

@ -302,36 +302,38 @@ static int send_server_hello(SSL *ssl)
memcpy(ssl->server_random, &buf[6], SSL_RANDOM_SIZE);
offset = 6 + SSL_RANDOM_SIZE;
/* send a session id - and put it into the cache */
buf[offset++] = SSL_SESSION_ID_SIZE;
#ifndef CONFIG_SSL_SKELETON_MODE
if (IS_SET_SSL_FLAG(SSL_SESSION_RESUME))
{
/* retrieve id from session cache */
buf[offset++] = SSL_SESSION_ID_SIZE;
memcpy(&buf[offset], ssl->session->session_id, SSL_SESSION_ID_SIZE);
memcpy(ssl->session_id, ssl->session->session_id, SSL_SESSION_ID_SIZE);
ssl->sess_id_size = SSL_SESSION_ID_SIZE;
offset += SSL_SESSION_ID_SIZE;
}
else /* generate our own session id */
#endif
{
#ifndef CONFIG_SSL_SKELETON_MODE
buf[offset++] = SSL_SESSION_ID_SIZE;
get_random(SSL_SESSION_ID_SIZE, &buf[offset]);
memcpy(ssl->session_id, &buf[offset], SSL_SESSION_ID_SIZE);
ssl->sess_id_size = SSL_SESSION_ID_SIZE;
#ifndef CONFIG_SSL_SKELETON_MODE
/* store id in session cache */
if (ssl->ssl_ctx->num_sessions)
{
memcpy(ssl->session->session_id,
ssl->session_id, SSL_SESSION_ID_SIZE);
}
offset += SSL_SESSION_ID_SIZE;
#else
buf[offset++] = 0; /* don't bother with session id in skelton mode */
#endif
}
offset += SSL_SESSION_ID_SIZE;
buf[offset++] = 0; /* cipher we are using */
buf[offset++] = ssl->cipher;
buf[offset++] = 0; /* no compression */