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

17 files changed, 23 insertions, 60 deletions

diff --git a/source/blender/Makefile b/source/blender/Makefile
index f06b91b4314..28ff16ca141 100644
--- a/source/blender/Makefile
+++ b/source/blender/Makefile
@@ -34,7 +34,7 @@
 include nan_definitions.mk
 
 DIRS = blenloader
-DIRS += deflate inflate encrypt decrypt
+DIRS += deflate inflate
 DIRS += writestreamglue readstreamglue writeblenfile readblenfile
 DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi
 DIRS += makesdna src renderconverter
diff --git a/source/blender/decrypt/intern/BLO_decrypt.c b/source/blender/decrypt/intern/BLO_decrypt.c
index c57addc4aa5..76fdfab2cca 100644
--- a/source/blender/decrypt/intern/BLO_decrypt.c
+++ b/source/blender/decrypt/intern/BLO_decrypt.c
@@ -42,7 +42,6 @@
 
 #include "GEN_messaging.h"
 
-#include "blenkey.h"
 #include "BLO_getPubKey.h"	// real and stub implemented at writestream ...
 
 #include "BLO_readStreamGlue.h"
@@ -134,7 +133,7 @@ BLO_decrypt_process(
 			//static unsigned char rsa_e[] = "\x11";
 			static unsigned char rsa_e[] = "\x01\x00\x01";
 			RSA *rsa = NULL;
-			byte *publisherPubKey;
+			unsigned char *publisherPubKey;
 			int publisherPubKeyLen;
 
 			header = (struct BLO_en_de_cryptHeaderStruct *)
diff --git a/source/blender/decrypt/intern/Makefile b/source/blender/decrypt/intern/Makefile
index 1fcb7e5f9ee..281e9015e3b 100644
--- a/source/blender/decrypt/intern/Makefile
+++ b/source/blender/decrypt/intern/Makefile
@@ -52,9 +52,6 @@ CPPFLAGS += -I../../readstreamglue
 # ugly hack for decrypt/pubkey
 CPPFLAGS += -I../../writestreamglue
 
-CPPFLAGS += -I$(NAN_OPENSSL)/include
-CPPFLAGS += -I$(NAN_BLENKEY)/include
-
 ifeq ($(OS),$(findstring $(OS), "solaris windows"))
     CPPFLAGS += -I$(NAN_ZLIB)/include
 endif
diff --git a/source/blender/encrypt/intern/Makefile b/source/blender/encrypt/intern/Makefile
index 0c8bab4f2ab..1ee2a0b5da2 100644
--- a/source/blender/encrypt/intern/Makefile
+++ b/source/blender/encrypt/intern/Makefile
@@ -51,9 +51,6 @@ CPPFLAGS += -I../../writestreamglue
 CPPFLAGS += -I../../readstreamglue
 CPPFLAGS += -I../../decrypt
 
-CPPFLAGS += -I$(NAN_OPENSSL)/include
-CPPFLAGS += -I$(NAN_BLENKEY)/include
-
 ifeq ($(OS),$(findstring $(OS), "solaris windows"))
     CPPFLAGS += -I$(NAN_ZLIB)/include
 endif
diff --git a/source/blender/readstreamglue/BLO_keyStore.h b/source/blender/readstreamglue/BLO_keyStore.h
index 0b4bded6d97..afc22206eb9 100644
--- a/source/blender/readstreamglue/BLO_keyStore.h
+++ b/source/blender/readstreamglue/BLO_keyStore.h
@@ -38,7 +38,17 @@
 extern "C" {
 #endif
 
-#include "blenkey.h"
+typedef unsigned char byte;
+
+typedef struct UserStructType {
+        char name[100];
+        char email[100];
+        char shopid[100];
+        unsigned long reldate;
+        int keytype;    /* 1 = Individual, 2 = Corporate, 3 = Unlimited */
+        int keylevel;   /* key disclosure level, starts at 1 */
+        int keyformat;  /* if we change the keyformat, up BLENKEYFORMAT */
+} UserStruct;
 
 	void
 keyStoreConstructor(
diff --git a/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h b/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h
index f340927e415..8ec4099f2cd 100644
--- a/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h
+++ b/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h
@@ -37,23 +37,21 @@
 extern "C" {
 #endif
 
-#include "blenkey.h"
-
 // TODO this must be made external in key.h
 #define MAXBYTEDATABLOCK 1000
 
 struct keyStoreStruct {
 	UserStruct keyUserStruct;
 
-	byte *privKey;
+	unsigned char *privKey;
 	int privKeyLen;
 
-	byte *pubKey;
+	unsigned char *pubKey;
 	int pubKeyLen;
 
-	byte ByteChecks[MAXBYTEDATABLOCK];
+	unsigned char ByteChecks[MAXBYTEDATABLOCK];
 
-	byte *PythonCode;
+	unsigned char *PythonCode;
 	int PythonCodeLen;
 };
 
diff --git a/source/blender/readstreamglue/intern/BLO_readStreamGlue.c b/source/blender/readstreamglue/intern/BLO_readStreamGlue.c
index dc729fa4a96..4557f5447f8 100644
--- a/source/blender/readstreamglue/intern/BLO_readStreamGlue.c
+++ b/source/blender/readstreamglue/intern/BLO_readStreamGlue.c
@@ -45,7 +45,6 @@
 #include "BLO_readStreamGlueLoopBack.h"
 #include "BLO_readfile.h"
 #include "BLO_inflate.h"
-#include "BLO_decrypt.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -172,12 +171,6 @@ readStreamGlue(
 				(*control)->process = BLO_inflate_process;
 				(*control)->end = BLO_inflate_end;
 				break;
-			case DECRYPT:
-			case ENCRYPT:
-				(*control)->begin = BLO_decrypt_begin;
-				(*control)->process = BLO_decrypt_process;
-				(*control)->end = BLO_decrypt_end;
-				break;
 			default:
 				err = BRS_SETFUNCTION(BRS_READSTREAMGLUE) |
 					  BRS_SETSPECERR(BRS_UNKNOWN);
diff --git a/source/blender/readstreamglue/intern/Makefile b/source/blender/readstreamglue/intern/Makefile
index 84386ba951b..e17fdae0376 100644
--- a/source/blender/readstreamglue/intern/Makefile
+++ b/source/blender/readstreamglue/intern/Makefile
@@ -52,12 +52,6 @@ CPPFLAGS += -I..
 CPPFLAGS += -I../../../kernel/gen_messaging
 CPPFLAGS += -I../../blenloader
 CPPFLAGS += -I../../inflate
-CPPFLAGS += -I../../decrypt
-
-CPPFLAGS += -I$(NAN_OPENSSL)/include
-
-#TODO make keystore a seperate lib
-CPPFLAGS += -I$(NAN_BLENKEY)/include
 
 ifeq ($(OS),$(findstring $(OS), "solaris windows"))
     CPPFLAGS += -I$(NAN_ZLIB)/include
diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile
index dc8fde9a77d..6f91c899eba 100644
--- a/source/blender/src/Makefile
+++ b/source/blender/src/Makefile
@@ -36,7 +36,7 @@ LIBNAME ?= $(ORGLIBNAME)
 DIR ?= $(OCGDIR)/blender/$(ORGLIBNAME)
 
 CSRCS ?= $(wildcard *.c)
-PUB_CSRCS ?= $(CSRCS) $(wildcard pub/*.c)
+PUB_CSRCS ?= $(CSRCS)
 CRE_CSRCS ?= $(CSRCS) $(wildcard cre/*.c)
 
 OBJS = $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)DNA.o
@@ -85,7 +85,6 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I$(NAN_DECIMATION)/include
 CPPFLAGS += -I$(NAN_BSP)/include
 
-CPPFLAGS += -I$(NAN_BLENKEY)/include
 CPPFLAGS += -I../readstreamglue
 CPPFLAGS += -I../include
 
diff --git a/source/blender/src/cre/license_key.c b/source/blender/src/cre/license_key.c
index 6b76aef6b95..d0b1d22b0d5 100644
--- a/source/blender/src/cre/license_key.c
+++ b/source/blender/src/cre/license_key.c
@@ -35,7 +35,6 @@
 #include "BKE_utildefines.h"
 #include "BIF_screen.h"  // splash
 #include "BIF_toolbox.h"
-#include "blenkey.h"
 #include <stdio.h>
 #include <string.h>
 #include "BLO_readfile.h"
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