convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744)

author: Kirill Volinsky <Mataes2007@gmail.com> 2017-12-06 14:15:09 +0300
committer: Kirill Volinsky <Mataes2007@gmail.com> 2017-12-06 14:15:09 +0300
commit: a27079fe5c4a210664515c47767c00112c435d65 (patch)
tree: 39e36b58b4138af46e2f10661de352482b89399d /plugins/CryptoPP/crypto
parent: 87c39b86cfeb0dedf94f9bf04af30de2daf368bc (diff)
263 files changed, 263 insertions, 263 deletions
diff --git a/plugins/CryptoPP/crypto/docs/License.txt b/plugins/CryptoPP/crypto/docs/License.txt
index dd39c7a0de..8ec0a405b7 100644
--- a/plugins/CryptoPP/crypto/docs/License.txt
+++ b/plugins/CryptoPP/crypto/docs/License.txt
@@ -1,4 +1,4 @@
-Compilation Copyright (c) 1995-2006 by Wei Dai.  All rights reserved.
+Compilation Copyright (c) 1995-2006 by Wei Dai.  All rights reserved.
 This copyright applies only to this software distribution package 
 as a compilation, and does not imply a copyright on any particular 
 file in the package.
diff --git a/plugins/CryptoPP/crypto/docs/Readme.txt b/plugins/CryptoPP/crypto/docs/Readme.txt
index 702a08d952..d4d3acd475 100644
--- a/plugins/CryptoPP/crypto/docs/Readme.txt
+++ b/plugins/CryptoPP/crypto/docs/Readme.txt
@@ -1,4 +1,4 @@
-Crypto++: a C++ Class Library of Cryptographic Schemes
+Crypto++: a C++ Class Library of Cryptographic Schemes
 Version 5.5.2 (9/24/2007)
 
 Crypto++ Library is a free C++ class library of cryptographic schemes.
diff --git a/plugins/CryptoPP/crypto/src/3way.cpp b/plugins/CryptoPP/crypto/src/3way.cpp
index dafaf76632..f1265ce8d0 100644
--- a/plugins/CryptoPP/crypto/src/3way.cpp
+++ b/plugins/CryptoPP/crypto/src/3way.cpp
@@ -1,4 +1,4 @@
-// 3way.cpp - modifed by Wei Dai from Joan Daemen's 3way.c
+// 3way.cpp - modifed by Wei Dai from Joan Daemen's 3way.c
 // The original code and all modifications are in the public domain.
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/3way.h b/plugins/CryptoPP/crypto/src/3way.h
index 6f9a5e345a..ccbf9038b7 100644
--- a/plugins/CryptoPP/crypto/src/3way.h
+++ b/plugins/CryptoPP/crypto/src/3way.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_THREEWAY_H
+#ifndef CRYPTOPP_THREEWAY_H
 #define CRYPTOPP_THREEWAY_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/adhoc.cpp b/plugins/CryptoPP/crypto/src/adhoc.cpp
index a069f82fb7..dc7f697596 100644
--- a/plugins/CryptoPP/crypto/src/adhoc.cpp
+++ b/plugins/CryptoPP/crypto/src/adhoc.cpp
@@ -1,4 +1,4 @@
-#include "filters.h"
+#include "filters.h"
 #include "files.h"
 #include "base64.h"
 #include "hex.h"
diff --git a/plugins/CryptoPP/crypto/src/adler32.cpp b/plugins/CryptoPP/crypto/src/adler32.cpp
index 9746aabf69..227020275f 100644
--- a/plugins/CryptoPP/crypto/src/adler32.cpp
+++ b/plugins/CryptoPP/crypto/src/adler32.cpp
@@ -1,4 +1,4 @@
-// adler32.cpp - written and placed in the public domain by Wei Dai
+// adler32.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "adler32.h"
diff --git a/plugins/CryptoPP/crypto/src/adler32.h b/plugins/CryptoPP/crypto/src/adler32.h
index f51fa24859..672b3edd18 100644
--- a/plugins/CryptoPP/crypto/src/adler32.h
+++ b/plugins/CryptoPP/crypto/src/adler32.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ADLER32_H
+#ifndef CRYPTOPP_ADLER32_H
 #define CRYPTOPP_ADLER32_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/aes.h b/plugins/CryptoPP/crypto/src/aes.h
index 76dc866515..03b6bf12b9 100644
--- a/plugins/CryptoPP/crypto/src/aes.h
+++ b/plugins/CryptoPP/crypto/src/aes.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_AES_H
+#ifndef CRYPTOPP_AES_H
 #define CRYPTOPP_AES_H
 
 #include "rijndael.h"
diff --git a/plugins/CryptoPP/crypto/src/algebra.cpp b/plugins/CryptoPP/crypto/src/algebra.cpp
index 7335a7694b..5d7e2134fc 100644
--- a/plugins/CryptoPP/crypto/src/algebra.cpp
+++ b/plugins/CryptoPP/crypto/src/algebra.cpp
@@ -1,4 +1,4 @@
-// algebra.cpp - written and placed in the public domain by Wei Dai
+// algebra.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/algebra.h b/plugins/CryptoPP/crypto/src/algebra.h
index 196b37229f..e7f379394f 100644
--- a/plugins/CryptoPP/crypto/src/algebra.h
+++ b/plugins/CryptoPP/crypto/src/algebra.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ALGEBRA_H
+#ifndef CRYPTOPP_ALGEBRA_H
 #define CRYPTOPP_ALGEBRA_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/algparam.cpp b/plugins/CryptoPP/crypto/src/algparam.cpp
index 444652320c..6e765c2768 100644
--- a/plugins/CryptoPP/crypto/src/algparam.cpp
+++ b/plugins/CryptoPP/crypto/src/algparam.cpp
@@ -1,4 +1,4 @@
-// algparam.cpp - written and placed in the public domain by Wei Dai
+// algparam.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/algparam.h b/plugins/CryptoPP/crypto/src/algparam.h
index af2b997281..e47accee83 100644
--- a/plugins/CryptoPP/crypto/src/algparam.h
+++ b/plugins/CryptoPP/crypto/src/algparam.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ALGPARAM_H
+#ifndef CRYPTOPP_ALGPARAM_H
 #define CRYPTOPP_ALGPARAM_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/arc4.cpp b/plugins/CryptoPP/crypto/src/arc4.cpp
index af4a9b17df..ff9d587712 100644
--- a/plugins/CryptoPP/crypto/src/arc4.cpp
+++ b/plugins/CryptoPP/crypto/src/arc4.cpp
@@ -1,4 +1,4 @@
-// arc4.cpp - written and placed in the public domain by Wei Dai
+// arc4.cpp - written and placed in the public domain by Wei Dai
 
 // The ARC4 algorithm was first revealed in an anonymous email to the
 // cypherpunks mailing list. This file originally contained some
diff --git a/plugins/CryptoPP/crypto/src/arc4.h b/plugins/CryptoPP/crypto/src/arc4.h
index c51bcd9a3f..7846d5adbe 100644
--- a/plugins/CryptoPP/crypto/src/arc4.h
+++ b/plugins/CryptoPP/crypto/src/arc4.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ARC4_H
+#ifndef CRYPTOPP_ARC4_H
 #define CRYPTOPP_ARC4_H
 
 #include "strciphr.h"
diff --git a/plugins/CryptoPP/crypto/src/argnames.h b/plugins/CryptoPP/crypto/src/argnames.h
index e232a3e79c..f888d42dae 100644
--- a/plugins/CryptoPP/crypto/src/argnames.h
+++ b/plugins/CryptoPP/crypto/src/argnames.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ARGNAMES_H
+#ifndef CRYPTOPP_ARGNAMES_H
 #define CRYPTOPP_ARGNAMES_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/asn.cpp b/plugins/CryptoPP/crypto/src/asn.cpp
index f737ef7581..41740900ca 100644
--- a/plugins/CryptoPP/crypto/src/asn.cpp
+++ b/plugins/CryptoPP/crypto/src/asn.cpp
@@ -1,4 +1,4 @@
-// asn.cpp - written and placed in the public domain by Wei Dai
+// asn.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/asn.h b/plugins/CryptoPP/crypto/src/asn.h
index d37c02056a..d74af5a76a 100644
--- a/plugins/CryptoPP/crypto/src/asn.h
+++ b/plugins/CryptoPP/crypto/src/asn.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ASN_H
+#ifndef CRYPTOPP_ASN_H
 #define CRYPTOPP_ASN_H
 
 #include "filters.h"
diff --git a/plugins/CryptoPP/crypto/src/base32.cpp b/plugins/CryptoPP/crypto/src/base32.cpp
index f3f985a315..5eee3aa130 100644
--- a/plugins/CryptoPP/crypto/src/base32.cpp
+++ b/plugins/CryptoPP/crypto/src/base32.cpp
@@ -1,4 +1,4 @@
-// base32.cpp - written and placed in the public domain by Frank Palazzolo, based on hex.cpp by Wei Dai
+// base32.cpp - written and placed in the public domain by Frank Palazzolo, based on hex.cpp by Wei Dai
 
 #include "pch.h"
 #include "base32.h"
diff --git a/plugins/CryptoPP/crypto/src/base32.h b/plugins/CryptoPP/crypto/src/base32.h
index d4e635e5ee..6b7937ac78 100644
--- a/plugins/CryptoPP/crypto/src/base32.h
+++ b/plugins/CryptoPP/crypto/src/base32.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_BASE32_H
+#ifndef CRYPTOPP_BASE32_H
 #define CRYPTOPP_BASE32_H
 
 #include "basecode.h"
diff --git a/plugins/CryptoPP/crypto/src/base64.cpp b/plugins/CryptoPP/crypto/src/base64.cpp
index 5a46c4fda0..1e233496a4 100644
--- a/plugins/CryptoPP/crypto/src/base64.cpp
+++ b/plugins/CryptoPP/crypto/src/base64.cpp
@@ -1,4 +1,4 @@
-// base64.cpp - written and placed in the public domain by Wei Dai
+// base64.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "base64.h"
diff --git a/plugins/CryptoPP/crypto/src/base64.h b/plugins/CryptoPP/crypto/src/base64.h
index 5fa416fe17..c405ecaf36 100644
--- a/plugins/CryptoPP/crypto/src/base64.h
+++ b/plugins/CryptoPP/crypto/src/base64.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_BASE64_H
+#ifndef CRYPTOPP_BASE64_H
 #define CRYPTOPP_BASE64_H
 
 #include "basecode.h"
diff --git a/plugins/CryptoPP/crypto/src/basecode.cpp b/plugins/CryptoPP/crypto/src/basecode.cpp
index b76e22de81..ab94f81550 100644
--- a/plugins/CryptoPP/crypto/src/basecode.cpp
+++ b/plugins/CryptoPP/crypto/src/basecode.cpp
@@ -1,4 +1,4 @@
-// basecode.cpp - written and placed in the public domain by Wei Dai
+// basecode.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/basecode.h b/plugins/CryptoPP/crypto/src/basecode.h
index ca1e7727fe..a20623ae0b 100644
--- a/plugins/CryptoPP/crypto/src/basecode.h
+++ b/plugins/CryptoPP/crypto/src/basecode.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_BASECODE_H
+#ifndef CRYPTOPP_BASECODE_H
 #define CRYPTOPP_BASECODE_H
 
 #include "filters.h"
diff --git a/plugins/CryptoPP/crypto/src/bench.cpp b/plugins/CryptoPP/crypto/src/bench.cpp
index da6d5de3cb..bbaa1e5c5c 100644
--- a/plugins/CryptoPP/crypto/src/bench.cpp
+++ b/plugins/CryptoPP/crypto/src/bench.cpp
@@ -1,4 +1,4 @@
-// bench.cpp - written and placed in the public domain by Wei Dai
+// bench.cpp - written and placed in the public domain by Wei Dai
 
 #define _CRT_SECURE_NO_DEPRECATE
 
diff --git a/plugins/CryptoPP/crypto/src/bench.h b/plugins/CryptoPP/crypto/src/bench.h
index 890375a4ba..c5da2cf693 100644
--- a/plugins/CryptoPP/crypto/src/bench.h
+++ b/plugins/CryptoPP/crypto/src/bench.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_BENCH_H
+#ifndef CRYPTOPP_BENCH_H
 #define CRYPTOPP_BENCH_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/bench2.cpp b/plugins/CryptoPP/crypto/src/bench2.cpp
index aa922105a5..144c1b172b 100644
--- a/plugins/CryptoPP/crypto/src/bench2.cpp
+++ b/plugins/CryptoPP/crypto/src/bench2.cpp
@@ -1,4 +1,4 @@
-// bench2.cpp - written and placed in the public domain by Wei Dai
+// bench2.cpp - written and placed in the public domain by Wei Dai
 
 #include "bench.h"
 #include "rng.h"
diff --git a/plugins/CryptoPP/crypto/src/bfinit.cpp b/plugins/CryptoPP/crypto/src/bfinit.cpp
index 26023230c6..06db2096f6 100644
--- a/plugins/CryptoPP/crypto/src/bfinit.cpp
+++ b/plugins/CryptoPP/crypto/src/bfinit.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "blowfish.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/plugins/CryptoPP/crypto/src/blowfish.cpp b/plugins/CryptoPP/crypto/src/blowfish.cpp
index af9027c10d..7fe9a56fef 100644
--- a/plugins/CryptoPP/crypto/src/blowfish.cpp
+++ b/plugins/CryptoPP/crypto/src/blowfish.cpp
@@ -1,4 +1,4 @@
-// blowfish.cpp - written and placed in the public domain by Wei Dai
+// blowfish.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "blowfish.h"
diff --git a/plugins/CryptoPP/crypto/src/blowfish.h b/plugins/CryptoPP/crypto/src/blowfish.h
index ffc97890e5..d36af881dd 100644
--- a/plugins/CryptoPP/crypto/src/blowfish.h
+++ b/plugins/CryptoPP/crypto/src/blowfish.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_BLOWFISH_H
+#ifndef CRYPTOPP_BLOWFISH_H
 #define CRYPTOPP_BLOWFISH_H
 
 /** \file */
diff --git a/plugins/CryptoPP/crypto/src/blumshub.cpp b/plugins/CryptoPP/crypto/src/blumshub.cpp
index f6c9ada2b3..6ab2209925 100644
--- a/plugins/CryptoPP/crypto/src/blumshub.cpp
+++ b/plugins/CryptoPP/crypto/src/blumshub.cpp
@@ -1,4 +1,4 @@
-// blumshub.cpp - written and placed in the public domain by Wei Dai
+// blumshub.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "blumshub.h"
diff --git a/plugins/CryptoPP/crypto/src/blumshub.h b/plugins/CryptoPP/crypto/src/blumshub.h
index ae7c3df4f3..538c1520d5 100644
--- a/plugins/CryptoPP/crypto/src/blumshub.h
+++ b/plugins/CryptoPP/crypto/src/blumshub.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_BLUMSHUB_H
+#ifndef CRYPTOPP_BLUMSHUB_H
 #define CRYPTOPP_BLUMSHUB_H
 
 #include "modarith.h"
