diff options
| -rw-r--r-- | source/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/readstreamglue/intern/BLO_readStreamGlue.c | 7 | ||||
| -rw-r--r-- | source/blender/readstreamglue/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/src/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/src/usiblender.c | 15 | ||||
| -rw-r--r-- | source/blender/writestreamglue/test/readwritetest/Makefile | 1 |
7 files changed, 5 insertions, 24 deletions
diff --git a/source/Makefile b/source/Makefile index c3cf6e9b2d4..eb7b5a9300a 100644 --- a/source/Makefile +++ b/source/Makefile @@ -186,7 +186,6 @@ endif 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/verify/$(DEBUG_DIR)libverify.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 :) @@ -208,7 +207,6 @@ endif 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/verify/$(DEBUG_DIR)libverify.a SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a PULIB += $(NAN_BLENKEY)/lib/libblenkey.a diff --git a/source/blender/Makefile b/source/blender/Makefile index 45cd1d252a2..f860b30881e 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -34,7 +34,7 @@ include nan_definitions.mk DIRS = blenloader -DIRS += deflate inflate encrypt decrypt verify +DIRS += deflate inflate encrypt decrypt DIRS += writestreamglue readstreamglue writeblenfile readblenfile DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi DIRS += bpython makesdna src renderconverter diff --git a/source/blender/readstreamglue/intern/BLO_readStreamGlue.c b/source/blender/readstreamglue/intern/BLO_readStreamGlue.c index 0ed15026c59..dc729fa4a96 100644 --- a/source/blender/readstreamglue/intern/BLO_readStreamGlue.c +++ b/source/blender/readstreamglue/intern/BLO_readStreamGlue.c @@ -46,7 +46,6 @@ #include "BLO_readfile.h" #include "BLO_inflate.h" #include "BLO_decrypt.h" -#include "BLO_verify.h" #ifdef HAVE_CONFIG_H #include <config.h> @@ -179,12 +178,6 @@ readStreamGlue( (*control)->process = BLO_decrypt_process; (*control)->end = BLO_decrypt_end; break; - case VERIFY: - case SIGN: - (*control)->begin = BLO_verify_begin; - (*control)->process = BLO_verify_process; - (*control)->end = BLO_verify_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 c42a1f4d0bb..84386ba951b 100644 --- a/source/blender/readstreamglue/intern/Makefile +++ b/source/blender/readstreamglue/intern/Makefile @@ -53,7 +53,6 @@ CPPFLAGS += -I../../../kernel/gen_messaging CPPFLAGS += -I../../blenloader CPPFLAGS += -I../../inflate CPPFLAGS += -I../../decrypt -CPPFLAGS += -I../../verify CPPFLAGS += -I$(NAN_OPENSSL)/include diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index 64a2c95ea24..dc8fde9a77d 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -71,7 +71,6 @@ CPPFLAGS += -I../makesdna CPPFLAGS += -I../imbuf CPPFLAGS += -I../img CPPFLAGS += -I../blenloader -CPPFLAGS += -I../verify CPPFLAGS += -I.. CPPFLAGS += -I../../kernel/gen_system CPPFLAGS += -I../../gameengine/SoundSystem diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index f474fcdbf42..f9e3f149265 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -33,8 +33,6 @@ /* placed up here because of crappy * winsock stuff. */ -#include "BLO_signer_info.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -137,7 +135,6 @@ void BIF_read_file(char *name) { extern short winqueue_break; /* editscreen.c */ - struct BLO_SignerInfo *info; extern char datatoc_splash_jpg[]; extern int datatoc_splash_jpg_size; char infostring[400]; @@ -146,15 +143,11 @@ void BIF_read_file(char *name) // first try to read exotic file formats... if (BKE_read_exotic(name) == 0) { /* throws first error box */ - // we didn't succeed, now try to read Blender file - BKE_read_file(name, NULL); /* calls readfile, calls toolbox, throws one more, on failure calls the stream, and that is stubbed.... */ - } - info = BLO_getSignerInfo(); - if (BLO_isValidSignerInfo(info)) { - sprintf(infostring, "File signed by: %s // %s", info->name, info->email); - splash((void *)datatoc_splash_jpg, datatoc_splash_jpg_size, infostring); + /* we didn't succeed, now try to read Blender file + calls readfile, calls toolbox, throws one more, + on failure calls the stream, and that is stubbed.... */ + BKE_read_file(name, NULL); } - BLO_clrSignerInfo(info); sound_initialize_sounds(); diff --git a/source/blender/writestreamglue/test/readwritetest/Makefile b/source/blender/writestreamglue/test/readwritetest/Makefile index ddd27ba9e18..9f146f0a0f5 100644 --- a/source/blender/writestreamglue/test/readwritetest/Makefile +++ b/source/blender/writestreamglue/test/readwritetest/Makefile @@ -51,7 +51,6 @@ 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/verify/$(DEBUG_DIR)libverify.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 |