bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Stage two of removing ssl support.

Browse Source 
I've modified things so it nolonger uses the stuff in
blender/source/blender/verify
This should be working for both the old Makefiles and the autoconf stuff.
People working with other build systems please update them,
both blender/source/blender/verify and sign will be going away soon.

(Next step is to get rid of blender/intern/keymaker)

Kent
This commit is contained in:
Kent Mein 2003-05-22 17:16:41 +00:00
parent d746ad1416
commit b8f2835ba2
7 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Makefile
View File

@ -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

2
source/blender/Makefile
View File

@ -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

7
source/blender/readstreamglue/intern/BLO_readStreamGlue.c
View File

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

1
source/blender/readstreamglue/intern/Makefile
View File

@ -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

1
source/blender/src/Makefile
View File

@ -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

15
source/blender/src/usiblender.c
View File

@ -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.... */
/* 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);
}
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);
}
BLO_clrSignerInfo(info);
sound_initialize_sounds();

1
source/blender/writestreamglue/test/readwritetest/Makefile
View File

@ -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