[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  a9f3f1ccbbf84f4ef804ede82d4b072492b54c03 (commit)
      from  dfee8626a8f6c1e23ab270a6fc20b4d1ba145392 (commit)


- Log -----------------------------------------------------------------
commit a9f3f1ccbbf84f4ef804ede82d4b072492b54c03
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Jul 4 07:48:45 2018 +1000

    Tests for MD5-SHA1 combined digest.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6642)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/30-test_evp_data/evpdigest.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/recipes/30-test_evp_data/evpdigest.txt b/test/recipes/30-test_evp_data/evpdigest.txt
index c0b9d2d..ae3f7e6 100644
--- a/test/recipes/30-test_evp_data/evpdigest.txt
+++ b/test/recipes/30-test_evp_data/evpdigest.txt
@@ -257,6 +257,20 @@ Digest = MD5
 Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930
 Output = 57edf4a22be3c955ac49da2e2107b67a
 
+Title = MD5-SHA1
+
+Digest = MD5-SHA1
+Input =
+Output = d41d8cd98f00b204e9800998ecf8427eda39a3ee5e6b4b0d3255bfef95601890afd80709
+
+Digest = MD5-SHA1
+Input = "abc"
+Output = 900150983cd24fb0d6963f7d28e17f72a9993e364706816aba3e25717850c26c9cd0d89d
+
+Digest = MD5-SHA1
+Input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+Output = 8215ef0796a20bcaaae116d3876c664a84983e441c3bd26ebaae4aa1f95129e5e54670f1
+
 Title = MD4 tests
 
 Digest = MD4