Apply OpenSSL exception to Hippotat files

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Cargo.toml b/Cargo.toml
index 849d8da0ac4256324a760047452e0d30d857491f..639aa1135e6d62b91df0c81a2473b5a8a5ab1240 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 [package]

diff --git a/Makefile b/Makefile
index 2fee95b736fbfc2d21b3a779bd256231e8213668..ffb76d8db2cd16d5869624396a7e6be1ca43c901 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Copyright 2020-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 SHELL=/bin/bash

diff --git a/client/client.rs b/client/client.rs
index f623771c203e1d6ec498650b35412c987a447071..17dee6b77249204e825815aed98594191e297290 100644 (file)
--- a/client/client.rs
+++ b/client/client.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use hippotat::prelude::*;

diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 4da04be644a5dce67eea42a0ec8fc8a7b46deed8..73b746973e30740bd0aa273b946bd5597357145e 100644 (file)
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -1,5 +1,5 @@
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 [package]

diff --git a/macros/macros.rs b/macros/macros.rs
index 22b778dd662bd724e4ce02f687f047e6794ec312..060fe7004e20cab3fb9466a5df793954ca185240 100644 (file)
--- a/macros/macros.rs
+++ b/macros/macros.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use syn::{parse_macro_input, parse_quote};

diff --git a/server/daemon.rs b/server/daemon.rs
index c5f6155fb36c482a0c465ab25631e50a528b7309..3d87a688533e080f13f3b9c366b0f21535dc2017 100644 (file)
--- a/server/daemon.rs
+++ b/server/daemon.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use std::convert::TryInto;

diff --git a/server/server.rs b/server/server.rs
index 3fd58a491bdcfa6d092ab310813e3f0d4fc9ad46..b30e2da49d19dff29faf78649f9a6156fa581e81 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use hippotat::prelude::*;

diff --git a/server/slocal.rs b/server/slocal.rs
index ab2f2fc1ff4e34988c16ff55a4ee50b081833d42..32d769d96b2154882f360b335f232556142b185e 100644 (file)
--- a/server/slocal.rs
+++ b/server/slocal.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use super::*;

diff --git a/server/suser.rs b/server/suser.rs
index b51ea76e126eec1863add6cd73dcc10cc00621a4..68cb4a4e11d249c807b8c3225fd0fd471618da91 100644 (file)
--- a/server/suser.rs
+++ b/server/suser.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use super::*;

diff --git a/server/sweb.rs b/server/sweb.rs
index bd9316acb6a8583142c3c59d71f8cca11c2e557d..ecdcc57aaff8455c7cabbe5c86dfe129db7f205c 100644 (file)
--- a/server/sweb.rs
+++ b/server/sweb.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use super::*;

diff --git a/src/config.rs b/src/config.rs
index beedd5f73ba5b8d8c861f045d4bc8a0c3c380d42..a668c06c83598c9bfef1af529c7cd155e56c96cd 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/ipif.rs b/src/ipif.rs
index 3b4da9c420984b90fc93f7d6b99471a3d3299335..27432a71b1fb754ac340f0ff494deee2664d9c70 100644 (file)
--- a/src/ipif.rs
+++ b/src/ipif.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/lib.rs b/src/lib.rs
index fc641d266f6655c849f815f8d830c7752172f0b3..16ef74fc6af1a0df609e2b68fc846fd486c48375 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 pub mod prelude;

diff --git a/src/multipart.rs b/src/multipart.rs
index c2f0ff4faa872a80fa6b06081518baaf2c19a4e3..d66342b66faa5512234815054eaab26d058eb614 100644 (file)
--- a/src/multipart.rs
+++ b/src/multipart.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/prelude.rs b/src/prelude.rs
index a692d06942134dd8a13a66ae25b1c4157def8415..9f461c78d37d2c3c0cf76ab9dd9d0a7198ea70db 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 pub use std::array;

