Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2003-05-30 19:06:54 +0400
committerKent Mein <mein@cs.umn.edu>2003-05-30 19:06:54 +0400
commit3c7c20676e1666f2d684571b501d7ac8762a91e0 (patch)
tree3928428752f6b1c30ed3ceceae7f5e550d764300 /source/blender/decrypt
parent42d04bec4d434b959dc118a9f42f0d9c32547bf9 (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/blender/decrypt')
-rw-r--r--source/blender/decrypt/intern/BLO_decrypt.c3
-rw-r--r--source/blender/decrypt/intern/Makefile3
2 files changed, 1 insertions, 5 deletions
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