Merge branch 'master' of github.com:jedisct1/libsodium

* 'master' of github.com:jedisct1/libsodium:
  Make room for several secretstream
  Fix .gitignore

.gitignore

@@ -84,9 +84,9 @@ test-driver
 test/default/*.asm.js
 test/default/*.res
 test/default/*.trs
+test/default/aead_aegis256
 test/default/aead_aes256gcm
 test/default/aead_aes256gcm2
-test/default/aead_aesgis256
 test/default/aead_chacha20poly1305
 test/default/aead_chacha20poly13052
 test/default/aead_xchacha20poly1305
@@ -148,7 +148,7 @@ test/default/secretbox7
 test/default/secretbox8
 test/default/secretbox_easy
 test/default/secretbox_easy2
-test/default/secretstream
+test/default/secretstream_xchacha20poly1305
 test/default/shorthash
 test/default/sign
 test/default/siphashx24

test/default/Makefile.am

@@ -68,7 +68,7 @@ EXTRA_DIST = \
 	secretbox8.exp \
 	secretbox_easy.exp \
 	secretbox_easy2.exp \
-	secretstream.exp \
+	secretstream_xchacha20poly1305.exp \
 	shorthash.exp \
 	sign.exp \
 	siphashx24.exp \
@@ -149,7 +149,7 @@ DISTCLEANFILES = \
 	secretbox8.res \
 	secretbox_easy.res \
 	secretbox_easy2.res \
-	secretstream.res \
+	secretstream_xchacha20poly1305.res \
 	shorthash.res \
 	sign.res \
 	siphashx24.res \
@@ -233,7 +233,7 @@ TESTS_TARGETS = \
 	secretbox8 \
 	secretbox_easy \
 	secretbox_easy2 \
-	secretstream \
+	secretstream_xchacha20poly1305 \
 	shorthash \
 	sign \
 	sodium_core \
@@ -447,8 +447,8 @@ secretbox_easy_LDADD      = $(TESTS_LDADD)
 secretbox_easy2_SOURCE    = cmptest.h secretbox_easy2.c
 secretbox_easy2_LDADD     = $(TESTS_LDADD)
 
-secretstream_SOURCE       = cmptest.h secretstream.c
-secretstream_LDADD        = $(TESTS_LDADD)
+secretstream_xchacha20poly1305_SOURCE = cmptest.h secretstream_xchacha20poly1305.c
+secretstream_xchacha20poly1305_LDADD  = $(TESTS_LDADD)
 
 shorthash_SOURCE          = cmptest.h shorthash.c
 shorthash_LDADD           = $(TESTS_LDADD)

test/default/secretstream_xchacha20poly1305.c

@@ -1,5 +1,5 @@
 
-#define TEST_NAME "secretstream"
+#define TEST_NAME "secretstream_xchacha20poly1305"
 #include "cmptest.h"
 
 int