[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  39c44eee7fd89ce13e805873e1c43bd8e488a93f (commit)
      from  2a7b6f3908dce70c4fbb8686425e202d1b50a819 (commit)


- Log -----------------------------------------------------------------
commit 39c44eee7fd89ce13e805873e1c43bd8e488a93f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:54:23 2018 +0100

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

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

Summary of changes:
 crypto/seed/seed.c      | 2 +-
 crypto/seed/seed_cbc.c  | 2 +-
 crypto/seed/seed_cfb.c  | 2 +-
 crypto/seed/seed_ecb.c  | 2 +-
 crypto/seed/seed_locl.h | 2 +-
 crypto/seed/seed_ofb.c  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index d62da91..a73ec44 100644
--- a/crypto/seed/seed.c
+++ b/crypto/seed/seed.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2007-2016 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/seed/seed_cbc.c b/crypto/seed/seed_cbc.c
index c9a4fe2..26116ab 100644
--- a/crypto/seed/seed_cbc.c
+++ b/crypto/seed/seed_cbc.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2007-2016 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/seed/seed_cfb.c b/crypto/seed/seed_cfb.c
index 2aee1ff..b8ee9e9 100644
--- a/crypto/seed/seed_cfb.c
+++ b/crypto/seed/seed_cfb.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2007-2016 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/seed/seed_ecb.c b/crypto/seed/seed_ecb.c
index b6e301c..d7f34ec 100644
--- a/crypto/seed/seed_ecb.c
+++ b/crypto/seed/seed_ecb.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2007-2016 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/seed/seed_locl.h b/crypto/seed/seed_locl.h
index ac2950d..9be89b2 100644
--- a/crypto/seed/seed_locl.h
+++ b/crypto/seed/seed_locl.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2007-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/seed/seed_ofb.c b/crypto/seed/seed_ofb.c
index b455540..e556c44 100644
--- a/crypto/seed/seed_ofb.c
+++ b/crypto/seed/seed_ofb.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2007-2016 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