diff options
-rw-r--r-- | .gitignore | 14 | ||||
-rwxr-xr-x | Configure | 28 | ||||
-rw-r--r-- | Makefile.org | 23 | ||||
-rw-r--r-- | crypto/err/openssl.ec | 63 | ||||
-rw-r--r-- | crypto/objects/Makefile | 10 | ||||
-rw-r--r-- | include/openssl/aes.h (renamed from crypto/aes/aes.h) | 0 | ||||
-rw-r--r-- | include/openssl/asn1.h (renamed from crypto/asn1/asn1.h) | 0 | ||||
-rw-r--r-- | include/openssl/asn1_mac.h (renamed from crypto/asn1/asn1_mac.h) | 0 | ||||
-rw-r--r-- | include/openssl/asn1t.h (renamed from crypto/asn1/asn1t.h) | 0 | ||||
-rw-r--r-- | include/openssl/bio.h (renamed from crypto/bio/bio.h) | 0 | ||||
-rw-r--r-- | include/openssl/blowfish.h (renamed from crypto/bf/blowfish.h) | 0 | ||||
-rw-r--r-- | include/openssl/bn.h (renamed from crypto/bn/bn.h) | 0 | ||||
-rw-r--r-- | include/openssl/buffer.h (renamed from crypto/buffer/buffer.h) | 0 | ||||
-rw-r--r-- | include/openssl/camellia.h (renamed from crypto/camellia/camellia.h) | 0 | ||||
-rw-r--r-- | include/openssl/cast.h (renamed from crypto/cast/cast.h) | 0 | ||||
-rw-r--r-- | include/openssl/cmac.h (renamed from crypto/cmac/cmac.h) | 0 | ||||
-rw-r--r-- | include/openssl/cms.h (renamed from crypto/cms/cms.h) | 0 | ||||
-rw-r--r-- | include/openssl/comp.h (renamed from crypto/comp/comp.h) | 0 | ||||
-rw-r--r-- | include/openssl/conf.h (renamed from crypto/conf/conf.h) | 0 | ||||
-rw-r--r-- | include/openssl/conf_api.h (renamed from crypto/conf/conf_api.h) | 0 | ||||
-rw-r--r-- | include/openssl/crypto.h (renamed from crypto/crypto.h) | 0 | ||||
-rw-r--r-- | include/openssl/des.h (renamed from crypto/des/des.h) | 0 | ||||
-rw-r--r-- | include/openssl/dh.h (renamed from crypto/dh/dh.h) | 0 | ||||
-rw-r--r-- | include/openssl/dsa.h (renamed from crypto/dsa/dsa.h) | 0 | ||||
-rw-r--r-- | include/openssl/dso.h (renamed from crypto/dso/dso.h) | 0 | ||||
-rw-r--r-- | include/openssl/dtls1.h (renamed from ssl/dtls1.h) | 0 | ||||
-rw-r--r-- | include/openssl/e_os2.h (renamed from e_os2.h) | 0 | ||||
-rw-r--r-- | include/openssl/ebcdic.h (renamed from crypto/ebcdic.h) | 0 | ||||
-rw-r--r-- | include/openssl/ec.h (renamed from crypto/ec/ec.h) | 0 | ||||
-rw-r--r-- | include/openssl/ecdh.h (renamed from crypto/ecdh/ecdh.h) | 0 | ||||
-rw-r--r-- | include/openssl/ecdsa.h (renamed from crypto/ecdsa/ecdsa.h) | 0 | ||||
-rw-r--r-- | include/openssl/engine.h (renamed from crypto/engine/engine.h) | 0 | ||||
-rw-r--r-- | include/openssl/err.h (renamed from crypto/err/err.h) | 0 | ||||
-rw-r--r-- | include/openssl/evp.h (renamed from crypto/evp/evp.h) | 0 | ||||
-rw-r--r-- | include/openssl/hmac.h (renamed from crypto/hmac/hmac.h) | 0 | ||||
-rw-r--r-- | include/openssl/idea.h (renamed from crypto/idea/idea.h) | 0 | ||||
-rw-r--r-- | include/openssl/jpake.h (renamed from crypto/jpake/jpake.h) | 0 | ||||
-rw-r--r-- | include/openssl/krb5_asn.h (renamed from crypto/krb5/krb5_asn.h) | 0 | ||||
-rw-r--r-- | include/openssl/kssl.h (renamed from ssl/kssl.h) | 0 | ||||
-rw-r--r-- | include/openssl/lhash.h (renamed from crypto/lhash/lhash.h) | 0 | ||||
-rw-r--r-- | include/openssl/md2.h (renamed from crypto/md2/md2.h) | 0 | ||||
-rw-r--r-- | include/openssl/md4.h (renamed from crypto/md4/md4.h) | 0 | ||||
-rw-r--r-- | include/openssl/md5.h (renamed from crypto/md5/md5.h) | 0 | ||||
-rw-r--r-- | include/openssl/mdc2.h (renamed from crypto/mdc2/mdc2.h) | 0 | ||||
-rw-r--r-- | include/openssl/modes.h (renamed from crypto/modes/modes.h) | 0 | ||||
-rw-r--r-- | include/openssl/obj_mac.h (renamed from crypto/objects/obj_mac.h) | 0 | ||||
-rw-r--r-- | include/openssl/objects.h (renamed from crypto/objects/objects.h) | 0 | ||||
-rw-r--r-- | include/openssl/ocsp.h (renamed from crypto/ocsp/ocsp.h) | 0 | ||||
-rw-r--r-- | include/openssl/opensslv.h (renamed from crypto/opensslv.h) | 0 | ||||
-rw-r--r-- | include/openssl/ossl_typ.h (renamed from crypto/ossl_typ.h) | 0 | ||||
-rw-r--r-- | include/openssl/pem.h (renamed from crypto/pem/pem.h) | 0 | ||||
-rw-r--r-- | include/openssl/pem2.h (renamed from crypto/pem/pem2.h) | 0 | ||||
-rw-r--r-- | include/openssl/pkcs12.h (renamed from crypto/pkcs12/pkcs12.h) | 0 | ||||
-rw-r--r-- | include/openssl/pkcs7.h (renamed from crypto/pkcs7/pkcs7.h) | 0 | ||||
-rw-r--r-- | include/openssl/pqueue.h (renamed from crypto/pqueue/pqueue.h) | 0 | ||||
-rw-r--r-- | include/openssl/rand.h (renamed from crypto/rand/rand.h) | 0 | ||||
-rw-r--r-- | include/openssl/rc2.h (renamed from crypto/rc2/rc2.h) | 0 | ||||
-rw-r--r-- | include/openssl/rc4.h (renamed from crypto/rc4/rc4.h) | 0 | ||||
-rw-r--r-- | include/openssl/rc5.h (renamed from crypto/rc5/rc5.h) | 0 | ||||
-rw-r--r-- | include/openssl/ripemd.h (renamed from crypto/ripemd/ripemd.h) | 0 | ||||
-rw-r--r-- | include/openssl/rsa.h (renamed from crypto/rsa/rsa.h) | 0 | ||||
-rw-r--r-- | include/openssl/safestack.h (renamed from crypto/stack/safestack.h) | 0 | ||||
-rw-r--r-- | include/openssl/seed.h (renamed from crypto/seed/seed.h) | 0 | ||||
-rw-r--r-- | include/openssl/sha.h (renamed from crypto/sha/sha.h) | 0 | ||||
-rw-r--r-- | include/openssl/srp.h (renamed from crypto/srp/srp.h) | 0 | ||||
-rw-r--r-- | include/openssl/srtp.h (renamed from ssl/srtp.h) | 0 | ||||
-rw-r--r-- | include/openssl/ssl.h (renamed from ssl/ssl.h) | 0 | ||||
-rw-r--r-- | include/openssl/ssl2.h (renamed from ssl/ssl2.h) | 0 | ||||
-rw-r--r-- | include/openssl/ssl23.h (renamed from ssl/ssl23.h) | 0 | ||||
-rw-r--r-- | include/openssl/ssl3.h (renamed from ssl/ssl3.h) | 0 | ||||
-rw-r--r-- | include/openssl/stack.h (renamed from crypto/stack/stack.h) | 0 | ||||
-rw-r--r-- | include/openssl/store.h (renamed from crypto/store/store.h) | 0 | ||||
-rw-r--r-- | include/openssl/symhacks.h (renamed from crypto/symhacks.h) | 0 | ||||
-rw-r--r-- | include/openssl/tls1.h (renamed from ssl/tls1.h) | 0 | ||||
-rw-r--r-- | include/openssl/ts.h (renamed from crypto/ts/ts.h) | 0 | ||||
-rw-r--r-- | include/openssl/txt_db.h (renamed from crypto/txt_db/txt_db.h) | 0 | ||||
-rw-r--r-- | include/openssl/ui.h (renamed from crypto/ui/ui.h) | 0 | ||||
-rw-r--r-- | include/openssl/whrlpool.h (renamed from crypto/whrlpool/whrlpool.h) | 0 | ||||
-rw-r--r-- | include/openssl/x509.h (renamed from crypto/x509/x509.h) | 0 | ||||
-rw-r--r-- | include/openssl/x509_vfy.h (renamed from crypto/x509/x509_vfy.h) | 0 | ||||
-rw-r--r-- | include/openssl/x509v3.h (renamed from crypto/x509v3/x509v3.h) | 0 | ||||
-rw-r--r-- | test/bftest.c (renamed from crypto/bf/bftest.c) | 0 | ||||
-rw-r--r-- | test/bntest.c (renamed from crypto/bn/bntest.c) | 0 | ||||
-rw-r--r-- | test/casttest.c (renamed from crypto/cast/casttest.c) | 0 | ||||
-rw-r--r-- | test/constant_time_test.c (renamed from crypto/constant_time_test.c) | 0 | ||||
-rw-r--r-- | test/destest.c (renamed from crypto/des/destest.c) | 0 | ||||
-rw-r--r-- | test/dhtest.c (renamed from crypto/dh/dhtest.c) | 0 | ||||
-rw-r--r-- | test/dsatest.c (renamed from crypto/dsa/dsatest.c) | 0 | ||||
-rw-r--r-- | test/ecdhtest.c (renamed from crypto/ecdh/ecdhtest.c) | 0 | ||||
-rw-r--r-- | test/ecdsatest.c (renamed from crypto/ecdsa/ecdsatest.c) | 0 | ||||
-rw-r--r-- | test/ectest.c (renamed from crypto/ec/ectest.c) | 0 | ||||
-rw-r--r-- | test/enginetest.c (renamed from crypto/engine/enginetest.c) | 0 | ||||
-rw-r--r-- | test/evp_extra_test.c (renamed from crypto/evp/evp_extra_test.c) | 0 | ||||
-rw-r--r-- | test/evp_test.c (renamed from crypto/evp/evp_test.c) | 0 | ||||
-rw-r--r-- | test/evptests.txt (renamed from crypto/evp/evptests.txt) | 0 | ||||
-rw-r--r-- | test/exptest.c (renamed from crypto/bn/exptest.c) | 0 | ||||
-rw-r--r-- | test/gost2814789test.c (renamed from engines/ccgost/gost2814789test.c) | 0 | ||||
-rw-r--r-- | test/heartbeat_test.c (renamed from ssl/heartbeat_test.c) | 0 | ||||
-rw-r--r-- | test/hmactest.c (renamed from crypto/hmac/hmactest.c) | 0 | ||||
-rw-r--r-- | test/ideatest.c (renamed from crypto/idea/ideatest.c) | 0 | ||||
-rw-r--r-- | test/jpaketest.c (renamed from crypto/jpake/jpaketest.c) | 0 | ||||
-rw-r--r-- | test/md2test.c (renamed from crypto/md2/md2test.c) | 0 | ||||
-rw-r--r-- | test/md4test.c (renamed from crypto/md4/md4test.c) | 0 | ||||
-rw-r--r-- | test/md5test.c (renamed from crypto/md5/md5test.c) | 0 | ||||
-rw-r--r-- | test/mdc2test.c (renamed from crypto/mdc2/mdc2test.c) | 0 | ||||
-rw-r--r-- | test/p5_crpt2_test.c (renamed from crypto/evp/p5_crpt2_test.c) | 0 | ||||
-rw-r--r-- | test/randtest.c (renamed from crypto/rand/randtest.c) | 0 | ||||
-rw-r--r-- | test/rc2test.c (renamed from crypto/rc2/rc2test.c) | 0 | ||||
-rw-r--r-- | test/rc4test.c (renamed from crypto/rc4/rc4test.c) | 0 | ||||
-rw-r--r-- | test/rc5test.c (renamed from crypto/rc5/rc5test.c) | 0 | ||||
-rw-r--r-- | test/rmdtest.c (renamed from crypto/ripemd/rmdtest.c) | 0 | ||||
-rw-r--r-- | test/rsa_test.c (renamed from crypto/rsa/rsa_test.c) | 0 | ||||
-rw-r--r-- | test/sha1test.c (renamed from crypto/sha/sha1test.c) | 0 | ||||
-rw-r--r-- | test/sha256t.c (renamed from crypto/sha/sha256t.c) | 0 | ||||
-rw-r--r-- | test/sha512t.c (renamed from crypto/sha/sha512t.c) | 0 | ||||
-rw-r--r-- | test/srptest.c (renamed from crypto/srp/srptest.c) | 0 | ||||
-rw-r--r-- | test/ssltest.c (renamed from ssl/ssltest.c) | 0 | ||||
-rw-r--r-- | test/v3nametest.c (renamed from crypto/x509v3/v3nametest.c) | 0 | ||||
-rw-r--r-- | test/wp_test.c (renamed from crypto/whrlpool/wp_test.c) | 0 | ||||
-rwxr-xr-x | util/mkdef.pl | 138 | ||||
-rwxr-xr-x | util/mkstack.pl | 4 |
121 files changed, 129 insertions, 151 deletions
diff --git a/.gitignore b/.gitignore index 2f27dc66c8..9f85632eb0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ /MINFO /TABLE /*.a -/include /*.pc /rehash.time /inc.* @@ -22,17 +21,6 @@ /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 @@ -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 |