diff --git a/src/queue.rs b/src/queue.rs
index 49fd3c4d15451ebddeb297b2d83ee0f1fcfb26ed..c78413cdcae5519573eb22b4ae7560d1ac6de1c3 100644 (file)
--- a/src/queue.rs
+++ b/src/queue.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/rope.rs b/src/rope.rs
index 12054ab7fed49ab5c955354ca795ab3428fc8d89..8aad943e1aee320f696c1617d84753389e138777 100644 (file)
--- a/src/rope.rs
+++ b/src/rope.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/slip.rs b/src/slip.rs
index 64760144615f152e3f90c77c1296fe876470a917..c70d6583528e7546687a91bfd0bfb563563daa04 100644 (file)
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/types.rs b/src/types.rs
index c5b4737ad58f66543635bbd51d3dc1b23adb7175..162b61e0d5eb7ea8ddf9e1d1d827e136e146739d 100644 (file)
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/src/utils.rs b/src/utils.rs
index e005d6860d8a3f168c24d5c5cb18469afebe3b94..7911976e7d36d640ffd5fb76a671564af6c9325b 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;

diff --git a/test/capture-log b/test/capture-log
index 3b4c841581d40fda1ffc9b37b96f66d18718f1b9..7eb0bab226070fe7b55271521a6a8edb83ae9ceb 100755 (executable)
--- a/test/capture-log
+++ b/test/capture-log
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2020-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 set -e
 

diff --git a/test/common b/test/common
index 4bbd1fdf224e1f1f57661800f66108f9c633eb6e..14b8d1e981909513b62f192cecb3852442a049ac 100644 (file)
--- a/test/common
+++ b/test/common
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -x

diff --git a/test/go-with-unshare b/test/go-with-unshare
index 96f983fe21ab357a31066e65c86ce138c325013a..ac77a98a2fe8d661a163d492e33beeb68634554f 100755 (executable)
--- a/test/go-with-unshare
+++ b/test/go-with-unshare
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -e

diff --git a/test/netns-setup b/test/netns-setup
index d91e0f98d2a1ea0e27b736f6d13344caf209121c..38ec098360140a6553da0dca3dd1939d8ee16a03 100755 (executable)
--- a/test/netns-setup
+++ b/test/netns-setup
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -ex

diff --git a/test/t-basic b/test/t-basic
index 046e17e1770d8bca40fc5337d499326cd651ff39..ab0342358093a8e7be631307d24f308894df9ef9 100755 (executable)
--- a/test/t-basic
+++ b/test/t-basic
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -e

diff --git a/test/test.cfg b/test/test.cfg
index d74e8d38c40031797253f9edcb00987b5af2a128..423643fa23f165e2605aa588a760316a48f2a0c4 100644 (file)
--- a/test/test.cfg
+++ b/test/test.cfg
@@ -1,5 +1,5 @@
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 [SERVER]

diff --git a/test/with-unshare b/test/with-unshare
index 5d29c8765f60d3b66a054194e8a20d87b97efd7d..ba16bf72df0f26a8e41f058a86d1fdfa24936056 100755 (executable)
--- a/test/with-unshare
+++ b/test/with-unshare
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -e

diff --git a/uml/psusan-uml-run b/uml/psusan-uml-run
index 36a4b530e53d4f177bfc7eaa3c9fb71ec54e1379..e6c879a72618201293e383b36e86a190e56e521a 100755 (executable)
--- a/uml/psusan-uml-run
+++ b/uml/psusan-uml-run
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -e

diff --git a/uml/psusan-uml-setup b/uml/psusan-uml-setup
index 5f4afe757f143ad15ee4a1b2dbb5205576009028..136403aafac63c75bf7777da3d3490a682edd612 100755 (executable)
--- a/uml/psusan-uml-setup
+++ b/uml/psusan-uml-setup
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 set -e

diff --git a/uml/run-test b/uml/run-test
index 07932d49b26a353816f7943cf89a923038ff03ab..b8c4e60f8e334eeb9a9a1518ce27b64fda6dea44 100755 (executable)
--- a/uml/run-test
+++ b/uml/run-test
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 # There is NO WARRANTY.
 
 # *** This does not work. ***