diff --git a/plugins/CryptoPP/crypto/src/camellia.cpp b/plugins/CryptoPP/crypto/src/camellia.cpp
index 637328b4f5..b9f1db808a 100644
--- a/plugins/CryptoPP/crypto/src/camellia.cpp
+++ b/plugins/CryptoPP/crypto/src/camellia.cpp
@@ -1,4 +1,4 @@
-// camellia.cpp - by Kevin Springle, 2003
+// camellia.cpp - by Kevin Springle, 2003
 // This code is hereby placed in the public domain.
 
 /*
diff --git a/plugins/CryptoPP/crypto/src/camellia.h b/plugins/CryptoPP/crypto/src/camellia.h
index cc0b7f2597..0426e45426 100644
--- a/plugins/CryptoPP/crypto/src/camellia.h
+++ b/plugins/CryptoPP/crypto/src/camellia.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CAMELLIA_H
+#ifndef CRYPTOPP_CAMELLIA_H
 #define CRYPTOPP_CAMELLIA_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/cast.cpp b/plugins/CryptoPP/crypto/src/cast.cpp
index 53efc4d399..c6787ea22c 100644
--- a/plugins/CryptoPP/crypto/src/cast.cpp
+++ b/plugins/CryptoPP/crypto/src/cast.cpp
@@ -1,4 +1,4 @@
-// cast.cpp - written and placed in the public domain by Wei Dai and Leonard Janke
+// cast.cpp - written and placed in the public domain by Wei Dai and Leonard Janke
 // based on Steve Reid's public domain cast.c
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/cast.h b/plugins/CryptoPP/crypto/src/cast.h
index 222a55a22a..f527be8aa1 100644
--- a/plugins/CryptoPP/crypto/src/cast.h
+++ b/plugins/CryptoPP/crypto/src/cast.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CAST_H
+#ifndef CRYPTOPP_CAST_H
 #define CRYPTOPP_CAST_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/casts.cpp b/plugins/CryptoPP/crypto/src/casts.cpp
index fd9881299f..d823d725ce 100644
--- a/plugins/CryptoPP/crypto/src/casts.cpp
+++ b/plugins/CryptoPP/crypto/src/casts.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "cast.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/plugins/CryptoPP/crypto/src/cbcmac.cpp b/plugins/CryptoPP/crypto/src/cbcmac.cpp
index 1a029f8375..322a4c3845 100644
--- a/plugins/CryptoPP/crypto/src/cbcmac.cpp
+++ b/plugins/CryptoPP/crypto/src/cbcmac.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 
 #ifndef CRYPTOPP_IMPORTS
 
diff --git a/plugins/CryptoPP/crypto/src/cbcmac.h b/plugins/CryptoPP/crypto/src/cbcmac.h
index 8da1df5e52..9e944c685c 100644
--- a/plugins/CryptoPP/crypto/src/cbcmac.h
+++ b/plugins/CryptoPP/crypto/src/cbcmac.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CBCMAC_H
+#ifndef CRYPTOPP_CBCMAC_H
 #define CRYPTOPP_CBCMAC_H
 
 #include "seckey.h"
diff --git a/plugins/CryptoPP/crypto/src/channels.cpp b/plugins/CryptoPP/crypto/src/channels.cpp
index dd0d9cb10a..e0c5c4fb74 100644
--- a/plugins/CryptoPP/crypto/src/channels.cpp
+++ b/plugins/CryptoPP/crypto/src/channels.cpp
@@ -1,4 +1,4 @@
-// channels.cpp - written and placed in the public domain by Wei Dai
+// channels.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/channels.h b/plugins/CryptoPP/crypto/src/channels.h
index a6567760a1..499a246b6b 100644
--- a/plugins/CryptoPP/crypto/src/channels.h
+++ b/plugins/CryptoPP/crypto/src/channels.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CHANNELS_H
+#ifndef CRYPTOPP_CHANNELS_H
 #define CRYPTOPP_CHANNELS_H
 
 #include "simple.h"
diff --git a/plugins/CryptoPP/crypto/src/config.h b/plugins/CryptoPP/crypto/src/config.h
index 37f60f62b0..02f05f1ca3 100644
--- a/plugins/CryptoPP/crypto/src/config.h
+++ b/plugins/CryptoPP/crypto/src/config.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CONFIG_H
+#ifndef CRYPTOPP_CONFIG_H
 #define CRYPTOPP_CONFIG_H
 
 // ***************** Important Settings ********************
diff --git a/plugins/CryptoPP/crypto/src/cpu.cpp b/plugins/CryptoPP/crypto/src/cpu.cpp
index 66772023d4..ab6905231a 100644
--- a/plugins/CryptoPP/crypto/src/cpu.cpp
+++ b/plugins/CryptoPP/crypto/src/cpu.cpp
@@ -1,4 +1,4 @@
-// cpu.cpp - written and placed in the public domain by Wei Dai
+// cpu.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/cpu.h b/plugins/CryptoPP/crypto/src/cpu.h
index 4d18704fc6..518e92f166 100644
--- a/plugins/CryptoPP/crypto/src/cpu.h
+++ b/plugins/CryptoPP/crypto/src/cpu.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CPU_H
+#ifndef CRYPTOPP_CPU_H
 #define CRYPTOPP_CPU_H
 
 #ifdef CRYPTOPP_GENERATE_X64_MASM
diff --git a/plugins/CryptoPP/crypto/src/crc.cpp b/plugins/CryptoPP/crypto/src/crc.cpp
index 045e2608ac..a27f891ba4 100644
--- a/plugins/CryptoPP/crypto/src/crc.cpp
+++ b/plugins/CryptoPP/crypto/src/crc.cpp
@@ -1,4 +1,4 @@
-// crc.cpp - written and placed in the public domain by Wei Dai
+// crc.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "crc.h"
diff --git a/plugins/CryptoPP/crypto/src/crc.h b/plugins/CryptoPP/crypto/src/crc.h
index 740e77832b..ffe90f4c46 100644
--- a/plugins/CryptoPP/crypto/src/crc.h
+++ b/plugins/CryptoPP/crypto/src/crc.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_CRC32_H
+#ifndef CRYPTOPP_CRC32_H
 #define CRYPTOPP_CRC32_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/cryptlib.cpp b/plugins/CryptoPP/crypto/src/cryptlib.cpp
index 8e723e19bf..c91d4e3de3 100644
--- a/plugins/CryptoPP/crypto/src/cryptlib.cpp
+++ b/plugins/CryptoPP/crypto/src/cryptlib.cpp
@@ -1,4 +1,4 @@
-// cryptlib.cpp - written and placed in the public domain by Wei Dai
+// cryptlib.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/cryptlib.h b/plugins/CryptoPP/crypto/src/cryptlib.h
index 8e5e9590d6..8949e03ae8 100644
--- a/plugins/CryptoPP/crypto/src/cryptlib.h
+++ b/plugins/CryptoPP/crypto/src/cryptlib.h
@@ -1,4 +1,4 @@
-// cryptlib.h - written and placed in the public domain by Wei Dai
+// cryptlib.h - written and placed in the public domain by Wei Dai
 /*! \file
  	This file contains the declarations for the abstract base
 	classes that provide a uniform interface to this library.
diff --git a/plugins/CryptoPP/crypto/src/cryptlib_bds.cpp b/plugins/CryptoPP/crypto/src/cryptlib_bds.cpp
index 82420679ae..40fc2474ac 100644
--- a/plugins/CryptoPP/crypto/src/cryptlib_bds.cpp
+++ b/plugins/CryptoPP/crypto/src/cryptlib_bds.cpp
@@ -1,4 +1,4 @@
-//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 
 /*
 #include <vcl.h>
diff --git a/plugins/CryptoPP/crypto/src/datatest.cpp b/plugins/CryptoPP/crypto/src/datatest.cpp
index 2f520e080e..4a6fb04f43 100644
--- a/plugins/CryptoPP/crypto/src/datatest.cpp
+++ b/plugins/CryptoPP/crypto/src/datatest.cpp
@@ -1,4 +1,4 @@
-#include "factory.h"
+#include "factory.h"
 #include "integer.h"
 #include "filters.h"
 #include "hex.h"
diff --git a/plugins/CryptoPP/crypto/src/default.cpp b/plugins/CryptoPP/crypto/src/default.cpp
index b1c2f5d40c..c7f9b2c68b 100644
--- a/plugins/CryptoPP/crypto/src/default.cpp
+++ b/plugins/CryptoPP/crypto/src/default.cpp
@@ -1,4 +1,4 @@
-// default.cpp - written and placed in the public domain by Wei Dai
+// default.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "default.h"
diff --git a/plugins/CryptoPP/crypto/src/default.h b/plugins/CryptoPP/crypto/src/default.h
index 5291e8a54d..fd3eb48c2d 100644
--- a/plugins/CryptoPP/crypto/src/default.h
+++ b/plugins/CryptoPP/crypto/src/default.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DEFAULT_H
+#ifndef CRYPTOPP_DEFAULT_H
 #define CRYPTOPP_DEFAULT_H
 
 #include "sha.h"
diff --git a/plugins/CryptoPP/crypto/src/des.cpp b/plugins/CryptoPP/crypto/src/des.cpp
index 322b1df26a..69c4ba066d 100644
--- a/plugins/CryptoPP/crypto/src/des.cpp
+++ b/plugins/CryptoPP/crypto/src/des.cpp
@@ -1,4 +1,4 @@
-// des.cpp - modified by Wei Dai from Phil Karn's des.c
+// des.cpp - modified by Wei Dai from Phil Karn's des.c
 // The original code and all modifications are in the public domain.
 
 /*
diff --git a/plugins/CryptoPP/crypto/src/des.h b/plugins/CryptoPP/crypto/src/des.h
index 1a52333fc5..a6aaa79d94 100644
--- a/plugins/CryptoPP/crypto/src/des.h
+++ b/plugins/CryptoPP/crypto/src/des.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DES_H
+#ifndef CRYPTOPP_DES_H
 #define CRYPTOPP_DES_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/dessp.cpp b/plugins/CryptoPP/crypto/src/dessp.cpp
index a4451bc8ee..938272106c 100644
--- a/plugins/CryptoPP/crypto/src/dessp.cpp
+++ b/plugins/CryptoPP/crypto/src/dessp.cpp
@@ -1,4 +1,4 @@
-// This file is mostly generated by Phil Karn's gensp.c
+// This file is mostly generated by Phil Karn's gensp.c
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/dh.cpp b/plugins/CryptoPP/crypto/src/dh.cpp
index 895a97b6ad..b0b2e7c861 100644
--- a/plugins/CryptoPP/crypto/src/dh.cpp
+++ b/plugins/CryptoPP/crypto/src/dh.cpp
@@ -1,4 +1,4 @@
-// dh.cpp - written and placed in the public domain by Wei Dai
+// dh.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/dh.h b/plugins/CryptoPP/crypto/src/dh.h
index 8bf43b7539..590b9bbc93 100644
--- a/plugins/CryptoPP/crypto/src/dh.h
+++ b/plugins/CryptoPP/crypto/src/dh.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DH_H
+#ifndef CRYPTOPP_DH_H
 #define CRYPTOPP_DH_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/dh2.cpp b/plugins/CryptoPP/crypto/src/dh2.cpp
index b03f1eac9b..4a292af3b1 100644
--- a/plugins/CryptoPP/crypto/src/dh2.cpp
+++ b/plugins/CryptoPP/crypto/src/dh2.cpp
@@ -1,4 +1,4 @@
-// dh2.cpp - written and placed in the public domain by Wei Dai
+// dh2.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "dh2.h"
diff --git a/plugins/CryptoPP/crypto/src/dh2.h b/plugins/CryptoPP/crypto/src/dh2.h
index 1c1cb5103f..1dfd5e2f86 100644
--- a/plugins/CryptoPP/crypto/src/dh2.h
+++ b/plugins/CryptoPP/crypto/src/dh2.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DH2_H
+#ifndef CRYPTOPP_DH2_H
 #define CRYPTOPP_DH2_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/dll.cpp b/plugins/CryptoPP/crypto/src/dll.cpp
index 020ce917cf..5f644577cb 100644
--- a/plugins/CryptoPP/crypto/src/dll.cpp
+++ b/plugins/CryptoPP/crypto/src/dll.cpp
@@ -1,4 +1,4 @@
-// dll.cpp - written and placed in the public domain by Wei Dai
+// dll.cpp - written and placed in the public domain by Wei Dai
 
 #define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
 #define CRYPTOPP_DEFAULT_NO_DLL
diff --git a/plugins/CryptoPP/crypto/src/dll.h b/plugins/CryptoPP/crypto/src/dll.h
index d92da97124..274e8b6234 100644
--- a/plugins/CryptoPP/crypto/src/dll.h
+++ b/plugins/CryptoPP/crypto/src/dll.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DLL_H
+#ifndef CRYPTOPP_DLL_H
 #define CRYPTOPP_DLL_H
 
 #if !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS) && !defined(CRYPTOPP_DEFAULT_NO_DLL)
diff --git a/plugins/CryptoPP/crypto/src/dlltest.cpp b/plugins/CryptoPP/crypto/src/dlltest.cpp
index 59ee13fbbf..0b3287dc7f 100644
--- a/plugins/CryptoPP/crypto/src/dlltest.cpp
+++ b/plugins/CryptoPP/crypto/src/dlltest.cpp
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DLL_ONLY
+#ifndef CRYPTOPP_DLL_ONLY
 #define CRYPTOPP_DEFAULT_NO_DLL
 #endif
 
diff --git a/plugins/CryptoPP/crypto/src/dmac.h b/plugins/CryptoPP/crypto/src/dmac.h
index 84554ab5dc..054e6cbf18 100644
--- a/plugins/CryptoPP/crypto/src/dmac.h
+++ b/plugins/CryptoPP/crypto/src/dmac.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DMAC_H
+#ifndef CRYPTOPP_DMAC_H
 #define CRYPTOPP_DMAC_H
 
 #include "cbcmac.h"
diff --git a/plugins/CryptoPP/crypto/src/dsa.cpp b/plugins/CryptoPP/crypto/src/dsa.cpp
index 708bc2032e..4b130d723f 100644
--- a/plugins/CryptoPP/crypto/src/dsa.cpp
+++ b/plugins/CryptoPP/crypto/src/dsa.cpp
@@ -1,4 +1,4 @@
-// dsa.cpp - written and placed in the public domain by Wei Dai
+// dsa.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/dsa.h b/plugins/CryptoPP/crypto/src/dsa.h
index 3edb4f1b5f..96ba3c1b24 100644
--- a/plugins/CryptoPP/crypto/src/dsa.h
+++ b/plugins/CryptoPP/crypto/src/dsa.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_DSA_H
+#ifndef CRYPTOPP_DSA_H
 #define CRYPTOPP_DSA_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/ec2n.cpp b/plugins/CryptoPP/crypto/src/ec2n.cpp
index b015dbd31d..e2cf4ad0ed 100644
--- a/plugins/CryptoPP/crypto/src/ec2n.cpp
+++ b/plugins/CryptoPP/crypto/src/ec2n.cpp
@@ -1,4 +1,4 @@
-// ec2n.cpp - written and placed in the public domain by Wei Dai
+// ec2n.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/ec2n.h b/plugins/CryptoPP/crypto/src/ec2n.h
index a7b0e631d7..ebcaf4d26c 100644
--- a/plugins/CryptoPP/crypto/src/ec2n.h
+++ b/plugins/CryptoPP/crypto/src/ec2n.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_EC2N_H
+#ifndef CRYPTOPP_EC2N_H
 #define CRYPTOPP_EC2N_H
 
 #include "gf2n.h"
diff --git a/plugins/CryptoPP/crypto/src/eccrypto.cpp b/plugins/CryptoPP/crypto/src/eccrypto.cpp
index c40a25362d..c08df9e4a6 100644
--- a/plugins/CryptoPP/crypto/src/eccrypto.cpp
+++ b/plugins/CryptoPP/crypto/src/eccrypto.cpp
@@ -1,4 +1,4 @@
-// eccrypto.cpp - written and placed in the public domain by Wei Dai
+// eccrypto.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/eccrypto.h b/plugins/CryptoPP/crypto/src/eccrypto.h
index 2ccebbb027..e97b906465 100644
--- a/plugins/CryptoPP/crypto/src/eccrypto.h
+++ b/plugins/CryptoPP/crypto/src/eccrypto.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ECCRYPTO_H
+#ifndef CRYPTOPP_ECCRYPTO_H
 #define CRYPTOPP_ECCRYPTO_H
 
 /*! \file
diff --git a/plugins/CryptoPP/crypto/src/ecp.cpp b/plugins/CryptoPP/crypto/src/ecp.cpp
index ff8992654b..35e264b62a 100644
--- a/plugins/CryptoPP/crypto/src/ecp.cpp
+++ b/plugins/CryptoPP/crypto/src/ecp.cpp
@@ -1,4 +1,4 @@
-// ecp.cpp - written and placed in the public domain by Wei Dai
+// ecp.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/ecp.h b/plugins/CryptoPP/crypto/src/ecp.h
index 0fc07b4873..07f906c9aa 100644
--- a/plugins/CryptoPP/crypto/src/ecp.h
+++ b/plugins/CryptoPP/crypto/src/ecp.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ECP_H
+#ifndef CRYPTOPP_ECP_H
 #define CRYPTOPP_ECP_H
 
 #include "modarith.h"
diff --git a/plugins/CryptoPP/crypto/src/elgamal.cpp b/plugins/CryptoPP/crypto/src/elgamal.cpp
index b7da08b9a7..ff0a1dcc90 100644
--- a/plugins/CryptoPP/crypto/src/elgamal.cpp
+++ b/plugins/CryptoPP/crypto/src/elgamal.cpp
@@ -1,4 +1,4 @@
-// elgamal.cpp - written and placed in the public domain by Wei Dai
+// elgamal.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "elgamal.h"
diff --git a/plugins/CryptoPP/crypto/src/elgamal.h b/plugins/CryptoPP/crypto/src/elgamal.h
index 9ca024aa2a..1c5d53ba22 100644
--- a/plugins/CryptoPP/crypto/src/elgamal.h
+++ b/plugins/CryptoPP/crypto/src/elgamal.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ELGAMAL_H
+#ifndef CRYPTOPP_ELGAMAL_H
 #define CRYPTOPP_ELGAMAL_H
 
 #include "modexppc.h"
diff --git a/plugins/CryptoPP/crypto/src/emsa2.cpp b/plugins/CryptoPP/crypto/src/emsa2.cpp
index 787ff525a0..43974358f6 100644
--- a/plugins/CryptoPP/crypto/src/emsa2.cpp
+++ b/plugins/CryptoPP/crypto/src/emsa2.cpp
@@ -1,4 +1,4 @@
-// emsa2.cpp - written and placed in the public domain by Wei Dai
+// emsa2.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "emsa2.h"
diff --git a/plugins/CryptoPP/crypto/src/emsa2.h b/plugins/CryptoPP/crypto/src/emsa2.h
index 53022c217a..911bd9707d 100644
--- a/plugins/CryptoPP/crypto/src/emsa2.h
+++ b/plugins/CryptoPP/crypto/src/emsa2.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_EMSA2_H
+#ifndef CRYPTOPP_EMSA2_H
 #define CRYPTOPP_EMSA2_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/eprecomp.cpp b/plugins/CryptoPP/crypto/src/eprecomp.cpp
index 7c83e5f1fe..67a4ab6105 100644
--- a/plugins/CryptoPP/crypto/src/eprecomp.cpp
+++ b/plugins/CryptoPP/crypto/src/eprecomp.cpp
@@ -1,4 +1,4 @@
-// eprecomp.cpp - written and placed in the public domain by Wei Dai
+// eprecomp.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/eprecomp.h b/plugins/CryptoPP/crypto/src/eprecomp.h
index 53a5218161..ade6c3400a 100644
--- a/plugins/CryptoPP/crypto/src/eprecomp.h
+++ b/plugins/CryptoPP/crypto/src/eprecomp.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_EPRECOMP_H
+#ifndef CRYPTOPP_EPRECOMP_H
 #define CRYPTOPP_EPRECOMP_H
 
 #include "integer.h"
diff --git a/plugins/CryptoPP/crypto/src/esign.cpp b/plugins/CryptoPP/crypto/src/esign.cpp
index 23540bd305..39d80a61fc 100644
--- a/plugins/CryptoPP/crypto/src/esign.cpp
+++ b/plugins/CryptoPP/crypto/src/esign.cpp
@@ -1,4 +1,4 @@
-// esign.cpp - written and placed in the public domain by Wei Dai
+// esign.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "esign.h"
diff --git a/plugins/CryptoPP/crypto/src/esign.h b/plugins/CryptoPP/crypto/src/esign.h
index a699418b0e..058e414cc3 100644
--- a/plugins/CryptoPP/crypto/src/esign.h
+++ b/plugins/CryptoPP/crypto/src/esign.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ESIGN_H
+#ifndef CRYPTOPP_ESIGN_H
 #define CRYPTOPP_ESIGN_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/factory.h b/plugins/CryptoPP/crypto/src/factory.h
index 353cab6366..3c22c1b8f2 100644
--- a/plugins/CryptoPP/crypto/src/factory.h
+++ b/plugins/CryptoPP/crypto/src/factory.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_OBJFACT_H
+#ifndef CRYPTOPP_OBJFACT_H
 #define CRYPTOPP_OBJFACT_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/files.cpp b/plugins/CryptoPP/crypto/src/files.cpp
index 03b3fa9bb4..61915d777a 100644
--- a/plugins/CryptoPP/crypto/src/files.cpp
+++ b/plugins/CryptoPP/crypto/src/files.cpp
@@ -1,4 +1,4 @@
-// files.cpp - written and placed in the public domain by Wei Dai
+// files.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/files.h b/plugins/CryptoPP/crypto/src/files.h
index e621caf6b9..2e6fa87cc2 100644
--- a/plugins/CryptoPP/crypto/src/files.h
+++ b/plugins/CryptoPP/crypto/src/files.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_FILES_H
+#ifndef CRYPTOPP_FILES_H
 #define CRYPTOPP_FILES_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/filters.cpp b/plugins/CryptoPP/crypto/src/filters.cpp
index 8a8a41d99c..b3fbacfaa3 100644
--- a/plugins/CryptoPP/crypto/src/filters.cpp
+++ b/plugins/CryptoPP/crypto/src/filters.cpp
@@ -1,4 +1,4 @@
-// filters.cpp - written and placed in the public domain by Wei Dai
+// filters.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/filters.h b/plugins/CryptoPP/crypto/src/filters.h
index 6c8d508308..a49fb8df8b 100644
--- a/plugins/CryptoPP/crypto/src/filters.h
+++ b/plugins/CryptoPP/crypto/src/filters.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_FILTERS_H
+#ifndef CRYPTOPP_FILTERS_H
 #define CRYPTOPP_FILTERS_H
 
 #include "simple.h"
diff --git a/plugins/CryptoPP/crypto/src/fips140.cpp b/plugins/CryptoPP/crypto/src/fips140.cpp
index 6dec2092ef..87b49118a5 100644
--- a/plugins/CryptoPP/crypto/src/fips140.cpp
+++ b/plugins/CryptoPP/crypto/src/fips140.cpp
@@ -1,4 +1,4 @@
-// fips140.cpp - written and placed in the public domain by Wei Dai
+// fips140.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/fips140.h b/plugins/CryptoPP/crypto/src/fips140.h
index d40cb83451..b580fe4657 100644
--- a/plugins/CryptoPP/crypto/src/fips140.h
+++ b/plugins/CryptoPP/crypto/src/fips140.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_FIPS140_H
+#ifndef CRYPTOPP_FIPS140_H
 #define CRYPTOPP_FIPS140_H
 
 /*! \file
diff --git a/plugins/CryptoPP/crypto/src/fipsalgt.cpp b/plugins/CryptoPP/crypto/src/fipsalgt.cpp
index 08e8b47c45..5f33537516 100644
--- a/plugins/CryptoPP/crypto/src/fipsalgt.cpp
+++ b/plugins/CryptoPP/crypto/src/fipsalgt.cpp
@@ -1,4 +1,4 @@
-// fipsalgt.cpp - written and placed in the public domain by Wei Dai
+// fipsalgt.cpp - written and placed in the public domain by Wei Dai
 
 // This file implements the various algorithm tests needed to pass FIPS 140 validation.
 // They're preserved here (commented out) in case Crypto++ needs to be revalidated.
diff --git a/plugins/CryptoPP/crypto/src/fipstest.cpp b/plugins/CryptoPP/crypto/src/fipstest.cpp
index 72469655d5..d65730b010 100644
--- a/plugins/CryptoPP/crypto/src/fipstest.cpp
+++ b/plugins/CryptoPP/crypto/src/fipstest.cpp
@@ -1,4 +1,4 @@
-// fipstest.cpp - written and placed in the public domain by Wei Dai
+// fipstest.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/fltrimpl.h b/plugins/CryptoPP/crypto/src/fltrimpl.h
index 29dad5ef1b..62f7604ab0 100644
--- a/plugins/CryptoPP/crypto/src/fltrimpl.h
+++ b/plugins/CryptoPP/crypto/src/fltrimpl.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_FLTRIMPL_H
+#ifndef CRYPTOPP_FLTRIMPL_H
 #define CRYPTOPP_FLTRIMPL_H
 
 #define FILTER_BEGIN	\
diff --git a/plugins/CryptoPP/crypto/src/gf256.cpp b/plugins/CryptoPP/crypto/src/gf256.cpp
index fa4720647e..3649f75592 100644
--- a/plugins/CryptoPP/crypto/src/gf256.cpp
+++ b/plugins/CryptoPP/crypto/src/gf256.cpp
@@ -1,4 +1,4 @@
-// gf256.cpp - written and placed in the public domain by Wei Dai
+// gf256.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "gf256.h"
diff --git a/plugins/CryptoPP/crypto/src/gf256.h b/plugins/CryptoPP/crypto/src/gf256.h
index 6a75fd2462..24a86f5cd2 100644
--- a/plugins/CryptoPP/crypto/src/gf256.h
+++ b/plugins/CryptoPP/crypto/src/gf256.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_GF256_H
+#ifndef CRYPTOPP_GF256_H
 #define CRYPTOPP_GF256_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/gf2_32.cpp b/plugins/CryptoPP/crypto/src/gf2_32.cpp
index f9c5dae66e..929dac0deb 100644
--- a/plugins/CryptoPP/crypto/src/gf2_32.cpp
+++ b/plugins/CryptoPP/crypto/src/gf2_32.cpp
@@ -1,4 +1,4 @@
-// gf2_32.cpp - written and placed in the public domain by Wei Dai
+// gf2_32.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "misc.h"
diff --git a/plugins/CryptoPP/crypto/src/gf2_32.h b/plugins/CryptoPP/crypto/src/gf2_32.h
index 4bba9e7cfe..d2eecf1a9f 100644
--- a/plugins/CryptoPP/crypto/src/gf2_32.h
+++ b/plugins/CryptoPP/crypto/src/gf2_32.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_GF2_32_H
+#ifndef CRYPTOPP_GF2_32_H
 #define CRYPTOPP_GF2_32_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/gf2n.cpp b/plugins/CryptoPP/crypto/src/gf2n.cpp
index a1435258e2..463db0fa3b 100644
--- a/plugins/CryptoPP/crypto/src/gf2n.cpp
+++ b/plugins/CryptoPP/crypto/src/gf2n.cpp
@@ -1,4 +1,4 @@
-// gf2n.cpp - written and placed in the public domain by Wei Dai
+// gf2n.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/gf2n.h b/plugins/CryptoPP/crypto/src/gf2n.h
index aaf2ca63d4..c4500502ca 100644
--- a/plugins/CryptoPP/crypto/src/gf2n.h
+++ b/plugins/CryptoPP/crypto/src/gf2n.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_GF2N_H
+#ifndef CRYPTOPP_GF2N_H
 #define CRYPTOPP_GF2N_H
 
 /*! \file */
