[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8de396f875edc47fbceeef5a31b7b64b297648de (commit)
      from  03d770d935b93417334c0a93c58409b5587c7c8c (commit)


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

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

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

Summary of changes:
 crypto/cmac/cm_ameth.c | 2 +-
 crypto/cmac/cm_meth.c  | 2 +-
 crypto/cmac/cmac.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/cmac/cm_ameth.c b/crypto/cmac/cm_ameth.c
index 7126584..ed513b1 100644
--- a/crypto/cmac/cm_ameth.c
+++ b/crypto/cmac/cm_ameth.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2010-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
diff --git a/crypto/cmac/cm_meth.c b/crypto/cmac/cm_meth.c
index 7089936..3f20e6c 100644
--- a/crypto/cmac/cm_meth.c
+++ b/crypto/cmac/cm_meth.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
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 6989c32..79936a5 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2010-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