X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.gitignore;h=8178a2214b41b29cb618d835a65f20c3dfb74cc7;hp=a9fcf4ef669130f777bb0a519a03a7cb3642369b;hb=e863d92010f250164d0f90cb61e51e3d9429942a;hpb=bba43f3f4398ed27048a253c372a64b3951877b8

diff --git a/.gitignore b/.gitignore
index a9fcf4ef66..8178a2214b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,33 @@
 # Object files
 *.o
+*.obj
 
 # editor artefacts
 *.swp
 .#*
-#*#
+\#*#
 *~
+/.dir-locals.el
 
 # Top level excludes
 /Makefile.bak
 /Makefile
+/MINFO
+/TABLE
 /*.a
-/include
 /*.pc
 /rehash.time
-
-# 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
+/inc.*
+/makefile.*
+/out.*
+/tmp.*
 
 /test/*.ss
 /test/*.srl
 /test/.rnd
 /test/test*.pem
 /test/newkey.pem
+/test/*.log
 
 # Certificate symbolic links
 *.0
@@ -45,13 +43,17 @@
 
 # Auto generated assembly language source files
 *.s
-!/crypto/bn/asm/pa-risc2.s
-!/crypto/bn/asm/pa-risc2W.s
+!/crypto/*/asm/*.s
+/crypto/arm*.S
+/crypto/*/*.S
+*.asm
+!/crypto/*/asm/*.asm
 
 # Executables
 /apps/openssl
 /test/sha256t
 /test/sha512t
+/test/gost2814789t
 /test/*test
 /test/fips_aesavs
 /test/fips_desmovs
@@ -65,13 +67,64 @@
 *.so*
 *.dylib*
 *.dll*
+*.exe
 # Exceptions
 !/test/bctest
 !/crypto/des/times/486-50.sol
 
 # Misc auto generated files
+include/openssl/opensslconf.h
 /tools/c_rehash
-/test/evptests.txt
 lib
 Makefile.save
 *.bak
+tags
+TAGS
+cscope.out
+*.d
+crypto.map
+ssl.map
+
+# Windows
+/tmp32
+/tmp32.dbg
+/tmp32dll
+/tmp32dll.dbg
+/out32
+/out32.dbg
+/out32dll
+/out32dll.dbg
+/inc32
+/MINFO
+ms/bcb.mak
+ms/libeay32.def
+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