diff --git a/plugins/CryptoPP/crypto/src/gfpcrypt.cpp b/plugins/CryptoPP/crypto/src/gfpcrypt.cpp
index bcfd69dd1a..0a0ffe96b3 100644
--- a/plugins/CryptoPP/crypto/src/gfpcrypt.cpp
+++ b/plugins/CryptoPP/crypto/src/gfpcrypt.cpp
@@ -1,4 +1,4 @@
-// dsa.cpp - written and placed in the public domain by Wei Dai
+// dsa.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/gfpcrypt.h b/plugins/CryptoPP/crypto/src/gfpcrypt.h
index ac47dbe3f8..6e73d47db7 100644
--- a/plugins/CryptoPP/crypto/src/gfpcrypt.h
+++ b/plugins/CryptoPP/crypto/src/gfpcrypt.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_GFPCRYPT_H
+#ifndef CRYPTOPP_GFPCRYPT_H
 #define CRYPTOPP_GFPCRYPT_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/gost.cpp b/plugins/CryptoPP/crypto/src/gost.cpp
index 1fb3b04d8b..4318b3df8f 100644
--- a/plugins/CryptoPP/crypto/src/gost.cpp
+++ b/plugins/CryptoPP/crypto/src/gost.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "gost.h"
 #include "misc.h"
 
diff --git a/plugins/CryptoPP/crypto/src/gost.h b/plugins/CryptoPP/crypto/src/gost.h
index a28a4cbf2a..a919120b62 100644
--- a/plugins/CryptoPP/crypto/src/gost.h
+++ b/plugins/CryptoPP/crypto/src/gost.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_GOST_H
+#ifndef CRYPTOPP_GOST_H
 #define CRYPTOPP_GOST_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/gzip.cpp b/plugins/CryptoPP/crypto/src/gzip.cpp
index c5636c4050..3a52529dc6 100644
--- a/plugins/CryptoPP/crypto/src/gzip.cpp
+++ b/plugins/CryptoPP/crypto/src/gzip.cpp
@@ -1,4 +1,4 @@
-// gzip.cpp - written and placed in the public domain by Wei Dai
+// gzip.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "gzip.h"
diff --git a/plugins/CryptoPP/crypto/src/gzip.h b/plugins/CryptoPP/crypto/src/gzip.h
index f65fd561c0..b96fc1ecb5 100644
--- a/plugins/CryptoPP/crypto/src/gzip.h
+++ b/plugins/CryptoPP/crypto/src/gzip.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_GZIP_H
+#ifndef CRYPTOPP_GZIP_H
 #define CRYPTOPP_GZIP_H
 
 #include "zdeflate.h"
