Commit f66c3032 authored by Bodo Möller's avatar Bodo Möller
Browse files

Don't include x509.h when we just need asn1.h

parent 40e29b19

crypto/asn1/Makefile.ssl

+41 −97
Original line number Diff line number Diff line
@@ -160,13 +160,11 @@ a_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h 
a_digest.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

a_digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

a_digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

a_digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

a_digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

a_digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

a_digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

a_digest.o: ../cryptlib.h

a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h

a_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

a_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

a_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

a_digest.o: ../../include/openssl/stack.h ../cryptlib.h

a_dup.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h

a_dup.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

a_dup.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -210,21 +208,11 @@ a_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 
a_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

a_int.o: ../cryptlib.h

a_meth.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

a_meth.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

a_meth.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

a_meth.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

a_meth.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

a_meth.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

a_meth.o: ../../include/openssl/err.h ../../include/openssl/evp.h

a_meth.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

a_meth.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

a_meth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

a_meth.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

a_meth.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

a_meth.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

a_meth.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

a_meth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

a_meth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

a_meth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

a_meth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

a_meth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

a_meth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

a_meth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

a_meth.o: ../cryptlib.h

a_object.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

a_object.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -334,22 +322,12 @@ asn1_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h 
asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

asn1_lib.o: ../../include/openssl/stack.h ../cryptlib.h

asn1_par.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

asn1_par.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

asn1_par.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

asn1_par.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

asn1_par.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

asn1_par.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

asn1_par.o: ../../include/openssl/err.h ../../include/openssl/evp.h

asn1_par.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

asn1_par.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

asn1_par.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

asn1_par.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

asn1_par.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

asn1_par.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

asn1_par.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

asn1_par.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

asn1_par.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

asn1_par.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

asn1_par.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

asn1_par.o: ../cryptlib.h

asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

asn1_par.o: ../../include/openssl/stack.h ../cryptlib.h

asn_pack.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

asn_pack.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
@@ -383,13 +361,11 @@ d2i_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h 
d2i_pr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

d2i_pr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

d2i_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

d2i_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

d2i_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

d2i_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

d2i_pr.o: ../cryptlib.h

d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h

d2i_pr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

d2i_pr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

d2i_pr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

d2i_pr.o: ../../include/openssl/stack.h ../cryptlib.h

d2i_pu.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

d2i_pu.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

d2i_pu.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -400,13 +376,11 @@ d2i_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h 
d2i_pu.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

d2i_pu.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

d2i_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

d2i_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

d2i_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

d2i_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

d2i_pu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

d2i_pu.o: ../cryptlib.h

d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h

d2i_pu.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

d2i_pu.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

d2i_pu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

d2i_pu.o: ../../include/openssl/stack.h ../cryptlib.h

d2i_r_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h

d2i_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

d2i_r_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -449,56 +423,26 @@ evp_asn1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h 
evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

evp_asn1.o: ../../include/openssl/stack.h ../cryptlib.h

f_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

f_enum.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

f_enum.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

f_enum.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

f_enum.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

f_enum.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

f_enum.o: ../../include/openssl/err.h ../../include/openssl/evp.h

f_enum.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

f_enum.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

f_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

f_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

f_enum.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

f_enum.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

f_enum.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

f_enum.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

f_enum.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

f_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

f_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

f_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

f_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

f_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

f_enum.o: ../cryptlib.h

f_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

f_int.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

f_int.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

f_int.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

f_int.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

f_int.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

f_int.o: ../../include/openssl/err.h ../../include/openssl/evp.h

f_int.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

f_int.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

f_int.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

f_int.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

f_int.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

f_int.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

f_int.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

f_int.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

f_int.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

f_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

f_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

f_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

f_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

f_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

f_int.o: ../cryptlib.h

f_string.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

f_string.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

f_string.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

f_string.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

f_string.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

f_string.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

f_string.o: ../../include/openssl/err.h ../../include/openssl/evp.h

f_string.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

f_string.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

f_string.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

f_string.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

f_string.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

f_string.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

f_string.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

f_string.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

f_string.o: ../cryptlib.h

f_string.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

f_string.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

f_string.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

f_string.o: ../../include/openssl/opensslconf.h

f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

f_string.o: ../../include/openssl/stack.h ../cryptlib.h

i2d_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h

i2d_dhp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

i2d_dhp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

crypto/asn1/a_digest.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 


#include "cryptlib.h"

#include <openssl/evp.h>

#include <openssl/x509.h>

#include <openssl/buffer.h>



int ASN1_digest(int (*i2d)(), EVP_MD *type, char *data, unsigned char *md,

crypto/asn1/a_meth.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#include <stdio.h>

#include "cryptlib.h"

#include <openssl/buffer.h>

#include <openssl/x509.h>

#include <openssl/asn1.h>



static  ASN1_METHOD ia5string_meth={

	(int (*)())	i2d_ASN1_IA5STRING,

crypto/asn1/asn1_par.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include "cryptlib.h"

#include <openssl/buffer.h>

#include <openssl/objects.h>

#include <openssl/x509.h>

#include <openssl/asn1.h>



static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed,

	int indent);

crypto/asn1/d2i_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include <openssl/bn.h>

#include <openssl/evp.h>

#include <openssl/objects.h>

#include <openssl/x509.h>

#include <openssl/asn1.h>



EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,

	     long length)