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
This commit is contained in:
parent
42d04bec4d
commit
3c7c20676e
17
README
17
README
@ -7,7 +7,6 @@ on irc.freenode.net
|
|||||||
|
|
||||||
Here are some links to external packages you may or may not need:
|
Here are some links to external packages you may or may not need:
|
||||||
|
|
||||||
openssl: http://www.openssl.org
|
|
||||||
python: http://www.python.org
|
python: http://www.python.org
|
||||||
mxtexttools: http://www.egenix.com/files/python/mxTextTools.html (python lib)
|
mxtexttools: http://www.egenix.com/files/python/mxTextTools.html (python lib)
|
||||||
libjpeg: http://www.ijg.org/
|
libjpeg: http://www.ijg.org/
|
||||||
@ -75,7 +74,7 @@ fix the pointer to it I'm still working on automating this)
|
|||||||
|
|
||||||
--------------Basic Makefile TIPS---------------------------------------
|
--------------Basic Makefile TIPS---------------------------------------
|
||||||
Edit source/nan_definitions.mk to fit your environment, be sure to edit the
|
Edit source/nan_definitions.mk to fit your environment, be sure to edit the
|
||||||
block matching your OS. You will want to change variables like NAN_OPENSSL,
|
block matching your OS. You will want to change variables like
|
||||||
NAN_JPEG, NAN_PNG etc. to point to where you have those installed.
|
NAN_JPEG, NAN_PNG etc. to point to where you have those installed.
|
||||||
|
|
||||||
If you want to integrate the game-engine in Blender, you might want
|
If you want to integrate the game-engine in Blender, you might want
|
||||||
@ -187,20 +186,18 @@ your system in a fixed location.
|
|||||||
Step 2:
|
Step 2:
|
||||||
You can use the package installer fink (http://fink.sourceforge.net/) for some
|
You can use the package installer fink (http://fink.sourceforge.net/) for some
|
||||||
of the external libraries:
|
of the external libraries:
|
||||||
1. openssl (fink install openssl)
|
1. jpeg (fink install libjpeg)
|
||||||
2. openssl-dev (fink install openssl-dev)
|
2. png (fink install libpng3)
|
||||||
3. jpeg (fink install libjpeg)
|
3. cvs (fixes some bugs in the shipped cvs: fink install cvs)
|
||||||
4. png (fink install libpng3)
|
4. python22 ((addes the static lib for python) fink install python22)
|
||||||
5. cvs (fixes some bugs in the shipped cvs: fink install cvs)
|
|
||||||
6. python22 ((addes the static lib for python) fink install python22)
|
|
||||||
You will probably want to select python-nox when
|
You will probably want to select python-nox when
|
||||||
it asks you.
|
it asks you.
|
||||||
7. freetype (fink install freetype2)
|
5. freetype (fink install freetype2)
|
||||||
|
|
||||||
After you have done this you should install the mx lib from:
|
After you have done this you should install the mx lib from:
|
||||||
http://www.egenix.com/files/python/mxTextTools.html
|
http://www.egenix.com/files/python/mxTextTools.html
|
||||||
|
|
||||||
(we are currently in the process removing openssl and mxTextTools from Blender)
|
(we are currently in the process removing mxTextTools from Blender)
|
||||||
|
|
||||||
Step 3:
|
Step 3:
|
||||||
The rest of the external libraries are present in CVS in binary format so you
|
The rest of the external libraries are present in CVS in binary format so you
|
||||||
|
@ -35,7 +35,7 @@ SOURCEDIR = intern
|
|||||||
# include nan_subdirs.mk
|
# include nan_subdirs.mk
|
||||||
|
|
||||||
ALLDIRS = string ghost guardedalloc bmfont moto container memutil
|
ALLDIRS = string ghost guardedalloc bmfont moto container memutil
|
||||||
ALLDIRS += decimation iksolver keymaker bsp
|
ALLDIRS += decimation iksolver bsp
|
||||||
|
|
||||||
ifneq ($(EXPYTHON), true)
|
ifneq ($(EXPYTHON), true)
|
||||||
ALLDIRS += python/freeze
|
ALLDIRS += python/freeze
|
||||||
|
@ -191,8 +191,6 @@ endif
|
|||||||
#PULIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
|
#PULIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
|
||||||
PULIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
|
PULIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
|
||||||
PULIB += $(OCGDIR)/blender/deflate/$(DEBUG_DIR)libdeflate.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/writeblenfile/$(DEBUG_DIR)libwriteblenfile.a
|
||||||
PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
|
PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
|
||||||
# toggle 2 writestreamglue libs for the Uber-Publisher :)
|
# toggle 2 writestreamglue libs for the Uber-Publisher :)
|
||||||
@ -212,25 +210,9 @@ endif
|
|||||||
# but somehow it consistently fails to resolve these symbols... or
|
# but somehow it consistently fails to resolve these symbols... or
|
||||||
# can I just not check them? nm claims they aren't...
|
# can I just not check them? nm claims they aren't...
|
||||||
SPLIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
|
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/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
|
||||||
SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.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
|
# These three need to be explicitly mentioned on the cl, because
|
||||||
# if they are offered as a lib, they are optimized away. (nzc)
|
# if they are offered as a lib, they are optimized away. (nzc)
|
||||||
NSPLUGLIB = $(OCGDIR)/gameengine/GamePlayer/netscape/src/$(DEBUG_DIR)UnixShell.o
|
NSPLUGLIB = $(OCGDIR)/gameengine/GamePlayer/netscape/src/$(DEBUG_DIR)UnixShell.o
|
||||||
@ -273,11 +255,6 @@ endif
|
|||||||
|
|
||||||
# A bit silly... but needed to resolve symbols.
|
# A bit silly... but needed to resolve symbols.
|
||||||
PLUGREMLIB = $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
|
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!) ################
|
######################## OS dependencies (alphabetic!) ################
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
include nan_definitions.mk
|
include nan_definitions.mk
|
||||||
|
|
||||||
DIRS = blenloader
|
DIRS = blenloader
|
||||||
DIRS += deflate inflate encrypt decrypt
|
DIRS += deflate inflate
|
||||||
DIRS += writestreamglue readstreamglue writeblenfile readblenfile
|
DIRS += writestreamglue readstreamglue writeblenfile readblenfile
|
||||||
DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi
|
DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi
|
||||||
DIRS += makesdna src renderconverter
|
DIRS += makesdna src renderconverter
|
||||||
|
@ -42,7 +42,6 @@
|
|||||||
|
|
||||||
#include "GEN_messaging.h"
|
#include "GEN_messaging.h"
|
||||||
|
|
||||||
#include "blenkey.h"
|
|
||||||
#include "BLO_getPubKey.h" // real and stub implemented at writestream ...
|
#include "BLO_getPubKey.h" // real and stub implemented at writestream ...
|
||||||
|
|
||||||
#include "BLO_readStreamGlue.h"
|
#include "BLO_readStreamGlue.h"
|
||||||
@ -134,7 +133,7 @@ BLO_decrypt_process(
|
|||||||
//static unsigned char rsa_e[] = "\x11";
|
//static unsigned char rsa_e[] = "\x11";
|
||||||
static unsigned char rsa_e[] = "\x01\x00\x01";
|
static unsigned char rsa_e[] = "\x01\x00\x01";
|
||||||
RSA *rsa = NULL;
|
RSA *rsa = NULL;
|
||||||
byte *publisherPubKey;
|
unsigned char *publisherPubKey;
|
||||||
int publisherPubKeyLen;
|
int publisherPubKeyLen;
|
||||||
|
|
||||||
header = (struct BLO_en_de_cryptHeaderStruct *)
|
header = (struct BLO_en_de_cryptHeaderStruct *)
|
||||||
|
@ -52,9 +52,6 @@ CPPFLAGS += -I../../readstreamglue
|
|||||||
# ugly hack for decrypt/pubkey
|
# ugly hack for decrypt/pubkey
|
||||||
CPPFLAGS += -I../../writestreamglue
|
CPPFLAGS += -I../../writestreamglue
|
||||||
|
|
||||||
CPPFLAGS += -I$(NAN_OPENSSL)/include
|
|
||||||
CPPFLAGS += -I$(NAN_BLENKEY)/include
|
|
||||||
|
|
||||||
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
||||||
CPPFLAGS += -I$(NAN_ZLIB)/include
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
||||||
endif
|
endif
|
||||||
|
@ -51,9 +51,6 @@ CPPFLAGS += -I../../writestreamglue
|
|||||||
CPPFLAGS += -I../../readstreamglue
|
CPPFLAGS += -I../../readstreamglue
|
||||||
CPPFLAGS += -I../../decrypt
|
CPPFLAGS += -I../../decrypt
|
||||||
|
|
||||||
CPPFLAGS += -I$(NAN_OPENSSL)/include
|
|
||||||
CPPFLAGS += -I$(NAN_BLENKEY)/include
|
|
||||||
|
|
||||||
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
||||||
CPPFLAGS += -I$(NAN_ZLIB)/include
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
||||||
endif
|
endif
|
||||||
|
@ -38,7 +38,17 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#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
|
void
|
||||||
keyStoreConstructor(
|
keyStoreConstructor(
|
||||||
|
@ -37,23 +37,21 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "blenkey.h"
|
|
||||||
|
|
||||||
// TODO this must be made external in key.h
|
// TODO this must be made external in key.h
|
||||||
#define MAXBYTEDATABLOCK 1000
|
#define MAXBYTEDATABLOCK 1000
|
||||||
|
|
||||||
struct keyStoreStruct {
|
struct keyStoreStruct {
|
||||||
UserStruct keyUserStruct;
|
UserStruct keyUserStruct;
|
||||||
|
|
||||||
byte *privKey;
|
unsigned char *privKey;
|
||||||
int privKeyLen;
|
int privKeyLen;
|
||||||
|
|
||||||
byte *pubKey;
|
unsigned char *pubKey;
|
||||||
int pubKeyLen;
|
int pubKeyLen;
|
||||||
|
|
||||||
byte ByteChecks[MAXBYTEDATABLOCK];
|
unsigned char ByteChecks[MAXBYTEDATABLOCK];
|
||||||
|
|
||||||
byte *PythonCode;
|
unsigned char *PythonCode;
|
||||||
int PythonCodeLen;
|
int PythonCodeLen;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -45,7 +45,6 @@
|
|||||||
#include "BLO_readStreamGlueLoopBack.h"
|
#include "BLO_readStreamGlueLoopBack.h"
|
||||||
#include "BLO_readfile.h"
|
#include "BLO_readfile.h"
|
||||||
#include "BLO_inflate.h"
|
#include "BLO_inflate.h"
|
||||||
#include "BLO_decrypt.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
@ -172,12 +171,6 @@ readStreamGlue(
|
|||||||
(*control)->process = BLO_inflate_process;
|
(*control)->process = BLO_inflate_process;
|
||||||
(*control)->end = BLO_inflate_end;
|
(*control)->end = BLO_inflate_end;
|
||||||
break;
|
break;
|
||||||
case DECRYPT:
|
|
||||||
case ENCRYPT:
|
|
||||||
(*control)->begin = BLO_decrypt_begin;
|
|
||||||
(*control)->process = BLO_decrypt_process;
|
|
||||||
(*control)->end = BLO_decrypt_end;
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
err = BRS_SETFUNCTION(BRS_READSTREAMGLUE) |
|
err = BRS_SETFUNCTION(BRS_READSTREAMGLUE) |
|
||||||
BRS_SETSPECERR(BRS_UNKNOWN);
|
BRS_SETSPECERR(BRS_UNKNOWN);
|
||||||
|
@ -52,12 +52,6 @@ CPPFLAGS += -I..
|
|||||||
CPPFLAGS += -I../../../kernel/gen_messaging
|
CPPFLAGS += -I../../../kernel/gen_messaging
|
||||||
CPPFLAGS += -I../../blenloader
|
CPPFLAGS += -I../../blenloader
|
||||||
CPPFLAGS += -I../../inflate
|
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"))
|
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
||||||
CPPFLAGS += -I$(NAN_ZLIB)/include
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
||||||
|
@ -36,7 +36,7 @@ LIBNAME ?= $(ORGLIBNAME)
|
|||||||
DIR ?= $(OCGDIR)/blender/$(ORGLIBNAME)
|
DIR ?= $(OCGDIR)/blender/$(ORGLIBNAME)
|
||||||
|
|
||||||
CSRCS ?= $(wildcard *.c)
|
CSRCS ?= $(wildcard *.c)
|
||||||
PUB_CSRCS ?= $(CSRCS) $(wildcard pub/*.c)
|
PUB_CSRCS ?= $(CSRCS)
|
||||||
CRE_CSRCS ?= $(CSRCS) $(wildcard cre/*.c)
|
CRE_CSRCS ?= $(CSRCS) $(wildcard cre/*.c)
|
||||||
|
|
||||||
OBJS = $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)DNA.o
|
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_DECIMATION)/include
|
||||||
CPPFLAGS += -I$(NAN_BSP)/include
|
CPPFLAGS += -I$(NAN_BSP)/include
|
||||||
|
|
||||||
CPPFLAGS += -I$(NAN_BLENKEY)/include
|
|
||||||
CPPFLAGS += -I../readstreamglue
|
CPPFLAGS += -I../readstreamglue
|
||||||
CPPFLAGS += -I../include
|
CPPFLAGS += -I../include
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
#include "BKE_utildefines.h"
|
#include "BKE_utildefines.h"
|
||||||
#include "BIF_screen.h" // splash
|
#include "BIF_screen.h" // splash
|
||||||
#include "BIF_toolbox.h"
|
#include "BIF_toolbox.h"
|
||||||
#include "blenkey.h"
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "BLO_readfile.h"
|
#include "BLO_readfile.h"
|
||||||
|
@ -32,6 +32,6 @@
|
|||||||
* STUB: give back the dataStreamPubKey
|
* STUB: give back the dataStreamPubKey
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int getPubKey(byte *dataStreamPubKey, int dataStreamPubKeyLen,
|
int getPubKey(unsigned char *dataStreamPubKey, int dataStreamPubKeyLen,
|
||||||
byte **publisherPubKey, int *publisherPubKeyLen);
|
unsigned char **publisherPubKey, int *publisherPubKeyLen);
|
||||||
|
|
||||||
|
@ -41,7 +41,6 @@
|
|||||||
#include "BLO_dumpFromMemory.h"
|
#include "BLO_dumpFromMemory.h"
|
||||||
#include "BLO_writeblenfile.h"
|
#include "BLO_writeblenfile.h"
|
||||||
#include "BLO_deflate.h"
|
#include "BLO_deflate.h"
|
||||||
#include "BLO_encrypt.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
@ -134,12 +133,6 @@ writeStreamGlue(
|
|||||||
(*streamGlue)->streamBufferCount,
|
(*streamGlue)->streamBufferCount,
|
||||||
streamGlueHeader);
|
streamGlueHeader);
|
||||||
break;
|
break;
|
||||||
case ENCRYPT:
|
|
||||||
err = BLO_encrypt((*streamGlue)->streamBuffer,
|
|
||||||
(*streamGlue)->streamBufferCount,
|
|
||||||
streamGlueHeader);
|
|
||||||
break;
|
|
||||||
case SIGN:
|
|
||||||
case WRITEBLENFILE:
|
case WRITEBLENFILE:
|
||||||
err = BLO_writeblenfile((*streamGlue)->streamBuffer,
|
err = BLO_writeblenfile((*streamGlue)->streamBuffer,
|
||||||
(*streamGlue)->streamBufferCount,
|
(*streamGlue)->streamBufferCount,
|
||||||
|
@ -57,12 +57,6 @@ CPPFLAGS += -I../../writeblenfile
|
|||||||
CPPFLAGS += -I../../blenloader
|
CPPFLAGS += -I../../blenloader
|
||||||
|
|
||||||
CPPFLAGS += -I../../deflate
|
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"))
|
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
||||||
CPPFLAGS += -I$(NAN_ZLIB)/include
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
* note really a STUB eh ...
|
* note really a STUB eh ...
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "blenkey.h" // for byte ... duh this needs change !
|
|
||||||
#include "BLO_getPubKey.h"
|
#include "BLO_getPubKey.h"
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
@ -40,9 +39,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
getPubKey(byte *dataStreamPubKey,
|
getPubKey(unsigned char *dataStreamPubKey,
|
||||||
int dataStreamPubKeyLen,
|
int dataStreamPubKeyLen,
|
||||||
byte **publisherPubKey,
|
unsigned char **publisherPubKey,
|
||||||
int *publisherPubKeyLen)
|
int *publisherPubKeyLen)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
@ -44,7 +44,7 @@ keyStoreConstructor(
|
|||||||
UserStruct *keyUserStruct,
|
UserStruct *keyUserStruct,
|
||||||
char *privHexKey,
|
char *privHexKey,
|
||||||
char *pubHexKey,
|
char *pubHexKey,
|
||||||
byte *ByteChecks,
|
unsigned char *ByteChecks,
|
||||||
char *HexPython)
|
char *HexPython)
|
||||||
{
|
{
|
||||||
keyUserStruct = NULL;
|
keyUserStruct = NULL;
|
||||||
|
@ -49,9 +49,6 @@ CPPFLAGS += -I..
|
|||||||
CPPFLAGS += -I../../../kernel/gen_messaging
|
CPPFLAGS += -I../../../kernel/gen_messaging
|
||||||
CPPFLAGS += -I../../readstreamglue
|
CPPFLAGS += -I../../readstreamglue
|
||||||
|
|
||||||
#TODO make this a seperate lib
|
|
||||||
CPPFLAGS += -I$(NAN_BLENKEY)/include
|
|
||||||
|
|
||||||
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
ifeq ($(OS),$(findstring $(OS), "solaris windows"))
|
||||||
CPPFLAGS += -I$(NAN_ZLIB)/include
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
||||||
endif
|
endif
|
||||||
|
@ -48,24 +48,18 @@ TESTLIBS += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
|
|||||||
TESTLIBS += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
|
TESTLIBS += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
|
||||||
TESTLIBS += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
|
TESTLIBS += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
|
||||||
TESTLIBS += $(OCGDIR)/blender/deflate/$(DEBUG_DIR)libdeflate.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/writeblenfile/$(DEBUG_DIR)libwriteblenfile.a
|
||||||
TESTLIBS += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
|
TESTLIBS += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
|
||||||
TESTLIBS += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
|
TESTLIBS += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
|
||||||
TESTLIBS += $(NAN_BLENKEY)/lib/libblenkey.a
|
|
||||||
TESTLIBS += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
|
TESTLIBS += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
|
||||||
|
|
||||||
ifeq ($(OS),$(findstring $(OS), "linux freebsd"))
|
ifeq ($(OS),$(findstring $(OS), "linux freebsd"))
|
||||||
TESTLIBS += -lz
|
TESTLIBS += -lz
|
||||||
TESTLIBS += $(NAN_OPENSSL)/lib/libcrypto.a
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),windows)
|
ifeq ($(OS),windows)
|
||||||
TESTLIBS += ws2_32.lib
|
TESTLIBS += ws2_32.lib
|
||||||
TESTLIBS += $(NAN_ZLIB)/lib/libz.a
|
TESTLIBS += $(NAN_ZLIB)/lib/libz.a
|
||||||
TESTLIBS += $(NAN_OPENSSL)/lib/libeay32.lib
|
|
||||||
TESTLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
|
TESTLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
|
||||||
TESTLIBS += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
|
TESTLIBS += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
|
||||||
TESTLIBS += winmm.lib opengl32.lib glu32.lib largeint.lib dxguid.lib
|
TESTLIBS += winmm.lib opengl32.lib glu32.lib largeint.lib dxguid.lib
|
||||||
|
@ -58,7 +58,6 @@ CPPFLAGS += -I../blender/bpython/include
|
|||||||
CPPFLAGS += -I../blender/blenloader
|
CPPFLAGS += -I../blender/blenloader
|
||||||
CPPFLAGS += -I../kernel/gen_system
|
CPPFLAGS += -I../kernel/gen_system
|
||||||
CPPFLAGS += -I../kernel/gen_messaging
|
CPPFLAGS += -I../kernel/gen_messaging
|
||||||
CPPFLAGS += -I$(NAN_BLENKEY)/include
|
|
||||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||||
|
|
||||||
ifeq ($(WITH_QUICKTIME), true)
|
ifeq ($(WITH_QUICKTIME), true)
|
||||||
|
@ -98,7 +98,6 @@ all debug::
|
|||||||
export NAN_PNG ?= $(LCGDIR)/png
|
export NAN_PNG ?= $(LCGDIR)/png
|
||||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= $(LCGDIR)/openssl
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
||||||
@ -140,7 +139,6 @@ all debug::
|
|||||||
export NAN_PNG ?= /sw
|
export NAN_PNG ?= /sw
|
||||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= /sw
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
||||||
@ -184,7 +182,6 @@ all debug::
|
|||||||
export NAN_PNG ?= /usr/local
|
export NAN_PNG ?= /usr/local
|
||||||
export NAN_SDL ?= /usr/local
|
export NAN_SDL ?= /usr/local
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= /usr
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= /usr
|
export NAN_ZLIB ?= /usr
|
||||||
@ -225,7 +222,6 @@ all debug::
|
|||||||
export NAN_PNG ?= $(LCGDIR)/png
|
export NAN_PNG ?= $(LCGDIR)/png
|
||||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= $(LCGDIR)/openssl
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= /usr/freeware
|
export NAN_ZLIB ?= /usr/freeware
|
||||||
@ -266,7 +262,6 @@ all debug::
|
|||||||
export NAN_PNG ?= /usr
|
export NAN_PNG ?= /usr
|
||||||
export NAN_SDL ?= /usr
|
export NAN_SDL ?= /usr
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= /usr
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr
|
export NAN_MESA ?= /usr
|
||||||
export NAN_ZLIB ?= /usr
|
export NAN_ZLIB ?= /usr
|
||||||
@ -309,7 +304,6 @@ all debug::
|
|||||||
export NAN_PNG ?= $(LCGDIR)/png
|
export NAN_PNG ?= $(LCGDIR)/png
|
||||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= $(LCGDIR)/openssl
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
||||||
@ -350,7 +344,6 @@ all debug::
|
|||||||
export NAN_PNG ?= /usr/local
|
export NAN_PNG ?= /usr/local
|
||||||
export NAN_SDL ?= /usr/local
|
export NAN_SDL ?= /usr/local
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= /usr/local/ssl
|
|
||||||
export NAN_TERRAPLAY ?=
|
export NAN_TERRAPLAY ?=
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= /usr
|
export NAN_ZLIB ?= /usr
|
||||||
@ -385,12 +378,10 @@ all debug::
|
|||||||
export NAN_PYTHON_VERSION ?= 2.2
|
export NAN_PYTHON_VERSION ?= 2.2
|
||||||
ifeq ($(FREE_WINDOWS), true)
|
ifeq ($(FREE_WINDOWS), true)
|
||||||
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
|
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_FREETYPE ?= $(LCGDIR)/gcc/freetype
|
||||||
export NAN_ODE ?= $(LCGDIR)/gcc/ode
|
export NAN_ODE ?= $(LCGDIR)/gcc/ode
|
||||||
else
|
else
|
||||||
export NAN_PYTHON_BINARY ?= python
|
export NAN_PYTHON_BINARY ?= python
|
||||||
export NAN_OPENSSL ?= $(LCGDIR)/openssl
|
|
||||||
export NAN_FREETYPE ?= $(LCGDIR)/freetype
|
export NAN_FREETYPE ?= $(LCGDIR)/freetype
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
endif
|
endif
|
||||||
@ -441,7 +432,6 @@ export NAN_PYTHON_BINARY ?= python
|
|||||||
export NAN_PNG ?= $(LCGDIR)/png
|
export NAN_PNG ?= $(LCGDIR)/png
|
||||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||||
export NAN_ODE ?= $(LCGDIR)/ode
|
export NAN_ODE ?= $(LCGDIR)/ode
|
||||||
export NAN_OPENSSL ?= $(LCGDIR)/openssl
|
|
||||||
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
|
||||||
export NAN_MESA ?= /usr/src/Mesa-3.1
|
export NAN_MESA ?= /usr/src/Mesa-3.1
|
||||||
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
||||||
|
Loading…
Reference in New Issue
Block a user