Following the license change, modify the boilerplates in include/ and crypto/include/ Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7770)
diff --git a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H b/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H index c350018..e57c0ea 100644 --- a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H +++ b/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H
@@ -1,7 +1,7 @@ /* * Copyright 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/include/internal/__DECC_INCLUDE_PROLOGUE.H b/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H index 9a9c777..a013957 100644 --- a/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H +++ b/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H
@@ -1,7 +1,7 @@ /* * Copyright 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/include/internal/aria.h b/crypto/include/internal/aria.h index 355abe5..4bfbd5a 100644 --- a/crypto/include/internal/aria.h +++ b/crypto/include/internal/aria.h
@@ -2,7 +2,7 @@ * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2017, Oracle and/or its affiliates. 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/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h index 9c9b4d8..1f62063 100644 --- a/crypto/include/internal/asn1_int.h +++ b/crypto/include/internal/asn1_int.h
@@ -1,7 +1,7 @@ /* * Copyright 2015-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/include/internal/async.h b/crypto/include/internal/async.h index dc8e937..f5454f2 100644 --- a/crypto/include/internal/async.h +++ b/crypto/include/internal/async.h
@@ -1,7 +1,7 @@ /* * Copyright 2016-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/include/internal/bn_conf.h.in b/crypto/include/internal/bn_conf.h.in index ec6e4f6..9061d20 100644 --- a/crypto/include/internal/bn_conf.h.in +++ b/crypto/include/internal/bn_conf.h.in
@@ -2,7 +2,7 @@ /* * Copyright 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/include/internal/bn_dh.h b/crypto/include/internal/bn_dh.h index 70ebca2..9077234 100644 --- a/crypto/include/internal/bn_dh.h +++ b/crypto/include/internal/bn_dh.h
@@ -1,7 +1,7 @@ /* * Copyright 2015-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/include/internal/bn_int.h b/crypto/include/internal/bn_int.h index 30be7ef..66e34ec 100644 --- a/crypto/include/internal/bn_int.h +++ b/crypto/include/internal/bn_int.h
@@ -1,7 +1,7 @@ /* * Copyright 2014-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/include/internal/bn_srp.h b/crypto/include/internal/bn_srp.h index d4b282a..897618c 100644 --- a/crypto/include/internal/bn_srp.h +++ b/crypto/include/internal/bn_srp.h
@@ -1,7 +1,7 @@ /* * Copyright 2014-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/include/internal/chacha.h b/crypto/include/internal/chacha.h index 67243f2..7e79e12 100644 --- a/crypto/include/internal/chacha.h +++ b/crypto/include/internal/chacha.h
@@ -1,7 +1,7 @@ /* * Copyright 2015-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/include/internal/cryptlib_int.h b/crypto/include/internal/cryptlib_int.h index 38b5dac..618dadb 100644 --- a/crypto/include/internal/cryptlib_int.h +++ b/crypto/include/internal/cryptlib_int.h
@@ -1,7 +1,7 @@ /* * Copyright 2016-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/include/internal/ctype.h b/crypto/include/internal/ctype.h index a35b12b..adcbc8b 100644 --- a/crypto/include/internal/ctype.h +++ b/crypto/include/internal/ctype.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/include/internal/dso_conf.h.in b/crypto/include/internal/dso_conf.h.in index d6e9d1b..af9e307 100644 --- a/crypto/include/internal/dso_conf.h.in +++ b/crypto/include/internal/dso_conf.h.in
@@ -2,7 +2,7 @@ /* * Copyright 2016-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/include/internal/ec_int.h b/crypto/include/internal/ec_int.h index 182c39c..9d8882d 100644 --- a/crypto/include/internal/ec_int.h +++ b/crypto/include/internal/ec_int.h
@@ -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/include/internal/engine.h b/crypto/include/internal/engine.h index f80ae3e..fac6ed0 100644 --- a/crypto/include/internal/engine.h +++ b/crypto/include/internal/engine.h
@@ -1,7 +1,7 @@ /* * Copyright 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/include/internal/err_int.h b/crypto/include/internal/err_int.h index 44ac944..a2006ca 100644 --- a/crypto/include/internal/err_int.h +++ b/crypto/include/internal/err_int.h
@@ -1,7 +1,7 @@ /* * Copyright 2016-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/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index 1828125..82d1a6b 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h
@@ -1,7 +1,7 @@ /* * Copyright 2015-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/include/internal/lhash.h b/crypto/include/internal/lhash.h index 200ba86..de0c8b0 100644 --- a/crypto/include/internal/lhash.h +++ b/crypto/include/internal/lhash.h
@@ -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/include/internal/md32_common.h b/crypto/include/internal/md32_common.h index 1124e9c..3b16f1b 100644 --- a/crypto/include/internal/md32_common.h +++ b/crypto/include/internal/md32_common.h
@@ -1,7 +1,7 @@ /* * Copyright 1999-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/include/internal/objects.h b/crypto/include/internal/objects.h index 76e1b4d..7db718f 100644 --- a/crypto/include/internal/objects.h +++ b/crypto/include/internal/objects.h
@@ -1,7 +1,7 @@ /* * Copyright 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/include/internal/poly1305.h b/crypto/include/internal/poly1305.h index 5fef239..46f834e 100644 --- a/crypto/include/internal/poly1305.h +++ b/crypto/include/internal/poly1305.h
@@ -1,7 +1,7 @@ /* * Copyright 2015-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/include/internal/rand_int.h b/crypto/include/internal/rand_int.h index 888cab1..5098125 100644 --- a/crypto/include/internal/rand_int.h +++ b/crypto/include/internal/rand_int.h
@@ -1,14 +1,14 @@ /* * Copyright 2016-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 */ /* - * Licensed under the OpenSSL licenses, (the "License"); + * Licensed under the Apache License 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * https://www.openssl.org/source/license.html
diff --git a/crypto/include/internal/sha.h b/crypto/include/internal/sha.h index 458a75e..3b5ac03 100644 --- a/crypto/include/internal/sha.h +++ b/crypto/include/internal/sha.h
@@ -2,7 +2,7 @@ * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2018, Oracle and/or its affiliates. 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/include/internal/siphash.h b/crypto/include/internal/siphash.h index 9573680..1575141 100644 --- a/crypto/include/internal/siphash.h +++ b/crypto/include/internal/siphash.h
@@ -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/include/internal/sm2.h b/crypto/include/internal/sm2.h index 5c5cd4b..dad70e6 100644 --- a/crypto/include/internal/sm2.h +++ b/crypto/include/internal/sm2.h
@@ -3,7 +3,7 @@ * Copyright 2017 Ribose Inc. All Rights Reserved. * Ported from Ribose contributions from Botan. * - * 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/include/internal/sm2err.h b/crypto/include/internal/sm2err.h index a4db1b7..2f404e0 100644 --- a/crypto/include/internal/sm2err.h +++ b/crypto/include/internal/sm2err.h
@@ -2,7 +2,7 @@ * Generated by util/mkerr.pl DO NOT EDIT * 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
diff --git a/crypto/include/internal/sm3.h b/crypto/include/internal/sm3.h index 27eb471..cb0f28d 100644 --- a/crypto/include/internal/sm3.h +++ b/crypto/include/internal/sm3.h
@@ -2,7 +2,7 @@ * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2017 Ribose Inc. 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/include/internal/sm4.h b/crypto/include/internal/sm4.h index f1f157e..f2e1728 100644 --- a/crypto/include/internal/sm4.h +++ b/crypto/include/internal/sm4.h
@@ -2,7 +2,7 @@ * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2017 Ribose Inc. 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/include/internal/store.h b/crypto/include/internal/store.h index f5013dc..b2e9dbf 100644 --- a/crypto/include/internal/store.h +++ b/crypto/include/internal/store.h
@@ -1,7 +1,7 @@ /* * Copyright 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/include/internal/store_int.h b/crypto/include/internal/store_int.h index 6f31e01..67f2526 100644 --- a/crypto/include/internal/store_int.h +++ b/crypto/include/internal/store_int.h
@@ -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/include/internal/x509_int.h b/crypto/include/internal/x509_int.h index b53c2b0..82d7bbf 100644 --- a/crypto/include/internal/x509_int.h +++ b/crypto/include/internal/x509_int.h
@@ -1,7 +1,7 @@ /* * Copyright 2015-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