diff --git a/service/kbupd/benches/common.rs b/service/kbupd/benches/common.rs
index 94cabf2..47bd84a 100644
--- a/service/kbupd/benches/common.rs
+++ b/service/kbupd/benches/common.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
extern crate x86;
diff --git a/service/kbupd/build.rs b/service/kbupd/build.rs
index 19dee48..52db514 100644
--- a/service/kbupd/build.rs
+++ b/service/kbupd/build.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
fn main() {
println!("cargo:rustc-link-search=native=./lib");
diff --git a/service/kbupd/src/actor.rs b/service/kbupd/src/actor.rs
index 6c426c3..942e759 100644
--- a/service/kbupd/src/actor.rs
+++ b/service/kbupd/src/actor.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use futures::future;
use futures::prelude::*;
diff --git a/service/kbupd/src/api/auth/anonymous_user.rs b/service/kbupd/src/api/auth/anonymous_user.rs
index ee3714d..bbd0571 100644
--- a/service/kbupd/src/api/auth/anonymous_user.rs
+++ b/service/kbupd/src/api/auth/anonymous_user.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fmt;
diff --git a/service/kbupd/src/api/auth/mod.rs b/service/kbupd/src/api/auth/mod.rs
index 4ebd4a6..beefb8f 100644
--- a/service/kbupd/src/api/auth/mod.rs
+++ b/service/kbupd/src/api/auth/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod anonymous_user;
pub mod signal_user;
diff --git a/service/kbupd/src/api/auth/signal_user.rs b/service/kbupd/src/api/auth/signal_user.rs
index 5a47499..3cf82b0 100644
--- a/service/kbupd/src/api/auth/signal_user.rs
+++ b/service/kbupd/src/api/auth/signal_user.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fmt;
use std::str;
diff --git a/service/kbupd/src/api/listener.rs b/service/kbupd/src/api/listener.rs
index 19c1f06..f2461d9 100644
--- a/service/kbupd/src/api/listener.rs
+++ b/service/kbupd/src/api/listener.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::net::{ToSocketAddrs};
diff --git a/service/kbupd/src/api/mod.rs b/service/kbupd/src/api/mod.rs
index 439573f..d57012d 100644
--- a/service/kbupd/src/api/mod.rs
+++ b/service/kbupd/src/api/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod auth;
pub mod listener;
diff --git a/service/kbupd/src/api/service.rs b/service/kbupd/src/api/service.rs
index 7a0df6b..cd1d3d5 100644
--- a/service/kbupd/src/api/service.rs
+++ b/service/kbupd/src/api/service.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::ops::{Deref};
use std::sync::{Arc};
diff --git a/service/kbupd/src/backup/manager.rs b/service/kbupd/src/backup/manager.rs
index 4be4e68..1cc7550 100644
--- a/service/kbupd/src/backup/manager.rs
+++ b/service/kbupd/src/backup/manager.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::convert::{TryInto};
use std::sync::{Arc};
diff --git a/service/kbupd/src/backup/mod.rs b/service/kbupd/src/backup/mod.rs
index f75c76a..538d11b 100644
--- a/service/kbupd/src/backup/mod.rs
+++ b/service/kbupd/src/backup/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod manager;
pub mod request_manager;
diff --git a/service/kbupd/src/backup/request_manager.rs b/service/kbupd/src/backup/request_manager.rs
index 84afbef..df10f58 100644
--- a/service/kbupd/src/backup/request_manager.rs
+++ b/service/kbupd/src/backup/request_manager.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::{hash_map, HashMap, VecDeque};
use std::time::{Duration};
diff --git a/service/kbupd/src/bin/kbupctl.rs b/service/kbupd/src/bin/kbupctl.rs
index b9b549b..c5e8308 100644
--- a/service/kbupd/src/bin/kbupctl.rs
+++ b/service/kbupd/src/bin/kbupctl.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::*;
use std::convert::TryInto;
diff --git a/service/kbupd/src/constants.rs b/service/kbupd/src/constants.rs
index cd679ae..6e7af24 100644
--- a/service/kbupd/src/constants.rs
+++ b/service/kbupd/src/constants.rs
@@ -1,18 +1,8 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub const METRICS_NAME: &'static str = "signal";
diff --git a/service/kbupd/src/control.rs b/service/kbupd/src/control.rs
index 9362dc0..1df43a5 100644
--- a/service/kbupd/src/control.rs
+++ b/service/kbupd/src/control.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::convert::{TryInto};
use std::io;
diff --git a/service/kbupd/src/enclave/attestation_manager.rs b/service/kbupd/src/enclave/attestation_manager.rs
index 16c16e8..2e5177c 100644
--- a/service/kbupd/src/enclave/attestation_manager.rs
+++ b/service/kbupd/src/enclave/attestation_manager.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::{HashMap};
diff --git a/service/kbupd/src/enclave/enclave.rs b/service/kbupd/src/enclave/enclave.rs
index 770869b..db6c8c2 100644
--- a/service/kbupd/src/enclave/enclave.rs
+++ b/service/kbupd/src/enclave/enclave.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use crate::enclave::attestation_manager::AttestationManager;
use std::array::{TryFromSliceError};
diff --git a/service/kbupd/src/enclave/enclave_manager.rs b/service/kbupd/src/enclave/enclave_manager.rs
index 5d90c48..4dadc2b 100644
--- a/service/kbupd/src/enclave/enclave_manager.rs
+++ b/service/kbupd/src/enclave/enclave_manager.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::{HashMap};
use std::sync::mpsc;
diff --git a/service/kbupd/src/enclave/error.rs b/service/kbupd/src/enclave/error.rs
index 0b7f593..ae59786 100644
--- a/service/kbupd/src/enclave/error.rs
+++ b/service/kbupd/src/enclave/error.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fmt;
diff --git a/service/kbupd/src/enclave/ffi/ecalls.rs b/service/kbupd/src/enclave/ffi/ecalls.rs
index e535555..6158a5d 100644
--- a/service/kbupd/src/enclave/ffi/ecalls.rs
+++ b/service/kbupd/src/enclave/ffi/ecalls.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use prost::{Message};
use sgx_sdk_ffi::*;
diff --git a/service/kbupd/src/enclave/ffi/mod.rs b/service/kbupd/src/enclave/ffi/mod.rs
index 1c40f19..6509b84 100644
--- a/service/kbupd/src/enclave/ffi/mod.rs
+++ b/service/kbupd/src/enclave/ffi/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#[allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals, improper_ctypes)]
mod bindgen_wrapper;
diff --git a/service/kbupd/src/enclave/ffi/ocalls.rs b/service/kbupd/src/enclave/ffi/ocalls.rs
index 1993586..b6743b2 100644
--- a/service/kbupd/src/enclave/ffi/ocalls.rs
+++ b/service/kbupd/src/enclave/ffi/ocalls.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::mem;
diff --git a/service/kbupd/src/enclave/ffi/sgxsd.rs b/service/kbupd/src/enclave/ffi/sgxsd.rs
index 8c7e085..c10fa5f 100644
--- a/service/kbupd/src/enclave/ffi/sgxsd.rs
+++ b/service/kbupd/src/enclave/ffi/sgxsd.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fmt;
use std::mem;
diff --git a/service/kbupd/src/enclave/handshake_manager.rs b/service/kbupd/src/enclave/handshake_manager.rs
index a2a2c0b..a830571 100644
--- a/service/kbupd/src/enclave/handshake_manager.rs
+++ b/service/kbupd/src/enclave/handshake_manager.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::time::{Duration, Instant};
diff --git a/service/kbupd/src/enclave/mod.rs b/service/kbupd/src/enclave/mod.rs
index 147a93b..9b3f17c 100644
--- a/service/kbupd/src/enclave/mod.rs
+++ b/service/kbupd/src/enclave/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod attestation_manager;
pub mod enclave;
diff --git a/service/kbupd/src/enclave/revocation_list_refresh.rs b/service/kbupd/src/enclave/revocation_list_refresh.rs
index 60436ce..512efcb 100644
--- a/service/kbupd/src/enclave/revocation_list_refresh.rs
+++ b/service/kbupd/src/enclave/revocation_list_refresh.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::time::*;
diff --git a/service/kbupd/src/enclave/status_refresh.rs b/service/kbupd/src/enclave/status_refresh.rs
index 34dfd82..e525044 100644
--- a/service/kbupd/src/enclave/status_refresh.rs
+++ b/service/kbupd/src/enclave/status_refresh.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::time::*;
diff --git a/service/kbupd/src/enclave/timer_tick.rs b/service/kbupd/src/enclave/timer_tick.rs
index 62a73e0..4e58b57 100644
--- a/service/kbupd/src/enclave/timer_tick.rs
+++ b/service/kbupd/src/enclave/timer_tick.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::time::*;
diff --git a/service/kbupd/src/frontend/config.rs b/service/kbupd/src/frontend/config.rs
index 052a63f..6cebddc 100644
--- a/service/kbupd/src/frontend/config.rs
+++ b/service/kbupd/src/frontend/config.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(non_snake_case)]
diff --git a/service/kbupd/src/frontend/mod.rs b/service/kbupd/src/frontend/mod.rs
index 0a8727b..a7e99db 100644
--- a/service/kbupd/src/frontend/mod.rs
+++ b/service/kbupd/src/frontend/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod config;
diff --git a/service/kbupd/src/intel_client.rs b/service/kbupd/src/intel_client.rs
index cbe7d7b..a665725 100644
--- a/service/kbupd/src/intel_client.rs
+++ b/service/kbupd/src/intel_client.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::sync::Arc;
diff --git a/service/kbupd/src/lib.rs b/service/kbupd/src/lib.rs
index 7827652..1a4ad60 100644
--- a/service/kbupd/src/lib.rs
+++ b/service/kbupd/src/lib.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(unused_parens)]
diff --git a/service/kbupd/src/limits/leaky_bucket.rs b/service/kbupd/src/limits/leaky_bucket.rs
index 7fe72cd..ed833e3 100644
--- a/service/kbupd/src/limits/leaky_bucket.rs
+++ b/service/kbupd/src/limits/leaky_bucket.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::time::{Instant};
diff --git a/service/kbupd/src/limits/mod.rs b/service/kbupd/src/limits/mod.rs
index ffb57ba..84ac122 100644
--- a/service/kbupd/src/limits/mod.rs
+++ b/service/kbupd/src/limits/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod leaky_bucket;
pub mod rate_limiter;
diff --git a/service/kbupd/src/limits/rate_limiter.rs b/service/kbupd/src/limits/rate_limiter.rs
index 092d171..13378bf 100644
--- a/service/kbupd/src/limits/rate_limiter.rs
+++ b/service/kbupd/src/limits/rate_limiter.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::{HashMap};
use std::time::{Instant};
diff --git a/service/kbupd/src/logger.rs b/service/kbupd/src/logger.rs
index 4a1d2c5..ab00d15 100644
--- a/service/kbupd/src/logger.rs
+++ b/service/kbupd/src/logger.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::cell::*;
use std::fmt;
diff --git a/service/kbupd/src/main.rs b/service/kbupd/src/main.rs
index d873951..2ca08a5 100644
--- a/service/kbupd/src/main.rs
+++ b/service/kbupd/src/main.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fs;
use std::io;
diff --git a/service/kbupd/src/metrics/json_reporter.rs b/service/kbupd/src/metrics/json_reporter.rs
index db16f2c..b1f418d 100644
--- a/service/kbupd/src/metrics/json_reporter.rs
+++ b/service/kbupd/src/metrics/json_reporter.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::borrow::{Cow};
use std::collections::{HashMap};
diff --git a/service/kbupd/src/metrics/macros.rs b/service/kbupd/src/metrics/macros.rs
index 2801130..0779a91 100644
--- a/service/kbupd/src/metrics/macros.rs
+++ b/service/kbupd/src/metrics/macros.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
macro_rules! metric_module_name {
() => (module_path!().replace("::", "."));
diff --git a/service/kbupd/src/metrics/metrics.rs b/service/kbupd/src/metrics/metrics.rs
index 1cc29a2..406dc64 100644
--- a/service/kbupd/src/metrics/metrics.rs
+++ b/service/kbupd/src/metrics/metrics.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::convert::*;
use std::sync::*;
diff --git a/service/kbupd/src/metrics/mod.rs b/service/kbupd/src/metrics/mod.rs
index 0b366a7..2bc1597 100644
--- a/service/kbupd/src/metrics/mod.rs
+++ b/service/kbupd/src/metrics/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
mod json_reporter;
#[macro_use]
diff --git a/service/kbupd/src/metrics/registry.rs b/service/kbupd/src/metrics/registry.rs
index e38eb3e..d7aeef2 100644
--- a/service/kbupd/src/metrics/registry.rs
+++ b/service/kbupd/src/metrics/registry.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::*;
use std::convert::*;
diff --git a/service/kbupd/src/metrics/reporter.rs b/service/kbupd/src/metrics/reporter.rs
index f2f55b1..632fc50 100644
--- a/service/kbupd/src/metrics/reporter.rs
+++ b/service/kbupd/src/metrics/reporter.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::sync::*;
use std::thread;
diff --git a/service/kbupd/src/mocks.rs b/service/kbupd/src/mocks.rs
index 27e2aab..4d1bbb6 100644
--- a/service/kbupd/src/mocks.rs
+++ b/service/kbupd/src/mocks.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::cell::*;
use std::fmt;
diff --git a/service/kbupd/src/peer/codec.rs b/service/kbupd/src/peer/codec.rs
index a42c799..811fc14 100644
--- a/service/kbupd/src/peer/codec.rs
+++ b/service/kbupd/src/peer/codec.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::sync::{Arc};
diff --git a/service/kbupd/src/peer/connection.rs b/service/kbupd/src/peer/connection.rs
index 56bd408..b84d538 100644
--- a/service/kbupd/src/peer/connection.rs
+++ b/service/kbupd/src/peer/connection.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
use std::net::{SocketAddr};
diff --git a/service/kbupd/src/peer/discovery.rs b/service/kbupd/src/peer/discovery.rs
index 9d97b8f..b184ccc 100644
--- a/service/kbupd/src/peer/discovery.rs
+++ b/service/kbupd/src/peer/discovery.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
diff --git a/service/kbupd/src/peer/listener.rs b/service/kbupd/src/peer/listener.rs
index 03fe5f2..9941fc4 100644
--- a/service/kbupd/src/peer/listener.rs
+++ b/service/kbupd/src/peer/listener.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::net::{ToSocketAddrs};
use std::path::{PathBuf};
diff --git a/service/kbupd/src/peer/manager.rs b/service/kbupd/src/peer/manager.rs
index d9b3444..cf8e644 100644
--- a/service/kbupd/src/peer/manager.rs
+++ b/service/kbupd/src/peer/manager.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::convert::{TryFrom};
use std::collections::{hash_map, HashMap};
diff --git a/service/kbupd/src/peer/mod.rs b/service/kbupd/src/peer/mod.rs
index 6a1e7ff..37a2607 100644
--- a/service/kbupd/src/peer/mod.rs
+++ b/service/kbupd/src/peer/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
mod codec;
mod connection;
diff --git a/service/kbupd/src/peer/peer.rs b/service/kbupd/src/peer/peer.rs
index 8d3ed66..0cc7186 100644
--- a/service/kbupd/src/peer/peer.rs
+++ b/service/kbupd/src/peer/peer.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::{VecDeque};
use std::io;
diff --git a/service/kbupd/src/protobufs.rs b/service/kbupd/src/protobufs.rs
index 6d9f13f..0306db3 100644
--- a/service/kbupd/src/protobufs.rs
+++ b/service/kbupd/src/protobufs.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod kbupd {
use kbupd_client;
diff --git a/service/kbupd/src/protobufs_impl/kbupd.rs b/service/kbupd/src/protobufs_impl/kbupd.rs
index b38d8ae..49f22cd 100644
--- a/service/kbupd/src/protobufs_impl/kbupd.rs
+++ b/service/kbupd/src/protobufs_impl/kbupd.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use crate::protobufs::kbupd::*;
use crate::util::{DisplayAsDebug, ListDisplay, OptionDisplay, ToHex};
diff --git a/service/kbupd/src/protobufs_impl/mod.rs b/service/kbupd/src/protobufs_impl/mod.rs
index 9610397..6216684 100644
--- a/service/kbupd/src/protobufs_impl/mod.rs
+++ b/service/kbupd/src/protobufs_impl/mod.rs
@@ -1,18 +1,8 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
mod kbupd;
diff --git a/service/kbupd/src/replica/mod.rs b/service/kbupd/src/replica/mod.rs
index ce62749..4611f46 100644
--- a/service/kbupd/src/replica/mod.rs
+++ b/service/kbupd/src/replica/mod.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::path::{Path};
use std::time::{Duration};
diff --git a/service/kbupd/src/tls.rs b/service/kbupd/src/tls.rs
index 3c1ddc1..7973e83 100644
--- a/service/kbupd/src/tls.rs
+++ b/service/kbupd/src/tls.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
use std::net::{SocketAddr};
diff --git a/service/kbupd/src/unix_signal.rs b/service/kbupd/src/unix_signal.rs
index 123b052..2d0a6e2 100644
--- a/service/kbupd/src/unix_signal.rs
+++ b/service/kbupd/src/unix_signal.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use futures::prelude::*;
use futures::stream::{Fuse};
diff --git a/service/kbupd/src/util.rs b/service/kbupd/src/util.rs
index 8ea6348..aa5d919 100644
--- a/service/kbupd/src/util.rs
+++ b/service/kbupd/src/util.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::path::{Path, PathBuf};
diff --git a/service/kbupd_api/src/entities.rs b/service/kbupd_api/src/entities.rs
index 6871006..8d5db51 100644
--- a/service/kbupd_api/src/entities.rs
+++ b/service/kbupd_api/src/entities.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(non_snake_case)]
diff --git a/service/kbupd_api/src/lib.rs b/service/kbupd_api/src/lib.rs
index 554e726..478784c 100644
--- a/service/kbupd_api/src/lib.rs
+++ b/service/kbupd_api/src/lib.rs
@@ -1,18 +1,8 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod entities;
diff --git a/service/kbupd_api_client/src/lib.rs b/service/kbupd_api_client/src/lib.rs
index fdeb64b..e5121ef 100644
--- a/service/kbupd_api_client/src/lib.rs
+++ b/service/kbupd_api_client/src/lib.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use cookie::Cookie;
use failure::{format_err, Fail, ResultExt};
diff --git a/service/kbupd_api_client/src/main.rs b/service/kbupd_api_client/src/main.rs
index a4cc02d..7ebd29d 100644
--- a/service/kbupd_api_client/src/main.rs
+++ b/service/kbupd_api_client/src/main.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fmt::{Display, Write as _};
use std::io::{Cursor, Write as _};
diff --git a/service/kbupd_client/build.rs b/service/kbupd_client/build.rs
index 9396bd1..f99156e 100644
--- a/service/kbupd_client/build.rs
+++ b/service/kbupd_client/build.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
fn main() {
prost_build::compile_protos(&["src/kbupd_client.proto"], &["src/"]).expect("error compiling protobufs");
diff --git a/service/kbupd_client/src/lib.rs b/service/kbupd_client/src/lib.rs
index eca4773..d35fcba 100644
--- a/service/kbupd_client/src/lib.rs
+++ b/service/kbupd_client/src/lib.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
mod protobufs;
mod protobufs_impl;
diff --git a/service/kbupd_client/src/protobufs.rs b/service/kbupd_client/src/protobufs.rs
index 23cfb34..5754c58 100644
--- a/service/kbupd_client/src/protobufs.rs
+++ b/service/kbupd_client/src/protobufs.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod kbupd_client {
include!(concat!(env!("OUT_DIR"), "/protobufs.kbupd_client.rs"));
diff --git a/service/kbupd_client/src/protobufs_impl/kbupd_client.rs b/service/kbupd_client/src/protobufs_impl/kbupd_client.rs
index 3e75c72..59092ba 100644
--- a/service/kbupd_client/src/protobufs_impl/kbupd_client.rs
+++ b/service/kbupd_client/src/protobufs_impl/kbupd_client.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use crate::protobufs::kbupd_client;
diff --git a/service/kbupd_client/src/protobufs_impl/mod.rs b/service/kbupd_client/src/protobufs_impl/mod.rs
index 11eab32..85d60b6 100644
--- a/service/kbupd_client/src/protobufs_impl/mod.rs
+++ b/service/kbupd_client/src/protobufs_impl/mod.rs
@@ -1,18 +1,8 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
mod kbupd_client;
diff --git a/service/kbupd_config/src/frontend.rs b/service/kbupd_config/src/frontend.rs
index d85a467..69eb8c9 100644
--- a/service/kbupd_config/src/frontend.rs
+++ b/service/kbupd_config/src/frontend.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(non_snake_case)]
diff --git a/service/kbupd_config/src/lib.rs b/service/kbupd_config/src/lib.rs
index 99a22e4..4cbbb7a 100644
--- a/service/kbupd_config/src/lib.rs
+++ b/service/kbupd_config/src/lib.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod frontend;
pub mod metrics;
diff --git a/service/kbupd_config/src/main.rs b/service/kbupd_config/src/main.rs
index 6859c97..980a681 100644
--- a/service/kbupd_config/src/main.rs
+++ b/service/kbupd_config/src/main.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fs;
use std::path::Path;
diff --git a/service/kbupd_config/src/metrics.rs b/service/kbupd_config/src/metrics.rs
index c85b67d..ca10850 100644
--- a/service/kbupd_config/src/metrics.rs
+++ b/service/kbupd_config/src/metrics.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(non_snake_case)]
diff --git a/service/kbupd_config/src/replica.rs b/service/kbupd_config/src/replica.rs
index 7611799..63948e4 100644
--- a/service/kbupd_config/src/replica.rs
+++ b/service/kbupd_config/src/replica.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(non_snake_case)]
diff --git a/service/kbuptlsd/src/base64.rs b/service/kbuptlsd/src/base64.rs
index 0cd1747..e21fbd1 100644
--- a/service/kbuptlsd/src/base64.rs
+++ b/service/kbuptlsd/src/base64.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::fmt;
diff --git a/service/kbuptlsd/src/client.rs b/service/kbuptlsd/src/client.rs
index f8856fd..bb44c7b 100644
--- a/service/kbuptlsd/src/client.rs
+++ b/service/kbuptlsd/src/client.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#[cfg(feature = "hyper")]
pub mod hyper;
diff --git a/service/kbuptlsd/src/client/hyper.rs b/service/kbuptlsd/src/client/hyper.rs
index 9c54e32..88a1109 100644
--- a/service/kbuptlsd/src/client/hyper.rs
+++ b/service/kbuptlsd/src/client/hyper.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::sync::*;
diff --git a/service/kbuptlsd/src/config.rs b/service/kbuptlsd/src/config.rs
index 4ad1329..0998acf 100644
--- a/service/kbuptlsd/src/config.rs
+++ b/service/kbuptlsd/src/config.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(non_snake_case)]
diff --git a/service/kbuptlsd/src/counter.rs b/service/kbuptlsd/src/counter.rs
index 6ecabb1..5cf0f8f 100644
--- a/service/kbuptlsd/src/counter.rs
+++ b/service/kbuptlsd/src/counter.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::sync::{Arc, Weak};
diff --git a/service/kbuptlsd/src/lib.rs b/service/kbuptlsd/src/lib.rs
index 86a2514..e066e13 100644
--- a/service/kbuptlsd/src/lib.rs
+++ b/service/kbuptlsd/src/lib.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(unused_parens)]
diff --git a/service/kbuptlsd/src/main.rs b/service/kbuptlsd/src/main.rs
index c5c7337..dfa35f7 100644
--- a/service/kbuptlsd/src/main.rs
+++ b/service/kbuptlsd/src/main.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::env;
use std::fs;
diff --git a/service/kbuptlsd/src/proxy_child.rs b/service/kbuptlsd/src/proxy_child.rs
index 916771f..7bc5508 100644
--- a/service/kbuptlsd/src/proxy_child.rs
+++ b/service/kbuptlsd/src/proxy_child.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
use std::io::prelude::*;
diff --git a/service/kbuptlsd/src/server.rs b/service/kbuptlsd/src/server.rs
index c015894..0504db7 100644
--- a/service/kbuptlsd/src/server.rs
+++ b/service/kbuptlsd/src/server.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod logger;
diff --git a/service/kbuptlsd/src/server/logger.rs b/service/kbuptlsd/src/server/logger.rs
index f5a52af..1462a31 100644
--- a/service/kbuptlsd/src/server/logger.rs
+++ b/service/kbuptlsd/src/server/logger.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::cell::*;
use std::rc::*;
diff --git a/service/kbuptlsd/src/util.rs b/service/kbuptlsd/src/util.rs
index 6401526..7d52797 100644
--- a/service/kbuptlsd/src/util.rs
+++ b/service/kbuptlsd/src/util.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::net::{SocketAddr, ToSocketAddrs};
use std::io;
diff --git a/service/kbuptlsd/tests/server_test.rs b/service/kbuptlsd/tests/server_test.rs
index 5c9930c..71218c4 100644
--- a/service/kbuptlsd/tests/server_test.rs
+++ b/service/kbuptlsd/tests/server_test.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#[macro_use]
mod util;
diff --git a/service/kbuptlsd/tests/util.rs b/service/kbuptlsd/tests/util.rs
index d2f9b3a..9243fde 100644
--- a/service/kbuptlsd/tests/util.rs
+++ b/service/kbuptlsd/tests/util.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(dead_code, unused_macros)]
diff --git a/service/rustunnel/build.rs b/service/rustunnel/build.rs
index 5735e78..ef776b9 100644
--- a/service/rustunnel/build.rs
+++ b/service/rustunnel/build.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
fn main() {
let mut cc = cc::Build::new();
diff --git a/service/rustunnel/src/lib.rs b/service/rustunnel/src/lib.rs
index 166ea20..850fa02 100644
--- a/service/rustunnel/src/lib.rs
+++ b/service/rustunnel/src/lib.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
pub mod logger;
mod proxy;
diff --git a/service/rustunnel/src/logger.rs b/service/rustunnel/src/logger.rs
index 71b04a4..97727e2 100644
--- a/service/rustunnel/src/logger.rs
+++ b/service/rustunnel/src/logger.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
use std::io::prelude::*;
diff --git a/service/rustunnel/src/proxy.rs b/service/rustunnel/src/proxy.rs
index c1ab2c7..088a66b 100644
--- a/service/rustunnel/src/proxy.rs
+++ b/service/rustunnel/src/proxy.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
diff --git a/service/rustunnel/src/seccomp.rs b/service/rustunnel/src/seccomp.rs
index 1a6d5a1..5058896 100644
--- a/service/rustunnel/src/seccomp.rs
+++ b/service/rustunnel/src/seccomp.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::*;
use std::ffi::{CStr};
diff --git a/service/rustunnel/src/stream.rs b/service/rustunnel/src/stream.rs
index 7350a4c..14a4544 100644
--- a/service/rustunnel/src/stream.rs
+++ b/service/rustunnel/src/stream.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
use std::io::prelude::*;
diff --git a/service/rustunnel/src/tls.rs b/service/rustunnel/src/tls.rs
index 4139991..6bd2a83 100644
--- a/service/rustunnel/src/tls.rs
+++ b/service/rustunnel/src/tls.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::collections::{HashSet};
use std::fs;
diff --git a/service/rustunnel/src/util.rs b/service/rustunnel/src/util.rs
index 8dcfbc7..b80da96 100644
--- a/service/rustunnel/src/util.rs
+++ b/service/rustunnel/src/util.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
use std::io;
use std::os::unix::prelude::*;
diff --git a/service/rustunnel/tests/client_child_test.rs b/service/rustunnel/tests/client_child_test.rs
index 60dd398..22c1796 100644
--- a/service/rustunnel/tests/client_child_test.rs
+++ b/service/rustunnel/tests/client_child_test.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#[macro_use]
mod util;
diff --git a/service/rustunnel/tests/server_child_test.rs b/service/rustunnel/tests/server_child_test.rs
index 6cb9b10..876b2ed 100644
--- a/service/rustunnel/tests/server_child_test.rs
+++ b/service/rustunnel/tests/server_child_test.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#[macro_use]
mod util;
diff --git a/service/rustunnel/tests/util.rs b/service/rustunnel/tests/util.rs
index ee22ceb..49d4b8d 100644
--- a/service/rustunnel/tests/util.rs
+++ b/service/rustunnel/tests/util.rs
@@ -1,19 +1,9 @@
-/*
- * Copyright (C) 2019 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
+//
+// Copyright (C) 2019, 2020 Signal Messenger, LLC.
+// All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
#![allow(dead_code, unused_macros)]