evp: prevent underflow in base64 decoding

[openssl.git] / crypto / buffer / Makefile

diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile
index d34979c1e80d810aa960f5694b3519efaa9c093f..2efba47f07002c7552db21854b7d8e2e7a8a454f 100644 (file)
--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# SSLeay/crypto/buffer/Makefile
+# OpenSSL/crypto/buffer/Makefile

 #
 
 DIR=   buffer
 #
 
 DIR=   buffer


@@ -7,8 +7,6 @@ TOP=    ../..
 CC=    cc
 INCLUDES= -I.. -I$(TOP) -I../../include
 CFLAG=-g
 CC=    cc
 INCLUDES= -I.. -I$(TOP) -I../../include
 CFLAG=-g

-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

 MAKEFILE=      Makefile
 AR=            ar r
 
 MAKEFILE=      Makefile
 AR=            ar r
 


@@ -19,8 +17,8 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
 APPS=
 
 LIB=$(TOP)/libcrypto.a

-LIBSRC= buffer.c buf_err.c
-LIBOBJ= buffer.o buf_err.o
+LIBSRC= buffer.c buf_str.c buf_err.c
+LIBOBJ= buffer.o buf_str.o buf_err.o

 
 SRC= $(LIBSRC)
 
 
 SRC= $(LIBSRC)
 


@@ -64,6 +62,7 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:

+       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...

        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:


@@ -82,6 +81,13 @@ buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buf_err.o: buf_err.c
 buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buf_err.o: buf_err.c

+buf_str.o: ../../e_os.h ../../include/openssl/bio.h
+buf_str.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+buf_str.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+buf_str.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+buf_str.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+buf_str.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+buf_str.o: ../../include/openssl/symhacks.h ../cryptlib.h buf_str.c

 buffer.o: ../../e_os.h ../../include/openssl/bio.h
 buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 buffer.o: ../../e_os.h ../../include/openssl/bio.h
 buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h