[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0c4fa1f10de91573a9cf2b3234a5baf2bb00e53d (commit)
      from  367ace6870e9cbc8fe21dff2ffe4673a98ea42f8 (commit)


- Log -----------------------------------------------------------------
commit 0c4fa1f10de91573a9cf2b3234a5baf2bb00e53d
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:23:18 2018 +0100

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

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

Summary of changes:
 crypto/buffer/buf_err.c | 2 +-
 crypto/buffer/buffer.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 7e6e532..00b137d 100644
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * Copyright 1995-2017 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/buffer/buffer.c b/crypto/buffer/buffer.c
index 72258ab..6589a07 100644
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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