diff options
| author | Kent Mein <mein@cs.umn.edu> | 2003-05-30 19:06:54 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2003-05-30 19:06:54 +0400 |
| commit | 3c7c20676e1666f2d684571b501d7ac8762a91e0 (patch) | |
| tree | 3928428752f6b1c30ed3ceceae7f5e550d764300 /source/blender/readstreamglue/intern | |
| parent | 42d04bec4d434b959dc118a9f42f0d9c32547bf9 (diff) | |
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
Diffstat (limited to 'source/blender/readstreamglue/intern')
| -rw-r--r-- | source/blender/readstreamglue/intern/BLO_keyStorePrivate.h | 10 | ||||
| -rw-r--r-- | source/blender/readstreamglue/intern/BLO_readStreamGlue.c | 7 | ||||
| -rw-r--r-- | source/blender/readstreamglue/intern/Makefile | 6 |
3 files changed, 4 insertions, 19 deletions
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 |