X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.gitignore;h=ac1c4c689ec5d6cc7df9d0473ca939b2383c18d6;hp=4a624e819dc30c0870e7c1c5a3326090079361df;hb=d6dfa55038fdb948cb214adf634f379eeb859f5d;hpb=41c9cfbc4ee7345547fb98cccb8511f082f0910b

diff --git a/.gitignore b/.gitignore
index 4a624e819d..ac1c4c689e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,15 +5,15 @@
 # editor artefacts
 *.swp
 .#*
-#*#
+\#*#
 *~
 
 # Top level excludes
 /Makefile.bak
 /Makefile
 /MINFO
+/TABLE
 /*.a
-/include
 /*.pc
 /rehash.time
 /inc.*
@@ -21,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
@@ -52,6 +41,7 @@
 
 # Auto generated assembly language source files
 *.s
+*.S
 !/crypto/bn/asm/pa-risc2.s
 !/crypto/bn/asm/pa-risc2W.s
 crypto/aes/asm/a_win32.asm
@@ -93,8 +83,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
@@ -104,8 +94,12 @@ cscope.out
 *.d
 
 # Windows
+/tmp32
+/tmp32.dbg
 /tmp32dll
 /tmp32dll.dbg
+/out32
+/out32.dbg
 /out32dll
 /out32dll.dbg
 /inc32
@@ -116,3 +110,29 @@ ms/nt.mak
 ms/ntdll.mak
 ms/ssleay32.def
 ms/version32.rc
+
+# Files created on other branches that are not held in git, and are not
+# needed on this branch
+include/openssl/asn1_mac.h
+include/openssl/des_old.h
+include/openssl/fips.h
+include/openssl/fips_rand.h
+include/openssl/krb5_asn.h
+include/openssl/kssl.h
+include/openssl/pq_compat.h
+include/openssl/ssl23.h
+include/openssl/tmdiff.h
+include/openssl/ui_compat.h
+test/fips_aesavs.c
+test/fips_desmovs.c
+test/fips_dsatest.c
+test/fips_dssvs.c
+test/fips_hmactest.c
+test/fips_randtest.c
+test/fips_rngvs.c
+test/fips_rsagtest.c
+test/fips_rsastest.c
+test/fips_rsavtest.c
+test/fips_shatest.c
+test/fips_test_suite.c
+test/shatest.c