Merge branch 'development' into dtls
* development: (46 commits)
Fix url again
Fix small bug in base64_encode()
Fix depend that was checked but not documented
Fix dependency that was not checked
Minor gitginore fixes
Move some ignore patterns to subdirectories
Ignore CMake/MSVC-related build files.
Re-categorize changelog entry
Fix misattribution
Minor nits with stdout/stderr.
Add cmake compatibility targets
Add script for polarssl symlink creation
Fix more stdio inclusion issues
Add debug info for cert/suite selection
Fix possible portability issue
Fix bug in ssl_get_verify_result()
aescrypt2.c local char array not initial
Update Changelog
Fix mips64 bignum implementation
Fix usage string of ssl_client2
...
Conflicts:
include/polarssl/ssl.h
library/CMakeLists.txt
library/Makefile
programs/Makefile
programs/ssl/ssl_client2.c
programs/ssl/ssl_server2.c
visualc/VS2010/PolarSSL.sln
visualc/VS2010/mbedTLS.vcxproj
visualc/VS6/mbedtls.dsp
visualc/VS6/mbedtls.dsw
diff --git a/library/Makefile b/library/Makefile
index d93f9ca..6b1136b 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -22,7 +22,7 @@
CFLAGS += -fPIC
endif
-SONAME=libpolarssl.so.8
+SONAME=libmbedtls.so.8
DLEXT=so.8
# OSX shared library extension:
@@ -69,32 +69,48 @@
ifndef SHARED
all: static
else
-all: shared
+all: shared static
endif
static: libpolarssl.a
-shared: libpolarssl.$(DLEXT) libpolarssl.so
+shared: libpolarssl.so
-libpolarssl.a: $(OBJS)
+libpolarssl.a: libmbedtls.a
+ echo " LN $@ -> $?"
+ifndef WINDOWS
+ ln -sf $? $@
+else
+ copy /y /b $? $@
+endif
+
+libmbedtls.a: $(OBJS)
echo " AR $@"
$(AR) r $@ $(OBJS)
echo " RL $@"
$(AR) s $@
-libpolarssl.${DLEXT}: libpolarssl.a
+libpolarssl.so: libmbedtls.so
+ echo " LN $@ -> $?"
+ifndef WINDOWS
+ ln -sf $? $@
+else
+ copy /y /b $? $@
+endif
+
+libmbedtls.${DLEXT}: $(OBJS)
echo " LD $@"
$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
-libpolarssl.so: libpolarssl.${DLEXT}
- echo " LN $@ -> libpolarssl.${DLEXT}"
- ln -sf libpolarssl.${DLEXT} $@
+libmbedtls.so: libmbedtls.${DLEXT}
+ echo " LN $@ -> libmbedtls.${DLEXT}"
+ ln -sf libmbedtls.${DLEXT} $@
-libpolarssl.dylib: libpolarssl.a
+libmbedtls.dylib: $(OBJS)
echo " LD $@"
$(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)
-libpolarssl.dll: libpolarssl.a
+libmbedtls.dll: $(OBJS)
echo " LD $@"
$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32
@@ -104,8 +120,8 @@
clean:
ifndef WINDOWS
- rm -f *.o libpolarssl.*
+ rm -f *.o libpolarssl.* libmbedtls.*
endif
ifdef WINDOWS
- del /Q /F *.o libpolarssl.*
+ del /Q /F *.o libpolarssl.* libmbedtls.*
endif