Cleanup mttest.c : better error reporting when certs are miggins

[openssl.git] / crypto / pkcs12 / Makefile

diff --git a/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile
index 3a7498fe7ad99a11da2eaf3be46a137c26c30f53..98ec4bfcb6b5b24cc65011c301881aeb0054ddb1 100644 (file)
--- a/crypto/pkcs12/Makefile
+++ b/crypto/pkcs12/Makefile
@@ -13,8 +13,6 @@ AR=           ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c \
@@ -26,8 +24,7 @@ LIBOBJ= p12_add.o p12_asn.o p12_attr.o p12_crpt.o p12_crt.o p12_decr.o \
 
 SRC= $(LIBSRC)
 
-EXHEADER=  pkcs12.h
-HEADER=        $(EXHEADER)
+HEADER=        
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -46,19 +43,6 @@ lib: $(LIBOBJ)
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-       @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-       @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-       @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-       @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-       do  \
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
-
 tags:
        ctags $(SRC)
 
@@ -67,6 +51,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
@@ -92,7 +78,8 @@ p12_add.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_add.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p12_add.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_add.c
+p12_add.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h
+p12_add.o: p12_add.c
 p12_asn.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_asn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 p12_asn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -106,7 +93,7 @@ p12_asn.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_asn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_asn.o: ../cryptlib.h p12_asn.c
+p12_asn.o: ../include/internal/cryptlib.h p12_asn.c
 p12_attr.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_attr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_attr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -120,7 +107,7 @@ p12_attr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_attr.o: ../cryptlib.h p12_attr.c
+p12_attr.o: ../include/internal/cryptlib.h p12_attr.c
 p12_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -134,7 +121,7 @@ p12_crpt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_crpt.o: ../cryptlib.h p12_crpt.c
+p12_crpt.o: ../include/internal/cryptlib.h p12_crpt.c
 p12_crt.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_crt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_crt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -147,7 +134,8 @@ p12_crt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_crt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p12_crt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_crt.c
+p12_crt.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h
+p12_crt.o: p12_crt.c
 p12_decr.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_decr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_decr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -161,7 +149,7 @@ p12_decr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_decr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_decr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_decr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_decr.o: ../cryptlib.h p12_decr.c
+p12_decr.o: ../include/internal/cryptlib.h p12_decr.c
 p12_init.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -175,7 +163,7 @@ p12_init.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_init.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_init.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_init.o: ../cryptlib.h p12_init.c
+p12_init.o: ../include/internal/cryptlib.h p12_init.c
 p12_key.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 p12_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -189,7 +177,7 @@ p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_key.o: ../cryptlib.h p12_key.c
+p12_key.o: ../include/internal/cryptlib.h p12_key.c
 p12_kiss.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_kiss.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_kiss.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -203,7 +191,7 @@ p12_kiss.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_kiss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p12_kiss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p12_kiss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_kiss.o: ../cryptlib.h p12_kiss.c
+p12_kiss.o: ../include/internal/cryptlib.h p12_kiss.c
 p12_mutl.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_mutl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_mutl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -217,7 +205,8 @@ p12_mutl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_mutl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_mutl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p12_mutl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_mutl.c
+p12_mutl.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h
+p12_mutl.o: p12_mutl.c
 p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_npas.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -244,7 +233,8 @@ p12_p8d.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 p12_p8d.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p12_p8d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_p8d.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p12_p8d.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8d.c
+p12_p8d.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h
+p12_p8d.o: p12_p8d.c
 p12_p8e.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_p8e.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_p8e.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -257,7 +247,8 @@ p12_p8e.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 p12_p8e.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p12_p8e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_p8e.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p12_p8e.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8e.c
+p12_p8e.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h
+p12_p8e.o: p12_p8e.c
 p12_utl.o: ../../e_os.h ../../include/openssl/asn1.h
 p12_utl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 p12_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -270,7 +261,8 @@ p12_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p12_utl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_utl.c
+p12_utl.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h
+p12_utl.o: p12_utl.c
 pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pk12err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h