Merge branch 'master' of openssl.net:openssl

diff --git a/.gitignore b/.gitignore
index a9fcf4ef669130f777bb0a519a03a7cb3642369b..81353625852371b3dbf34e9e22cf6a7262fd2c83 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@
 /apps/openssl
 /test/sha256t
 /test/sha512t
+/test/gost2814789t
 /test/*test
 /test/fips_aesavs
 /test/fips_desmovs