Stage two of removing ssl support.
authorKent Mein <mein@cs.umn.edu>
Thu, 22 May 2003 17:16:41 +0000 (17:16 +0000)
committerKent Mein <mein@cs.umn.edu>
Thu, 22 May 2003 17:16:41 +0000 (17:16 +0000)
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

source/Makefile
source/blender/Makefile
source/blender/readstreamglue/intern/BLO_readStreamGlue.c
source/blender/readstreamglue/intern/Makefile
source/blender/src/Makefile
source/blender/src/usiblender.c
source/blender/writestreamglue/test/readwritetest/Makefile

index c3cf6e9b2d42ee5b300595a1b580ed0e213b65e6..eb7b5a9300afaca5e108e95ac5e2e8d4e79fd9be 100644 (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
index 45cd1d252a2a014e003fee71a68957ccdf689631..f860b30881e6ae74c7fa0ddb3c2d563475ae96aa 100644 (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
index 0ed15026c5929ede8b0b77988f96af2f5b5e5d9b..dc729fa4a966207d9c8aa59df4fae3c3e0825f20 100644 (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);
index c42a1f4d0bb725c02374c1e5c8c724ac1e822b6e..84386ba951bca7613fa58d6190f1a1fc63bf4f1b 100644 (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
 
index 64a2c95ea24758a391ce9ef53c74368528e97de0..dc8fde9a77d389e96f6215f59b2653eae3688309 100644 (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
index f474fcdbf42f85250de7133754d0c4e6916fde41..f9e3f149265d54deb9940d56e5436a69086534b9 100644 (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>
 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();
 
index ddd27ba9e18497af55ba1a76da888a1256bd1182..9f146f0a0f55e696b0f11dda074b56ad0b75e4f5 100644 (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