X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.gitignore;h=1ac7f75cba7637a6b9ed72fb65a6f160f72bfc31;hp=1d5e75b0607fbc606be2639341da3b5367f4e1ba;hb=82c494276df9f594064688c920c4431c85759121;hpb=448e6f060e3ae034282f18cb7868f372cf276aaf

diff --git a/.gitignore b/.gitignore
index 1d5e75b060..1ac7f75cba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,8 @@
 /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
@@ -54,6 +43,21 @@
 *.s
 !/crypto/bn/asm/pa-risc2.s
 !/crypto/bn/asm/pa-risc2W.s
+crypto/aes/asm/a_win32.asm
+crypto/bf/asm/b_win32.asm
+crypto/bn/asm/bn_win32.asm
+crypto/bn/asm/co_win32.asm
+crypto/bn/asm/mt_win32.asm
+crypto/cast/asm/c_win32.asm
+crypto/cpu_win32.asm
+crypto/des/asm/d_win32.asm
+crypto/des/asm/y_win32.asm
+crypto/md5/asm/m5_win32.asm
+crypto/rc4/asm/r4_win32.asm
+crypto/rc5/asm/r5_win32.asm
+crypto/ripemd/asm/rm_win32.asm
+crypto/sha/asm/s1_win32.asm
+crypto/sha/asm/sha512-sse2.asm
 
 # Executables
 /apps/openssl
@@ -78,8 +82,8 @@
 !/crypto/des/times/486-50.sol
 
 # Misc auto generated files
+include/openssl/opensslconf.h
 /tools/c_rehash
-/test/evptests.txt
 lib
 Makefile.save
 *.bak
@@ -89,8 +93,14 @@ cscope.out
 *.d
 
 # Windows
+/tmp32
+/tmp32.dbg
 /tmp32dll
+/tmp32dll.dbg
+/out32
+/out32.dbg
 /out32dll
+/out32dll.dbg
 /inc32
 /MINFO
 ms/bcb.mak
@@ -99,3 +109,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