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 | |
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')
20 files changed, 23 insertions, 94 deletions
diff --git a/source/Makefile b/source/Makefile index 696bcf3a2b1..135f0061b92 100644 --- a/source/Makefile +++ b/source/Makefile @@ -191,8 +191,6 @@ endif #PULIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a PULIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a PULIB += $(OCGDIR)/blender/deflate/$(DEBUG_DIR)libdeflate.a - PULIB += $(OCGDIR)/blender/encrypt/$(DEBUG_DIR)libencrypt.a - PULIB += $(OCGDIR)/blender/decrypt/$(DEBUG_DIR)libdecrypt.a PULIB += $(OCGDIR)/blender/writeblenfile/$(DEBUG_DIR)libwriteblenfile.a PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a # toggle 2 writestreamglue libs for the Uber-Publisher :) @@ -212,25 +210,9 @@ endif # but somehow it consistently fails to resolve these symbols... or # can I just not check them? nm claims they aren't... SPLIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a - SPLIB += $(OCGDIR)/blender/decrypt/$(DEBUG_DIR)libdecrypt.a SPLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a - PULIB += $(NAN_BLENKEY)/lib/libblenkey.a - SPLIB += $(NAN_BLENKEY)/lib/libblenkey.a - ifeq ($(OS),windows) - ifeq ($(FREE_WINDOWS),true) - PULIB += $(NAN_OPENSSL)/lib/libcrypto.a - SPLIB += $(NAN_OPENSSL)/lib/libcrypto.a - else - PULIB += $(NAN_OPENSSL)/lib/libeay32.lib - SPLIB += $(NAN_OPENSSL)/lib/libeay32.lib - endif - else - PULIB += $(NAN_OPENSSL)/lib/libcrypto.a - SPLIB += $(NAN_OPENSSL)/lib/libcrypto.a - endif - # These three need to be explicitly mentioned on the cl, because # if they are offered as a lib, they are optimized away. (nzc) NSPLUGLIB = $(OCGDIR)/gameengine/GamePlayer/netscape/src/$(DEBUG_DIR)UnixShell.o @@ -273,11 +255,6 @@ endif # A bit silly... but needed to resolve symbols. PLUGREMLIB = $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a -ifeq ($(OS),windows) - PLUGREMLIB += $(NAN_OPENSSL)/lib/libeay32.lib -else - PLUGREMLIB += $(NAN_OPENSSL)/lib/libcrypto.a -endif ######################## OS dependencies (alphabetic!) ################ 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 diff --git a/source/creator/Makefile b/source/creator/Makefile index b5f9679c6e9..147f68151f3 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -58,7 +58,6 @@ CPPFLAGS += -I../blender/bpython/include CPPFLAGS += -I../blender/blenloader CPPFLAGS += -I../kernel/gen_system CPPFLAGS += -I../kernel/gen_messaging -CPPFLAGS += -I$(NAN_BLENKEY)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include ifeq ($(WITH_QUICKTIME), true) diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 401e09752c8..fbc5caf10ec 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -98,7 +98,6 @@ all debug:: export NAN_PNG ?= $(LCGDIR)/png export NAN_SDL ?= $(LCGDIR)/sdl export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= $(LCGDIR)/openssl export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= $(LCGDIR)/zlib @@ -140,7 +139,6 @@ all debug:: export NAN_PNG ?= /sw export NAN_SDL ?= $(LCGDIR)/sdl export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= /sw export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= $(LCGDIR)/zlib @@ -184,7 +182,6 @@ all debug:: export NAN_PNG ?= /usr/local export NAN_SDL ?= /usr/local export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= /usr export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= /usr @@ -225,7 +222,6 @@ all debug:: export NAN_PNG ?= $(LCGDIR)/png export NAN_SDL ?= $(LCGDIR)/sdl export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= $(LCGDIR)/openssl export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= /usr/freeware @@ -266,7 +262,6 @@ all debug:: export NAN_PNG ?= /usr export NAN_SDL ?= /usr export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= /usr export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr export NAN_ZLIB ?= /usr @@ -309,7 +304,6 @@ all debug:: export NAN_PNG ?= $(LCGDIR)/png export NAN_SDL ?= $(LCGDIR)/sdl export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= $(LCGDIR)/openssl export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= $(LCGDIR)/zlib @@ -350,7 +344,6 @@ all debug:: export NAN_PNG ?= /usr/local export NAN_SDL ?= /usr/local export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= /usr/local/ssl export NAN_TERRAPLAY ?= export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= /usr @@ -385,12 +378,10 @@ all debug:: export NAN_PYTHON_VERSION ?= 2.2 ifeq ($(FREE_WINDOWS), true) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) - export NAN_OPENSSL ?= $(LCGDIR)/gcc/openssl export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype export NAN_ODE ?= $(LCGDIR)/gcc/ode else export NAN_PYTHON_BINARY ?= python - export NAN_OPENSSL ?= $(LCGDIR)/openssl export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_ODE ?= $(LCGDIR)/ode endif @@ -441,7 +432,6 @@ export NAN_PYTHON_BINARY ?= python export NAN_PNG ?= $(LCGDIR)/png export NAN_SDL ?= $(LCGDIR)/sdl export NAN_ODE ?= $(LCGDIR)/ode - export NAN_OPENSSL ?= $(LCGDIR)/openssl export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= $(LCGDIR)/zlib |