This is a fun one ;)

Removes ssl from blender.
makes the following directorys not needed anymore:
blender/intern/keymaker
blender/source/blender/src/pub
blender/source/blender/encrypt
blender/source/blender/decrypt
blender/source/blender/sign
blender/source/blender/verify

It works with The Nan Makefiles and autoconf, could whoever is working
on the other build systems update them so we can nuke those directorys?
They won't do anything but I figured I'd leave them in for a week or so
to make things easyer on people.

Kent

7 files changed, 5 insertions, 28 deletions

diff --git a/source/blender/writestreamglue/BLO_getPubKey.h b/source/blender/writestreamglue/BLO_getPubKey.h
index b9d8daf8ff6..838da0c142d 100644
--- a/source/blender/writestreamglue/BLO_getPubKey.h
+++ b/source/blender/writestreamglue/BLO_getPubKey.h
@@ -32,6 +32,6 @@
  * STUB: give back the dataStreamPubKey
  */
 
-int getPubKey(byte *dataStreamPubKey, int dataStreamPubKeyLen,
-		  byte **publisherPubKey, int *publisherPubKeyLen);
+int getPubKey(unsigned char *dataStreamPubKey, int dataStreamPubKeyLen,
+		  unsigned char **publisherPubKey, int *publisherPubKeyLen);
 
diff --git a/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c b/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c
index 118bc6d6a7b..2da560b4278 100644
--- a/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c
+++ b/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c
@@ -41,7 +41,6 @@
 #include "BLO_dumpFromMemory.h"
 #include "BLO_writeblenfile.h"
 #include "BLO_deflate.h"
-#include "BLO_encrypt.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -134,12 +133,6 @@ writeStreamGlue(
 							  (*streamGlue)->streamBufferCount,
 							  streamGlueHeader);
 			break;
-		case ENCRYPT:
-			err = BLO_encrypt((*streamGlue)->streamBuffer,
-							  (*streamGlue)->streamBufferCount,
-							  streamGlueHeader);
-			break;
-	        case SIGN:
 		case WRITEBLENFILE:
 			err = BLO_writeblenfile((*streamGlue)->streamBuffer,
 									(*streamGlue)->streamBufferCount,
diff --git a/source/blender/writestreamglue/intern/Makefile b/source/blender/writestreamglue/intern/Makefile
index 9c9a8f2e767..7388b338ca9 100644
--- a/source/blender/writestreamglue/intern/Makefile
+++ b/source/blender/writestreamglue/intern/Makefile
@@ -57,12 +57,6 @@ CPPFLAGS += -I../../writeblenfile
 CPPFLAGS += -I../../blenloader
 
 CPPFLAGS += -I../../deflate
-CPPFLAGS += -I../../encrypt
-
-CPPFLAGS += -I$(NAN_OPENSSL)/include
-
-#TODO make keystore this a seperate lib
-CPPFLAGS += -I$(NAN_BLENKEY)/include
 
 ifeq ($(OS),$(findstring $(OS), "solaris windows"))
     CPPFLAGS += -I$(NAN_ZLIB)/include
diff --git a/source/blender/writestreamglue/stub/BLO_getPubKeySTUB.c b/source/blender/writestreamglue/stub/BLO_getPubKeySTUB.c
index f11dfc1bb24..9a6e7e1bb21 100644
--- a/source/blender/writestreamglue/stub/BLO_getPubKeySTUB.c
+++ b/source/blender/writestreamglue/stub/BLO_getPubKeySTUB.c
@@ -32,7 +32,6 @@
  * note really a STUB eh ...
  */
 
-#include "blenkey.h" // for byte ... duh this needs change !
 #include "BLO_getPubKey.h" 
 
 #ifdef HAVE_CONFIG_H
@@ -40,9 +39,9 @@
 #endif
 
 	int
-getPubKey(byte *dataStreamPubKey,
+getPubKey(unsigned char *dataStreamPubKey,
 		  int dataStreamPubKeyLen,
-		  byte **publisherPubKey,
+		  unsigned char **publisherPubKey,
 		  int *publisherPubKeyLen)
 {
 	int err = 0;
diff --git a/source/blender/writestreamglue/stub/BLO_keyStoreSTUB.c b/source/blender/writestreamglue/stub/BLO_keyStoreSTUB.c
index 8c73281356c..9a4347e161d 100644
--- a/source/blender/writestreamglue/stub/BLO_keyStoreSTUB.c
+++ b/source/blender/writestreamglue/stub/BLO_keyStoreSTUB.c
@@ -44,7 +44,7 @@ keyStoreConstructor(
 	UserStruct *keyUserStruct,
 	char *privHexKey,
 	char *pubHexKey,
-	byte *ByteChecks,
+	unsigned char *ByteChecks,
 	char *HexPython)
 {
 	keyUserStruct = NULL;
diff --git a/source/blender/writestreamglue/stub/Makefile b/source/blender/writestreamglue/stub/Makefile
index 54633d289ad..8711941a06c 100644
--- a/source/blender/writestreamglue/stub/Makefile
+++ b/source/blender/writestreamglue/stub/Makefile
@@ -49,9 +49,6 @@ CPPFLAGS += -I..
 CPPFLAGS += -I../../../kernel/gen_messaging
 CPPFLAGS += -I../../readstreamglue
 
-#TODO make this a seperate lib
-CPPFLAGS += -I$(NAN_BLENKEY)/include
-
 ifeq ($(OS),$(findstring $(OS), "solaris windows"))
     CPPFLAGS += -I$(NAN_ZLIB)/include
 endif
diff --git a/source/blender/writestreamglue/test/readwritetest/Makefile b/source/blender/writestreamglue/test/readwritetest/Makefile
index 9f146f0a0f5..bedb9f42a99 100644
--- a/source/blender/writestreamglue/test/readwritetest/Makefile
+++ b/source/blender/writestreamglue/test/readwritetest/Makefile
@@ -48,24 +48,18 @@ TESTLIBS += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
 TESTLIBS += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
 TESTLIBS += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
 TESTLIBS += $(OCGDIR)/blender/deflate/$(DEBUG_DIR)libdeflate.a
-TESTLIBS += $(OCGDIR)/blender/encrypt/$(DEBUG_DIR)libencrypt.a
-TESTLIBS += $(OCGDIR)/blender/decrypt/$(DEBUG_DIR)libdecrypt.a
-TESTLIBS += $(OCGDIR)/blender/sign/$(DEBUG_DIR)libsign.a
 TESTLIBS += $(OCGDIR)/blender/writeblenfile/$(DEBUG_DIR)libwriteblenfile.a
 TESTLIBS += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
 TESTLIBS += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
-TESTLIBS += $(NAN_BLENKEY)/lib/libblenkey.a
 TESTLIBS += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
 
 ifeq ($(OS),$(findstring $(OS), "linux freebsd"))
     TESTLIBS += -lz
-    TESTLIBS += $(NAN_OPENSSL)/lib/libcrypto.a
 endif
 
 ifeq ($(OS),windows)
     TESTLIBS += ws2_32.lib 
     TESTLIBS += $(NAN_ZLIB)/lib/libz.a
-    TESTLIBS += $(NAN_OPENSSL)/lib/libeay32.lib
     TESTLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
     TESTLIBS += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
     TESTLIBS += winmm.lib opengl32.lib glu32.lib largeint.lib dxguid.lib