diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-11-13 01:00:26 +0900 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-11-13 01:35:12 +0900 |
commit | e08da9757099af3d275c122c9379d46a037eb309 (patch) | |
tree | 9108b960c4b996d6644449486a1e005b5f45857c /src/gsm | |
parent | 0f7bcb5f17f18682f7f9dc41e2d0fc73c4c08318 (diff) |
Fix/Update copyright notices; Add SPDX annotation
Let's fix some erroneous/accidential references to wrong license,
update copyright information where applicable and introduce a
SPDX-License-Identifier to all files.
Change-Id: I39af26c6aaaf5c926966391f6565fc5936be21af
Diffstat (limited to 'src/gsm')
45 files changed, 132 insertions, 23 deletions
diff --git a/src/gsm/a5.c b/src/gsm/a5.c index ea09e172..223d3ad8 100644 --- a/src/gsm/a5.c +++ b/src/gsm/a5.c @@ -3,6 +3,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c index 7207fb97..8a3886da 100644 --- a/src/gsm/abis_nm.c +++ b/src/gsm/abis_nm.c @@ -1,8 +1,10 @@ /* - * (C) 2008-2011 by Harald Welte <laforge@gnumonks.org> + * (C) 2008-2014,2017 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/apn.c b/src/gsm/apn.c index f8303db9..e6632dd3 100644 --- a/src/gsm/apn.c +++ b/src/gsm/apn.c @@ -1,4 +1,24 @@ -/*! \file apn.c */ +/*! \file apn.c + * + * (C) 2014 by Harald Welte <laforge@gnumonks.org> + * (C) 2015,2017 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ #include <stdio.h> #include <stdint.h> diff --git a/src/gsm/auth_comp128v1.c b/src/gsm/auth_comp128v1.c index 1dddef31..493ebfd0 100644 --- a/src/gsm/auth_comp128v1.c +++ b/src/gsm/auth_comp128v1.c @@ -5,6 +5,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/auth_comp128v23.c b/src/gsm/auth_comp128v23.c index 4d23769c..279d2b74 100644 --- a/src/gsm/auth_comp128v23.c +++ b/src/gsm/auth_comp128v23.c @@ -7,6 +7,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index 738e8609..9e3b2c01 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -2,6 +2,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/auth_milenage.c b/src/gsm/auth_milenage.c index 2ddf712b..95891000 100644 --- a/src/gsm/auth_milenage.c +++ b/src/gsm/auth_milenage.c @@ -5,6 +5,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/comp128.c b/src/gsm/comp128.c index 0fcc67d5..b28a8437 100644 --- a/src/gsm/comp128.c +++ b/src/gsm/comp128.c @@ -46,6 +46,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/comp128v23.c b/src/gsm/comp128v23.c index 12f8a4c1..68f4b2a3 100644 --- a/src/gsm/comp128v23.c +++ b/src/gsm/comp128v23.c @@ -9,6 +9,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gan.c b/src/gsm/gan.c index fae93f11..8cd4f78a 100644 --- a/src/gsm/gan.c +++ b/src/gsm/gan.c @@ -4,6 +4,8 @@ * (C) 2012 by Harald Welte <laforge@gnumonks.org> * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gea.c b/src/gsm/gea.c index 70f08ada..5756bb08 100644 --- a/src/gsm/gea.c +++ b/src/gsm/gea.c @@ -1,11 +1,11 @@ /* - * Copyright (C) 2016 by Sysmocom s.f.m.c. GmbH + * Copyright (C) 2016 by sysmocom - s.f.m.c. GmbH * * All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c index fc68c402..6fa25d60 100644 --- a/src/gsm/gprs_cipher_core.c +++ b/src/gsm/gprs_cipher_core.c @@ -5,6 +5,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gprs_gea.c b/src/gsm/gprs_gea.c index db3f2cc7..73147886 100644 --- a/src/gsm/gprs_gea.c +++ b/src/gsm/gprs_gea.c @@ -1,13 +1,15 @@ /*! \file gprs_gea.c * GEA 3 & 4 plugin */ /* - * Copyright (C) 2016 by Sysmocom s.f.m.c. GmbH + * Copyright (C) 2016 by sysmocom - s.f.m.c. GmbH * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/src/gsm/gprs_rlc.c b/src/gsm/gprs_rlc.c index d2c05b70..bdfc8eac 100644 --- a/src/gsm/gprs_rlc.c +++ b/src/gsm/gprs_rlc.c @@ -1,5 +1,12 @@ /*! \file gsm/gprs_rlc.c * helper functions for (E)GPRS RLC according to 3GPP TS 44.060. + * + * (C) 2016 by Thomas Thou + * (C) 2016-2017 by sysmocom - s.f.m.c. GmbH + * (C) 2017 by Harald Welte <laforge@gnumonks.org> + * All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/src/gsm/gsm0341.c b/src/gsm/gsm0341.c index 485023f3..89f5de3f 100644 --- a/src/gsm/gsm0341.c +++ b/src/gsm/gsm0341.c @@ -2,6 +2,8 @@ * (C) 2014 by Harald Welte <laforge@gnumonks.org> * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0411_smc.c b/src/gsm/gsm0411_smc.c index f7c536b6..28287e4c 100644 --- a/src/gsm/gsm0411_smc.c +++ b/src/gsm/gsm0411_smc.c @@ -10,6 +10,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0411_smr.c b/src/gsm/gsm0411_smr.c index 0a25c7c4..892b7f01 100644 --- a/src/gsm/gsm0411_smr.c +++ b/src/gsm/gsm0411_smr.c @@ -10,6 +10,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index acf7e234..53d37a43 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -10,6 +10,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 557aa148..71470e54 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -6,6 +6,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0502.c b/src/gsm/gsm0502.c index 6b698938..53259a42 100644 --- a/src/gsm/gsm0502.c +++ b/src/gsm/gsm0502.c @@ -4,6 +4,8 @@ * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org> * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index ee5eda4d..2396a106 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -3,6 +3,8 @@ * (C) 2009,2010 by On-Waves * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 798a122b..93e6074c 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1,20 +1,20 @@ /* - * (C) 2016 by Sysmocom s.f.m.c. GmbH + * (C) 2016 by sysmocom - s.f.m.c. GmbH, Author: Philipp Maier * All Rights Reserved * - * Author: Philipp Maier + * SPDX-License-Identifier: GPL-2.0+ * * 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 + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 3c09acac..95ac9f83 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -1,10 +1,11 @@ /*! \file gsm23003.c * Utility function implementations related to 3GPP TS 23.003 */ /* - * (C) 2017 sysmocom s.f.m.c. GmbH <info@sysmocom.de> + * (C) 2017 sysmocom - s.f.m.c. GmbH <info@sysmocom.de> + * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de> * All Rights Reserved * - * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de> + * SPDX-License-Identifier: GPL-2.0+ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 10e2b804..a7daea47 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -7,6 +7,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index 105acbaf..1baf2879 100644 --- a/src/gsm/gsm48_ie.c +++ b/src/gsm/gsm48_ie.c @@ -7,6 +7,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm_04_08_gprs.c b/src/gsm/gsm_04_08_gprs.c index 43da27ee..608fa8c1 100644 --- a/src/gsm/gsm_04_08_gprs.c +++ b/src/gsm/gsm_04_08_gprs.c @@ -2,10 +2,12 @@ /* * (C) 2009-2016 by Harald Welte <laforge@gnumonks.org> * (C) 2010 by On-Waves - * (C) 2014-2015 by Sysmocom s.f.m.c. GmbH + * (C) 2014-2015 by sysmocom - s.f.m.c. GmbH * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 134b4752..8464090a 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -7,6 +7,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index e5b0a663..eb829f7c 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -1,10 +1,11 @@ /* - * (C) 2014 by sysmocom s.f.m.c. GmbH + * (C) 2014 by sysmocom - s.f.m.c. GmbH + * Author: Jacob Erlbeck * (C) 2015 by Holger Hans Peter Freyther * (C) 2016 by Harald Welte <laforge@gnumonks.org> * All Rights Reserved * - * Author: Jacob Erlbeck + * SPDX-License-Identifier: GPL-2.0+ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index fef73c3d..e00e2d01 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -7,6 +7,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/kasumi.c b/src/gsm/kasumi.c index c3a028b7..7de5cd03 100644 --- a/src/gsm/kasumi.c +++ b/src/gsm/kasumi.c @@ -2,9 +2,10 @@ * Kasumi cipher and KGcore functions. */ /* * (C) 2013 by Max <Max.Suraev@fairwaves.ru> - * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c index 6b580069..d14063e2 100644 --- a/src/gsm/lapd_core.c +++ b/src/gsm/lapd_core.c @@ -6,6 +6,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index db950a68..5efe7558 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -1,11 +1,14 @@ /*! \file lapdm.c * GSM LAPDm (TS 04.06) implementation. */ /* - * (C) 2010-2011 by Harald Welte <laforge@gnumonks.org> + * (C) 2010-2017 by Harald Welte <laforge@gnumonks.org> * (C) 2010-2011 by Andreas Eversberg <jolly@eversberg.eu> + * (C) 2014-2016 by sysmocom - s.f.m.c GmbH * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/gsm/milenage/aes-encblock.c b/src/gsm/milenage/aes-encblock.c index c4aa260d..9fd73f67 100644 --- a/src/gsm/milenage/aes-encblock.c +++ b/src/gsm/milenage/aes-encblock.c @@ -10,6 +10,8 @@ * Alternatively, this software may be distributed under the terms of BSD * license. * + * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * * See README and COPYING for more details. */ diff --git a/src/gsm/milenage/aes-internal-enc.c b/src/gsm/milenage/aes-internal-enc.c index 4c00f963..6de9992e 100644 --- a/src/gsm/milenage/aes-internal-enc.c +++ b/src/gsm/milenage/aes-internal-enc.c @@ -19,6 +19,8 @@ * Alternatively, this software may be distributed under the terms of BSD * license. * + * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * * See README and COPYING for more details. */ diff --git a/src/gsm/milenage/aes-internal.c b/src/gsm/milenage/aes-internal.c index 60c520c2..c46654ac 100644 --- a/src/gsm/milenage/aes-internal.c +++ b/src/gsm/milenage/aes-internal.c @@ -19,6 +19,8 @@ * Alternatively, this software may be distributed under the terms of BSD * license. * + * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * * See README and COPYING for more details. */ diff --git a/src/gsm/milenage/aes.h b/src/gsm/milenage/aes.h index ce42b207..5410c368 100644 --- a/src/gsm/milenage/aes.h +++ b/src/gsm/milenage/aes.h @@ -10,6 +10,8 @@ * Alternatively, this software may be distributed under the terms of BSD * license. * + * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * * See README and COPYING for more details. */ diff --git a/src/gsm/milenage/aes_i.h b/src/gsm/milenage/aes_i.h index 6df019a1..3e0fd218 100644 --- a/src/gsm/milenage/aes_i.h +++ b/src/gsm/milenage/aes_i.h @@ -10,6 +10,8 @@ * Alternatively, this software may be distributed under the terms of BSD * license. * + * SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause + * * See README and COPYING for more details. */ diff --git a/src/gsm/milenage/aes_wrap.h b/src/gsm/milenage/aes_wrap.h index 7d4d5d90..b644d4c0 100644 --- a/src/gsm/milenage/aes_wrap.h +++ b/src/gsm/milenage/aes_wrap.h @@ -17,6 +17,8 @@ * Alternatively, this software may be distributed under the terms of BSD * license. * + * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * * See README and COPYING for more details. */ diff --git a/src/gsm/milenage/milenage.c b/src/gsm/milenage/milenage.c index 012b3996..7cf33122 100644 --- a/src/gsm/milenage/milenage.c +++ b/src/gsm/milenage/milenage.c @@ -12,6 +12,8 @@ * * See README and COPYING for more details. * + * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * * This file implements an example authentication algorithm defined for 3GPP * AKA. This can be used to implement a simple HLR/AuC into hlr_auc_gw to allow * EAP-AKA to be tested properly with real USIM cards. |