diff --git a/plugins/CryptoPP/crypto/src/haval.cpp b/plugins/CryptoPP/crypto/src/haval.cpp
index 636422a489..d98d38e0c6 100644
--- a/plugins/CryptoPP/crypto/src/haval.cpp
+++ b/plugins/CryptoPP/crypto/src/haval.cpp
@@ -1,4 +1,4 @@
-// haval.cpp - written and placed in the public domain by Wei Dai
+// haval.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "haval.h"
diff --git a/plugins/CryptoPP/crypto/src/haval.h b/plugins/CryptoPP/crypto/src/haval.h
index 1f300fb14b..4cd6db382a 100644
--- a/plugins/CryptoPP/crypto/src/haval.h
+++ b/plugins/CryptoPP/crypto/src/haval.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_HAVAL_H
+#ifndef CRYPTOPP_HAVAL_H
 #define CRYPTOPP_HAVAL_H
 
 #include "iterhash.h"
diff --git a/plugins/CryptoPP/crypto/src/hex.cpp b/plugins/CryptoPP/crypto/src/hex.cpp
index 9f0b66c815..df4fc2ed2d 100644
--- a/plugins/CryptoPP/crypto/src/hex.cpp
+++ b/plugins/CryptoPP/crypto/src/hex.cpp
@@ -1,4 +1,4 @@
-// hex.cpp - written and placed in the public domain by Wei Dai
+// hex.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/hex.h b/plugins/CryptoPP/crypto/src/hex.h
index 60d881f60a..b19592cdba 100644
--- a/plugins/CryptoPP/crypto/src/hex.h
+++ b/plugins/CryptoPP/crypto/src/hex.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_HEX_H
+#ifndef CRYPTOPP_HEX_H
 #define CRYPTOPP_HEX_H
 
 #include "basecode.h"
diff --git a/plugins/CryptoPP/crypto/src/hmac.cpp b/plugins/CryptoPP/crypto/src/hmac.cpp
index aaf19e3b60..a25eb74990 100644
--- a/plugins/CryptoPP/crypto/src/hmac.cpp
+++ b/plugins/CryptoPP/crypto/src/hmac.cpp
@@ -1,4 +1,4 @@
-// hmac.cpp - written and placed in the public domain by Wei Dai
+// hmac.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/hmac.h b/plugins/CryptoPP/crypto/src/hmac.h
index 9c5dde6846..8dfebe186f 100644
--- a/plugins/CryptoPP/crypto/src/hmac.h
+++ b/plugins/CryptoPP/crypto/src/hmac.h
@@ -1,4 +1,4 @@
-// hmac.h - written and placed in the public domain by Wei Dai
+// hmac.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_HMAC_H
 #define CRYPTOPP_HMAC_H
diff --git a/plugins/CryptoPP/crypto/src/hrtimer.cpp b/plugins/CryptoPP/crypto/src/hrtimer.cpp
index 379eb29108..4a1cc79ec5 100644
--- a/plugins/CryptoPP/crypto/src/hrtimer.cpp
+++ b/plugins/CryptoPP/crypto/src/hrtimer.cpp
@@ -1,4 +1,4 @@
-// hrtimer.cpp - written and placed in the public domain by Wei Dai
+// hrtimer.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "hrtimer.h"
diff --git a/plugins/CryptoPP/crypto/src/hrtimer.h b/plugins/CryptoPP/crypto/src/hrtimer.h
index a83d813380..de8835fef7 100644
--- a/plugins/CryptoPP/crypto/src/hrtimer.h
+++ b/plugins/CryptoPP/crypto/src/hrtimer.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_HRTIMER_H
+#ifndef CRYPTOPP_HRTIMER_H
 #define CRYPTOPP_HRTIMER_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/ida.cpp b/plugins/CryptoPP/crypto/src/ida.cpp
index b22feecbab..aae18f22bb 100644
--- a/plugins/CryptoPP/crypto/src/ida.cpp
+++ b/plugins/CryptoPP/crypto/src/ida.cpp
@@ -1,4 +1,4 @@
-// ida.cpp - written and placed in the public domain by Wei Dai
+// ida.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "ida.h"
diff --git a/plugins/CryptoPP/crypto/src/ida.h b/plugins/CryptoPP/crypto/src/ida.h
index a51ddb5c5a..8171637a20 100644
--- a/plugins/CryptoPP/crypto/src/ida.h
+++ b/plugins/CryptoPP/crypto/src/ida.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_IDA_H
+#ifndef CRYPTOPP_IDA_H
 #define CRYPTOPP_IDA_H
 
 #include "mqueue.h"
diff --git a/plugins/CryptoPP/crypto/src/idea.cpp b/plugins/CryptoPP/crypto/src/idea.cpp
index be3d48ab76..19e9330579 100644
--- a/plugins/CryptoPP/crypto/src/idea.cpp
+++ b/plugins/CryptoPP/crypto/src/idea.cpp
@@ -1,4 +1,4 @@
-// idea.cpp - written and placed in the public domain by Wei Dai
+// idea.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "idea.h"
diff --git a/plugins/CryptoPP/crypto/src/idea.h b/plugins/CryptoPP/crypto/src/idea.h
index 69b462f735..2b97ee5ce0 100644
--- a/plugins/CryptoPP/crypto/src/idea.h
+++ b/plugins/CryptoPP/crypto/src/idea.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_IDEA_H
+#ifndef CRYPTOPP_IDEA_H
 #define CRYPTOPP_IDEA_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/integer.cpp b/plugins/CryptoPP/crypto/src/integer.cpp
index fe09a7a636..fe87a957e8 100644
--- a/plugins/CryptoPP/crypto/src/integer.cpp
+++ b/plugins/CryptoPP/crypto/src/integer.cpp
@@ -1,4 +1,4 @@
-// integer.cpp - written and placed in the public domain by Wei Dai
+// integer.cpp - written and placed in the public domain by Wei Dai
 // contains public domain code contributed by Alister Lee and Leonard Janke
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/integer.h b/plugins/CryptoPP/crypto/src/integer.h
index 41c69f7c7b..aca1db08f2 100644
--- a/plugins/CryptoPP/crypto/src/integer.h
+++ b/plugins/CryptoPP/crypto/src/integer.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_INTEGER_H
+#ifndef CRYPTOPP_INTEGER_H
 #define CRYPTOPP_INTEGER_H
 
 /** \file */
diff --git a/plugins/CryptoPP/crypto/src/iterhash.cpp b/plugins/CryptoPP/crypto/src/iterhash.cpp
index 3ace9f8ab9..53c133e65e 100644
--- a/plugins/CryptoPP/crypto/src/iterhash.cpp
+++ b/plugins/CryptoPP/crypto/src/iterhash.cpp
@@ -1,4 +1,4 @@
-// iterhash.cpp - written and placed in the public domain by Wei Dai
+// iterhash.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/iterhash.h b/plugins/CryptoPP/crypto/src/iterhash.h
index 558eefb69f..de3cae85cc 100644
--- a/plugins/CryptoPP/crypto/src/iterhash.h
+++ b/plugins/CryptoPP/crypto/src/iterhash.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ITERHASH_H
+#ifndef CRYPTOPP_ITERHASH_H
 #define CRYPTOPP_ITERHASH_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/lubyrack.h b/plugins/CryptoPP/crypto/src/lubyrack.h
index 47aa6ba69a..e2b30eacfd 100644
--- a/plugins/CryptoPP/crypto/src/lubyrack.h
+++ b/plugins/CryptoPP/crypto/src/lubyrack.h
@@ -1,4 +1,4 @@
-// lubyrack.h - written and placed in the public domain by Wei Dai
+// lubyrack.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_LUBYRACK_H
 #define CRYPTOPP_LUBYRACK_H
diff --git a/plugins/CryptoPP/crypto/src/luc.cpp b/plugins/CryptoPP/crypto/src/luc.cpp
index 8bd4468e74..51af79fec2 100644
--- a/plugins/CryptoPP/crypto/src/luc.cpp
+++ b/plugins/CryptoPP/crypto/src/luc.cpp
@@ -1,4 +1,4 @@
-// luc.cpp - written and placed in the public domain by Wei Dai
+// luc.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "luc.h"
diff --git a/plugins/CryptoPP/crypto/src/luc.h b/plugins/CryptoPP/crypto/src/luc.h
index d234fd7b4d..f220e73781 100644
--- a/plugins/CryptoPP/crypto/src/luc.h
+++ b/plugins/CryptoPP/crypto/src/luc.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_LUC_H
+#ifndef CRYPTOPP_LUC_H
 #define CRYPTOPP_LUC_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/mars.cpp b/plugins/CryptoPP/crypto/src/mars.cpp
index 6649699c18..6e2fe9d94f 100644
--- a/plugins/CryptoPP/crypto/src/mars.cpp
+++ b/plugins/CryptoPP/crypto/src/mars.cpp
@@ -1,4 +1,4 @@
-// mars.cpp - modified by Sean Woods from Brian Gladman's mars6.c for Crypto++
+// mars.cpp - modified by Sean Woods from Brian Gladman's mars6.c for Crypto++
 // key setup updated by Wei Dai to reflect IBM's "tweak" proposed in August 1999
 
 /* This is an independent implementation of the MARS encryption         */
diff --git a/plugins/CryptoPP/crypto/src/mars.h b/plugins/CryptoPP/crypto/src/mars.h
index b5114078fe..9c681021d2 100644
--- a/plugins/CryptoPP/crypto/src/mars.h
+++ b/plugins/CryptoPP/crypto/src/mars.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MARS_H
+#ifndef CRYPTOPP_MARS_H
 #define CRYPTOPP_MARS_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/marss.cpp b/plugins/CryptoPP/crypto/src/marss.cpp
index b1b36ee125..d7eff4f849 100644
--- a/plugins/CryptoPP/crypto/src/marss.cpp
+++ b/plugins/CryptoPP/crypto/src/marss.cpp
@@ -1,4 +1,4 @@
-// MARS S-Box
+// MARS S-Box
 
 #include "pch.h"
 #include "mars.h"
diff --git a/plugins/CryptoPP/crypto/src/md2.cpp b/plugins/CryptoPP/crypto/src/md2.cpp
index a3044551f7..f4331dad86 100644
--- a/plugins/CryptoPP/crypto/src/md2.cpp
+++ b/plugins/CryptoPP/crypto/src/md2.cpp
@@ -1,4 +1,4 @@
-// md2.cpp - modified by Wei Dai from Andrew M. Kuchling's md2.c
+// md2.cpp - modified by Wei Dai from Andrew M. Kuchling's md2.c
 // The original code and all modifications are in the public domain.
 
 // This is the original introductory comment:
diff --git a/plugins/CryptoPP/crypto/src/md2.h b/plugins/CryptoPP/crypto/src/md2.h
index 8e0feb8ab5..760edec051 100644
--- a/plugins/CryptoPP/crypto/src/md2.h
+++ b/plugins/CryptoPP/crypto/src/md2.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MD2_H
+#ifndef CRYPTOPP_MD2_H
 #define CRYPTOPP_MD2_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/md4.cpp b/plugins/CryptoPP/crypto/src/md4.cpp
index fe4a3c50d5..84fe4cca32 100644
--- a/plugins/CryptoPP/crypto/src/md4.cpp
+++ b/plugins/CryptoPP/crypto/src/md4.cpp
@@ -1,4 +1,4 @@
-// md4.cpp - modified by Wei Dai from Andrew M. Kuchling's md4.c
+// md4.cpp - modified by Wei Dai from Andrew M. Kuchling's md4.c
 // The original code and all modifications are in the public domain.
 
 // This is the original introductory comment:
diff --git a/plugins/CryptoPP/crypto/src/md4.h b/plugins/CryptoPP/crypto/src/md4.h
index 4b0a8cb178..ac98f94654 100644
--- a/plugins/CryptoPP/crypto/src/md4.h
+++ b/plugins/CryptoPP/crypto/src/md4.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MD4_H
+#ifndef CRYPTOPP_MD4_H
 #define CRYPTOPP_MD4_H
 
 #include "iterhash.h"
diff --git a/plugins/CryptoPP/crypto/src/md5.cpp b/plugins/CryptoPP/crypto/src/md5.cpp
index 8efecd3f3d..11035b77ca 100644
--- a/plugins/CryptoPP/crypto/src/md5.cpp
+++ b/plugins/CryptoPP/crypto/src/md5.cpp
@@ -1,4 +1,4 @@
-// md5.cpp - modified by Wei Dai from Colin Plumb's public domain md5.c
+// md5.cpp - modified by Wei Dai from Colin Plumb's public domain md5.c
 // any modifications are placed in the public domain
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/md5.h b/plugins/CryptoPP/crypto/src/md5.h
index f1215442a0..2b35003b7a 100644
--- a/plugins/CryptoPP/crypto/src/md5.h
+++ b/plugins/CryptoPP/crypto/src/md5.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MD5_H
+#ifndef CRYPTOPP_MD5_H
 #define CRYPTOPP_MD5_H
 
 #include "iterhash.h"
diff --git a/plugins/CryptoPP/crypto/src/md5mac.cpp b/plugins/CryptoPP/crypto/src/md5mac.cpp
index 8d1537a366..f5c90c3f11 100644
--- a/plugins/CryptoPP/crypto/src/md5mac.cpp
+++ b/plugins/CryptoPP/crypto/src/md5mac.cpp
@@ -1,4 +1,4 @@
-// md5mac.cpp - modified by Wei Dai from Colin Plumb's public domain md5.c
+// md5mac.cpp - modified by Wei Dai from Colin Plumb's public domain md5.c
 // any modifications are placed in the public domain
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/md5mac.h b/plugins/CryptoPP/crypto/src/md5mac.h
index d113441adb..bd17e70ba2 100644
--- a/plugins/CryptoPP/crypto/src/md5mac.h
+++ b/plugins/CryptoPP/crypto/src/md5mac.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MD5MAC_H
+#ifndef CRYPTOPP_MD5MAC_H
 #define CRYPTOPP_MD5MAC_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/mdc.h b/plugins/CryptoPP/crypto/src/mdc.h
index 87a686ff14..50c368be74 100644
--- a/plugins/CryptoPP/crypto/src/mdc.h
+++ b/plugins/CryptoPP/crypto/src/mdc.h
@@ -1,4 +1,4 @@
- // mdc.h - written and placed in the public domain by Wei Dai
+ // mdc.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_MDC_H
 #define CRYPTOPP_MDC_H
diff --git a/plugins/CryptoPP/crypto/src/misc.cpp b/plugins/CryptoPP/crypto/src/misc.cpp
index bc0d6bbe86..92aa7d2fd9 100644
--- a/plugins/CryptoPP/crypto/src/misc.cpp
+++ b/plugins/CryptoPP/crypto/src/misc.cpp
@@ -1,4 +1,4 @@
-// misc.cpp - written and placed in the public domain by Wei Dai
+// misc.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/misc.h b/plugins/CryptoPP/crypto/src/misc.h
index 6a0bc4762b..7927a29684 100644
--- a/plugins/CryptoPP/crypto/src/misc.h
+++ b/plugins/CryptoPP/crypto/src/misc.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MISC_H
+#ifndef CRYPTOPP_MISC_H
 #define CRYPTOPP_MISC_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/modarith.h b/plugins/CryptoPP/crypto/src/modarith.h
index ef106bd90d..7decb621dd 100644
--- a/plugins/CryptoPP/crypto/src/modarith.h
+++ b/plugins/CryptoPP/crypto/src/modarith.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MODARITH_H
+#ifndef CRYPTOPP_MODARITH_H
 #define CRYPTOPP_MODARITH_H
 
 // implementations are in integer.cpp
