diff options
author | Richard Levitte <levitte@openssl.org> | 2015-03-26 21:33:18 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-03-31 20:16:01 +0200 |
commit | dee502be89e78e2979e3bd1d7724cf79daa6ef61 (patch) | |
tree | 53e97582c488f1a484bd42e570de6a99768fd1df /util | |
parent | 30cd4ff294252c4b6a4b69cbef6a5b4117705d22 (diff) | |
download | openssl-dee502be89e78e2979e3bd1d7724cf79daa6ef61.tar.gz |
Stop symlinking, move files to intended directory
Rather than making include/openssl/foo.h a symlink to
crypto/foo/foo.h, this change moves the file to include/openssl/foo.h
once and for all.
Likewise, move crypto/foo/footest.c to test/footest.c, instead of
symlinking it there.
Originally-by: Geoff Thorpe <geoff@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util')
-rwxr-xr-x | util/mkdef.pl | 138 | ||||
-rwxr-xr-x | util/mkstack.pl | 4 |
2 files changed, 71 insertions, 71 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 1d47561f4c..7f1c093e32 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -257,79 +257,79 @@ $max_ssl = $max_num; %crypto_list=&load_numbers($crypto_num); $max_crypto = $max_num; -my $ssl="ssl/ssl.h"; -$ssl.=" ssl/kssl.h"; -$ssl.=" ssl/tls1.h"; -$ssl.=" ssl/srtp.h"; +my $ssl="include/openssl/ssl.h"; +$ssl.=" include/openssl/kssl.h"; +$ssl.=" include/openssl/tls1.h"; +$ssl.=" include/openssl/srtp.h"; -my $crypto ="crypto/crypto.h"; +my $crypto ="include/openssl/crypto.h"; $crypto.=" crypto/cryptlib.h"; $crypto.=" crypto/o_dir.h"; $crypto.=" crypto/o_str.h"; -$crypto.=" crypto/des/des.h" ; # unless $no_des; -$crypto.=" crypto/idea/idea.h" ; # unless $no_idea; -$crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4; -$crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5; -$crypto.=" crypto/rc2/rc2.h" ; # unless $no_rc2; -$crypto.=" crypto/bf/blowfish.h" ; # unless $no_bf; -$crypto.=" crypto/cast/cast.h" ; # unless $no_cast; -$crypto.=" crypto/whrlpool/whrlpool.h" ; -$crypto.=" crypto/md2/md2.h" ; # unless $no_md2; -$crypto.=" crypto/md4/md4.h" ; # unless $no_md4; -$crypto.=" crypto/md5/md5.h" ; # unless $no_md5; -$crypto.=" crypto/mdc2/mdc2.h" ; # unless $no_mdc2; -$crypto.=" crypto/sha/sha.h" ; # unless $no_sha; -$crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd; -$crypto.=" crypto/aes/aes.h" ; # unless $no_aes; -$crypto.=" crypto/camellia/camellia.h" ; # unless $no_camellia; -$crypto.=" crypto/seed/seed.h"; # unless $no_seed; - -$crypto.=" crypto/bn/bn.h"; -$crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa; -$crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa; -$crypto.=" crypto/dh/dh.h" ; # unless $no_dh; -$crypto.=" crypto/ec/ec.h" ; # unless $no_ec; -$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa; -$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh; -$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac; -$crypto.=" crypto/cmac/cmac.h" ; - -$crypto.=" crypto/engine/engine.h"; # unless $no_engine; -$crypto.=" crypto/stack/stack.h" ; # unless $no_stack; -$crypto.=" crypto/buffer/buffer.h" ; # unless $no_buffer; -$crypto.=" crypto/bio/bio.h" ; # unless $no_bio; -$crypto.=" crypto/dso/dso.h" ; # unless $no_dso; -$crypto.=" crypto/lhash/lhash.h" ; # unless $no_lhash; -$crypto.=" crypto/conf/conf.h"; -$crypto.=" crypto/txt_db/txt_db.h"; - -$crypto.=" crypto/evp/evp.h" ; # unless $no_evp; -$crypto.=" crypto/objects/objects.h"; -$crypto.=" crypto/pem/pem.h"; -#$crypto.=" crypto/meth/meth.h"; -$crypto.=" crypto/asn1/asn1.h"; -$crypto.=" crypto/asn1/asn1t.h"; -$crypto.=" crypto/asn1/asn1_mac.h"; -$crypto.=" crypto/err/err.h" ; # unless $no_err; -$crypto.=" crypto/pkcs7/pkcs7.h"; -$crypto.=" crypto/pkcs12/pkcs12.h"; -$crypto.=" crypto/x509/x509.h"; -$crypto.=" crypto/x509/x509_vfy.h"; -$crypto.=" crypto/x509v3/x509v3.h"; -$crypto.=" crypto/ts/ts.h"; -$crypto.=" crypto/rand/rand.h"; -$crypto.=" crypto/comp/comp.h" ; # unless $no_comp; -$crypto.=" crypto/ocsp/ocsp.h"; -$crypto.=" crypto/ui/ui.h"; -$crypto.=" crypto/krb5/krb5_asn.h"; -#$crypto.=" crypto/store/store.h"; -$crypto.=" crypto/pqueue/pqueue.h"; -$crypto.=" crypto/cms/cms.h"; -$crypto.=" crypto/jpake/jpake.h"; -$crypto.=" crypto/srp/srp.h"; -$crypto.=" crypto/modes/modes.h"; - -my $symhacks="crypto/symhacks.h"; +$crypto.=" include/openssl/des.h" ; # unless $no_des; +$crypto.=" include/openssl/idea.h" ; # unless $no_idea; +$crypto.=" include/openssl/rc4.h" ; # unless $no_rc4; +$crypto.=" include/openssl/rc5.h" ; # unless $no_rc5; +$crypto.=" include/openssl/rc2.h" ; # unless $no_rc2; +$crypto.=" include/openssl/blowfish.h" ; # unless $no_bf; +$crypto.=" include/openssl/cast.h" ; # unless $no_cast; +$crypto.=" include/openssl/whrlpool.h" ; +$crypto.=" include/openssl/md2.h" ; # unless $no_md2; +$crypto.=" include/openssl/md4.h" ; # unless $no_md4; +$crypto.=" include/openssl/md5.h" ; # unless $no_md5; +$crypto.=" include/openssl/mdc2.h" ; # unless $no_mdc2; +$crypto.=" include/openssl/sha.h" ; # unless $no_sha; +$crypto.=" include/openssl/ripemd.h" ; # unless $no_ripemd; +$crypto.=" include/openssl/aes.h" ; # unless $no_aes; +$crypto.=" include/openssl/camellia.h" ; # unless $no_camellia; +$crypto.=" include/openssl/seed.h"; # unless $no_seed; + +$crypto.=" include/openssl/bn.h"; +$crypto.=" include/openssl/rsa.h" ; # unless $no_rsa; +$crypto.=" include/openssl/dsa.h" ; # unless $no_dsa; +$crypto.=" include/openssl/dh.h" ; # unless $no_dh; +$crypto.=" include/openssl/ec.h" ; # unless $no_ec; +$crypto.=" include/openssl/ecdsa.h" ; # unless $no_ecdsa; +$crypto.=" include/openssl/ecdh.h" ; # unless $no_ecdh; +$crypto.=" include/openssl/hmac.h" ; # unless $no_hmac; +$crypto.=" include/openssl/cmac.h" ; + +$crypto.=" include/openssl/engine.h"; # unless $no_engine; +$crypto.=" include/openssl/stack.h" ; # unless $no_stack; +$crypto.=" include/openssl/buffer.h" ; # unless $no_buffer; +$crypto.=" include/openssl/bio.h" ; # unless $no_bio; +$crypto.=" include/openssl/dso.h" ; # unless $no_dso; +$crypto.=" include/openssl/lhash.h" ; # unless $no_lhash; +$crypto.=" include/openssl/conf.h"; +$crypto.=" include/openssl/txt_db.h"; + +$crypto.=" include/openssl/evp.h" ; # unless $no_evp; +$crypto.=" include/openssl/objects.h"; +$crypto.=" include/openssl/pem.h"; +#$crypto.=" include/openssl/meth.h"; +$crypto.=" include/openssl/asn1.h"; +$crypto.=" include/openssl/asn1t.h"; +$crypto.=" include/openssl/asn1_mac.h"; +$crypto.=" include/openssl/err.h" ; # unless $no_err; +$crypto.=" include/openssl/pkcs7.h"; +$crypto.=" include/openssl/pkcs12.h"; +$crypto.=" include/openssl/x509.h"; +$crypto.=" include/openssl/x509_vfy.h"; +$crypto.=" include/openssl/x509v3.h"; +$crypto.=" include/openssl/ts.h"; +$crypto.=" include/openssl/rand.h"; +$crypto.=" include/openssl/comp.h" ; # unless $no_comp; +$crypto.=" include/openssl/ocsp.h"; +$crypto.=" include/openssl/ui.h"; +$crypto.=" include/openssl/krb5_asn.h"; +#$crypto.=" include/openssl/store.h"; +$crypto.=" include/openssl/pqueue.h"; +$crypto.=" include/openssl/cms.h"; +$crypto.=" include/openssl/jpake.h"; +$crypto.=" include/openssl/srp.h"; +$crypto.=" include/openssl/modes.h"; + +my $symhacks="include/openssl/symhacks.h"; my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks); my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks); diff --git a/util/mkstack.pl b/util/mkstack.pl index 6e6741f233..073902759c 100755 --- a/util/mkstack.pl +++ b/util/mkstack.pl @@ -3,7 +3,7 @@ # Search out "DECLARE_STACK_OF()" # declarations in .h and .c files, # and create corresponding macro declarations for crypto/stack/safestack.h. -my $safestack = "crypto/stack/safestack.h"; +my $safestack = "include/openssl/safestack.h"; my $do_write = 0; foreach ( @ARGV ) { @@ -15,7 +15,7 @@ my @sstacklst; my @asn1setlst; my @p12stklst; my @lhashlst; -my @source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>); +my @source = (<include/openssl/*.h>, <crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>); foreach $file (@source) { next if -l $file; |