diff options
Diffstat (limited to 'src/lib/libcrypto/rc2')
| -rw-r--r-- | src/lib/libcrypto/rc2/Makefile | 14 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc2/rc2speed.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc2/rc2test.c | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/rc2/Makefile b/src/lib/libcrypto/rc2/Makefile index 34080ab741..73eac347e7 100644 --- a/src/lib/libcrypto/rc2/Makefile +++ b/src/lib/libcrypto/rc2/Makefile | |||
| @@ -7,11 +7,6 @@ TOP= ../.. | |||
| 7 | CC= cc | 7 | CC= cc |
| 8 | INCLUDES= | 8 | INCLUDES= |
| 9 | CFLAG=-g | 9 | CFLAG=-g |
| 10 | INSTALL_PREFIX= | ||
| 11 | OPENSSLDIR= /usr/local/ssl | ||
| 12 | INSTALLTOP=/usr/local/ssl | ||
| 13 | MAKEDEPPROG= makedepend | ||
| 14 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
| 15 | MAKEFILE= Makefile | 10 | MAKEFILE= Makefile |
| 16 | AR= ar r | 11 | AR= ar r |
| 17 | 12 | ||
| @@ -51,6 +46,7 @@ links: | |||
| 51 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | 46 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) |
| 52 | 47 | ||
| 53 | install: | 48 | install: |
| 49 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | ||
| 54 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | 50 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ |
| 55 | do \ | 51 | do \ |
| 56 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | 52 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
| @@ -66,6 +62,7 @@ lint: | |||
| 66 | lint -DLINT $(INCLUDES) $(SRC)>fluff | 62 | lint -DLINT $(INCLUDES) $(SRC)>fluff |
| 67 | 63 | ||
| 68 | depend: | 64 | depend: |
| 65 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
| 69 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | 66 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) |
| 70 | 67 | ||
| 71 | dclean: | 68 | dclean: |
| @@ -81,11 +78,8 @@ rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h | |||
| 81 | rc2_cbc.o: rc2_cbc.c rc2_locl.h | 78 | rc2_cbc.o: rc2_cbc.c rc2_locl.h |
| 82 | rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 79 | rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
| 83 | rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h | 80 | rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h |
| 84 | rc2_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 81 | rc2_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h |
| 85 | rc2_skey.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h | 82 | rc2_skey.o: rc2_locl.h rc2_skey.c |
| 86 | rc2_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h | ||
| 87 | rc2_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 88 | rc2_skey.o: ../../include/openssl/symhacks.h rc2_locl.h rc2_skey.c | ||
| 89 | rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h | 83 | rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h |
| 90 | rc2cfb64.o: rc2_locl.h rc2cfb64.c | 84 | rc2cfb64.o: rc2_locl.h rc2cfb64.c |
| 91 | rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h | 85 | rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h |
diff --git a/src/lib/libcrypto/rc2/rc2speed.c b/src/lib/libcrypto/rc2/rc2speed.c index 4d0e1242ea..85cf6f65bf 100644 --- a/src/lib/libcrypto/rc2/rc2speed.c +++ b/src/lib/libcrypto/rc2/rc2speed.c | |||
| @@ -69,7 +69,10 @@ | |||
| 69 | #include OPENSSL_UNISTD_IO | 69 | #include OPENSSL_UNISTD_IO |
| 70 | OPENSSL_DECLARE_EXIT | 70 | OPENSSL_DECLARE_EXIT |
| 71 | 71 | ||
| 72 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | 73 | #include <signal.h> |
| 74 | #endif | ||
| 75 | |||
| 73 | #ifndef _IRIX | 76 | #ifndef _IRIX |
| 74 | #include <time.h> | 77 | #include <time.h> |
| 75 | #endif | 78 | #endif |
diff --git a/src/lib/libcrypto/rc2/rc2test.c b/src/lib/libcrypto/rc2/rc2test.c index b67bafb49f..0e117436bb 100644 --- a/src/lib/libcrypto/rc2/rc2test.c +++ b/src/lib/libcrypto/rc2/rc2test.c | |||
| @@ -205,6 +205,9 @@ int main(int argc, char *argv[]) | |||
| 205 | printf("ok\n"); | 205 | printf("ok\n"); |
| 206 | #endif | 206 | #endif |
| 207 | 207 | ||
| 208 | #ifdef OPENSSL_SYS_NETWARE | ||
| 209 | if (err) printf("ERROR: %d\n", err); | ||
| 210 | #endif | ||
| 208 | EXIT(err); | 211 | EXIT(err); |
| 209 | return(err); | 212 | return(err); |
| 210 | } | 213 | } |
