summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-08-14 00:42:30 +0200
committerHarald Welte <laforge@gnumonks.org>2017-08-14 06:14:38 +0000
commitc8512b15107644810a6a5e1f46ed3b2b1c37b849 (patch)
tree319d77e96ad86ec88ae51565e4f176f0b92ace1f
parentf1b77d9b58fcb083afe343669abbcbc1dc138bdb (diff)
Re-license asn1helper.c under identical license as upstream
asn1helpers.c originally existed in the repository of an application (osmo-hnbgw, IIRC), and hence was under AGPLv3. When moving it to this repository, it should have been relicensed but wasn't. The intention was never to "contaminate" (lib)asn1c with AGPLv3 code. Change-Id: I8e714d4c51d771b1eabec7aa06e7daae73f48b15
-rw-r--r--debian/copyright14
-rw-r--r--src/asn1helpers.c15
2 files changed, 3 insertions, 26 deletions
diff --git a/debian/copyright b/debian/copyright
index 91a7cb9..2eef07a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,19 +18,7 @@ License: BSD-3-Clause
Files: src/asn1helpers.c
Copyright: 2014-2015 by Harald Welte <laforge@gnumonks.org>
-License: AGPL-3.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
- (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 <http://www.gnu.org/licenses/>.
+License: BSD-2-Clause
Files: debian/*
Copyright: 2017 Alexander Couzens <lynxis@stretch>
diff --git a/src/asn1helpers.c b/src/asn1helpers.c
index aca5300..a4ced70 100644
--- a/src/asn1helpers.c
+++ b/src/asn1helpers.c
@@ -3,19 +3,8 @@
/* (C) 2014-2015 by Harald Welte <laforge@gnumonks.org>
* All Rights Reserved
*
- * 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 <http://www.gnu.org/licenses/>.
- *
+ * Redistribution and modifications are permitted subject to BSD license
+ * contained in COPYING file.
*/
#include <string.h>