Stop symlinking, move files to intended directory
authorRichard Levitte <levitte@openssl.org>
Thu, 26 Mar 2015 20:33:18 +0000 (21:33 +0100)
committerRichard Levitte <levitte@openssl.org>
Tue, 31 Mar 2015 18:16:01 +0000 (20:16 +0200)
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>
121 files changed:
.gitignore
Configure
Makefile.org
crypto/err/openssl.ec
crypto/objects/Makefile
include/openssl/aes.h [moved from crypto/aes/aes.h with 100% similarity]
include/openssl/asn1.h [moved from crypto/asn1/asn1.h with 100% similarity]
include/openssl/asn1_mac.h [moved from crypto/asn1/asn1_mac.h with 100% similarity]
include/openssl/asn1t.h [moved from crypto/asn1/asn1t.h with 100% similarity]
include/openssl/bio.h [moved from crypto/bio/bio.h with 100% similarity]
include/openssl/blowfish.h [moved from crypto/bf/blowfish.h with 100% similarity]
include/openssl/bn.h [moved from crypto/bn/bn.h with 100% similarity]
include/openssl/buffer.h [moved from crypto/buffer/buffer.h with 100% similarity]
include/openssl/camellia.h [moved from crypto/camellia/camellia.h with 100% similarity]
include/openssl/cast.h [moved from crypto/cast/cast.h with 100% similarity]
include/openssl/cmac.h [moved from crypto/cmac/cmac.h with 100% similarity]
include/openssl/cms.h [moved from crypto/cms/cms.h with 100% similarity]
include/openssl/comp.h [moved from crypto/comp/comp.h with 100% similarity]
include/openssl/conf.h [moved from crypto/conf/conf.h with 100% similarity]
include/openssl/conf_api.h [moved from crypto/conf/conf_api.h with 100% similarity]
include/openssl/crypto.h [moved from crypto/crypto.h with 100% similarity]
include/openssl/des.h [moved from crypto/des/des.h with 100% similarity]
include/openssl/dh.h [moved from crypto/dh/dh.h with 100% similarity]
include/openssl/dsa.h [moved from crypto/dsa/dsa.h with 100% similarity]
include/openssl/dso.h [moved from crypto/dso/dso.h with 100% similarity]
include/openssl/dtls1.h [moved from ssl/dtls1.h with 100% similarity]
include/openssl/e_os2.h [moved from e_os2.h with 100% similarity]
include/openssl/ebcdic.h [moved from crypto/ebcdic.h with 100% similarity]
include/openssl/ec.h [moved from crypto/ec/ec.h with 100% similarity]
include/openssl/ecdh.h [moved from crypto/ecdh/ecdh.h with 100% similarity]
include/openssl/ecdsa.h [moved from crypto/ecdsa/ecdsa.h with 100% similarity]
include/openssl/engine.h [moved from crypto/engine/engine.h with 100% similarity]
include/openssl/err.h [moved from crypto/err/err.h with 100% similarity]
include/openssl/evp.h [moved from crypto/evp/evp.h with 100% similarity]
include/openssl/hmac.h [moved from crypto/hmac/hmac.h with 100% similarity]
include/openssl/idea.h [moved from crypto/idea/idea.h with 100% similarity]
include/openssl/jpake.h [moved from crypto/jpake/jpake.h with 100% similarity]
include/openssl/krb5_asn.h [moved from crypto/krb5/krb5_asn.h with 100% similarity]
include/openssl/kssl.h [moved from ssl/kssl.h with 100% similarity]
include/openssl/lhash.h [moved from crypto/lhash/lhash.h with 100% similarity]
include/openssl/md2.h [moved from crypto/md2/md2.h with 100% similarity]
include/openssl/md4.h [moved from crypto/md4/md4.h with 100% similarity]
include/openssl/md5.h [moved from crypto/md5/md5.h with 100% similarity]
include/openssl/mdc2.h [moved from crypto/mdc2/mdc2.h with 100% similarity]
include/openssl/modes.h [moved from crypto/modes/modes.h with 100% similarity]
include/openssl/obj_mac.h [moved from crypto/objects/obj_mac.h with 100% similarity]
include/openssl/objects.h [moved from crypto/objects/objects.h with 100% similarity]
include/openssl/ocsp.h [moved from crypto/ocsp/ocsp.h with 100% similarity]
include/openssl/opensslv.h [moved from crypto/opensslv.h with 100% similarity]
include/openssl/ossl_typ.h [moved from crypto/ossl_typ.h with 100% similarity]
include/openssl/pem.h [moved from crypto/pem/pem.h with 100% similarity]
include/openssl/pem2.h [moved from crypto/pem/pem2.h with 100% similarity]
include/openssl/pkcs12.h [moved from crypto/pkcs12/pkcs12.h with 100% similarity]
include/openssl/pkcs7.h [moved from crypto/pkcs7/pkcs7.h with 100% similarity]
include/openssl/pqueue.h [moved from crypto/pqueue/pqueue.h with 100% similarity]
include/openssl/rand.h [moved from crypto/rand/rand.h with 100% similarity]
include/openssl/rc2.h [moved from crypto/rc2/rc2.h with 100% similarity]
include/openssl/rc4.h [moved from crypto/rc4/rc4.h with 100% similarity]
include/openssl/rc5.h [moved from crypto/rc5/rc5.h with 100% similarity]
include/openssl/ripemd.h [moved from crypto/ripemd/ripemd.h with 100% similarity]
include/openssl/rsa.h [moved from crypto/rsa/rsa.h with 100% similarity]
include/openssl/safestack.h [moved from crypto/stack/safestack.h with 100% similarity]
include/openssl/seed.h [moved from crypto/seed/seed.h with 100% similarity]
include/openssl/sha.h [moved from crypto/sha/sha.h with 100% similarity]
include/openssl/srp.h [moved from crypto/srp/srp.h with 100% similarity]
include/openssl/srtp.h [moved from ssl/srtp.h with 100% similarity]
include/openssl/ssl.h [moved from ssl/ssl.h with 100% similarity]
include/openssl/ssl2.h [moved from ssl/ssl2.h with 100% similarity]
include/openssl/ssl23.h [moved from ssl/ssl23.h with 100% similarity]
include/openssl/ssl3.h [moved from ssl/ssl3.h with 100% similarity]
include/openssl/stack.h [moved from crypto/stack/stack.h with 100% similarity]
include/openssl/store.h [moved from crypto/store/store.h with 100% similarity]
include/openssl/symhacks.h [moved from crypto/symhacks.h with 100% similarity]
include/openssl/tls1.h [moved from ssl/tls1.h with 100% similarity]
include/openssl/ts.h [moved from crypto/ts/ts.h with 100% similarity]
include/openssl/txt_db.h [moved from crypto/txt_db/txt_db.h with 100% similarity]
include/openssl/ui.h [moved from crypto/ui/ui.h with 100% similarity]
include/openssl/whrlpool.h [moved from crypto/whrlpool/whrlpool.h with 100% similarity]
include/openssl/x509.h [moved from crypto/x509/x509.h with 100% similarity]
include/openssl/x509_vfy.h [moved from crypto/x509/x509_vfy.h with 100% similarity]
include/openssl/x509v3.h [moved from crypto/x509v3/x509v3.h with 100% similarity]
test/bftest.c [moved from crypto/bf/bftest.c with 100% similarity]
test/bntest.c [moved from crypto/bn/bntest.c with 100% similarity]
test/casttest.c [moved from crypto/cast/casttest.c with 100% similarity]
test/constant_time_test.c [moved from crypto/constant_time_test.c with 100% similarity]
test/destest.c [moved from crypto/des/destest.c with 100% similarity]
test/dhtest.c [moved from crypto/dh/dhtest.c with 100% similarity]
test/dsatest.c [moved from crypto/dsa/dsatest.c with 100% similarity]
test/ecdhtest.c [moved from crypto/ecdh/ecdhtest.c with 100% similarity]
test/ecdsatest.c [moved from crypto/ecdsa/ecdsatest.c with 100% similarity]
test/ectest.c [moved from crypto/ec/ectest.c with 100% similarity]
test/enginetest.c [moved from crypto/engine/enginetest.c with 100% similarity]
test/evp_extra_test.c [moved from crypto/evp/evp_extra_test.c with 100% similarity]
test/evp_test.c [moved from crypto/evp/evp_test.c with 100% similarity]
test/evptests.txt [moved from crypto/evp/evptests.txt with 100% similarity]
test/exptest.c [moved from crypto/bn/exptest.c with 100% similarity]
test/gost2814789test.c [moved from engines/ccgost/gost2814789test.c with 100% similarity]
test/heartbeat_test.c [moved from ssl/heartbeat_test.c with 100% similarity]
test/hmactest.c [moved from crypto/hmac/hmactest.c with 100% similarity]
test/ideatest.c [moved from crypto/idea/ideatest.c with 100% similarity]
test/jpaketest.c [moved from crypto/jpake/jpaketest.c with 100% similarity]
test/md2test.c [moved from crypto/md2/md2test.c with 100% similarity]
test/md4test.c [moved from crypto/md4/md4test.c with 100% similarity]
test/md5test.c [moved from crypto/md5/md5test.c with 100% similarity]
test/mdc2test.c [moved from crypto/mdc2/mdc2test.c with 100% similarity]
test/p5_crpt2_test.c [moved from crypto/evp/p5_crpt2_test.c with 100% similarity]
test/randtest.c [moved from crypto/rand/randtest.c with 100% similarity]
test/rc2test.c [moved from crypto/rc2/rc2test.c with 100% similarity]
test/rc4test.c [moved from crypto/rc4/rc4test.c with 100% similarity]
test/rc5test.c [moved from crypto/rc5/rc5test.c with 100% similarity]
test/rmdtest.c [moved from crypto/ripemd/rmdtest.c with 100% similarity]
test/rsa_test.c [moved from crypto/rsa/rsa_test.c with 100% similarity]
test/sha1test.c [moved from crypto/sha/sha1test.c with 100% similarity]
test/sha256t.c [moved from crypto/sha/sha256t.c with 100% similarity]
test/sha512t.c [moved from crypto/sha/sha512t.c with 100% similarity]
test/srptest.c [moved from crypto/srp/srptest.c with 100% similarity]
test/ssltest.c [moved from ssl/ssltest.c with 100% similarity]
test/v3nametest.c [moved from crypto/x509v3/v3nametest.c with 100% similarity]
test/wp_test.c [moved from crypto/whrlpool/wp_test.c with 100% similarity]
util/mkdef.pl
util/mkstack.pl