diff --git a/plugins/CryptoPP/crypto/src/modes.cpp b/plugins/CryptoPP/crypto/src/modes.cpp
index 6ad383813f..21bcc4c39d 100644
--- a/plugins/CryptoPP/crypto/src/modes.cpp
+++ b/plugins/CryptoPP/crypto/src/modes.cpp
@@ -1,4 +1,4 @@
-// modes.cpp - written and placed in the public domain by Wei Dai
+// modes.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/modes.h b/plugins/CryptoPP/crypto/src/modes.h
index 881020f4d4..1a5f5ec305 100644
--- a/plugins/CryptoPP/crypto/src/modes.h
+++ b/plugins/CryptoPP/crypto/src/modes.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MODES_H
+#ifndef CRYPTOPP_MODES_H
 #define CRYPTOPP_MODES_H
 
 /*! \file
diff --git a/plugins/CryptoPP/crypto/src/modexppc.h b/plugins/CryptoPP/crypto/src/modexppc.h
index 39bf024f4f..a9df756497 100644
--- a/plugins/CryptoPP/crypto/src/modexppc.h
+++ b/plugins/CryptoPP/crypto/src/modexppc.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MODEXPPC_H
+#ifndef CRYPTOPP_MODEXPPC_H
 #define CRYPTOPP_MODEXPPC_H
 
 #include "modarith.h"
diff --git a/plugins/CryptoPP/crypto/src/mqueue.cpp b/plugins/CryptoPP/crypto/src/mqueue.cpp
index 248c74f5c6..8c071e27c5 100644
--- a/plugins/CryptoPP/crypto/src/mqueue.cpp
+++ b/plugins/CryptoPP/crypto/src/mqueue.cpp
@@ -1,4 +1,4 @@
-// mqueue.cpp - written and placed in the public domain by Wei Dai
+// mqueue.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/mqueue.h b/plugins/CryptoPP/crypto/src/mqueue.h
index eba4e5cd98..a05cafbf4c 100644
--- a/plugins/CryptoPP/crypto/src/mqueue.h
+++ b/plugins/CryptoPP/crypto/src/mqueue.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MQUEUE_H
+#ifndef CRYPTOPP_MQUEUE_H
 #define CRYPTOPP_MQUEUE_H
 
 #include "queue.h"
diff --git a/plugins/CryptoPP/crypto/src/mqv.cpp b/plugins/CryptoPP/crypto/src/mqv.cpp
index f2a6d46899..a290945a2e 100644
--- a/plugins/CryptoPP/crypto/src/mqv.cpp
+++ b/plugins/CryptoPP/crypto/src/mqv.cpp
@@ -1,4 +1,4 @@
-// mqv.cpp - written and placed in the public domain by Wei Dai
+// mqv.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "mqv.h"
diff --git a/plugins/CryptoPP/crypto/src/mqv.h b/plugins/CryptoPP/crypto/src/mqv.h
index 94bf8252c1..8692010a18 100644
--- a/plugins/CryptoPP/crypto/src/mqv.h
+++ b/plugins/CryptoPP/crypto/src/mqv.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_MQV_H
+#ifndef CRYPTOPP_MQV_H
 #define CRYPTOPP_MQV_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/nbtheory.cpp b/plugins/CryptoPP/crypto/src/nbtheory.cpp
index b8ab60c61e..3de1fa5e3d 100644
--- a/plugins/CryptoPP/crypto/src/nbtheory.cpp
+++ b/plugins/CryptoPP/crypto/src/nbtheory.cpp
@@ -1,4 +1,4 @@
-// nbtheory.cpp - written and placed in the public domain by Wei Dai
+// nbtheory.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/nbtheory.h b/plugins/CryptoPP/crypto/src/nbtheory.h
index 64cd9a257d..0a1ac37619 100644
--- a/plugins/CryptoPP/crypto/src/nbtheory.h
+++ b/plugins/CryptoPP/crypto/src/nbtheory.h
@@ -1,4 +1,4 @@
-// nbtheory.h - written and placed in the public domain by Wei Dai
+// nbtheory.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_NBTHEORY_H
 #define CRYPTOPP_NBTHEORY_H
diff --git a/plugins/CryptoPP/crypto/src/network.cpp b/plugins/CryptoPP/crypto/src/network.cpp
index 6a075f7ff4..b47c236207 100644
--- a/plugins/CryptoPP/crypto/src/network.cpp
+++ b/plugins/CryptoPP/crypto/src/network.cpp
@@ -1,4 +1,4 @@
-// network.cpp - written and placed in the public domain by Wei Dai
+// network.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "network.h"
diff --git a/plugins/CryptoPP/crypto/src/network.h b/plugins/CryptoPP/crypto/src/network.h
index e9ea98e771..d9b3c66ef0 100644
--- a/plugins/CryptoPP/crypto/src/network.h
+++ b/plugins/CryptoPP/crypto/src/network.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_NETWORK_H
+#ifndef CRYPTOPP_NETWORK_H
 #define CRYPTOPP_NETWORK_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/nr.h b/plugins/CryptoPP/crypto/src/nr.h
index e5cae0020f..f13acebe4c 100644
--- a/plugins/CryptoPP/crypto/src/nr.h
+++ b/plugins/CryptoPP/crypto/src/nr.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_NR_H
+#ifndef CRYPTOPP_NR_H
 #define CRYPTOPP_NR_H
 
 #include "gfpcrypt.h"
diff --git a/plugins/CryptoPP/crypto/src/oaep.cpp b/plugins/CryptoPP/crypto/src/oaep.cpp
index 961c19746e..cbdef84d74 100644
--- a/plugins/CryptoPP/crypto/src/oaep.cpp
+++ b/plugins/CryptoPP/crypto/src/oaep.cpp
@@ -1,4 +1,4 @@
-// oaep.cpp - written and placed in the public domain by Wei Dai
+// oaep.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/oaep.h b/plugins/CryptoPP/crypto/src/oaep.h
index b538dd546b..b40c30b9b5 100644
--- a/plugins/CryptoPP/crypto/src/oaep.h
+++ b/plugins/CryptoPP/crypto/src/oaep.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_OAEP_H
+#ifndef CRYPTOPP_OAEP_H
 #define CRYPTOPP_OAEP_H
 
 #include "pubkey.h"
diff --git a/plugins/CryptoPP/crypto/src/oids.h b/plugins/CryptoPP/crypto/src/oids.h
index 86c872ddc3..56e15be8b3 100644
--- a/plugins/CryptoPP/crypto/src/oids.h
+++ b/plugins/CryptoPP/crypto/src/oids.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_OIDS_H
+#ifndef CRYPTOPP_OIDS_H
 #define CRYPTOPP_OIDS_H
 
 // crypto-related ASN.1 object identifiers
diff --git a/plugins/CryptoPP/crypto/src/osrng.cpp b/plugins/CryptoPP/crypto/src/osrng.cpp
index a99f9a3f06..22f13e65d1 100644
--- a/plugins/CryptoPP/crypto/src/osrng.cpp
+++ b/plugins/CryptoPP/crypto/src/osrng.cpp
@@ -1,4 +1,4 @@
-// osrng.cpp - written and placed in the public domain by Wei Dai
+// osrng.cpp - written and placed in the public domain by Wei Dai
 
 // Thanks to Leonard Janke for the suggestion for AutoSeededRandomPool.
 
diff --git a/plugins/CryptoPP/crypto/src/osrng.h b/plugins/CryptoPP/crypto/src/osrng.h
index 5f220897b8..839e768607 100644
--- a/plugins/CryptoPP/crypto/src/osrng.h
+++ b/plugins/CryptoPP/crypto/src/osrng.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_OSRNG_H
+#ifndef CRYPTOPP_OSRNG_H
 #define CRYPTOPP_OSRNG_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/panama.cpp b/plugins/CryptoPP/crypto/src/panama.cpp
index d0db9efa45..06f023576c 100644
--- a/plugins/CryptoPP/crypto/src/panama.cpp
+++ b/plugins/CryptoPP/crypto/src/panama.cpp
@@ -1,4 +1,4 @@
-// panama.cpp - written and placed in the public domain by Wei Dai
+// panama.cpp - written and placed in the public domain by Wei Dai
 
 // use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM panama.cpp" to generate MASM code
 
diff --git a/plugins/CryptoPP/crypto/src/panama.h b/plugins/CryptoPP/crypto/src/panama.h
index 92b467db51..18a19bbaba 100644
--- a/plugins/CryptoPP/crypto/src/panama.h
+++ b/plugins/CryptoPP/crypto/src/panama.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_PANAMA_H
+#ifndef CRYPTOPP_PANAMA_H
 #define CRYPTOPP_PANAMA_H
 
 #include "strciphr.h"
diff --git a/plugins/CryptoPP/crypto/src/pch.cpp b/plugins/CryptoPP/crypto/src/pch.cpp
index e0d2ef1a2a..9e6b2e073e 100644
--- a/plugins/CryptoPP/crypto/src/pch.cpp
+++ b/plugins/CryptoPP/crypto/src/pch.cpp
@@ -1 +1 @@
-#include "pch.h"
+#include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/pch.h b/plugins/CryptoPP/crypto/src/pch.h
index a35fab74ec..765ebde9b3 100644
--- a/plugins/CryptoPP/crypto/src/pch.h
+++ b/plugins/CryptoPP/crypto/src/pch.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_PCH_H
+#ifndef CRYPTOPP_PCH_H
 #define CRYPTOPP_PCH_H
 
 #ifdef CRYPTOPP_GENERATE_X64_MASM
diff --git a/plugins/CryptoPP/crypto/src/pkcspad.cpp b/plugins/CryptoPP/crypto/src/pkcspad.cpp
index 35df766975..5a8b6cad48 100644
--- a/plugins/CryptoPP/crypto/src/pkcspad.cpp
+++ b/plugins/CryptoPP/crypto/src/pkcspad.cpp
@@ -1,4 +1,4 @@
-// pkcspad.cpp - written and placed in the public domain by Wei Dai
+// pkcspad.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/pkcspad.h b/plugins/CryptoPP/crypto/src/pkcspad.h
index 69705d5865..096a923779 100644
--- a/plugins/CryptoPP/crypto/src/pkcspad.h
+++ b/plugins/CryptoPP/crypto/src/pkcspad.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_PKCSPAD_H
+#ifndef CRYPTOPP_PKCSPAD_H
 #define CRYPTOPP_PKCSPAD_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/polynomi.cpp b/plugins/CryptoPP/crypto/src/polynomi.cpp
index 088dbed619..40258ad94a 100644
--- a/plugins/CryptoPP/crypto/src/polynomi.cpp
+++ b/plugins/CryptoPP/crypto/src/polynomi.cpp
@@ -1,4 +1,4 @@
-// polynomi.cpp - written and placed in the public domain by Wei Dai
+// polynomi.cpp - written and placed in the public domain by Wei Dai
 
 // Part of the code for polynomial evaluation and interpolation
 // originally came from Hal Finney's public domain secsplit.c.
diff --git a/plugins/CryptoPP/crypto/src/polynomi.h b/plugins/CryptoPP/crypto/src/polynomi.h
index bb19595464..60221659e8 100644
--- a/plugins/CryptoPP/crypto/src/polynomi.h
+++ b/plugins/CryptoPP/crypto/src/polynomi.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_POLYNOMI_H
+#ifndef CRYPTOPP_POLYNOMI_H
 #define CRYPTOPP_POLYNOMI_H
 
 /*! \file */
diff --git a/plugins/CryptoPP/crypto/src/pssr.cpp b/plugins/CryptoPP/crypto/src/pssr.cpp
index ef64ecfffa..34ce71aed6 100644
--- a/plugins/CryptoPP/crypto/src/pssr.cpp
+++ b/plugins/CryptoPP/crypto/src/pssr.cpp
@@ -1,4 +1,4 @@
-// pssr.cpp - written and placed in the public domain by Wei Dai
+// pssr.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "pssr.h"
diff --git a/plugins/CryptoPP/crypto/src/pssr.h b/plugins/CryptoPP/crypto/src/pssr.h
index 1f81441745..e1ee5fec4f 100644
--- a/plugins/CryptoPP/crypto/src/pssr.h
+++ b/plugins/CryptoPP/crypto/src/pssr.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_PSSR_H
+#ifndef CRYPTOPP_PSSR_H
 #define CRYPTOPP_PSSR_H
 
 #include "pubkey.h"
diff --git a/plugins/CryptoPP/crypto/src/pubkey.cpp b/plugins/CryptoPP/crypto/src/pubkey.cpp
index 6ebb6e111c..3b53ee5e6a 100644
--- a/plugins/CryptoPP/crypto/src/pubkey.cpp
+++ b/plugins/CryptoPP/crypto/src/pubkey.cpp
@@ -1,4 +1,4 @@
-// pubkey.cpp - written and placed in the public domain by Wei Dai
+// pubkey.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/pubkey.h b/plugins/CryptoPP/crypto/src/pubkey.h
index 8e103426cf..51743ef797 100644
--- a/plugins/CryptoPP/crypto/src/pubkey.h
+++ b/plugins/CryptoPP/crypto/src/pubkey.h
@@ -1,4 +1,4 @@
-// pubkey.h - written and placed in the public domain by Wei Dai
+// pubkey.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_PUBKEY_H
 #define CRYPTOPP_PUBKEY_H
diff --git a/plugins/CryptoPP/crypto/src/pwdbased.h b/plugins/CryptoPP/crypto/src/pwdbased.h
index 928aa23731..0751030136 100644
--- a/plugins/CryptoPP/crypto/src/pwdbased.h
+++ b/plugins/CryptoPP/crypto/src/pwdbased.h
@@ -1,4 +1,4 @@
-// pwdbased.h - written and placed in the public domain by Wei Dai
+// pwdbased.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_PWDBASED_H
 #define CRYPTOPP_PWDBASED_H
diff --git a/plugins/CryptoPP/crypto/src/queue.cpp b/plugins/CryptoPP/crypto/src/queue.cpp
index 04d1c921d7..38218a6c91 100644
--- a/plugins/CryptoPP/crypto/src/queue.cpp
+++ b/plugins/CryptoPP/crypto/src/queue.cpp
@@ -1,4 +1,4 @@
-// queue.cpp - written and placed in the public domain by Wei Dai
+// queue.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/queue.h b/plugins/CryptoPP/crypto/src/queue.h
index 75b8693a80..a7c4f4c71f 100644
--- a/plugins/CryptoPP/crypto/src/queue.h
+++ b/plugins/CryptoPP/crypto/src/queue.h
@@ -1,4 +1,4 @@
-// specification file for an unlimited queue for storing bytes
+// specification file for an unlimited queue for storing bytes
 
 #ifndef CRYPTOPP_QUEUE_H
 #define CRYPTOPP_QUEUE_H
diff --git a/plugins/CryptoPP/crypto/src/rabin.cpp b/plugins/CryptoPP/crypto/src/rabin.cpp
index 6a8253e450..51d6c8ccc4 100644
--- a/plugins/CryptoPP/crypto/src/rabin.cpp
+++ b/plugins/CryptoPP/crypto/src/rabin.cpp
@@ -1,4 +1,4 @@
-// rabin.cpp - written and placed in the public domain by Wei Dai
+// rabin.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rabin.h"
diff --git a/plugins/CryptoPP/crypto/src/rabin.h b/plugins/CryptoPP/crypto/src/rabin.h
index aabb1b38a3..60deabb49a 100644
--- a/plugins/CryptoPP/crypto/src/rabin.h
+++ b/plugins/CryptoPP/crypto/src/rabin.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RABIN_H
+#ifndef CRYPTOPP_RABIN_H
 #define CRYPTOPP_RABIN_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/randpool.cpp b/plugins/CryptoPP/crypto/src/randpool.cpp
