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

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(

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;
 };
 

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);

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