X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=.gitignore;h=bf4a9dedf2dbcb3748b72233dfcc06f81a5aa965;hp=508fe0b30c3ba62f9ceff34b7b8ea29b77728fe3;hb=e1dbf7f431b996010844e220d3200cbf2122dbb3;hpb=4a2c4c1ab81bf2dbdcab0f33845e0e842a57182a

diff --git a/.gitignore b/.gitignore
index 508fe0b30c..bf4a9dedf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,4 @@
-# Object files
-*.o
-*.obj
-
-# editor artefacts
-*.swp
-.#*
-\#*#
-*~
+# Ignore editor artefacts
 /.dir-locals.el
 
 # Top level excludes
@@ -24,48 +16,23 @@
 
 # *all* Makefiles
 Makefile
-
-/test/*.ss
-/test/*.srl
-/test/.rnd
-/test/test*.pem
-/test/newkey.pem
-/test/*.log
-
-# Certificate symbolic links
-*.0
+# ... except in demos
+!/demos/*/Makefile
 
 # Links under apps
 /apps/CA.pl
 /apps/tsget
+/apps/tsget.pl
 /apps/md4.c
 
-
 # Auto generated headers
 /crypto/buildinf.h
 /crypto/include/internal/*_conf.h
 /openssl/include/opensslconf.h
 /util/domd
 
-# Auto generated assembly language source files
-*.s
-!/crypto/*/asm/*.s
-/crypto/arm*.S
-/crypto/*/*.S
-*.asm
-!/crypto/*/asm/*.asm
-
 # Executables
 /apps/openssl
-/fuzz/asn1
-/fuzz/asn1parse
-/fuzz/bignum
-/fuzz/bndiv
-/fuzz/conf
-/fuzz/cms
-/fuzz/ct
-/fuzz/server
-/fuzz/x509
 /test/sha256t
 /test/sha512t
 /test/gost2814789t
@@ -82,31 +49,39 @@ Makefile
 /test/fips_test_suite
 /test/ssltest_old
 /test/x509aux
-*.so*
-*.dylib*
-*.dll*
-*.exe
-*.pyc
-# Exceptions
-!/test/bctest
-!/crypto/des/times/486-50.sol
+/test/v3ext
+/test/ossl_shim/ossl_shim
+
+# Certain files that get created by tests on the fly
+/test/*.ss
+/test/*.srl
+/test/.rnd
+/test/test*.pem
+/test/newkey.pem
+/test/*.log
+/test/buildtest_*
+
+# Fuzz stuff.
+# Anything without an extension is an executable on Unix, so we keep files
+# with extensions.  And we keep the corpora subddir versioned as well.
+# Anything more generic with extensions that should be ignored will be taken
+# care of by general ignores for those extensions (*.o, *.obj, *.exe, ...)
+/fuzz/*
+!/fuzz/README*
+!/fuzz/corpora
+!/fuzz/*.*
 
 # Misc auto generated files
 /include/openssl/opensslconf.h
 /tools/c_rehash
-/crypto/**/lib
-/engines/**/lib
-/ssl/**/lib
-Makefile.save
-*.bak
+/tools/c_rehash.pl
+/util/shlib_wrap.sh
 /tags
 /TAGS
-cscope.*
-*.d
 /crypto.map
 /ssl.map
 
-# Windows
+# Windows (legacy)
 /tmp32
 /tmp32.dbg
 /tmp32dll
@@ -150,3 +125,56 @@ cscope.*
 /test/fips_shatest.c
 /test/fips_test_suite.c
 /test/shatest.c
+
+##### Generic patterns
+# Auto generated assembly language source files
+*.s
+!/crypto/*/asm/*.s
+/crypto/arm*.S
+/crypto/*/*.S
+*.asm
+!/crypto/*/asm/*.asm
+
+# Object files
+*.o
+*.obj
+
+# editor artefacts
+*.swp
+.#*
+\#*#
+*~
+
+# Certificate symbolic links
+*.0
+
+# All kinds of executables
+*.so
+*.so.*
+*.dylib
+*.dylib.*
+*.dll
+*.dll.*
+*.exe
+*.pyc
+*.exp
+*.lib
+*.pdb
+*.ilk
+*.def
+*.rc
+*.res
+
+# Misc generated stuff
+Makefile.save
+/crypto/**/lib
+/engines/**/lib
+/ssl/**/lib
+*.bak
+cscope.*
+*.d
+pod2htmd.tmp
+
+# Windows manifest files
+*.manifest
+doc-nits