index 9f3adab9fc..2a38f5d50d 100644
--- a/plugins/CryptoPP/crypto/src/randpool.cpp
+++ b/plugins/CryptoPP/crypto/src/randpool.cpp
@@ -1,4 +1,4 @@
-// randpool.cpp - written and placed in the public domain by Wei Dai
+// randpool.cpp - written and placed in the public domain by Wei Dai
 // RandomPool used to follow the design of randpool in PGP 2.6.x,
 // but as of version 5.5 it has been redesigned to reduce the risk
 // of reusing random numbers after state rollback (which may occur
diff --git a/plugins/CryptoPP/crypto/src/randpool.h b/plugins/CryptoPP/crypto/src/randpool.h
index 4ed958437d..4c444be0f2 100644
--- a/plugins/CryptoPP/crypto/src/randpool.h
+++ b/plugins/CryptoPP/crypto/src/randpool.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RANDPOOL_H
+#ifndef CRYPTOPP_RANDPOOL_H
 #define CRYPTOPP_RANDPOOL_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/rc2.cpp b/plugins/CryptoPP/crypto/src/rc2.cpp
index 77dadfeffe..2cc8cf1061 100644
--- a/plugins/CryptoPP/crypto/src/rc2.cpp
+++ b/plugins/CryptoPP/crypto/src/rc2.cpp
@@ -1,4 +1,4 @@
-// rc2.cpp - written and placed in the public domain by Wei Dai
+// rc2.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rc2.h"
diff --git a/plugins/CryptoPP/crypto/src/rc2.h b/plugins/CryptoPP/crypto/src/rc2.h
index 4cbd9060bd..25c10f3c74 100644
--- a/plugins/CryptoPP/crypto/src/rc2.h
+++ b/plugins/CryptoPP/crypto/src/rc2.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RC2_H
+#ifndef CRYPTOPP_RC2_H
 #define CRYPTOPP_RC2_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/rc5.cpp b/plugins/CryptoPP/crypto/src/rc5.cpp
index 4961fdc734..7fd623991a 100644
--- a/plugins/CryptoPP/crypto/src/rc5.cpp
+++ b/plugins/CryptoPP/crypto/src/rc5.cpp
@@ -1,4 +1,4 @@
-// rc5.cpp - written and placed in the public domain by Wei Dai
+// rc5.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rc5.h"
diff --git a/plugins/CryptoPP/crypto/src/rc5.h b/plugins/CryptoPP/crypto/src/rc5.h
index b08f908f61..36be4b71c5 100644
--- a/plugins/CryptoPP/crypto/src/rc5.h
+++ b/plugins/CryptoPP/crypto/src/rc5.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RC5_H
+#ifndef CRYPTOPP_RC5_H
 #define CRYPTOPP_RC5_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/rc6.cpp b/plugins/CryptoPP/crypto/src/rc6.cpp
index 3835a1a91b..f2cf808698 100644
--- a/plugins/CryptoPP/crypto/src/rc6.cpp
+++ b/plugins/CryptoPP/crypto/src/rc6.cpp
@@ -1,4 +1,4 @@
-// rc6.cpp - written and placed in the public domain by Sean Woods
+// rc6.cpp - written and placed in the public domain by Sean Woods
 // based on Wei Dai's RC5 code.
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/rc6.h b/plugins/CryptoPP/crypto/src/rc6.h
index 509e18e0c6..0499d3338a 100644
--- a/plugins/CryptoPP/crypto/src/rc6.h
+++ b/plugins/CryptoPP/crypto/src/rc6.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RC6_H
+#ifndef CRYPTOPP_RC6_H
 #define CRYPTOPP_RC6_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/rdtables.cpp b/plugins/CryptoPP/crypto/src/rdtables.cpp
index 8d07e42185..8dd8b80985 100644
--- a/plugins/CryptoPP/crypto/src/rdtables.cpp
+++ b/plugins/CryptoPP/crypto/src/rdtables.cpp
@@ -1,4 +1,4 @@
-// Rijndael tables
+// Rijndael tables
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/regtest.cpp b/plugins/CryptoPP/crypto/src/regtest.cpp
index e101701a5a..0cfb9ce797 100644
--- a/plugins/CryptoPP/crypto/src/regtest.cpp
+++ b/plugins/CryptoPP/crypto/src/regtest.cpp
@@ -1,4 +1,4 @@
-#include "factory.h"
+#include "factory.h"
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 #include "modes.h"
diff --git a/plugins/CryptoPP/crypto/src/resource.h b/plugins/CryptoPP/crypto/src/resource.h
index 1c0aba2577..a2e492cb43 100644
--- a/plugins/CryptoPP/crypto/src/resource.h
+++ b/plugins/CryptoPP/crypto/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by cryptopp.rc
 //
diff --git a/plugins/CryptoPP/crypto/src/rijndael.cpp b/plugins/CryptoPP/crypto/src/rijndael.cpp
index 42a35ce510..c1682d8399 100644
--- a/plugins/CryptoPP/crypto/src/rijndael.cpp
+++ b/plugins/CryptoPP/crypto/src/rijndael.cpp
@@ -1,4 +1,4 @@
-// rijndael.cpp - modified by Chris Morgan <cmorgan@wpi.edu>
+// rijndael.cpp - modified by Chris Morgan <cmorgan@wpi.edu>
 // and Wei Dai from Paulo Baretto's Rijndael implementation
 // The original code and all modifications are in the public domain.
 
diff --git a/plugins/CryptoPP/crypto/src/rijndael.h b/plugins/CryptoPP/crypto/src/rijndael.h
index 6bc24400b3..8a2fa77d2d 100644
--- a/plugins/CryptoPP/crypto/src/rijndael.h
+++ b/plugins/CryptoPP/crypto/src/rijndael.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RIJNDAEL_H
+#ifndef CRYPTOPP_RIJNDAEL_H
 #define CRYPTOPP_RIJNDAEL_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/ripemd.cpp b/plugins/CryptoPP/crypto/src/ripemd.cpp
index 511228f780..16d977894d 100644
--- a/plugins/CryptoPP/crypto/src/ripemd.cpp
+++ b/plugins/CryptoPP/crypto/src/ripemd.cpp
@@ -1,4 +1,4 @@
-// ripemd.cpp
+// ripemd.cpp
 // RIPEMD-160 written and placed in the public domain by Wei Dai
 // RIPEMD-320, RIPEMD-128, RIPEMD-256 written by Kevin Springle
 // and also placed in the public domain
diff --git a/plugins/CryptoPP/crypto/src/ripemd.h b/plugins/CryptoPP/crypto/src/ripemd.h
index e0f7f79c65..fc7b54d3cc 100644
--- a/plugins/CryptoPP/crypto/src/ripemd.h
+++ b/plugins/CryptoPP/crypto/src/ripemd.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RIPEMD_H
+#ifndef CRYPTOPP_RIPEMD_H
 #define CRYPTOPP_RIPEMD_H
 
 #include "iterhash.h"
diff --git a/plugins/CryptoPP/crypto/src/rng.cpp b/plugins/CryptoPP/crypto/src/rng.cpp
index ae0c06be1d..a27974e956 100644
--- a/plugins/CryptoPP/crypto/src/rng.cpp
+++ b/plugins/CryptoPP/crypto/src/rng.cpp
@@ -1,4 +1,4 @@
-// rng.cpp - written and placed in the public domain by Wei Dai
+// rng.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/rng.h b/plugins/CryptoPP/crypto/src/rng.h
index b6a23492ba..ff4d6267ba 100644
--- a/plugins/CryptoPP/crypto/src/rng.h
+++ b/plugins/CryptoPP/crypto/src/rng.h
@@ -1,4 +1,4 @@
-// rng.h - misc RNG related classes, see also osrng.h, randpool.h
+// rng.h - misc RNG related classes, see also osrng.h, randpool.h
 
 #ifndef CRYPTOPP_RNG_H
 #define CRYPTOPP_RNG_H
diff --git a/plugins/CryptoPP/crypto/src/rsa.cpp b/plugins/CryptoPP/crypto/src/rsa.cpp
index b49c31c620..9793de56c8 100644
--- a/plugins/CryptoPP/crypto/src/rsa.cpp
+++ b/plugins/CryptoPP/crypto/src/rsa.cpp
@@ -1,4 +1,4 @@
-// rsa.cpp - written and placed in the public domain by Wei Dai
+// rsa.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rsa.h"
diff --git a/plugins/CryptoPP/crypto/src/rsa.h b/plugins/CryptoPP/crypto/src/rsa.h
index c1fa0f3155..cc8a1bb2c7 100644
--- a/plugins/CryptoPP/crypto/src/rsa.h
+++ b/plugins/CryptoPP/crypto/src/rsa.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RSA_H
+#ifndef CRYPTOPP_RSA_H
 #define CRYPTOPP_RSA_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/rw.cpp b/plugins/CryptoPP/crypto/src/rw.cpp
index 9928b53f19..b8d135972f 100644
--- a/plugins/CryptoPP/crypto/src/rw.cpp
+++ b/plugins/CryptoPP/crypto/src/rw.cpp
@@ -1,4 +1,4 @@
-// rw.cpp - written and placed in the public domain by Wei Dai
+// rw.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rw.h"
diff --git a/plugins/CryptoPP/crypto/src/rw.h b/plugins/CryptoPP/crypto/src/rw.h
index 1ea53f7073..e999f58fa9 100644
--- a/plugins/CryptoPP/crypto/src/rw.h
+++ b/plugins/CryptoPP/crypto/src/rw.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_RW_H
+#ifndef CRYPTOPP_RW_H
 #define CRYPTOPP_RW_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/safer.cpp b/plugins/CryptoPP/crypto/src/safer.cpp
index 6c66f66aee..1e66357046 100644
--- a/plugins/CryptoPP/crypto/src/safer.cpp
+++ b/plugins/CryptoPP/crypto/src/safer.cpp
@@ -1,4 +1,4 @@
-// safer.cpp - modified by by Wei Dai from Richard De Moliner's safer.c
+// safer.cpp - modified by by Wei Dai from Richard De Moliner's safer.c
 
 #include "pch.h"
 #include "safer.h"
diff --git a/plugins/CryptoPP/crypto/src/safer.h b/plugins/CryptoPP/crypto/src/safer.h
index 59ee45d7c8..60676c507b 100644
--- a/plugins/CryptoPP/crypto/src/safer.h
+++ b/plugins/CryptoPP/crypto/src/safer.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SAFER_H
+#ifndef CRYPTOPP_SAFER_H
 #define CRYPTOPP_SAFER_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/salsa.cpp b/plugins/CryptoPP/crypto/src/salsa.cpp
index 0c91b215fd..ae10d4a81a 100644
--- a/plugins/CryptoPP/crypto/src/salsa.cpp
+++ b/plugins/CryptoPP/crypto/src/salsa.cpp
@@ -1,4 +1,4 @@
-// salsa.cpp - written and placed in the public domain by Wei Dai
+// salsa.cpp - written and placed in the public domain by Wei Dai
 
 // use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM salsa.cpp" to generate MASM code
 
diff --git a/plugins/CryptoPP/crypto/src/salsa.h b/plugins/CryptoPP/crypto/src/salsa.h
index 96c71127d7..ea3ed248a6 100644
--- a/plugins/CryptoPP/crypto/src/salsa.h
+++ b/plugins/CryptoPP/crypto/src/salsa.h
@@ -1,4 +1,4 @@
-// salsa.h - written and placed in the public domain by Wei Dai
+// salsa.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_SALSA_H
 #define CRYPTOPP_SALSA_H
diff --git a/plugins/CryptoPP/crypto/src/seal.cpp b/plugins/CryptoPP/crypto/src/seal.cpp
index ec5bdf2e87..0af337544d 100644
--- a/plugins/CryptoPP/crypto/src/seal.cpp
+++ b/plugins/CryptoPP/crypto/src/seal.cpp
@@ -1,4 +1,4 @@
-// seal.cpp - written and placed in the public domain by Wei Dai
+// seal.cpp - written and placed in the public domain by Wei Dai
 // updated to SEAL 3.0 by Leonard Janke
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/seal.h b/plugins/CryptoPP/crypto/src/seal.h
index 2bbe2382c9..c8b7ff4e95 100644
--- a/plugins/CryptoPP/crypto/src/seal.h
+++ b/plugins/CryptoPP/crypto/src/seal.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SEAL_H
+#ifndef CRYPTOPP_SEAL_H
 #define CRYPTOPP_SEAL_H
 
 #include "strciphr.h"
diff --git a/plugins/CryptoPP/crypto/src/secblock.h b/plugins/CryptoPP/crypto/src/secblock.h
index 31150f3ca1..4c2b27bb8b 100644
--- a/plugins/CryptoPP/crypto/src/secblock.h
+++ b/plugins/CryptoPP/crypto/src/secblock.h
@@ -1,4 +1,4 @@
-// secblock.h - written and placed in the public domain by Wei Dai
+// secblock.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_SECBLOCK_H
 #define CRYPTOPP_SECBLOCK_H
diff --git a/plugins/CryptoPP/crypto/src/seckey.h b/plugins/CryptoPP/crypto/src/seckey.h
index 1dc368c2f0..5bd8f9a0ce 100644
--- a/plugins/CryptoPP/crypto/src/seckey.h
+++ b/plugins/CryptoPP/crypto/src/seckey.h
@@ -1,4 +1,4 @@
-// seckey.h - written and placed in the public domain by Wei Dai
+// seckey.h - written and placed in the public domain by Wei Dai
 
 // This file contains helper classes/functions for implementing secret key algorithms.
 
diff --git a/plugins/CryptoPP/crypto/src/serpent.cpp b/plugins/CryptoPP/crypto/src/serpent.cpp
index fd89157044..068e64281f 100644
--- a/plugins/CryptoPP/crypto/src/serpent.cpp
+++ b/plugins/CryptoPP/crypto/src/serpent.cpp
@@ -1,4 +1,4 @@
-// serpent.cpp - written and placed in the public domain by Wei Dai
+// serpent.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "serpent.h"
diff --git a/plugins/CryptoPP/crypto/src/serpent.h b/plugins/CryptoPP/crypto/src/serpent.h
index 0e9a77a85b..900ea7662e 100644
--- a/plugins/CryptoPP/crypto/src/serpent.h
+++ b/plugins/CryptoPP/crypto/src/serpent.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SERPENT_H
+#ifndef CRYPTOPP_SERPENT_H
 #define CRYPTOPP_SERPENT_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/serpentp.h b/plugins/CryptoPP/crypto/src/serpentp.h
index 565468b841..4416b5de90 100644
--- a/plugins/CryptoPP/crypto/src/serpentp.h
+++ b/plugins/CryptoPP/crypto/src/serpentp.h
@@ -1,4 +1,4 @@
-// private header for Serpent and Sosemanuk
+// private header for Serpent and Sosemanuk
 
 NAMESPACE_BEGIN(CryptoPP)
 
