Skip to content

Commit

Permalink
chore(license): Replace copyright and license text with SPDX identifiers
Browse files Browse the repository at this point in the history
In case a one to one translation was possible I replaced the license
and copyright text with SPDX identifiers.
In case replacing wasn't possible completely I kept the part that goes
in detail to the copyright such as sections that explain the source of
the original code.

Resolves #39

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
  • Loading branch information
Thaodan authored and streambinder committed Jan 23, 2023
1 parent 1df063f commit 46b8335
Show file tree
Hide file tree
Showing 28 changed files with 169 additions and 487 deletions.
22 changes: 6 additions & 16 deletions src/cisco-decrypt.c
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
/* Decoder for password encoding of Cisco VPN client.
Copyright (C) 2005 Maurice Massar
/*
Decoder for password encoding of Cisco VPN client.
Thanks to HAL-9000@evilscientists.de for decoding and posting the algorithm!
Thanks to HAL-9000@evilscientists.de for decoding and posting the algorithm!
SPDX-FileCopyrightText: 2005 Maurice Massar
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#include "decrypt-utils.h"
Expand Down
21 changes: 5 additions & 16 deletions src/config.c
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
/* IPSec VPN client compatible with Cisco equipment.
Copyright (C) 2004-2005 Maurice Massar
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.
/*
IPSec VPN client compatible with Cisco equipment.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-FileCopyrightText: 2004-2005 Maurice Massar
SPDX-FileCopyrightText: 2023 Jolla Ltd.
$Id$
SPDX-License-Identifier: GPL-2.0-or-later
*/

#define _GNU_SOURCE
Expand Down
18 changes: 5 additions & 13 deletions src/crypto-gnutls.c
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
/* IPSec VPN client compatible with Cisco equipment.
/*
IPSec VPN client compatible with Cisco equipment.
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.
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <stdio.h>
Expand Down
18 changes: 5 additions & 13 deletions src/crypto-gnutls.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
/* IPSec VPN client compatible with Cisco equipment.
/*
IPSec VPN client compatible with Cisco equipment.
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.
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#ifndef VPNC_CRYPTO_GNUTLS_H
Expand Down
18 changes: 5 additions & 13 deletions src/crypto-openssl.c
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
/* IPSec VPN client compatible with Cisco equipment.
/*
IPSec VPN client compatible with Cisco equipment.
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.
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <stdio.h>
Expand Down
18 changes: 5 additions & 13 deletions src/crypto-openssl.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
/* IPSec VPN client compatible with Cisco equipment.
/*
IPSec VPN client compatible with Cisco equipment.
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.
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#ifndef OPENSSL_GPL_VIOLATION
Expand Down
18 changes: 5 additions & 13 deletions src/crypto.c
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
/* IPSec VPN client compatible with Cisco equipment.
/*
IPSec VPN client compatible with Cisco equipment.
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.
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <stdio.h>
Expand Down
17 changes: 3 additions & 14 deletions src/crypto.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
/* IPSec VPN client compatible with Cisco equipment.
/*
IPSec VPN client compatible with Cisco equipment.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
SPDX-License-Identifier: GPL-2.0-or-later
*/

#ifndef VPNC_CRYPTO_H
Expand Down
30 changes: 10 additions & 20 deletions src/decrypt-utils.c
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
/* IPSec VPN client compatible with Cisco equipment.
Copyright (C) 2004-2007 Maurice Massar
A bit reorganized in 2007 by Wolfram Sang
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
$Id$
*/
/*
IPSec VPN client compatible with Cisco equipment.
SPDX-FileCopyrightText: 2004-2007 Maurice Massar
SPDX-FileCopyrightText: 2007 Wolfram Sang
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
SPDX-License-Identifier: GPL-2.0-or-later
*/

#define _GNU_SOURCE

Expand Down
24 changes: 7 additions & 17 deletions src/decrypt-utils.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
/* IPSec VPN client compatible with Cisco equipment.
Copyright (C) 2004-2007 Maurice Massar
A bit reorganized in 2007 by Wolfram Sang
/*
IPSec VPN client compatible with Cisco equipment.
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.
SPDX-FileCopyrightText: 2004-2007 Maurice Massar
SPDX-FileCopyrightText: 2007 Wolfram Sang
SPDX-FileCopyrightText: 2019 Davide Pucci
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
$Id$
SPDX-License-Identifier: GPL-2.0-or-later
*/

#ifndef VPNC_DECRYPT_UTILS_H
Expand Down
25 changes: 4 additions & 21 deletions src/dh.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,11 @@
/* $EOM: dh.c,v 1.5 1999/04/17 23:20:22 niklas Exp $ */

/*
* Copyright (c) 1998 Niels Provos. All rights reserved.
* Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
* SPDX-FileCopyrightText: 1998 Niels Provos
* SPDX-FileCopyrightText: 1999 Niklas Hallqvist
* SPDX-FileCopyrightText: 2023 Jolla Ltd.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* SPDX-License-Identifier: BSD-2-Clause
*/

/*
Expand Down
23 changes: 3 additions & 20 deletions src/dh.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,10 @@
/* $EOM: dh.h,v 1.4 1999/04/17 23:20:24 niklas Exp $ */

/*
* Copyright (c) 1998 Niels Provos. All rights reserved.
* SPDX-FileCopyrightText: 1998 Niels Provos
* SPDX-FileCopyrightText: 2023 Jolla Ltd.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* SPDX-License-Identifier: BSD-2-Clause
*/

/*
Expand Down
29 changes: 9 additions & 20 deletions src/isakmp-pkt.c
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
/* ISAKMP packing and unpacking routines.
Copyright (C) 2002 Geoffrey Keating
Copyright (C) 2003-2005 Maurice Massar
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
$Id$
*/
/*
ISAKMP packing and unpacking routines.
SPDX-FileCopyrightText: 2002 Geoffrey Keating
SPDX-FileCopyrightText: 2003-2005 Maurice Massar
SPDX-FileCopyrightText: 2023 Jolla Ltd.
SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <assert.h>
#include <stdlib.h>
Expand Down
23 changes: 6 additions & 17 deletions src/isakmp-pkt.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
/* ISAKMP packing and unpacking routines.
Copyright (C) 2002 Geoffrey Keating
Copyright (C) 2003-2005 Maurice Massar
/*
ISAKMP packing and unpacking routines.
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.
SPDX-FileCopyrightText: 2002 Geoffrey Keating
SPDX-FileCopyrightText: 2003-2005 Maurice Massar
SPDX-FileCopyrightText: 2023 Jolla Ltd.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
$Id$
SPDX-License-Identifier: GPL-2.0-or-later
*/

#ifndef VPNC_ISAKMP_PKT_H
Expand Down
Loading

0 comments on commit 46b8335

Please sign in to comment.