summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/comp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/comp')
-rw-r--r--src/lib/libcrypto/comp/Makefile108
-rw-r--r--src/lib/libcrypto/comp/Makefile.ssl114
-rw-r--r--src/lib/libcrypto/comp/c_zlib.c4
3 files changed, 224 insertions, 2 deletions
diff --git a/src/lib/libcrypto/comp/Makefile b/src/lib/libcrypto/comp/Makefile
new file mode 100644
index 0000000000..5d364b8513
--- /dev/null
+++ b/src/lib/libcrypto/comp/Makefile
@@ -0,0 +1,108 @@
1#
2# OpenSSL/crypto/comp/Makefile
3#
4
5DIR= comp
6TOP= ../..
7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g
10MAKEFILE= Makefile
11AR= ar r
12
13CFLAGS= $(INCLUDES) $(CFLAG)
14
15GENERAL=Makefile
16TEST=
17APPS=
18
19LIB=$(TOP)/libcrypto.a
20LIBSRC= comp_lib.c comp_err.c \
21 c_rle.c c_zlib.c
22
23LIBOBJ= comp_lib.o comp_err.o \
24 c_rle.o c_zlib.o
25
26SRC= $(LIBSRC)
27
28EXHEADER= comp.h
29HEADER= $(EXHEADER)
30
31ALL= $(GENERAL) $(SRC) $(HEADER)
32
33top:
34 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
35
36all: lib
37
38lib: $(LIBOBJ)
39 $(ARX) $(LIB) $(LIBOBJ)
40 $(RANLIB) $(LIB) || echo Never mind.
41 @touch lib
42
43files:
44 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
45
46links:
47 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
48 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
49 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
50
51install:
52 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
53 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
54 do \
55 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
56 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
57 done;
58
59tags:
60 ctags $(SRC)
61
62tests:
63
64lint:
65 lint -DLINT $(INCLUDES) $(SRC)>fluff
66
67depend:
68 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
70
71dclean:
72 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
73 mv -f Makefile.new $(MAKEFILE)
74
75clean:
76 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
77
78# DO NOT DELETE THIS LINE -- make depend depends on it.
79
80c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
81c_rle.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
82c_rle.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
83c_rle.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
84c_rle.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
85c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
86c_rle.o: ../../include/openssl/symhacks.h c_rle.c
87c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
88c_zlib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
89c_zlib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
90c_zlib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
91c_zlib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
92c_zlib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
93c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
94c_zlib.o: ../../include/openssl/symhacks.h c_zlib.c
95comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h
96comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
97comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
98comp_err.o: ../../include/openssl/opensslconf.h
99comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
100comp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
101comp_err.o: ../../include/openssl/symhacks.h comp_err.c
102comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
103comp_lib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
104comp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
105comp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
106comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
107comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
108comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c
diff --git a/src/lib/libcrypto/comp/Makefile.ssl b/src/lib/libcrypto/comp/Makefile.ssl
new file mode 100644
index 0000000000..f70ba1b285
--- /dev/null
+++ b/src/lib/libcrypto/comp/Makefile.ssl
@@ -0,0 +1,114 @@
1#
2# SSLeay/crypto/comp/Makefile
3#
4
5DIR= comp
6TOP= ../..
7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKE= make -f Makefile.ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile.ssl
17AR= ar r
18
19CFLAGS= $(INCLUDES) $(CFLAG)
20
21GENERAL=Makefile
22TEST=
23APPS=
24
25LIB=$(TOP)/libcrypto.a
26LIBSRC= comp_lib.c comp_err.c \
27 c_rle.c c_zlib.c
28
29LIBOBJ= comp_lib.o comp_err.o \
30 c_rle.o c_zlib.o
31
32SRC= $(LIBSRC)
33
34EXHEADER= comp.h
35HEADER= $(EXHEADER)
36
37ALL= $(GENERAL) $(SRC) $(HEADER)
38
39top:
40 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
41
42all: lib
43
44lib: $(LIBOBJ)
45 $(AR) $(LIB) $(LIBOBJ)
46 $(RANLIB) $(LIB) || echo Never mind.
47 @touch lib
48
49files:
50 $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
51
52links:
53 @sh $(TOP)/util/point.sh Makefile.ssl Makefile
54 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
55 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
56 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
57
58install:
59 @for i in $(EXHEADER) ; \
60 do \
61 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
62 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
63 done;
64
65tags:
66 ctags $(SRC)
67
68tests:
69
70lint:
71 lint -DLINT $(INCLUDES) $(SRC)>fluff
72
73depend:
74 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
75
76dclean:
77 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
78 mv -f Makefile.new $(MAKEFILE)
79
80clean:
81 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
82
83# DO NOT DELETE THIS LINE -- make depend depends on it.
84
85c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
86c_rle.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
87c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
88c_rle.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
89c_rle.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
90c_rle.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
91c_rle.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h c_rle.c
92c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
93c_zlib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
94c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
95c_zlib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
96c_zlib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
97c_zlib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
98c_zlib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
99c_zlib.o: c_zlib.c
100comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h
101comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
102comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
103comp_err.o: ../../include/openssl/opensslconf.h
104comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
105comp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
106comp_err.o: comp_err.c
107comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
108comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
109comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
110comp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
111comp_lib.o: ../../include/openssl/opensslconf.h
112comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
113comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
114comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c
index eccfd09137..0f34597e70 100644
--- a/src/lib/libcrypto/comp/c_zlib.c
+++ b/src/lib/libcrypto/comp/c_zlib.c
@@ -727,7 +727,6 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
727 case BIO_CTRL_RESET: 727 case BIO_CTRL_RESET:
728 ctx->ocount = 0; 728 ctx->ocount = 0;
729 ctx->odone = 0; 729 ctx->odone = 0;
730 ret = 1;
731 break; 730 break;
732 731
733 case BIO_CTRL_FLUSH: 732 case BIO_CTRL_FLUSH:
@@ -772,7 +771,7 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
772 } 771 }
773 ctx->obufsize = obs; 772 ctx->obufsize = obs;
774 } 773 }
775 ret = 1; 774
776 break; 775 break;
777 776
778 case BIO_C_DO_STATE_MACHINE: 777 case BIO_C_DO_STATE_MACHINE:
@@ -784,6 +783,7 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
784 default: 783 default:
785 ret = BIO_ctrl(b->next_bio, cmd, num, ptr); 784 ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
786 break; 785 break;
786
787 } 787 }
788 788
789 return ret; 789 return ret;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-04 16:07:29 +0000