diff --git a/plugins/CryptoPP/crypto/src/sha.cpp b/plugins/CryptoPP/crypto/src/sha.cpp
index ab94089a86..ba20fc0715 100644
--- a/plugins/CryptoPP/crypto/src/sha.cpp
+++ b/plugins/CryptoPP/crypto/src/sha.cpp
@@ -1,4 +1,4 @@
-// sha.cpp - modified by Wei Dai from Steve Reid's public domain sha1.c
+// sha.cpp - modified by Wei Dai from Steve Reid's public domain sha1.c
 
 // Steve Reid implemented SHA-1. Wei Dai implemented SHA-2.
 // Both are in the public domain.
diff --git a/plugins/CryptoPP/crypto/src/sha.h b/plugins/CryptoPP/crypto/src/sha.h
index 9fd7d6350b..ff05827c7a 100644
--- a/plugins/CryptoPP/crypto/src/sha.h
+++ b/plugins/CryptoPP/crypto/src/sha.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SHA_H
+#ifndef CRYPTOPP_SHA_H
 #define CRYPTOPP_SHA_H
 
 #include "iterhash.h"
diff --git a/plugins/CryptoPP/crypto/src/shacal2.cpp b/plugins/CryptoPP/crypto/src/shacal2.cpp
index 8d3f6ab143..7ddc94dad4 100644
--- a/plugins/CryptoPP/crypto/src/shacal2.cpp
+++ b/plugins/CryptoPP/crypto/src/shacal2.cpp
@@ -1,4 +1,4 @@
-// shacal2.cpp - by Kevin Springle, 2003
+// shacal2.cpp - by Kevin Springle, 2003
 //
 // Portions of this code were derived from
 // Wei Dai's implementation of SHA-2
diff --git a/plugins/CryptoPP/crypto/src/shacal2.h b/plugins/CryptoPP/crypto/src/shacal2.h
index e21f21afc7..5a95f8be6a 100644
--- a/plugins/CryptoPP/crypto/src/shacal2.h
+++ b/plugins/CryptoPP/crypto/src/shacal2.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SHACAL2_H
+#ifndef CRYPTOPP_SHACAL2_H
 #define CRYPTOPP_SHACAL2_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/shark.cpp b/plugins/CryptoPP/crypto/src/shark.cpp
index 84c8d6bda5..1692a88005 100644
--- a/plugins/CryptoPP/crypto/src/shark.cpp
+++ b/plugins/CryptoPP/crypto/src/shark.cpp
@@ -1,4 +1,4 @@
-// shark.cpp - written and placed in the public domain by Wei Dai
+// shark.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/shark.h b/plugins/CryptoPP/crypto/src/shark.h
index 4be0fdb5d6..a4acd21a13 100644
--- a/plugins/CryptoPP/crypto/src/shark.h
+++ b/plugins/CryptoPP/crypto/src/shark.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SHARK_H
+#ifndef CRYPTOPP_SHARK_H
 #define CRYPTOPP_SHARK_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/sharkbox.cpp b/plugins/CryptoPP/crypto/src/sharkbox.cpp
index 32f72cddf7..bbe65b5ec7 100644
--- a/plugins/CryptoPP/crypto/src/sharkbox.cpp
+++ b/plugins/CryptoPP/crypto/src/sharkbox.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "shark.h"
 
 #ifdef WORD64_AVAILABLE
diff --git a/plugins/CryptoPP/crypto/src/simple.cpp b/plugins/CryptoPP/crypto/src/simple.cpp
index 61a0dd2b39..d0a120d112 100644
--- a/plugins/CryptoPP/crypto/src/simple.cpp
+++ b/plugins/CryptoPP/crypto/src/simple.cpp
@@ -1,4 +1,4 @@
-// simple.cpp - written and placed in the public domain by Wei Dai
+// simple.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/simple.h b/plugins/CryptoPP/crypto/src/simple.h
index 3f892f0807..268690758f 100644
--- a/plugins/CryptoPP/crypto/src/simple.h
+++ b/plugins/CryptoPP/crypto/src/simple.h
@@ -1,4 +1,4 @@
-// simple.h - written and placed in the public domain by Wei Dai
+// simple.h - written and placed in the public domain by Wei Dai
 /*! \file
  	Simple non-interface classes derived from classes in cryptlib.h.
 */
diff --git a/plugins/CryptoPP/crypto/src/skipjack.cpp b/plugins/CryptoPP/crypto/src/skipjack.cpp
index af0f458b15..e0a0e0143a 100644
--- a/plugins/CryptoPP/crypto/src/skipjack.cpp
+++ b/plugins/CryptoPP/crypto/src/skipjack.cpp
@@ -1,4 +1,4 @@
-// skipjack.cpp - modified by Wei Dai from Paulo Barreto's skipjack32.c,
+// skipjack.cpp - modified by Wei Dai from Paulo Barreto's skipjack32.c,
 // which is public domain according to his web site.
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/skipjack.h b/plugins/CryptoPP/crypto/src/skipjack.h
index 469ead2e38..9e8a33ba10 100644
--- a/plugins/CryptoPP/crypto/src/skipjack.h
+++ b/plugins/CryptoPP/crypto/src/skipjack.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SKIPJACK_H
+#ifndef CRYPTOPP_SKIPJACK_H
 #define CRYPTOPP_SKIPJACK_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/smartptr.h b/plugins/CryptoPP/crypto/src/smartptr.h
index f1d6fb2e7c..5259aa8e49 100644
--- a/plugins/CryptoPP/crypto/src/smartptr.h
+++ b/plugins/CryptoPP/crypto/src/smartptr.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SMARTPTR_H
+#ifndef CRYPTOPP_SMARTPTR_H
 #define CRYPTOPP_SMARTPTR_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/socketft.cpp b/plugins/CryptoPP/crypto/src/socketft.cpp
index 86c3d27287..bcb6e0a080 100644
--- a/plugins/CryptoPP/crypto/src/socketft.cpp
+++ b/plugins/CryptoPP/crypto/src/socketft.cpp
@@ -1,4 +1,4 @@
-// socketft.cpp - written and placed in the public domain by Wei Dai
+// socketft.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "socketft.h"
diff --git a/plugins/CryptoPP/crypto/src/socketft.h b/plugins/CryptoPP/crypto/src/socketft.h
index 2108ab459c..211c8dbb9e 100644
--- a/plugins/CryptoPP/crypto/src/socketft.h
+++ b/plugins/CryptoPP/crypto/src/socketft.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SOCKETFT_H
+#ifndef CRYPTOPP_SOCKETFT_H
 #define CRYPTOPP_SOCKETFT_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/sosemanuk.cpp b/plugins/CryptoPP/crypto/src/sosemanuk.cpp
index 4210be5a42..d33c8db50f 100644
--- a/plugins/CryptoPP/crypto/src/sosemanuk.cpp
+++ b/plugins/CryptoPP/crypto/src/sosemanuk.cpp
@@ -1,4 +1,4 @@
-// sosemanuk.cpp - written and placed in the public domain by Wei Dai
+// sosemanuk.cpp - written and placed in the public domain by Wei Dai
 
 // use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sosemanuk.cpp" to generate MASM code
 
diff --git a/plugins/CryptoPP/crypto/src/sosemanuk.h b/plugins/CryptoPP/crypto/src/sosemanuk.h
index 2120f49de5..f101e2c6c9 100644
--- a/plugins/CryptoPP/crypto/src/sosemanuk.h
+++ b/plugins/CryptoPP/crypto/src/sosemanuk.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SOSEMANUK_H
+#ifndef CRYPTOPP_SOSEMANUK_H
 #define CRYPTOPP_SOSEMANUK_H
 
 #include "strciphr.h"
diff --git a/plugins/CryptoPP/crypto/src/square.cpp b/plugins/CryptoPP/crypto/src/square.cpp
index 71fc4ae220..4bd7b9a969 100644
--- a/plugins/CryptoPP/crypto/src/square.cpp
+++ b/plugins/CryptoPP/crypto/src/square.cpp
@@ -1,4 +1,4 @@
-// square.cpp - written and placed in the public domain by Wei Dai
+// square.cpp - written and placed in the public domain by Wei Dai
 // Based on Paulo S.L.M. Barreto's public domain implementation
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/square.h b/plugins/CryptoPP/crypto/src/square.h
index 3852ce0e4c..939b7acc1d 100644
--- a/plugins/CryptoPP/crypto/src/square.h
+++ b/plugins/CryptoPP/crypto/src/square.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_SQUARE_H
+#ifndef CRYPTOPP_SQUARE_H
 #define CRYPTOPP_SQUARE_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/squaretb.cpp b/plugins/CryptoPP/crypto/src/squaretb.cpp
index c58ee1b787..a54465aee1 100644
--- a/plugins/CryptoPP/crypto/src/squaretb.cpp
+++ b/plugins/CryptoPP/crypto/src/squaretb.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "square.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/plugins/CryptoPP/crypto/src/stdcpp.h b/plugins/CryptoPP/crypto/src/stdcpp.h
index ca4bd94705..e535310efa 100644
--- a/plugins/CryptoPP/crypto/src/stdcpp.h
+++ b/plugins/CryptoPP/crypto/src/stdcpp.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_STDCPP_H
+#ifndef CRYPTOPP_STDCPP_H
 #define CRYPTOPP_STDCPP_H
 
 #include <stddef.h>
