[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e06785a5154cad12e8192bc2aaed0747ce7d23aa (commit)
      from  7bb803e85b8c64a5a4ed65d7a07efd8596a8438f (commit)


- Log -----------------------------------------------------------------
commit e06785a5154cad12e8192bc2aaed0747ce7d23aa
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:42:17 2018 +0100

    Following the license change, modify the boilerplates in crypto/kmac/
    
    [skip ci]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7797)

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

Summary of changes:
 crypto/kmac/kmac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/kmac/kmac.c b/crypto/kmac/kmac.c
index db0a42c..01a4b6a 100644
--- a/crypto/kmac/kmac.c
+++ b/crypto/kmac/kmac.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html