index 2f27dc6..9f85632 100644 (file)
@@ -14,7 +14,6 @@
 /MINFO
 /TABLE
 /*.a
-/include
 /*.pc
 /rehash.time
 /inc.*
 /out.*
 /tmp.*
 
-# Most *.c files under test/ are symlinks
-/test/*.c
-# Apart from these
-!/test/asn1test.c
-!/test/methtest.c
-!/test/dummytest.c
-!/test/igetest.c
-!/test/r160test.c
-!/test/fips_algvs.c
-!/test/testutil.c
-
 /test/*.ss
 /test/*.srl
 /test/.rnd
@@ -94,8 +82,8 @@ crypto/sha/asm/sha512-sse2.asm
 !/crypto/des/times/486-50.sol
 
 # Misc auto generated files
+include/openssl/opensslconf.h
 /tools/c_rehash
-/test/evptests.txt
 lib
 Makefile.save
 *.bak
index ba8cd96..97c2573 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -779,13 +779,13 @@ my $no_gmp=0;
 my @skip=();
 my $Makefile="Makefile";
 my $des_locl="crypto/des/des_locl.h";
-my $des        ="crypto/des/des.h";
-my $bn ="crypto/bn/bn.h";
-my $md2        ="crypto/md2/md2.h";
-my $rc4        ="crypto/rc4/rc4.h";
+my $des        ="include/openssl/des.h";
+my $bn ="include/openssl/bn.h";
+my $md2        ="include/openssl/md2.h";
+my $rc4        ="include/openssl/rc4.h";
 my $rc4_locl="crypto/rc4/rc4_locl.h";
-my $idea       ="crypto/idea/idea.h";
-my $rc2        ="crypto/rc2/rc2.h";
+my $idea       ="include/openssl/idea.h";
+my $rc2        ="include/openssl/rc2.h";
 my $bf ="crypto/bf/bf_locl.h";
 my $bn_asm     ="bn_asm.o";
 my $des_enc="des_enc.o fcrypt_b.o";
@@ -848,7 +848,6 @@ my $libs;
 my $libkrb5="";
 my $target;
 my $options;
-my $symlink;
 my $make_depend=0;
 my %withargs=();
 my $build_prefix = "release_";
@@ -869,7 +868,6 @@ while($argv_unprocessed)
        $libs="";
        $target="";
        $options="";
-       $symlink=1;
 
        $argv_unprocessed=0;
        $argvstring=join(' ',@argvcopy);
@@ -1192,8 +1190,6 @@ foreach (sort (keys %disabled))
                { }
        elsif (/^zlib-dynamic$/)
                { }
-       elsif (/^symlinks$/)
-               { $symlink = 0; }
        elsif (/^sse2$/)
                { $no_sse2 = 1; }
        else
@@ -1702,7 +1698,7 @@ my $shlib_version_history = "unknown";
 my $shlib_major = "unknown";
 my $shlib_minor = "unknown";
 
-open(IN,'<crypto/opensslv.h') || die "unable to read opensslv.h:$!\n";
+open(IN,'<include/openssl/opensslv.h') || die "unable to read opensslv.h:$!\n";
 while (<IN>)
        {
        $version=$1 if /OPENSSL.VERSION.TEXT.*OpenSSL (\S+) /;
@@ -1923,8 +1919,8 @@ foreach (sort split(/\s+/,$bn_ops))
        }
 
 open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";
-unlink("crypto/opensslconf.h.new") || die "unable to remove old crypto/opensslconf.h.new:$!\n" if -e "crypto/opensslconf.h.new";
-open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslconf.h.new:$!\n";
+unlink("include/openssl/opensslconf.h.new") || die "unable to remove old include/openssl/opensslconf.h.new:$!\n" if -e "include/openssl/opensslconf.h.new";
+open(OUT,'>include/openssl/opensslconf.h.new') || die "unable to create include/openssl/opensslconf.h.new:$!\n";
 print OUT "/* opensslconf.h */\n";
 print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";
 
