[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  134148276b1d27342210974173ac8db2920e6245 (commit)
      from  a598ed0dc444e010973c51e024e9b497a9340fee (commit)


- Log -----------------------------------------------------------------
commit 134148276b1d27342210974173ac8db2920e6245
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:56:12 2018 +0100

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

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

Summary of changes:
 crypto/siphash/siphash.c       | 2 +-
 crypto/siphash/siphash_ameth.c | 2 +-
 crypto/siphash/siphash_local.h | 2 +-
 crypto/siphash/siphash_meth.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/siphash/siphash.c b/crypto/siphash/siphash.c
index be74a38..9d91178 100644
--- a/crypto/siphash/siphash.c
+++ b/crypto/siphash/siphash.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2017-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/siphash/siphash_ameth.c b/crypto/siphash/siphash_ameth.c
index c0ab7ef..ba7679d 100644
--- a/crypto/siphash/siphash_ameth.c
+++ b/crypto/siphash/siphash_ameth.c
@@ -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/siphash/siphash_local.h b/crypto/siphash/siphash_local.h
index 5ad3476..4841284 100644
--- a/crypto/siphash/siphash_local.h
+++ b/crypto/siphash/siphash_local.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/siphash/siphash_meth.c b/crypto/siphash/siphash_meth.c
index 7a5457d..37cb286 100644
--- a/crypto/siphash/siphash_meth.c
+++ b/crypto/siphash/siphash_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