diff --git a/plugins/CryptoPP/crypto/src/strciphr.cpp b/plugins/CryptoPP/crypto/src/strciphr.cpp
index d68748c294..fcc1e907b1 100644
--- a/plugins/CryptoPP/crypto/src/strciphr.cpp
+++ b/plugins/CryptoPP/crypto/src/strciphr.cpp
@@ -1,4 +1,4 @@
-// strciphr.cpp - written and placed in the public domain by Wei Dai
+// strciphr.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/strciphr.h b/plugins/CryptoPP/crypto/src/strciphr.h
index 57a9c81640..d257af748b 100644
--- a/plugins/CryptoPP/crypto/src/strciphr.h
+++ b/plugins/CryptoPP/crypto/src/strciphr.h
@@ -1,4 +1,4 @@
-/*! \file
+/*! \file
  	This file contains helper classes for implementing stream ciphers.
 
 	All this infrastructure may look very complex compared to what's in Crypto++ 4.x,
diff --git a/plugins/CryptoPP/crypto/src/tea.cpp b/plugins/CryptoPP/crypto/src/tea.cpp
index 5aa476ea6e..1c2e2e15d2 100644
--- a/plugins/CryptoPP/crypto/src/tea.cpp
+++ b/plugins/CryptoPP/crypto/src/tea.cpp
@@ -1,4 +1,4 @@
-// tea.cpp - modified by Wei Dai from code in the original paper
+// tea.cpp - modified by Wei Dai from code in the original paper
 
 #include "pch.h"
 #include "tea.h"
diff --git a/plugins/CryptoPP/crypto/src/tea.h b/plugins/CryptoPP/crypto/src/tea.h
index f5f3f8ba46..4cc1e928cd 100644
--- a/plugins/CryptoPP/crypto/src/tea.h
+++ b/plugins/CryptoPP/crypto/src/tea.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_TEA_H
+#ifndef CRYPTOPP_TEA_H
 #define CRYPTOPP_TEA_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/test.cpp b/plugins/CryptoPP/crypto/src/test.cpp
index a1a21887ac..c49a222c6e 100644
--- a/plugins/CryptoPP/crypto/src/test.cpp
+++ b/plugins/CryptoPP/crypto/src/test.cpp
@@ -1,4 +1,4 @@
-// test.cpp - written and placed in the public domain by Wei Dai
+// test.cpp - written and placed in the public domain by Wei Dai
 
 #define _CRT_SECURE_NO_DEPRECATE
 #define CRYPTOPP_DEFAULT_NO_DLL
diff --git a/plugins/CryptoPP/crypto/src/tftables.cpp b/plugins/CryptoPP/crypto/src/tftables.cpp
index 899c21dd40..ad55aa7ed1 100644
--- a/plugins/CryptoPP/crypto/src/tftables.cpp
+++ b/plugins/CryptoPP/crypto/src/tftables.cpp
@@ -1,4 +1,4 @@
-// Twofish tables
+// Twofish tables
 
 #include "pch.h"
 #include "twofish.h"
diff --git a/plugins/CryptoPP/crypto/src/tiger.cpp b/plugins/CryptoPP/crypto/src/tiger.cpp
index 49ab7670ed..a4ecfd17a7 100644
--- a/plugins/CryptoPP/crypto/src/tiger.cpp
+++ b/plugins/CryptoPP/crypto/src/tiger.cpp
@@ -1,4 +1,4 @@
-// tiger.cpp - written and placed in the public domain by Wei Dai
+// tiger.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "tiger.h"
diff --git a/plugins/CryptoPP/crypto/src/tiger.h b/plugins/CryptoPP/crypto/src/tiger.h
index b387a7ca65..05b49d4a1d 100644
--- a/plugins/CryptoPP/crypto/src/tiger.h
+++ b/plugins/CryptoPP/crypto/src/tiger.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_TIGER_H
+#ifndef CRYPTOPP_TIGER_H
 #define CRYPTOPP_TIGER_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/tigertab.cpp b/plugins/CryptoPP/crypto/src/tigertab.cpp
index b5465886bd..0a7243256e 100644
--- a/plugins/CryptoPP/crypto/src/tigertab.cpp
+++ b/plugins/CryptoPP/crypto/src/tigertab.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "tiger.h"
 
 #ifdef WORD64_AVAILABLE
diff --git a/plugins/CryptoPP/crypto/src/trdlocal.cpp b/plugins/CryptoPP/crypto/src/trdlocal.cpp
index c74f3b0a16..6cf1799d06 100644
--- a/plugins/CryptoPP/crypto/src/trdlocal.cpp
+++ b/plugins/CryptoPP/crypto/src/trdlocal.cpp
@@ -1,4 +1,4 @@
-// trdlocal.cpp - written and placed in the public domain by Wei Dai
+// trdlocal.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/trdlocal.h b/plugins/CryptoPP/crypto/src/trdlocal.h
index b22ece937c..10f14a47fb 100644
--- a/plugins/CryptoPP/crypto/src/trdlocal.h
+++ b/plugins/CryptoPP/crypto/src/trdlocal.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_TRDLOCAL_H
+#ifndef CRYPTOPP_TRDLOCAL_H
 #define CRYPTOPP_TRDLOCAL_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/trunhash.h b/plugins/CryptoPP/crypto/src/trunhash.h
index 0e2aa1cd60..16fd8c09f8 100644
--- a/plugins/CryptoPP/crypto/src/trunhash.h
+++ b/plugins/CryptoPP/crypto/src/trunhash.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_TRUNHASH_H
+#ifndef CRYPTOPP_TRUNHASH_H
 #define CRYPTOPP_TRUNHASH_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/ttmac.cpp b/plugins/CryptoPP/crypto/src/ttmac.cpp
index 1c71b5a768..6b4e8bfe56 100644
--- a/plugins/CryptoPP/crypto/src/ttmac.cpp
+++ b/plugins/CryptoPP/crypto/src/ttmac.cpp
@@ -1,4 +1,4 @@
-// ttmac.cpp - written and placed in the public domain by Kevin Springle
+// ttmac.cpp - written and placed in the public domain by Kevin Springle
 
 #include "pch.h"
 #include "ttmac.h"
diff --git a/plugins/CryptoPP/crypto/src/ttmac.h b/plugins/CryptoPP/crypto/src/ttmac.h
index 3f6d80df12..ce8d968135 100644
--- a/plugins/CryptoPP/crypto/src/ttmac.h
+++ b/plugins/CryptoPP/crypto/src/ttmac.h
@@ -1,4 +1,4 @@
-// ttmac.h - written and placed in the public domain by Kevin Springle
+// ttmac.h - written and placed in the public domain by Kevin Springle
 
 #ifndef CRYPTOPP_TTMAC_H
 #define CRYPTOPP_TTMAC_H
diff --git a/plugins/CryptoPP/crypto/src/twofish.cpp b/plugins/CryptoPP/crypto/src/twofish.cpp
index 560230ce53..e34bde5cce 100644
--- a/plugins/CryptoPP/crypto/src/twofish.cpp
+++ b/plugins/CryptoPP/crypto/src/twofish.cpp
@@ -1,4 +1,4 @@
-// twofish.cpp - modified by Wei Dai from Matthew Skala's twofish.c
+// twofish.cpp - modified by Wei Dai from Matthew Skala's twofish.c
 // The original code and all modifications are in the public domain.
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/twofish.h b/plugins/CryptoPP/crypto/src/twofish.h
index be83a4139a..d3143ad957 100644
--- a/plugins/CryptoPP/crypto/src/twofish.h
+++ b/plugins/CryptoPP/crypto/src/twofish.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_TWOFISH_H
+#ifndef CRYPTOPP_TWOFISH_H
 #define CRYPTOPP_TWOFISH_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/validat1.cpp b/plugins/CryptoPP/crypto/src/validat1.cpp
index 8e8a1652d6..fceb62196b 100644
--- a/plugins/CryptoPP/crypto/src/validat1.cpp
+++ b/plugins/CryptoPP/crypto/src/validat1.cpp
@@ -1,4 +1,4 @@
-// validat1.cpp - written and placed in the public domain by Wei Dai
+// validat1.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/validat2.cpp b/plugins/CryptoPP/crypto/src/validat2.cpp
index 66efa82641..76b58ea7d9 100644
--- a/plugins/CryptoPP/crypto/src/validat2.cpp
+++ b/plugins/CryptoPP/crypto/src/validat2.cpp
@@ -1,4 +1,4 @@
-// validat2.cpp - written and placed in the public domain by Wei Dai
+// validat2.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/plugins/CryptoPP/crypto/src/validat3.cpp b/plugins/CryptoPP/crypto/src/validat3.cpp
index 0b7e415c52..698aa5b511 100644
--- a/plugins/CryptoPP/crypto/src/validat3.cpp
+++ b/plugins/CryptoPP/crypto/src/validat3.cpp
@@ -1,4 +1,4 @@
-// validat3.cpp - written and placed in the public domain by Wei Dai
+// validat3.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "validate.h"
diff --git a/plugins/CryptoPP/crypto/src/validate.h b/plugins/CryptoPP/crypto/src/validate.h
index cd2d18fc14..6e2cdaf174 100644
--- a/plugins/CryptoPP/crypto/src/validate.h
+++ b/plugins/CryptoPP/crypto/src/validate.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_VALIDATE_H
+#ifndef CRYPTOPP_VALIDATE_H
 #define CRYPTOPP_VALIDATE_H
 
 #include "cryptlib.h"
diff --git a/plugins/CryptoPP/crypto/src/version.h b/plugins/CryptoPP/crypto/src/version.h
index b52b4a13f3..ca634c9df2 100644
--- a/plugins/CryptoPP/crypto/src/version.h
+++ b/plugins/CryptoPP/crypto/src/version.h
@@ -1,4 +1,4 @@
-#define __MAJOR_VERSION            5
+#define __MAJOR_VERSION            5
 #define __MINOR_VERSION            5
 #define __RELEASE_NUM            2
 #define __BUILD_NUM               0
diff --git a/plugins/CryptoPP/crypto/src/vmac.cpp b/plugins/CryptoPP/crypto/src/vmac.cpp
index c8b65e1592..a24491792c 100644
--- a/plugins/CryptoPP/crypto/src/vmac.cpp
+++ b/plugins/CryptoPP/crypto/src/vmac.cpp
@@ -1,4 +1,4 @@
-// vmac.cpp - written and placed in the public domain by Wei Dai
+// vmac.cpp - written and placed in the public domain by Wei Dai
 // based on Ted Krovetz's public domain vmac.c and draft-krovetz-vmac-01.txt
 
 #include "pch.h"
diff --git a/plugins/CryptoPP/crypto/src/vmac.h b/plugins/CryptoPP/crypto/src/vmac.h
index cea88ac171..a2c85ace03 100644
--- a/plugins/CryptoPP/crypto/src/vmac.h
+++ b/plugins/CryptoPP/crypto/src/vmac.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_VMAC_H
+#ifndef CRYPTOPP_VMAC_H
 #define CRYPTOPP_VMAC_H
 
 #include "iterhash.h"
diff --git a/plugins/CryptoPP/crypto/src/wait.cpp b/plugins/CryptoPP/crypto/src/wait.cpp
index 190ee7a34d..b031922638 100644
--- a/plugins/CryptoPP/crypto/src/wait.cpp
+++ b/plugins/CryptoPP/crypto/src/wait.cpp
@@ -1,4 +1,4 @@
-// wait.cpp - written and placed in the public domain by Wei Dai
+// wait.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "wait.h"
diff --git a/plugins/CryptoPP/crypto/src/wait.h b/plugins/CryptoPP/crypto/src/wait.h
index 8267b67a68..c01b745e32 100644
--- a/plugins/CryptoPP/crypto/src/wait.h
+++ b/plugins/CryptoPP/crypto/src/wait.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_WAIT_H
+#ifndef CRYPTOPP_WAIT_H
 #define CRYPTOPP_WAIT_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/wake.cpp b/plugins/CryptoPP/crypto/src/wake.cpp
index f87c5afc47..41d06753ba 100644
--- a/plugins/CryptoPP/crypto/src/wake.cpp
+++ b/plugins/CryptoPP/crypto/src/wake.cpp
@@ -1,4 +1,4 @@
-// wake.cpp - written and placed in the public domain by Wei Dai
+// wake.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "wake.h"
diff --git a/plugins/CryptoPP/crypto/src/wake.h b/plugins/CryptoPP/crypto/src/wake.h
index 4fcca1c9ce..6c6c05c5e0 100644
--- a/plugins/CryptoPP/crypto/src/wake.h
+++ b/plugins/CryptoPP/crypto/src/wake.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_WAKE_H
+#ifndef CRYPTOPP_WAKE_H
 #define CRYPTOPP_WAKE_H
 
 #include "seckey.h"
diff --git a/plugins/CryptoPP/crypto/src/whrlpool.cpp b/plugins/CryptoPP/crypto/src/whrlpool.cpp
index 1ef2c07e94..33a32e2d3e 100644
--- a/plugins/CryptoPP/crypto/src/whrlpool.cpp
+++ b/plugins/CryptoPP/crypto/src/whrlpool.cpp
@@ -1,4 +1,4 @@
-// whrlpool.cpp - originally modified by Kevin Springle from
+// whrlpool.cpp - originally modified by Kevin Springle from
 // Paulo Barreto and Vincent Rijmen's public domain code, whirlpool.c.
 // Updated to Whirlpool version 3.0, optimized and SSE version added by Wei Dai
 // All modifications are placed in the public domain
diff --git a/plugins/CryptoPP/crypto/src/whrlpool.h b/plugins/CryptoPP/crypto/src/whrlpool.h
index 9745e92a11..32f3a2de83 100644
--- a/plugins/CryptoPP/crypto/src/whrlpool.h
+++ b/plugins/CryptoPP/crypto/src/whrlpool.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_WHIRLPOOL_H
+#ifndef CRYPTOPP_WHIRLPOOL_H
 #define CRYPTOPP_WHIRLPOOL_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/winpipes.cpp b/plugins/CryptoPP/crypto/src/winpipes.cpp
index f0bbffd797..ea9843973b 100644
--- a/plugins/CryptoPP/crypto/src/winpipes.cpp
+++ b/plugins/CryptoPP/crypto/src/winpipes.cpp
@@ -1,4 +1,4 @@
-// winpipes.cpp - written and placed in the public domain by Wei Dai
+// winpipes.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "winpipes.h"
diff --git a/plugins/CryptoPP/crypto/src/winpipes.h b/plugins/CryptoPP/crypto/src/winpipes.h
index 3ef554b92a..75ac3a8c66 100644
--- a/plugins/CryptoPP/crypto/src/winpipes.h
+++ b/plugins/CryptoPP/crypto/src/winpipes.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_WINPIPES_H
+#ifndef CRYPTOPP_WINPIPES_H
 #define CRYPTOPP_WINPIPES_H
 
 #include "config.h"
diff --git a/plugins/CryptoPP/crypto/src/words.h b/plugins/CryptoPP/crypto/src/words.h
index e9b45fb20b..f76e8499f4 100644
--- a/plugins/CryptoPP/crypto/src/words.h
+++ b/plugins/CryptoPP/crypto/src/words.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_WORDS_H
+#ifndef CRYPTOPP_WORDS_H
 #define CRYPTOPP_WORDS_H
 
 #include "misc.h"
diff --git a/plugins/CryptoPP/crypto/src/xormac.h b/plugins/CryptoPP/crypto/src/xormac.h
index c383bb5b04..977b2cd6f7 100644
--- a/plugins/CryptoPP/crypto/src/xormac.h
+++ b/plugins/CryptoPP/crypto/src/xormac.h
@@ -1,4 +1,4 @@
-// xormac.h - written and placed in the public domain by Wei Dai
+// xormac.h - written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_XORMAC_H
 #define CRYPTOPP_XORMAC_H
diff --git a/plugins/CryptoPP/crypto/src/xtr.cpp b/plugins/CryptoPP/crypto/src/xtr.cpp
index 530a7efe55..d2f3fb0708 100644
--- a/plugins/CryptoPP/crypto/src/xtr.cpp
+++ b/plugins/CryptoPP/crypto/src/xtr.cpp
@@ -1,4 +1,4 @@
-// cryptlib.cpp - written and placed in the public domain by Wei Dai
+// cryptlib.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "xtr.h"
diff --git a/plugins/CryptoPP/crypto/src/xtr.h b/plugins/CryptoPP/crypto/src/xtr.h
index f3896ac4a9..40ca8a14ab 100644
--- a/plugins/CryptoPP/crypto/src/xtr.h
+++ b/plugins/CryptoPP/crypto/src/xtr.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_XTR_H
+#ifndef CRYPTOPP_XTR_H
 #define CRYPTOPP_XTR_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/xtrcrypt.cpp b/plugins/CryptoPP/crypto/src/xtrcrypt.cpp
index 903c1a9c36..ce3ed76154 100644
--- a/plugins/CryptoPP/crypto/src/xtrcrypt.cpp
+++ b/plugins/CryptoPP/crypto/src/xtrcrypt.cpp
@@ -1,4 +1,4 @@
-// xtrcrypt.cpp - written and placed in the public domain by Wei Dai
+// xtrcrypt.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "xtrcrypt.h"
diff --git a/plugins/CryptoPP/crypto/src/xtrcrypt.h b/plugins/CryptoPP/crypto/src/xtrcrypt.h
index c5a8969c6f..2f51b116a3 100644
--- a/plugins/CryptoPP/crypto/src/xtrcrypt.h
+++ b/plugins/CryptoPP/crypto/src/xtrcrypt.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_XTRCRYPT_H
+#ifndef CRYPTOPP_XTRCRYPT_H
 #define CRYPTOPP_XTRCRYPT_H
 
 /** \file
diff --git a/plugins/CryptoPP/crypto/src/zdeflate.cpp b/plugins/CryptoPP/crypto/src/zdeflate.cpp
index 59bd92d287..099226bab8 100644
--- a/plugins/CryptoPP/crypto/src/zdeflate.cpp
+++ b/plugins/CryptoPP/crypto/src/zdeflate.cpp
@@ -1,4 +1,4 @@
-// zdeflate.cpp - written and placed in the public domain by Wei Dai
+// zdeflate.cpp - written and placed in the public domain by Wei Dai
 
 // Many of the algorithms and tables used here came from the deflate implementation
 // by Jean-loup Gailly, which was included in Crypto++ 4.0 and earlier. I completely
diff --git a/plugins/CryptoPP/crypto/src/zdeflate.h b/plugins/CryptoPP/crypto/src/zdeflate.h
index edecde33b6..60b8533112 100644
--- a/plugins/CryptoPP/crypto/src/zdeflate.h
+++ b/plugins/CryptoPP/crypto/src/zdeflate.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ZDEFLATE_H
+#ifndef CRYPTOPP_ZDEFLATE_H
 #define CRYPTOPP_ZDEFLATE_H
 
 #include "filters.h"
diff --git a/plugins/CryptoPP/crypto/src/zinflate.cpp b/plugins/CryptoPP/crypto/src/zinflate.cpp
index 289676f167..7a0c8aa110 100644
--- a/plugins/CryptoPP/crypto/src/zinflate.cpp
+++ b/plugins/CryptoPP/crypto/src/zinflate.cpp
@@ -1,4 +1,4 @@
-// zinflate.cpp - written and placed in the public domain by Wei Dai
+// zinflate.cpp - written and placed in the public domain by Wei Dai
 
 // This is a complete reimplementation of the DEFLATE decompression algorithm.
 // It should not be affected by any security vulnerabilities in the zlib 
diff --git a/plugins/CryptoPP/crypto/src/zinflate.h b/plugins/CryptoPP/crypto/src/zinflate.h
index df80bbe1d9..4d536beb2d 100644
--- a/plugins/CryptoPP/crypto/src/zinflate.h
+++ b/plugins/CryptoPP/crypto/src/zinflate.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ZINFLATE_H
+#ifndef CRYPTOPP_ZINFLATE_H
 #define CRYPTOPP_ZINFLATE_H
 
 #include "filters.h"
diff --git a/plugins/CryptoPP/crypto/src/zlib.cpp b/plugins/CryptoPP/crypto/src/zlib.cpp
index 7b78508743..528f809122 100644
--- a/plugins/CryptoPP/crypto/src/zlib.cpp
+++ b/plugins/CryptoPP/crypto/src/zlib.cpp
@@ -1,4 +1,4 @@
-// zlib.cpp - written and placed in the public domain by Wei Dai
+// zlib.cpp - written and placed in the public domain by Wei Dai
 
 // "zlib" is the name of a well known C language compression library
 // (http://www.zlib.org) and also the name of a compression format
diff --git a/plugins/CryptoPP/crypto/src/zlib.h b/plugins/CryptoPP/crypto/src/zlib.h
index 41de7c73fb..a9acc7d3fa 100644
--- a/plugins/CryptoPP/crypto/src/zlib.h
+++ b/plugins/CryptoPP/crypto/src/zlib.h
@@ -1,4 +1,4 @@
-#ifndef CRYPTOPP_ZLIB_H
+#ifndef CRYPTOPP_ZLIB_H
 #define CRYPTOPP_ZLIB_H
 
 #include "adler32.h"
author	Kirill Volinsky <Mataes2007@gmail.com>	2017-12-06 14:15:09 +0300
committer	Kirill Volinsky <Mataes2007@gmail.com>	2017-12-06 14:15:09 +0300
commit	a27079fe5c4a210664515c47767c00112c435d65 (patch)
tree	39e36b58b4138af46e2f10661de352482b89399d /plugins/CryptoPP/crypto
parent	87c39b86cfeb0dedf94f9bf04af30de2daf368bc (diff)