diff options
author | djm <> | 2010-10-01 22:59:01 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:59:01 +0000 |
commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/bf | |
parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/bf')
-rw-r--r-- | src/lib/libcrypto/bf/Makefile.ssl | 115 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/asm/bf-586.pl | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_skey.c | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/blowfish.h | 6 |
4 files changed, 5 insertions, 126 deletions
diff --git a/src/lib/libcrypto/bf/Makefile.ssl b/src/lib/libcrypto/bf/Makefile.ssl deleted file mode 100644 index be3ad77a05..0000000000 --- a/src/lib/libcrypto/bf/Makefile.ssl +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | # | ||
2 | # SSLeay/crypto/blowfish/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= bf | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | CPP= $(CC) -E | ||
9 | INCLUDES= | ||
10 | CFLAG=-g | ||
11 | INSTALL_PREFIX= | ||
12 | OPENSSLDIR= /usr/local/ssl | ||
13 | INSTALLTOP=/usr/local/ssl | ||
14 | MAKE= make -f Makefile.ssl | ||
15 | MAKEDEPPROG= makedepend | ||
16 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
17 | MAKEFILE= Makefile.ssl | ||
18 | AR= ar r | ||
19 | |||
20 | BF_ENC= bf_enc.o | ||
21 | # or use | ||
22 | #DES_ENC= bx86-elf.o | ||
23 | |||
24 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
25 | ASFLAGS= $(INCLUDES) $(ASFLAG) | ||
26 | |||
27 | GENERAL=Makefile | ||
28 | TEST=bftest.c | ||
29 | APPS= | ||
30 | |||
31 | LIB=$(TOP)/libcrypto.a | ||
32 | LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c | ||
33 | LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o | ||
34 | |||
35 | SRC= $(LIBSRC) | ||
36 | |||
37 | EXHEADER= blowfish.h | ||
38 | HEADER= bf_pi.h bf_locl.h $(EXHEADER) | ||
39 | |||
40 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
41 | |||
42 | top: | ||
43 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
44 | |||
45 | all: lib | ||
46 | |||
47 | lib: $(LIBOBJ) | ||
48 | $(AR) $(LIB) $(LIBOBJ) | ||
49 | $(RANLIB) $(LIB) || echo Never mind. | ||
50 | @touch lib | ||
51 | |||
52 | # elf | ||
53 | asm/bx86-elf.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
54 | (cd asm; $(PERL) bf-586.pl elf $(CFLAGS) $(PROCESSOR) > bx86-elf.s) | ||
55 | |||
56 | # a.out | ||
57 | asm/bx86-out.o: asm/bx86unix.cpp | ||
58 | $(CPP) -DOUT asm/bx86unix.cpp | as -o asm/bx86-out.o | ||
59 | |||
60 | # bsdi | ||
61 | asm/bx86bsdi.o: asm/bx86unix.cpp | ||
62 | $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o | ||
63 | |||
64 | asm/bx86unix.cpp: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
65 | (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) | ||
66 | |||
67 | files: | ||
68 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
69 | |||
70 | links: | ||
71 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
72 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
73 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
74 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
75 | |||
76 | install: installs | ||
77 | |||
78 | installs: | ||
79 | @for i in $(EXHEADER) ; \ | ||
80 | do \ | ||
81 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
82 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
83 | done; | ||
84 | |||
85 | tags: | ||
86 | ctags $(SRC) | ||
87 | |||
88 | tests: | ||
89 | |||
90 | lint: | ||
91 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
92 | |||
93 | depend: | ||
94 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
95 | |||
96 | dclean: | ||
97 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
98 | mv -f Makefile.new $(MAKEFILE) | ||
99 | |||
100 | clean: | ||
101 | rm -f asm/bx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
102 | |||
103 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
104 | |||
105 | bf_cfb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
106 | bf_cfb64.o: ../../include/openssl/opensslconf.h bf_cfb64.c bf_locl.h | ||
107 | bf_ecb.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
108 | bf_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
109 | bf_ecb.o: bf_ecb.c bf_locl.h | ||
110 | bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
111 | bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h | ||
112 | bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
113 | bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c | ||
114 | bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
115 | bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c | ||
diff --git a/src/lib/libcrypto/bf/asm/bf-586.pl b/src/lib/libcrypto/bf/asm/bf-586.pl index b5a4760d09..1f9b345aee 100644 --- a/src/lib/libcrypto/bf/asm/bf-586.pl +++ b/src/lib/libcrypto/bf/asm/bf-586.pl | |||
@@ -1,6 +1,7 @@ | |||
1 | #!/usr/local/bin/perl | 1 | #!/usr/local/bin/perl |
2 | 2 | ||
3 | push(@INC,"perlasm","../../perlasm"); | 3 | $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; |
4 | push(@INC,"${dir}","${dir}../../perlasm"); | ||
4 | require "x86asm.pl"; | 5 | require "x86asm.pl"; |
5 | require "cbc.pl"; | 6 | require "cbc.pl"; |
6 | 7 | ||
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c index 6ac2aeb279..3673cdee6e 100644 --- a/src/lib/libcrypto/bf/bf_skey.c +++ b/src/lib/libcrypto/bf/bf_skey.c | |||
@@ -59,15 +59,10 @@ | |||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <string.h> | 60 | #include <string.h> |
61 | #include <openssl/blowfish.h> | 61 | #include <openssl/blowfish.h> |
62 | #include <openssl/crypto.h> | ||
63 | #ifdef OPENSSL_FIPS | ||
64 | #include <openssl/fips.h> | ||
65 | #endif | ||
66 | |||
67 | #include "bf_locl.h" | 62 | #include "bf_locl.h" |
68 | #include "bf_pi.h" | 63 | #include "bf_pi.h" |
69 | 64 | ||
70 | FIPS_NON_FIPS_VCIPHER_Init(BF) | 65 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data) |
71 | { | 66 | { |
72 | int i; | 67 | int i; |
73 | BF_LONG *p,ri,in[2]; | 68 | BF_LONG *p,ri,in[2]; |
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h index d24ffccb65..b97e76f9a3 100644 --- a/src/lib/libcrypto/bf/blowfish.h +++ b/src/lib/libcrypto/bf/blowfish.h | |||
@@ -79,7 +79,7 @@ extern "C" { | |||
79 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 79 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
80 | */ | 80 | */ |
81 | 81 | ||
82 | #if defined(OPENSSL_SYS_WIN16) || defined(__LP32__) | 82 | #if defined(__LP32__) |
83 | #define BF_LONG unsigned long | 83 | #define BF_LONG unsigned long |
84 | #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) | 84 | #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) |
85 | #define BF_LONG unsigned long | 85 | #define BF_LONG unsigned long |
@@ -104,9 +104,7 @@ typedef struct bf_key_st | |||
104 | BF_LONG S[4*256]; | 104 | BF_LONG S[4*256]; |
105 | } BF_KEY; | 105 | } BF_KEY; |
106 | 106 | ||
107 | #ifdef OPENSSL_FIPS | 107 | |
108 | void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data); | ||
109 | #endif | ||
110 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data); | 108 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data); |
111 | 109 | ||
112 | void BF_encrypt(BF_LONG *data,const BF_KEY *key); | 110 | void BF_encrypt(BF_LONG *data,const BF_KEY *key); |