@@ -2039,8 +2035,8 @@ print OUT "#ifdef  __cplusplus\n";
 print OUT "}\n";
 print OUT "#endif\n";
 close(OUT);
-rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h";
-rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n";
+rename("include/openssl/opensslconf.h","include/openssl/opensslconf.h.bak") || die "unable to rename include/openssl/opensslconf.h\n" if -e "include/openssl/opensslconf.h";
+rename("include/openssl/opensslconf.h.new","include/openssl/opensslconf.h") || die "unable to rename include/openssl/opensslconf.h.new\n";
 
 
 # Fix the date
@@ -2082,9 +2078,7 @@ EOF
 } else {
        my $make_command = "$make PERL=\'$perl\'";
        my $make_targets = "";
-       $make_targets .= " links" if $symlink;
        $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
-       $make_targets .= " gentests" if $symlink;
        (system $make_command.$make_targets) == 0 or die "make $make_targets failed"
                if $make_targets ne "";
        if ( $perl =~ m@^/@) {
index 0d09ad4..5e510f2 100644 (file)
@@ -137,6 +137,7 @@ BASEADDR=
 DIRS=   crypto ssl engines apps test tools
 ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
+INSTALL_SUBS= engines apps tools
 
 # dirs in crypto to build
 SDIRS=  \
@@ -426,11 +427,6 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
        @set -e; target=files; $(RECURSIVE_BUILD_CMD)
 
-links:
-       @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
-       @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-       @set -e; target=links; $(RECURSIVE_BUILD_CMD)
-
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \
        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
@@ -486,10 +482,10 @@ util/libeay.num::
 util/ssleay.num::
        $(PERL) util/mkdef.pl ssl update
 
-crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
-       $(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
-crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
-       $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
+crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl include/openssl/obj_mac.h
+       $(PERL) crypto/objects/obj_dat.pl include/openssl/obj_mac.h crypto/objects/obj_dat.h
+include/openssl/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
+       $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num include/openssl/obj_mac.h
 crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
        $(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
 
@@ -547,12 +543,11 @@ uninstall: uninstall_sw uninstall_docs
 
 install_sw:
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS)
-       @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
-       do \
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       @set -e; for i in include/openssl/*.h; do \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$$i ); \
        done;
-       @set -e; target=install; $(RECURSIVE_BUILD_CMD)
+       @set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done
        @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
        do \
                if [ -f "$$i" ]; then \
index 3c268d2..8a10b80 100644 (file)
@@ -4,37 +4,38 @@
 
 # files that may have to be rewritten by util/mkerr.pl
 L ERR          NONE                            NONE
-L BN           crypto/bn/bn.h                  crypto/bn/bn_err.c
-L RSA          crypto/rsa/rsa.h                crypto/rsa/rsa_err.c
-L DH           crypto/dh/dh.h                  crypto/dh/dh_err.c
-L EVP          crypto/evp/evp.h                crypto/evp/evp_err.c
-L BUF          crypto/buffer/buffer.h          crypto/buffer/buf_err.c
-L OBJ          crypto/objects/objects.h        crypto/objects/obj_err.c
-L PEM          crypto/pem/pem.h                crypto/pem/pem_err.c
-L DSA          crypto/dsa/dsa.h                crypto/dsa/dsa_err.c
-L X509         crypto/x509/x509.h              crypto/x509/x509_err.c
-L ASN1         crypto/asn1/asn1.h              crypto/asn1/asn1_err.c
-L CONF         crypto/conf/conf.h              crypto/conf/conf_err.c
-L CRYPTO       crypto/crypto.h                 crypto/cpt_err.c
-L EC           crypto/ec/ec.h                  crypto/ec/ec_err.c
-L SSL          ssl/ssl.h                       ssl/ssl_err.c
-L BIO          crypto/bio/bio.h                crypto/bio/bio_err.c
-L PKCS7                crypto/pkcs7/pkcs7.h            crypto/pkcs7/pkcs7err.c
-L X509V3       crypto/x509v3/x509v3.h          crypto/x509v3/v3err.c
-L PKCS12       crypto/pkcs12/pkcs12.h          crypto/pkcs12/pk12err.c
-L RAND         crypto/rand/rand.h              crypto/rand/rand_err.c
-L DSO          crypto/dso/dso.h                crypto/dso/dso_err.c
-L ENGINE       crypto/engine/engine.h          crypto/engine/eng_err.c
-L OCSP         crypto/ocsp/ocsp.h              crypto/ocsp/ocsp_err.c
-L UI           crypto/ui/ui.h                  crypto/ui/ui_err.c
-L COMP         crypto/comp/comp.h              crypto/comp/comp_err.c
-L ECDSA                crypto/ecdsa/ecdsa.h            crypto/ecdsa/ecs_err.c
-L ECDH         crypto/ecdh/ecdh.h              crypto/ecdh/ech_err.c
-L STORE                crypto/store/store.h            crypto/store/str_err.c
-L TS           crypto/ts/ts.h                  crypto/ts/ts_err.c
-L HMAC         crypto/hmac/hmac.h              crypto/hmac/hmac_err.c
-L CMS          crypto/cms/cms.h                crypto/cms/cms_err.c
-L JPAKE                crypto/jpake/jpake.h            crypto/jpake/jpake_err.c
+L BN           include/openssl/bn.h            crypto/bn/bn_err.c
+L RSA          include/openssl/rsa.h           crypto/rsa/rsa_err.c
+L DH           include/openssl/dh.h            crypto/dh/dh_err.c
+L EVP          include/openssl/evp.h           crypto/evp/evp_err.c
+L BUF          include/openssl/buffer.h        crypto/buffer/buf_err.c
+L OBJ          include/openssl/objects.h       crypto/objects/obj_err.c
+L PEM          include/openssl/pem.h           crypto/pem/pem_err.c
+L DSA          include/openssl/dsa.h           crypto/dsa/dsa_err.c
+L X509         include/openssl/x509.h          crypto/x509/x509_err.c
+L ASN1         include/openssl/asn1.h          crypto/asn1/asn1_err.c
+L CONF         include/openssl/conf.h          crypto/conf/conf_err.c
+L CRYPTO       include/openssl/crypto.h        crypto/cpt_err.c
+L EC           include/openssl/ec.h            crypto/ec/ec_err.c
+L SSL          include/openssl/ssl.h           ssl/ssl_err.c
+L BIO          include/openssl/bio.h           crypto/bio/bio_err.c
+L PKCS7                include/openssl/pkcs7.h         crypto/pkcs7/pkcs7err.c
+L X509V3       include/openssl/x509v3.h        crypto/x509v3/v3err.c
+L PKCS12       include/openssl/pkcs12.h        crypto/pkcs12/pk12err.c
+L RAND         include/openssl/rand.h          crypto/rand/rand_err.c
+L DSO          include/openssl/dso.h           crypto/dso/dso_err.c
+L ENGINE       include/openssl/engine.h        crypto/engine/eng_err.c
+L OCSP         include/openssl/ocsp.h          crypto/ocsp/ocsp_err.c
+L UI           include/openssl/ui.h            crypto/ui/ui_err.c
+L COMP         include/openssl/comp.h          crypto/comp/comp_err.c
+L ECDSA                include/openssl/ecdsa.h         crypto/ecdsa/ecs_err.c
+L ECDH         include/openssl/ecdh.h          crypto/ecdh/ech_err.c
+L STORE                include/openssl/store.h         crypto/store/str_err.c
+L TS           include/openssl/ts.h            crypto/ts/ts_err.c
+L HMAC         include/openssl/hmac.h          crypto/hmac/hmac_err.c
+L CMS          include/openssl/cms.h           crypto/cms/cms_err.c
+L JPAKE                include/openssl/jpake.h         crypto/jpake/jpake_err.c
+L FIPS         include/openssl/fips.h          crypto/fips_err.h
 
 # additional header files to be scanned for function names
 L NONE         crypto/x509/x509_vfy.h          NONE
index c6ea71e..26a30bb 100644 (file)
@@ -38,13 +38,13 @@ lib:        $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
-obj_dat.h: obj_dat.pl obj_mac.h
-       $(PERL) obj_dat.pl obj_mac.h obj_dat.h
+obj_dat.h: obj_dat.pl ../../include/openssl/obj_mac.h
+       $(PERL) obj_dat.pl ../../include/openssl/obj_mac.h obj_dat.h
 
 # objects.pl both reads and writes obj_mac.num
-obj_mac.h: objects.pl objects.txt obj_mac.num
-       $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
-       @sleep 1; touch obj_mac.h; sleep 1
+../../include/openssl/obj_mac.h: objects.pl objects.txt obj_mac.num
+       $(PERL) objects.pl objects.txt obj_mac.num ../../include/openssl/obj_mac.h
+       @sleep 1; touch ../../include/openssl/obj_mac.h; sleep 1
 
 obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
        $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
similarity index 100%
rename from crypto/aes/aes.h
rename to include/openssl/aes.h
similarity index 100%
rename from crypto/asn1/asn1.h
rename to include/openssl/asn1.h
similarity index 100%
rename from crypto/asn1/asn1t.h
rename to include/openssl/asn1t.h
similarity index 100%
rename from crypto/bio/bio.h
rename to include/openssl/bio.h
similarity index 100%
rename from crypto/bn/bn.h
rename to include/openssl/bn.h
similarity index 100%
rename from crypto/cast/cast.h
rename to include/openssl/cast.h
similarity index 100%
rename from crypto/cmac/cmac.h
rename to include/openssl/cmac.h
similarity index 100%
rename from crypto/cms/cms.h
rename to include/openssl/cms.h
similarity index 100%
rename from crypto/comp/comp.h
rename to include/openssl/comp.h
similarity index 100%
rename from crypto/conf/conf.h
rename to include/openssl/conf.h
similarity index 100%
rename from crypto/crypto.h
rename to include/openssl/crypto.h
similarity index 100%
rename from crypto/des/des.h
rename to include/openssl/des.h
similarity index 100%
rename from crypto/dh/dh.h
rename to include/openssl/dh.h
similarity index 100%
rename from crypto/dsa/dsa.h
rename to include/openssl/dsa.h
similarity index 100%
rename from crypto/dso/dso.h
rename to include/openssl/dso.h
similarity index 100%
rename from ssl/dtls1.h
rename to include/openssl/dtls1.h
similarity index 100%
rename from e_os2.h
rename to include/openssl/e_os2.h
similarity index 100%
rename from crypto/ebcdic.h
rename to include/openssl/ebcdic.h
similarity index 100%
rename from crypto/ec/ec.h
rename to include/openssl/ec.h
similarity index 100%
rename from crypto/ecdh/ecdh.h
rename to include/openssl/ecdh.h
similarity index 100%
rename from crypto/ecdsa/ecdsa.h
rename to include/openssl/ecdsa.h
similarity index 100%
rename from crypto/err/err.h
rename to include/openssl/err.h
similarity index 100%
rename from crypto/evp/evp.h
rename to include/openssl/evp.h
similarity index 100%
rename from crypto/hmac/hmac.h
rename to include/openssl/hmac.h
similarity index 100%
rename from crypto/idea/idea.h
rename to include/openssl/idea.h
similarity index 100%
rename from crypto/jpake/jpake.h
rename to include/openssl/jpake.h
similarity index 100%
rename from ssl/kssl.h
rename to include/openssl/kssl.h
similarity index 100%
rename from crypto/lhash/lhash.h
rename to include/openssl/lhash.h
similarity index 100%
rename from crypto/md2/md2.h
rename to include/openssl/md2.h
similarity index 100%
rename from crypto/md4/md4.h
rename to include/openssl/md4.h
similarity index 100%
rename from crypto/md5/md5.h
rename to include/openssl/md5.h
similarity index 100%
rename from crypto/mdc2/mdc2.h
rename to include/openssl/mdc2.h
similarity index 100%
rename from crypto/modes/modes.h
rename to include/openssl/modes.h
similarity index 100%
rename from crypto/ocsp/ocsp.h
rename to include/openssl/ocsp.h
similarity index 100%
rename from crypto/opensslv.h
rename to include/openssl/opensslv.h
similarity index 100%
rename from crypto/ossl_typ.h
rename to include/openssl/ossl_typ.h
similarity index 100%
rename from crypto/pem/pem.h
rename to include/openssl/pem.h
similarity index 100%
rename from crypto/pem/pem2.h
rename to include/openssl/pem2.h
similarity index 100%
rename from crypto/pkcs7/pkcs7.h
rename to include/openssl/pkcs7.h
similarity index 100%
rename from crypto/rand/rand.h
rename to include/openssl/rand.h
similarity index 100%
rename from crypto/rc2/rc2.h
rename to include/openssl/rc2.h
similarity index 100%
rename from crypto/rc4/rc4.h
rename to include/openssl/rc4.h
similarity index 100%
rename from crypto/rc5/rc5.h
rename to include/openssl/rc5.h
similarity index 100%
rename from crypto/rsa/rsa.h
rename to include/openssl/rsa.h
similarity index 100%
rename from crypto/seed/seed.h
rename to include/openssl/seed.h
similarity index 100%
rename from crypto/sha/sha.h
rename to include/openssl/sha.h
similarity index 100%
rename from crypto/srp/srp.h
rename to include/openssl/srp.h
similarity index 100%
rename from ssl/srtp.h
rename to include/openssl/srtp.h
similarity index 100%
rename from ssl/ssl.h
rename to include/openssl/ssl.h
similarity index 100%
rename from ssl/ssl2.h
rename to include/openssl/ssl2.h
similarity index 100%
rename from ssl/ssl23.h
rename to include/openssl/ssl23.h
similarity index 100%
rename from ssl/ssl3.h
rename to include/openssl/ssl3.h
similarity index 100%
rename from crypto/stack/stack.h
rename to include/openssl/stack.h
similarity index 100%
rename from crypto/store/store.h
rename to include/openssl/store.h
similarity index 100%
rename from crypto/symhacks.h
rename to include/openssl/symhacks.h
similarity index 100%
rename from ssl/tls1.h
rename to include/openssl/tls1.h
similarity index 100%
rename from crypto/ts/ts.h
rename to include/openssl/ts.h
similarity index 100%
rename from crypto/ui/ui.h
rename to include/openssl/ui.h
similarity index 100%
rename from crypto/x509/x509.h
rename to include/openssl/x509.h
similarity index 100%
rename from crypto/bf/bftest.c
rename to test/bftest.c
similarity index 100%
rename from crypto/bn/bntest.c
rename to test/bntest.c
similarity index 100%
rename from crypto/cast/casttest.c
rename to test/casttest.c
similarity index 100%
rename from crypto/des/destest.c
rename to test/destest.c
similarity index 100%
rename from crypto/dh/dhtest.c
rename to test/dhtest.c
similarity index 100%
rename from crypto/dsa/dsatest.c
rename to test/dsatest.c
similarity index 100%
rename from crypto/ecdh/ecdhtest.c
rename to test/ecdhtest.c
similarity index 100%
rename from crypto/ecdsa/ecdsatest.c
rename to test/ecdsatest.c
similarity index 100%
rename from crypto/ec/ectest.c
rename to test/ectest.c
similarity index 100%
rename from crypto/engine/enginetest.c
rename to test/enginetest.c
similarity index 100%
rename from crypto/evp/evp_test.c
rename to test/evp_test.c
similarity index 100%
rename from crypto/evp/evptests.txt
rename to test/evptests.txt
similarity index 100%
rename from crypto/bn/exptest.c
rename to test/exptest.c
similarity index 100%
rename from ssl/heartbeat_test.c
rename to test/heartbeat_test.c
similarity index 100%
rename from crypto/hmac/hmactest.c
rename to test/hmactest.c
similarity index 100%
rename from crypto/idea/ideatest.c
rename to test/ideatest.c
similarity index 100%
rename from crypto/jpake/jpaketest.c
rename to test/jpaketest.c
similarity index 100%
rename from crypto/md2/md2test.c
rename to test/md2test.c
similarity index 100%
rename from crypto/md4/md4test.c
rename to test/md4test.c
similarity index 100%
rename from crypto/md5/md5test.c
rename to test/md5test.c
similarity index 100%
rename from crypto/mdc2/mdc2test.c
rename to test/mdc2test.c
similarity index 100%
rename from crypto/rand/randtest.c
rename to test/randtest.c
similarity index 100%
rename from crypto/rc2/rc2test.c
rename to test/rc2test.c
similarity index 100%
rename from crypto/rc4/rc4test.c
rename to test/rc4test.c
similarity index 100%
rename from crypto/rc5/rc5test.c
rename to test/rc5test.c
similarity index 100%
rename from crypto/ripemd/rmdtest.c
rename to test/rmdtest.c
similarity index 100%
rename from crypto/rsa/rsa_test.c
rename to test/rsa_test.c
similarity index 100%
rename from crypto/sha/sha1test.c
rename to test/sha1test.c
similarity index 100%
rename from crypto/sha/sha256t.c
rename to test/sha256t.c
similarity index 100%
rename from crypto/sha/sha512t.c
rename to test/sha512t.c
similarity index 100%
rename from crypto/srp/srptest.c
rename to test/srptest.c
similarity index 100%
rename from ssl/ssltest.c
rename to test/ssltest.c
similarity index 100%
rename from crypto/x509v3/v3nametest.c
rename to test/v3nametest.c
similarity index 100%
rename from crypto/whrlpool/wp_test.c
rename to test/wp_test.c
index 1d47561..7f1c093 100755 (executable)
@@ -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);
index 6e6741f..0739027 100755 (executable)
@@ -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;