fixed wording in license

client/crypto.c

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <openssl/evp.h>

client/ous.js

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 var fs = require('fs');
 var page = require('webpage').create();

client/socks5proxy.c

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <stdio.h>

client/tagging.c

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <stdio.h>

relay_station/crypto.c

@@ -2,33 +2,7 @@
  *
  * This file contains code for checking tagged flows, processing handshake
  * messages, and computing the master secret for a TLS session.
- *
- * Slitheen - a decoy routing system for censorship resistance
- * Copyright (C) 2017 Cecylia Bocovich (cbocovic@uwaterloo.ca)
- *
- * 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, version 3.
- *
- * 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/>.
- *
- * Additional permission under GNU GPL version 3 section 7
- * 
- * If you modify this Program, or any covered work, by linking or combining
- * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
  */
-
 /* Some code in this document is based on the OpenSSL source files:
  * 	crypto/ec/ec_key.c
  * 	crypto/dh/dh_key.c

relay_station/crypto.h

@@ -17,11 +17,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #ifndef _CRYPTO_H_

relay_station/cryptothread.c

@@ -22,11 +22,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <pthread.h>

relay_station/cryptothread.h

@@ -17,11 +17,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #ifndef _CRYPTOTHREAD_H_

relay_station/flow.c

@@ -21,11 +21,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <stdio.h>

relay_station/flow.h

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 #ifndef __RELAY_H__
 #define __RELAY_H__

relay_station/ptwist.h

@@ -1,6 +1,6 @@
 
 /* Slitheen - a decoy routing system for censorship resistance
- * Copyright (C) 2017 Cecylia Bocovich (cbocovic@uwaterloo.ca)
+ * Copyright (C) 2017 Ian Goldberg (iang@cs.uwaterloo.ca)
  *
  * 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
@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 #ifndef __PTWIST_H__
 #define __PTWIST_H__

relay_station/relay.c

@@ -27,11 +27,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <stdio.h>

relay_station/relay.h

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 #ifndef _RELAY_H_
 #define _RELAY_H_

relay_station/slitheen-proxy.c

@@ -19,11 +19,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #include <pcap.h>

relay_station/slitheen.h

@@ -18,11 +18,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 #ifndef _SLITHEEN_H_
 #define _SLITHEEN_H_

relay_station/util.c

@@ -22,11 +22,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 

relay_station/util.h

@@ -21,11 +21,12 @@
  * 
  * If you modify this Program, or any covered work, by linking or combining
  * it with the OpenSSL library (or a modified version of that library), 
- * containing parts covered by the terms of [name of library's license],
- * the licensors of this Program grant you additional permission to convey
- * the resulting work. {Corresponding Source for a non-source form of such
- * a combination shall include the source code for the parts of the OpenSSL
- * library used as well as that of the covered work.}
+ * containing parts covered by the terms of the OpenSSL Licence and the
+ * SSLeay license, the licensors of this Program grant you additional
+ * permission to convey the resulting work. Corresponding Source for a
+ * non-source form of such a combination shall include the source code
+ * for the parts of the OpenSSL library used as well as that of the covered
+ * work.
  */
 
 #ifndef _UTIL_H_