summaryrefslogtreecommitdiff
path: root/plugins/CryptoPP
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/CryptoPP')
-rw-r--r--plugins/CryptoPP/crypto/docs/License.txt2
-rw-r--r--plugins/CryptoPP/crypto/docs/Readme.txt2
-rw-r--r--plugins/CryptoPP/crypto/res/Version.rc2
-rw-r--r--plugins/CryptoPP/crypto/src/3way.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/3way.h2
-rw-r--r--plugins/CryptoPP/crypto/src/adhoc.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/adler32.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/adler32.h2
-rw-r--r--plugins/CryptoPP/crypto/src/aes.h2
-rw-r--r--plugins/CryptoPP/crypto/src/algebra.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/algebra.h2
-rw-r--r--plugins/CryptoPP/crypto/src/algparam.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/algparam.h2
-rw-r--r--plugins/CryptoPP/crypto/src/arc4.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/arc4.h2
-rw-r--r--plugins/CryptoPP/crypto/src/argnames.h2
-rw-r--r--plugins/CryptoPP/crypto/src/asn.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/asn.h2
-rw-r--r--plugins/CryptoPP/crypto/src/base32.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/base32.h2
-rw-r--r--plugins/CryptoPP/crypto/src/base64.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/base64.h2
-rw-r--r--plugins/CryptoPP/crypto/src/basecode.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/basecode.h2
-rw-r--r--plugins/CryptoPP/crypto/src/bench.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/bench.h2
-rw-r--r--plugins/CryptoPP/crypto/src/bench2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/bfinit.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/blowfish.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/blowfish.h2
-rw-r--r--plugins/CryptoPP/crypto/src/blumshub.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/blumshub.h2
-rw-r--r--plugins/CryptoPP/crypto/src/camellia.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/camellia.h2
-rw-r--r--plugins/CryptoPP/crypto/src/cast.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/cast.h2
-rw-r--r--plugins/CryptoPP/crypto/src/casts.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/cbcmac.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/cbcmac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/channels.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/channels.h2
-rw-r--r--plugins/CryptoPP/crypto/src/config.h2
-rw-r--r--plugins/CryptoPP/crypto/src/cpu.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/cpu.h2
-rw-r--r--plugins/CryptoPP/crypto/src/crc.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/crc.h2
-rw-r--r--plugins/CryptoPP/crypto/src/cryptlib.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/cryptlib.h2
-rw-r--r--plugins/CryptoPP/crypto/src/cryptlib_bds.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/datatest.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/default.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/default.h2
-rw-r--r--plugins/CryptoPP/crypto/src/des.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/des.h2
-rw-r--r--plugins/CryptoPP/crypto/src/dessp.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/dh.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/dh.h2
-rw-r--r--plugins/CryptoPP/crypto/src/dh2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/dh2.h2
-rw-r--r--plugins/CryptoPP/crypto/src/dll.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/dll.h2
-rw-r--r--plugins/CryptoPP/crypto/src/dlltest.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/dmac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/dsa.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/dsa.h2
-rw-r--r--plugins/CryptoPP/crypto/src/ec2n.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/ec2n.h2
-rw-r--r--plugins/CryptoPP/crypto/src/eccrypto.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/eccrypto.h2
-rw-r--r--plugins/CryptoPP/crypto/src/ecp.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/ecp.h2
-rw-r--r--plugins/CryptoPP/crypto/src/elgamal.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/elgamal.h2
-rw-r--r--plugins/CryptoPP/crypto/src/emsa2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/emsa2.h2
-rw-r--r--plugins/CryptoPP/crypto/src/eprecomp.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/eprecomp.h2
-rw-r--r--plugins/CryptoPP/crypto/src/esign.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/esign.h2
-rw-r--r--plugins/CryptoPP/crypto/src/factory.h2
-rw-r--r--plugins/CryptoPP/crypto/src/files.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/files.h2
-rw-r--r--plugins/CryptoPP/crypto/src/filters.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/filters.h2
-rw-r--r--plugins/CryptoPP/crypto/src/fips140.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/fips140.h2
-rw-r--r--plugins/CryptoPP/crypto/src/fipsalgt.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/fipstest.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/fltrimpl.h2
-rw-r--r--plugins/CryptoPP/crypto/src/gf256.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/gf256.h2
-rw-r--r--plugins/CryptoPP/crypto/src/gf2_32.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/gf2_32.h2
-rw-r--r--plugins/CryptoPP/crypto/src/gf2n.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/gf2n.h2
-rw-r--r--plugins/CryptoPP/crypto/src/gfpcrypt.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/gfpcrypt.h2
-rw-r--r--plugins/CryptoPP/crypto/src/gost.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/gost.h2
-rw-r--r--plugins/CryptoPP/crypto/src/gzip.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/gzip.h2
-rw-r--r--plugins/CryptoPP/crypto/src/haval.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/haval.h2
-rw-r--r--plugins/CryptoPP/crypto/src/hex.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/hex.h2
-rw-r--r--plugins/CryptoPP/crypto/src/hmac.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/hmac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/hrtimer.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/hrtimer.h2
-rw-r--r--plugins/CryptoPP/crypto/src/ida.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/ida.h2
-rw-r--r--plugins/CryptoPP/crypto/src/idea.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/idea.h2
-rw-r--r--plugins/CryptoPP/crypto/src/integer.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/integer.h2
-rw-r--r--plugins/CryptoPP/crypto/src/iterhash.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/iterhash.h2
-rw-r--r--plugins/CryptoPP/crypto/src/lubyrack.h2
-rw-r--r--plugins/CryptoPP/crypto/src/luc.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/luc.h2
-rw-r--r--plugins/CryptoPP/crypto/src/mars.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/mars.h2
-rw-r--r--plugins/CryptoPP/crypto/src/marss.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/md2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/md2.h2
-rw-r--r--plugins/CryptoPP/crypto/src/md4.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/md4.h2
-rw-r--r--plugins/CryptoPP/crypto/src/md5.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/md5.h2
-rw-r--r--plugins/CryptoPP/crypto/src/md5mac.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/md5mac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/mdc.h2
-rw-r--r--plugins/CryptoPP/crypto/src/misc.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/misc.h2
-rw-r--r--plugins/CryptoPP/crypto/src/modarith.h2
-rw-r--r--plugins/CryptoPP/crypto/src/modes.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/modes.h2
-rw-r--r--plugins/CryptoPP/crypto/src/modexppc.h2
-rw-r--r--plugins/CryptoPP/crypto/src/mqueue.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/mqueue.h2
-rw-r--r--plugins/CryptoPP/crypto/src/mqv.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/mqv.h2
-rw-r--r--plugins/CryptoPP/crypto/src/nbtheory.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/nbtheory.h2
-rw-r--r--plugins/CryptoPP/crypto/src/network.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/network.h2
-rw-r--r--plugins/CryptoPP/crypto/src/nr.h2
-rw-r--r--plugins/CryptoPP/crypto/src/oaep.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/oaep.h2
-rw-r--r--plugins/CryptoPP/crypto/src/oids.h2
-rw-r--r--plugins/CryptoPP/crypto/src/osrng.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/osrng.h2
-rw-r--r--plugins/CryptoPP/crypto/src/panama.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/panama.h2
-rw-r--r--plugins/CryptoPP/crypto/src/pch.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/pch.h2
-rw-r--r--plugins/CryptoPP/crypto/src/pkcspad.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/pkcspad.h2
-rw-r--r--plugins/CryptoPP/crypto/src/polynomi.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/polynomi.h2
-rw-r--r--plugins/CryptoPP/crypto/src/pssr.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/pssr.h2
-rw-r--r--plugins/CryptoPP/crypto/src/pubkey.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/pubkey.h2
-rw-r--r--plugins/CryptoPP/crypto/src/pwdbased.h2
-rw-r--r--plugins/CryptoPP/crypto/src/queue.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/queue.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rabin.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rabin.h2
-rw-r--r--plugins/CryptoPP/crypto/src/randpool.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/randpool.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rc2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rc2.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rc5.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rc5.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rc6.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rc6.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rdtables.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/regtest.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/resource.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rijndael.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rijndael.h2
-rw-r--r--plugins/CryptoPP/crypto/src/ripemd.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/ripemd.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rng.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rng.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rsa.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rsa.h2
-rw-r--r--plugins/CryptoPP/crypto/src/rw.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/rw.h2
-rw-r--r--plugins/CryptoPP/crypto/src/safer.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/safer.h2
-rw-r--r--plugins/CryptoPP/crypto/src/salsa.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/salsa.h2
-rw-r--r--plugins/CryptoPP/crypto/src/seal.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/seal.h2
-rw-r--r--plugins/CryptoPP/crypto/src/secblock.h2
-rw-r--r--plugins/CryptoPP/crypto/src/seckey.h2
-rw-r--r--plugins/CryptoPP/crypto/src/serpent.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/serpent.h2
-rw-r--r--plugins/CryptoPP/crypto/src/serpentp.h2
-rw-r--r--plugins/CryptoPP/crypto/src/sha.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/sha.h2
-rw-r--r--plugins/CryptoPP/crypto/src/shacal2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/shacal2.h2
-rw-r--r--plugins/CryptoPP/crypto/src/shark.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/shark.h2
-rw-r--r--plugins/CryptoPP/crypto/src/sharkbox.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/simple.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/simple.h2
-rw-r--r--plugins/CryptoPP/crypto/src/skipjack.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/skipjack.h2
-rw-r--r--plugins/CryptoPP/crypto/src/smartptr.h2
-rw-r--r--plugins/CryptoPP/crypto/src/socketft.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/socketft.h2
-rw-r--r--plugins/CryptoPP/crypto/src/sosemanuk.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/sosemanuk.h2
-rw-r--r--plugins/CryptoPP/crypto/src/square.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/square.h2
-rw-r--r--plugins/CryptoPP/crypto/src/squaretb.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/stdcpp.h2
-rw-r--r--plugins/CryptoPP/crypto/src/strciphr.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/strciphr.h2
-rw-r--r--plugins/CryptoPP/crypto/src/tea.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/tea.h2
-rw-r--r--plugins/CryptoPP/crypto/src/test.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/tftables.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/tiger.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/tiger.h2
-rw-r--r--plugins/CryptoPP/crypto/src/tigertab.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/trdlocal.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/trdlocal.h2
-rw-r--r--plugins/CryptoPP/crypto/src/trunhash.h2
-rw-r--r--plugins/CryptoPP/crypto/src/ttmac.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/ttmac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/twofish.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/twofish.h2
-rw-r--r--plugins/CryptoPP/crypto/src/validat1.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/validat2.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/validat3.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/validate.h2
-rw-r--r--plugins/CryptoPP/crypto/src/version.h2
-rw-r--r--plugins/CryptoPP/crypto/src/vmac.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/vmac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/wait.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/wait.h2
-rw-r--r--plugins/CryptoPP/crypto/src/wake.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/wake.h2
-rw-r--r--plugins/CryptoPP/crypto/src/whrlpool.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/whrlpool.h2
-rw-r--r--plugins/CryptoPP/crypto/src/winpipes.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/winpipes.h2
-rw-r--r--plugins/CryptoPP/crypto/src/words.h2
-rw-r--r--plugins/CryptoPP/crypto/src/xormac.h2
-rw-r--r--plugins/CryptoPP/crypto/src/xtr.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/xtr.h2
-rw-r--r--plugins/CryptoPP/crypto/src/xtrcrypt.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/xtrcrypt.h2
-rw-r--r--plugins/CryptoPP/crypto/src/zdeflate.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/zdeflate.h2
-rw-r--r--plugins/CryptoPP/crypto/src/zinflate.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/zinflate.h2
-rw-r--r--plugins/CryptoPP/crypto/src/zlib.cpp2
-rw-r--r--plugins/CryptoPP/crypto/src/zlib.h2
-rw-r--r--plugins/CryptoPP/docs/!whatsnew.txt2
-rw-r--r--plugins/CryptoPP/docs/readme.txt2
-rw-r--r--plugins/CryptoPP/res/resource.rc2
-rw-r--r--plugins/CryptoPP/res/version.rc2
-rw-r--r--plugins/CryptoPP/src/GPGw/gpg.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/gpg.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/gpg.rc2
-rw-r--r--plugins/CryptoPP/src/GPGw/gpg_main.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/gpg_res.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/gpgw.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/keys.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/keys.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/language.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/language.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/passdialog.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/passdialog.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/passphrases.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/passphrases.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/pipeexec.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/pipeexec.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/size.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/tools.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/tools.h2
-rw-r--r--plugins/CryptoPP/src/GPGw/userdialog.cpp2
-rw-r--r--plugins/CryptoPP/src/GPGw/userdialog.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/pgpw.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6.cpp2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8.cpp2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h2
-rw-r--r--plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h2
-rw-r--r--plugins/CryptoPP/src/base16.cpp2
-rw-r--r--plugins/CryptoPP/src/base16.h2
-rw-r--r--plugins/CryptoPP/src/base64.cpp2
-rw-r--r--plugins/CryptoPP/src/commonheaders.h2
-rw-r--r--plugins/CryptoPP/src/cpp_cntx.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_gpgw.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_gzip.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_keys.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_misc.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_pgpw.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_rsam.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_rsam.h2
-rw-r--r--plugins/CryptoPP/src/cpp_rsau.cpp2
-rw-r--r--plugins/CryptoPP/src/cpp_rsau.h2
-rw-r--r--plugins/CryptoPP/src/cpp_svcs.cpp2
-rw-r--r--plugins/CryptoPP/src/cryptopp.h2
-rw-r--r--plugins/CryptoPP/src/gettime.cpp2
-rw-r--r--plugins/CryptoPP/src/gettime.h2
-rw-r--r--plugins/CryptoPP/src/main.cpp2
-rw-r--r--plugins/CryptoPP/src/mmi.cpp2
-rw-r--r--plugins/CryptoPP/src/mmi.h2
-rw-r--r--plugins/CryptoPP/src/resource.h2
-rw-r--r--plugins/CryptoPP/src/stdafx.cpp2
-rw-r--r--plugins/CryptoPP/src/utf8.cpp2
-rw-r--r--plugins/CryptoPP/src/utf8.h2
-rw-r--r--plugins/CryptoPP/src/version.h2
381 files changed, 381 insertions, 381 deletions
diff --git a/plugins/CryptoPP/crypto/docs/License.txt b/plugins/CryptoPP/crypto/docs/License.txt
index 8ec0a405b7..dd39c7a0de 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 d4d3acd475..702a08d952 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/res/Version.rc b/plugins/CryptoPP/crypto/res/Version.rc
index 5bfbab4754..2dedc507d7 100644
--- a/plugins/CryptoPP/crypto/res/Version.rc
+++ b/plugins/CryptoPP/crypto/res/Version.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
diff --git a/plugins/CryptoPP/crypto/src/3way.cpp b/plugins/CryptoPP/crypto/src/3way.cpp
index f1265ce8d0..dafaf76632 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 ccbf9038b7..6f9a5e345a 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 dc7f697596..a069f82fb7 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 227020275f..9746aabf69 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 672b3edd18..f51fa24859 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 03b6bf12b9..76dc866515 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 5d7e2134fc..7335a7694b 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 e7f379394f..196b37229f 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 6e765c2768..444652320c 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 e47accee83..af2b997281 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 ff9d587712..af4a9b17df 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 7846d5adbe..c51bcd9a3f 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 f888d42dae..e232a3e79c 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 41740900ca..f737ef7581 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 d74af5a76a..d37c02056a 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 5eee3aa130..f3f985a315 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 6b7937ac78..d4e635e5ee 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 1e233496a4..5a46c4fda0 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 c405ecaf36..5fa416fe17 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 ab94f81550..b76e22de81 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 a20623ae0b..ca1e7727fe 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 bbaa1e5c5c..da6d5de3cb 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 c5da2cf693..890375a4ba 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 144c1b172b..aa922105a5 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 06db2096f6..26023230c6 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 7fe9a56fef..af9027c10d 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 d36af881dd..ffc97890e5 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 6ab2209925..f6c9ada2b3 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 538c1520d5..ae7c3df4f3 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 b9f1db808a..637328b4f5 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 0426e45426..cc0b7f2597 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 c6787ea22c..53efc4d399 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 f527be8aa1..222a55a22a 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 d823d725ce..fd9881299f 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 322a4c3845..1a029f8375 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 9e944c685c..8da1df5e52 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 e0c5c4fb74..dd0d9cb10a 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 499a246b6b..a6567760a1 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 02f05f1ca3..37f60f62b0 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 ab6905231a..66772023d4 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 518e92f166..4d18704fc6 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 a27f891ba4..045e2608ac 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 ffe90f4c46..740e77832b 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 c91d4e3de3..8e723e19bf 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 8949e03ae8..8e5e9590d6 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 40fc2474ac..82420679ae 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 4a6fb04f43..2f520e080e 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 c7f9b2c68b..b1c2f5d40c 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 fd3eb48c2d..5291e8a54d 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 69c4ba066d..322b1df26a 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 a6aaa79d94..1a52333fc5 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 938272106c..a4451bc8ee 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 b0b2e7c861..895a97b6ad 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 590b9bbc93..8bf43b7539 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 4a292af3b1..b03f1eac9b 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 1dfd5e2f86..1c1cb5103f 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 5f644577cb..020ce917cf 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 274e8b6234..d92da97124 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 0b3287dc7f..59ee13fbbf 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 054e6cbf18..84554ab5dc 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 4b130d723f..708bc2032e 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 96ba3c1b24..3edb4f1b5f 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 e2cf4ad0ed..b015dbd31d 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 ebcaf4d26c..a7b0e631d7 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 c08df9e4a6..c40a25362d 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 e97b906465..2ccebbb027 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 35e264b62a..ff8992654b 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 07f906c9aa..0fc07b4873 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 ff0a1dcc90..b7da08b9a7 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 1c5d53ba22..9ca024aa2a 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 43974358f6..787ff525a0 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 911bd9707d..53022c217a 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 67a4ab6105..7c83e5f1fe 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 ade6c3400a..53a5218161 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 39d80a61fc..23540bd305 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 058e414cc3..a699418b0e 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 3c22c1b8f2..353cab6366 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 61915d777a..03b3fa9bb4 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 2e6fa87cc2..e621caf6b9 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 b3fbacfaa3..8a8a41d99c 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 a49fb8df8b..6c8d508308 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 87b49118a5..6dec2092ef 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 b580fe4657..d40cb83451 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 5f33537516..08e8b47c45 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 d65730b010..72469655d5 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 62f7604ab0..29dad5ef1b 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 3649f75592..fa4720647e 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 24a86f5cd2..6a75fd2462 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 929dac0deb..f9c5dae66e 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 d2eecf1a9f..4bba9e7cfe 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 463db0fa3b..a1435258e2 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 c4500502ca..aaf2ca63d4 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 0a0ffe96b3..bcfd69dd1a 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 6e73d47db7..ac47dbe3f8 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 4318b3df8f..1fb3b04d8b 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 a919120b62..a28a4cbf2a 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 3a52529dc6..c5636c4050 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 b96fc1ecb5..f65fd561c0 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 d98d38e0c6..636422a489 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 4cd6db382a..1f300fb14b 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 df4fc2ed2d..9f0b66c815 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 b19592cdba..60d881f60a 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 a25eb74990..aaf19e3b60 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 8dfebe186f..9c5dde6846 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 4a1cc79ec5..379eb29108 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 de8835fef7..a83d813380 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 aae18f22bb..b22feecbab 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 8171637a20..a51ddb5c5a 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 19e9330579..be3d48ab76 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 2b97ee5ce0..69b462f735 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 fe87a957e8..fe09a7a636 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 aca1db08f2..41c69f7c7b 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 53c133e65e..3ace9f8ab9 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 de3cae85cc..558eefb69f 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 e2b30eacfd..47aa6ba69a 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 51af79fec2..8bd4468e74 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 f220e73781..d234fd7b4d 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 6e2fe9d94f..6649699c18 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 9c681021d2..b5114078fe 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 d7eff4f849..b1b36ee125 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 f4331dad86..a3044551f7 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 760edec051..8e0feb8ab5 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 84fe4cca32..fe4a3c50d5 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 ac98f94654..4b0a8cb178 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 11035b77ca..8efecd3f3d 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 2b35003b7a..f1215442a0 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 f5c90c3f11..8d1537a366 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 bd17e70ba2..d113441adb 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 50c368be74..87a686ff14 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 92aa7d2fd9..bc0d6bbe86 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 7927a29684..6a0bc4762b 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 7decb621dd..ef106bd90d 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 21bcc4c39d..6ad383813f 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 1a5f5ec305..881020f4d4 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 a9df756497..39bf024f4f 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 8c071e27c5..248c74f5c6 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 a05cafbf4c..eba4e5cd98 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 a290945a2e..f2a6d46899 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 8692010a18..94bf8252c1 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 3de1fa5e3d..b8ab60c61e 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 0a1ac37619..64cd9a257d 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 b47c236207..6a075f7ff4 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 d9b3c66ef0..e9ea98e771 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 f13acebe4c..e5cae0020f 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 cbdef84d74..961c19746e 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 b40c30b9b5..b538dd546b 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 56e15be8b3..86c872ddc3 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 22f13e65d1..a99f9a3f06 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 839e768607..5f220897b8 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 06f023576c..d0db9efa45 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 18a19bbaba..92b467db51 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 9e6b2e073e..e0d2ef1a2a 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 765ebde9b3..a35fab74ec 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 5a8b6cad48..35df766975 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 096a923779..69705d5865 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 40258ad94a..088dbed619 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 60221659e8..bb19595464 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 34ce71aed6..ef64ecfffa 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 e1ee5fec4f..1f81441745 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 3b53ee5e6a..6ebb6e111c 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 51743ef797..8e103426cf 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 0751030136..928aa23731 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 38218a6c91..04d1c921d7 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 a7c4f4c71f..75b8693a80 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 51d6c8ccc4..6a8253e450 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 60deabb49a..aabb1b38a3 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 2a38f5d50d..9f3adab9fc 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 4c444be0f2..4ed958437d 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 2cc8cf1061..77dadfeffe 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 25c10f3c74..4cbd9060bd 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 7fd623991a..4961fdc734 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 36be4b71c5..b08f908f61 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 f2cf808698..3835a1a91b 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 0499d3338a..509e18e0c6 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 8dd8b80985..8d07e42185 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 0cfb9ce797..e101701a5a 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 a2e492cb43..1c0aba2577 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 c1682d8399..42a35ce510 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 8a2fa77d2d..6bc24400b3 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 16d977894d..511228f780 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 fc7b54d3cc..e0f7f79c65 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 a27974e956..ae0c06be1d 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 ff4d6267ba..b6a23492ba 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 9793de56c8..b49c31c620 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 cc8a1bb2c7..c1fa0f3155 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 b8d135972f..9928b53f19 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 e999f58fa9..1ea53f7073 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 1e66357046..6c66f66aee 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 60676c507b..59ee45d7c8 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 ae10d4a81a..0c91b215fd 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 ea3ed248a6..96c71127d7 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 0af337544d..ec5bdf2e87 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 c8b7ff4e95..2bbe2382c9 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 4c2b27bb8b..31150f3ca1 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 5bd8f9a0ce..1dc368c2f0 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 068e64281f..fd89157044 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 900ea7662e..0e9a77a85b 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 4416b5de90..565468b841 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 ba20fc0715..ab94089a86 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 ff05827c7a..9fd7d6350b 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 7ddc94dad4..8d3f6ab143 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 5a95f8be6a..e21f21afc7 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 1692a88005..84c8d6bda5 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 a4acd21a13..4be0fdb5d6 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 bbe65b5ec7..32f72cddf7 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 d0a120d112..61a0dd2b39 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 268690758f..3f892f0807 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 e0a0e0143a..af0f458b15 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 9e8a33ba10..469ead2e38 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 5259aa8e49..f1d6fb2e7c 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 bcb6e0a080..86c3d27287 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 211c8dbb9e..2108ab459c 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 d33c8db50f..4210be5a42 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 f101e2c6c9..2120f49de5 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 4bd7b9a969..71fc4ae220 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 939b7acc1d..3852ce0e4c 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 a54465aee1..c58ee1b787 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 e535310efa..ca4bd94705 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 fcc1e907b1..d68748c294 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 d257af748b..57a9c81640 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 1c2e2e15d2..5aa476ea6e 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 4cc1e928cd..f5f3f8ba46 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 c49a222c6e..a1a21887ac 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 ad55aa7ed1..899c21dd40 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 a4ecfd17a7..49ab7670ed 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 05b49d4a1d..b387a7ca65 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 0a7243256e..b5465886bd 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 6cf1799d06..c74f3b0a16 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 10f14a47fb..b22ece937c 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 16fd8c09f8..0e2aa1cd60 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 6b4e8bfe56..1c71b5a768 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 ce8d968135..3f6d80df12 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 e34bde5cce..560230ce53 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 d3143ad957..be83a4139a 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 fceb62196b..8e8a1652d6 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 76b58ea7d9..66efa82641 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 698aa5b511..0b7e415c52 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 6e2cdaf174..cd2d18fc14 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 ca634c9df2..b52b4a13f3 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 a24491792c..c8b65e1592 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 a2c85ace03..cea88ac171 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 b031922638..190ee7a34d 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 c01b745e32..8267b67a68 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 41d06753ba..f87c5afc47 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 6c6c05c5e0..4fcca1c9ce 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 33a32e2d3e..1ef2c07e94 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 32f3a2de83..9745e92a11 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 ea9843973b..f0bbffd797 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 75ac3a8c66..3ef554b92a 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 f76e8499f4..e9b45fb20b 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 977b2cd6f7..c383bb5b04 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 d2f3fb0708..530a7efe55 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 40ca8a14ab..f3896ac4a9 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 ce3ed76154..903c1a9c36 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 2f51b116a3..c5a8969c6f 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 099226bab8..59bd92d287 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 60b8533112..edecde33b6 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 7a0c8aa110..289676f167 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 4d536beb2d..df80bbe1d9 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 528f809122..7b78508743 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 a9acc7d3fa..41de7c73fb 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"
diff --git a/plugins/CryptoPP/docs/!whatsnew.txt b/plugins/CryptoPP/docs/!whatsnew.txt
index a5931a12ee..adaa39a6b0 100644
--- a/plugins/CryptoPP/docs/!whatsnew.txt
+++ b/plugins/CryptoPP/docs/!whatsnew.txt
@@ -1,4 +1,4 @@
-
+
Verison 1.0.4.4 [22-05-2009]
diff --git a/plugins/CryptoPP/docs/readme.txt b/plugins/CryptoPP/docs/readme.txt
index a1150056c6..c054b473dc 100644
--- a/plugins/CryptoPP/docs/readme.txt
+++ b/plugins/CryptoPP/docs/readme.txt
@@ -1,4 +1,4 @@
-
+
-*-*-*-*-*-*-*-*- Описание RSA/AES алгоритма (наиболее свежее) -*-*-*-*-*-*-*-*-
diff --git a/plugins/CryptoPP/res/resource.rc b/plugins/CryptoPP/res/resource.rc
index 61ee5b969f..b861a41318 100644
--- a/plugins/CryptoPP/res/resource.rc
+++ b/plugins/CryptoPP/res/resource.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
#include "afxres.h"
diff --git a/plugins/CryptoPP/res/version.rc b/plugins/CryptoPP/res/version.rc
index fdeb14668c..6427dc9522 100644
--- a/plugins/CryptoPP/res/version.rc
+++ b/plugins/CryptoPP/res/version.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
diff --git a/plugins/CryptoPP/src/GPGw/gpg.cpp b/plugins/CryptoPP/src/GPGw/gpg.cpp
index 47d5d178dc..c50114c851 100644
--- a/plugins/CryptoPP/src/GPGw/gpg.cpp
+++ b/plugins/CryptoPP/src/GPGw/gpg.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
char *txtgpgargslistpublickeys=
diff --git a/plugins/CryptoPP/src/GPGw/gpg.h b/plugins/CryptoPP/src/GPGw/gpg.h
index 5a06071e4a..2c60a5570e 100644
--- a/plugins/CryptoPP/src/GPGw/gpg.h
+++ b/plugins/CryptoPP/src/GPGw/gpg.h
@@ -1,4 +1,4 @@
-#ifndef __GPG_H__
+#ifndef __GPG_H__
#define __GPG_H__
typedef enum
diff --git a/plugins/CryptoPP/src/GPGw/gpg.rc b/plugins/CryptoPP/src/GPGw/gpg.rc
index 95791b28b9..3e4096c545 100644
--- a/plugins/CryptoPP/src/GPGw/gpg.rc
+++ b/plugins/CryptoPP/src/GPGw/gpg.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "gpg_res.h"
diff --git a/plugins/CryptoPP/src/GPGw/gpg_main.cpp b/plugins/CryptoPP/src/GPGw/gpg_main.cpp
index 5bbbc9f5e3..2eaacce5a9 100644
--- a/plugins/CryptoPP/src/GPGw/gpg_main.cpp
+++ b/plugins/CryptoPP/src/GPGw/gpg_main.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
BOOL ShowSelectExecDlg(LPSTR);
diff --git a/plugins/CryptoPP/src/GPGw/gpg_res.h b/plugins/CryptoPP/src/GPGw/gpg_res.h
index af5efe29d7..6bbea495a1 100644
--- a/plugins/CryptoPP/src/GPGw/gpg_res.h
+++ b/plugins/CryptoPP/src/GPGw/gpg_res.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
diff --git a/plugins/CryptoPP/src/GPGw/gpgw.h b/plugins/CryptoPP/src/GPGw/gpgw.h
index 041c79abc5..d3722cea94 100644
--- a/plugins/CryptoPP/src/GPGw/gpgw.h
+++ b/plugins/CryptoPP/src/GPGw/gpgw.h
@@ -1,4 +1,4 @@
-// Windows API
+// Windows API
#pragma once
diff --git a/plugins/CryptoPP/src/GPGw/keys.cpp b/plugins/CryptoPP/src/GPGw/keys.cpp
index 74674bedd3..707e2169eb 100644
--- a/plugins/CryptoPP/src/GPGw/keys.cpp
+++ b/plugins/CryptoPP/src/GPGw/keys.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
typedef char tkeyuserid[keyuseridsize];
diff --git a/plugins/CryptoPP/src/GPGw/keys.h b/plugins/CryptoPP/src/GPGw/keys.h
index 394c6c05b8..039c5e8e85 100644
--- a/plugins/CryptoPP/src/GPGw/keys.h
+++ b/plugins/CryptoPP/src/GPGw/keys.h
@@ -1,4 +1,4 @@
-#ifndef __KEYS_H__
+#ifndef __KEYS_H__
#define __KEYS_H__
#define publickeyuserid 0
diff --git a/plugins/CryptoPP/src/GPGw/language.cpp b/plugins/CryptoPP/src/GPGw/language.cpp
index a815f7cff3..304a1633f0 100644
--- a/plugins/CryptoPP/src/GPGw/language.cpp
+++ b/plugins/CryptoPP/src/GPGw/language.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
//char *txtverifyoptions="Please verify your settings in M->Options->Plugins->GnuPG and GnuPG Advanced."; /*lang*/
diff --git a/plugins/CryptoPP/src/GPGw/language.h b/plugins/CryptoPP/src/GPGw/language.h
index 6c3548b4c3..6e8bcf9215 100644
--- a/plugins/CryptoPP/src/GPGw/language.h
+++ b/plugins/CryptoPP/src/GPGw/language.h
@@ -1,4 +1,4 @@
-#ifndef __TEXT_H__
+#ifndef __TEXT_H__
#define __TEXT_H__
// textkonstanten, die uebersetzt werden muessen
diff --git a/plugins/CryptoPP/src/GPGw/passdialog.cpp b/plugins/CryptoPP/src/GPGw/passdialog.cpp
index 18389c31d6..0263edb6e3 100644
--- a/plugins/CryptoPP/src/GPGw/passdialog.cpp
+++ b/plugins/CryptoPP/src/GPGw/passdialog.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
char dlgpassphrase[passphrasesize];
diff --git a/plugins/CryptoPP/src/GPGw/passdialog.h b/plugins/CryptoPP/src/GPGw/passdialog.h
index 0bf5b9522b..408c8c39da 100644
--- a/plugins/CryptoPP/src/GPGw/passdialog.h
+++ b/plugins/CryptoPP/src/GPGw/passdialog.h
@@ -1,4 +1,4 @@
-#ifndef __PASSDIALOG_H__
+#ifndef __PASSDIALOG_H__
#define __PASSDIALOG_H__
extern char dlgpassphrase[];
diff --git a/plugins/CryptoPP/src/GPGw/passphrases.cpp b/plugins/CryptoPP/src/GPGw/passphrases.cpp
index 6a88358370..01e17ec4b9 100644
--- a/plugins/CryptoPP/src/GPGw/passphrases.cpp
+++ b/plugins/CryptoPP/src/GPGw/passphrases.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
// globale variablen
diff --git a/plugins/CryptoPP/src/GPGw/passphrases.h b/plugins/CryptoPP/src/GPGw/passphrases.h
index 9a2c25dadd..30d5bc1931 100644
--- a/plugins/CryptoPP/src/GPGw/passphrases.h
+++ b/plugins/CryptoPP/src/GPGw/passphrases.h
@@ -1,4 +1,4 @@
-#ifndef __PASSPHRASES_H__
+#ifndef __PASSPHRASES_H__
#define __PASSPHRASES_H__
// funktions prototypen
diff --git a/plugins/CryptoPP/src/GPGw/pipeexec.cpp b/plugins/CryptoPP/src/GPGw/pipeexec.cpp
index 3a04fd1697..8ebdb00ab7 100644
--- a/plugins/CryptoPP/src/GPGw/pipeexec.cpp
+++ b/plugins/CryptoPP/src/GPGw/pipeexec.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
BOOL isWindowsNT(void)
diff --git a/plugins/CryptoPP/src/GPGw/pipeexec.h b/plugins/CryptoPP/src/GPGw/pipeexec.h
index 241e071a53..047baa4476 100644
--- a/plugins/CryptoPP/src/GPGw/pipeexec.h
+++ b/plugins/CryptoPP/src/GPGw/pipeexec.h
@@ -1,4 +1,4 @@
-#ifndef __PIPEEXEC_H__
+#ifndef __PIPEEXEC_H__
#define __PIPEEXEC_H__
#include <windows.h>
diff --git a/plugins/CryptoPP/src/GPGw/size.h b/plugins/CryptoPP/src/GPGw/size.h
index e9382f7a2b..6a46c40d52 100644
--- a/plugins/CryptoPP/src/GPGw/size.h
+++ b/plugins/CryptoPP/src/GPGw/size.h
@@ -1,4 +1,4 @@
-#ifndef __SIZE_H__
+#ifndef __SIZE_H__
#define __SIZE_H__
// array groessen
diff --git a/plugins/CryptoPP/src/GPGw/tools.cpp b/plugins/CryptoPP/src/GPGw/tools.cpp
index 17d3303739..fb12501629 100644
--- a/plugins/CryptoPP/src/GPGw/tools.cpp
+++ b/plugins/CryptoPP/src/GPGw/tools.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
// escape sequence type
diff --git a/plugins/CryptoPP/src/GPGw/tools.h b/plugins/CryptoPP/src/GPGw/tools.h
index 74da8552d3..f9e9cef7f8 100644
--- a/plugins/CryptoPP/src/GPGw/tools.h
+++ b/plugins/CryptoPP/src/GPGw/tools.h
@@ -1,4 +1,4 @@
-#ifndef __TOOLS_H__
+#ifndef __TOOLS_H__
#define __TOOLS_H__
#ifdef __cplusplus
diff --git a/plugins/CryptoPP/src/GPGw/userdialog.cpp b/plugins/CryptoPP/src/GPGw/userdialog.cpp
index a6f6cea17f..159d811fc9 100644
--- a/plugins/CryptoPP/src/GPGw/userdialog.cpp
+++ b/plugins/CryptoPP/src/GPGw/userdialog.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#include "gpgw.h"
void RefreshListView(HWND hLV);
diff --git a/plugins/CryptoPP/src/GPGw/userdialog.h b/plugins/CryptoPP/src/GPGw/userdialog.h
index acdf0a3bcc..f88c8f0b49 100644
--- a/plugins/CryptoPP/src/GPGw/userdialog.h
+++ b/plugins/CryptoPP/src/GPGw/userdialog.h
@@ -1,4 +1,4 @@
-#ifndef __USERDIALOG_H__
+#ifndef __USERDIALOG_H__
#define __USERDIALOG_H__
INT_PTR CALLBACK UserIdDialogProcedure(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam);
diff --git a/plugins/CryptoPP/src/PGPw/pgpw.h b/plugins/CryptoPP/src/PGPw/pgpw.h
index 5659ca2058..d924992cd7 100644
--- a/plugins/CryptoPP/src/PGPw/pgpw.h
+++ b/plugins/CryptoPP/src/PGPw/pgpw.h
@@ -1,4 +1,4 @@
-// Windows API
+// Windows API
#pragma once
diff --git a/plugins/CryptoPP/src/PGPw/sdk6.cpp b/plugins/CryptoPP/src/PGPw/sdk6.cpp
index 3d9bf47f17..115c1bf792 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6.cpp
+++ b/plugins/CryptoPP/src/PGPw/sdk6.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#define PGP_WIN32 0x600
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h
index 7e460c800a..a9aaa1445c 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpBase.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h
index 81c6b17429..5c0730f52e 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h
index 9e3ea0382a..d3fe01c537 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpCBC.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h
index 54ae8d7e43..cd7726ff47 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h
index f72f0d4c9b..0384083a4f 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h
@@ -1,4 +1,4 @@
-/*
+/*
* pgpConfig.h -- Configuration for the PGPsdk. This file contains
* the configuration information for the PGPsdk, and it should be
* included in all PGPsdk source files.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h
index 8b87c1c2f9..e835df9587 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpEncode.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h
index 52ffcfeaca..b93961cb51 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpErrors.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h
index 96016ad2b5..9524daa5b8 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h
index 65e4bc209a..45a49d8cc3 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h
index a04dc9545d..02b9f4477d 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpHMAC.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h
index 101120d47a..d412591ae5 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpHash.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h
index 25579aacd0..dda8964550 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h
index 8bfdc34cc3..4a1d7c94e9 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpKeys.h
Copyright(C) 1996,1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h
index 7480d52b55..7b6fb8b77e 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h
index 7ccbc8e1b7..9d628d4822 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpOptionList.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h
index a5d7e67415..4acccc4c96 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpPFLConfig.h (Win32 version)
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h
index ca35c79876..ba71748237 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h
index a420bfb537..6417719b31 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpPubTypes.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h
index d780876a75..85e20afec4 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpPublicKey.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h
index 5a7fabeb7e..b57f49c3ca 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpRandomPool.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h
index 2662786474..cc94274e48 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h
index c884cc5523..64896acd0a 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h
index b1dec160e2..18d5de70bd 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpSymmetricCipher.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h
index ec2903aa74..b89b4fac38 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997-1999 Network Associates, Inc.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h
index 8d2e05db40..a167d114f8 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h
index d92c999cf9..f160d77136 100644
--- a/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpUtilities.h
Copyright (C) 1997 Network Associates Inc. and affiliated companies.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8.cpp b/plugins/CryptoPP/src/PGPw/sdk8.cpp
index 5dd4cb1ebe..5f7cc35e9e 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8.cpp
+++ b/plugins/CryptoPP/src/PGPw/sdk8.cpp
@@ -1,4 +1,4 @@
-#include "../commonheaders.h"
+#include "../commonheaders.h"
#define PGP_WIN32 0x800
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h
index 00f3242fd4..538eafaaaa 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h
index e473df49e2..f114768450 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
* Copyright (C) 2003 PGP Corporation
* All rights reserved.
*
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h
index ad20d033fd..ff4615cc3b 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h
index 38122bca7f..28329ec23c 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h
index fdc65e2017..c87a2aacac 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h
index 26ae61d57f..c5c7f01491 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h
index 9745f969ec..f782f50ba7 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h
index f2e9f883a1..bf2e3408db 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h
@@ -1,4 +1,4 @@
-/*
+/*
* pgpConfig.h -- Configuration for the PGPsdk. This file contains
* the configuration information for the PGPsdk, and it should be
* included in all PGPsdk source files.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h
index c12ded4444..8577e8896c 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h
index 93a99825f8..d773a1c573 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h
index 7174b0a9e6..47eae10437 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h
index ad628a283b..c3f7f83791 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h
index 2f6ebd07af..73f9eb6db6 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h
index 3dc58a6ff9..ddd6431985 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h
index 44225347ee..35e5ea6969 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h
index 4c3c82cb8b..b77aabac56 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h
index 23a28c8bc2..9979deb9f5 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h
index 27594ea8b1..d797f09588 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h
index 8700cee34e..190287be7d 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h
index 1cdce41630..aec18b9a5b 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h
index 1a86a22a46..f89eaa2992 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h
index a0ef6ceab6..b03fb96450 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h
index 8474d66aa0..ab8220814c 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
pgpPFLConfig.h (Win32 version)
Copyright (C) 2002 PGP Corporation
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h
index f0264cafd0..fb69a3b03d 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h
index 6082d4bb62..34f1b257dc 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h
index 8ed1adc9ae..7797d5d7ab 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h
index b965b498d3..3185b4fc86 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h
index 756a19619e..5b7cfa1f45 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h
index 4a964f40ed..2532d827f5 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h
index 217c88e1b8..0e9c89559c 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h
index 04d6da569c..e10aaf1faa 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h
index 4a7aa3e920..9ff7f0752b 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h
index e82ab45026..c7acd5df02 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h
index 61a700e33e..4753af464a 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h
index f901b1b0db..68984f7d7f 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h
index 210f1656f2..fddb3c5e53 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h
index dc1ca20d62..259687c806 100644
--- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h
@@ -1,4 +1,4 @@
-/*____________________________________________________________________________
+/*____________________________________________________________________________
Copyright (C) 2002 PGP Corporation
All rights reserved.
diff --git a/plugins/CryptoPP/src/base16.cpp b/plugins/CryptoPP/src/base16.cpp
index e716b4be4f..b0f9c1b2c4 100644
--- a/plugins/CryptoPP/src/base16.cpp
+++ b/plugins/CryptoPP/src/base16.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
char *base16encode(const char *inBuffer, int count)
{
diff --git a/plugins/CryptoPP/src/base16.h b/plugins/CryptoPP/src/base16.h
index 871bca3fbd..562cdff696 100644
--- a/plugins/CryptoPP/src/base16.h
+++ b/plugins/CryptoPP/src/base16.h
@@ -1,4 +1,4 @@
-#ifndef __BASE_16__
+#ifndef __BASE_16__
#define __BASE_16__
#define BERR 0xFF /* Illegal char marker */
diff --git a/plugins/CryptoPP/src/base64.cpp b/plugins/CryptoPP/src/base64.cpp
index 9a855cdb8d..9361de5f7e 100644
--- a/plugins/CryptoPP/src/base64.cpp
+++ b/plugins/CryptoPP/src/base64.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
string base64encode(const string& buf)
{
diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index ff27ce934c..d96286fa2a 100644
--- a/plugins/CryptoPP/src/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
@@ -1,4 +1,4 @@
-// Windows API
+// Windows API
#define _CRT_NONSTDC_NO_DEPRECATE
#define WIN32_LEAN_AND_MEAN
#define NETLIB_LOG
diff --git a/plugins/CryptoPP/src/cpp_cntx.cpp b/plugins/CryptoPP/src/cpp_cntx.cpp
index 9fcb9e8542..670cd309e5 100644
--- a/plugins/CryptoPP/src/cpp_cntx.cpp
+++ b/plugins/CryptoPP/src/cpp_cntx.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
// get context data on context id
pCNTX get_context_on_id(HANDLE context)
diff --git a/plugins/CryptoPP/src/cpp_gpgw.cpp b/plugins/CryptoPP/src/cpp_gpgw.cpp
index bda82d6e6f..e9aca727aa 100644
--- a/plugins/CryptoPP/src/cpp_gpgw.cpp
+++ b/plugins/CryptoPP/src/cpp_gpgw.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
HMODULE hgpg;
diff --git a/plugins/CryptoPP/src/cpp_gzip.cpp b/plugins/CryptoPP/src/cpp_gzip.cpp
index 41183d3eb5..80dbe69ced 100644
--- a/plugins/CryptoPP/src/cpp_gzip.cpp
+++ b/plugins/CryptoPP/src/cpp_gzip.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
// gzip data
BYTE *cpp_gzip(BYTE *pData, size_t nLen, size_t& nCompressedLen)
diff --git a/plugins/CryptoPP/src/cpp_keys.cpp b/plugins/CryptoPP/src/cpp_keys.cpp
index 8cfea1c040..b88dfa93d5 100644
--- a/plugins/CryptoPP/src/cpp_keys.cpp
+++ b/plugins/CryptoPP/src/cpp_keys.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
const unsigned char IV[] = "PSKhell@MIRANDA!";
diff --git a/plugins/CryptoPP/src/cpp_misc.cpp b/plugins/CryptoPP/src/cpp_misc.cpp
index bdd3f2a645..5b078537b0 100644
--- a/plugins/CryptoPP/src/cpp_misc.cpp
+++ b/plugins/CryptoPP/src/cpp_misc.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
int __cdecl cpp_get_features(HANDLE context)
{
diff --git a/plugins/CryptoPP/src/cpp_pgpw.cpp b/plugins/CryptoPP/src/cpp_pgpw.cpp
index d574c2f236..23f1540e68 100644
--- a/plugins/CryptoPP/src/cpp_pgpw.cpp
+++ b/plugins/CryptoPP/src/cpp_pgpw.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
HMODULE hpgpsdk;
diff --git a/plugins/CryptoPP/src/cpp_rsam.cpp b/plugins/CryptoPP/src/cpp_rsam.cpp
index 1ff82b508d..694f7e2039 100644
--- a/plugins/CryptoPP/src/cpp_rsam.cpp
+++ b/plugins/CryptoPP/src/cpp_rsam.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
///////////////////////////////////////////////////////////////////////////
diff --git a/plugins/CryptoPP/src/cpp_rsam.h b/plugins/CryptoPP/src/cpp_rsam.h
index 7ffdbe1579..323e916fd3 100644
--- a/plugins/CryptoPP/src/cpp_rsam.h
+++ b/plugins/CryptoPP/src/cpp_rsam.h
@@ -1,4 +1,4 @@
-#ifndef __CPP_RSAM_H__
+#ifndef __CPP_RSAM_H__
#define __CPP_RSAM_H__
int __cdecl rsa_gen_keypair(short);
diff --git a/plugins/CryptoPP/src/cpp_rsau.cpp b/plugins/CryptoPP/src/cpp_rsau.cpp
index 1adf07afd5..84b7d5c1f1 100644
--- a/plugins/CryptoPP/src/cpp_rsau.cpp
+++ b/plugins/CryptoPP/src/cpp_rsau.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
const string padding = "PADDING!PADDING!PADDING!PADDING!"; // 256 bit
diff --git a/plugins/CryptoPP/src/cpp_rsau.h b/plugins/CryptoPP/src/cpp_rsau.h
index 38ba656f9d..b3199820ae 100644
--- a/plugins/CryptoPP/src/cpp_rsau.h
+++ b/plugins/CryptoPP/src/cpp_rsau.h
@@ -1,4 +1,4 @@
-#ifndef __CPP_RSAU_H__
+#ifndef __CPP_RSAU_H__
#define __CPP_RSAU_H__
class TLV {
diff --git a/plugins/CryptoPP/src/cpp_svcs.cpp b/plugins/CryptoPP/src/cpp_svcs.cpp
index 089d535a8f..1192a44e7c 100644
--- a/plugins/CryptoPP/src/cpp_svcs.cpp
+++ b/plugins/CryptoPP/src/cpp_svcs.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
const unsigned char IV[] = "SIMhell@MIRANDA!";
diff --git a/plugins/CryptoPP/src/cryptopp.h b/plugins/CryptoPP/src/cryptopp.h
index a13337f20e..d8c393b863 100644
--- a/plugins/CryptoPP/src/cryptopp.h
+++ b/plugins/CryptoPP/src/cryptopp.h
@@ -1,4 +1,4 @@
-#ifndef __CRYPTOPP_H__
+#ifndef __CRYPTOPP_H__
#define __CRYPTOPP_H__
#include <queue>
diff --git a/plugins/CryptoPP/src/gettime.cpp b/plugins/CryptoPP/src/gettime.cpp
index ab4687b9b0..c7d094a913 100644
--- a/plugins/CryptoPP/src/gettime.cpp
+++ b/plugins/CryptoPP/src/gettime.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
/* FILETIME unit is 100 nanoseconds */
const static long div_100_nsec = 10000000;
diff --git a/plugins/CryptoPP/src/gettime.h b/plugins/CryptoPP/src/gettime.h
index 00c8d90915..06a3a19210 100644
--- a/plugins/CryptoPP/src/gettime.h
+++ b/plugins/CryptoPP/src/gettime.h
@@ -1,4 +1,4 @@
-#ifndef __GETTIME_H__
+#ifndef __GETTIME_H__
#define __GETTIME_H__
#include <windows.h>
diff --git a/plugins/CryptoPP/src/main.cpp b/plugins/CryptoPP/src/main.cpp
index 9adee52785..7faadbcc2e 100644
--- a/plugins/CryptoPP/src/main.cpp
+++ b/plugins/CryptoPP/src/main.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
int hLangpack;
LPCSTR szModuleName = MODULENAME;
diff --git a/plugins/CryptoPP/src/mmi.cpp b/plugins/CryptoPP/src/mmi.cpp
index 5eb6f4af3e..3ebebf7806 100644
--- a/plugins/CryptoPP/src/mmi.cpp
+++ b/plugins/CryptoPP/src/mmi.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
void __fastcall safe_free(void** p)
{
diff --git a/plugins/CryptoPP/src/mmi.h b/plugins/CryptoPP/src/mmi.h
index 1ea57eb621..500a15c70b 100644
--- a/plugins/CryptoPP/src/mmi.h
+++ b/plugins/CryptoPP/src/mmi.h
@@ -1,4 +1,4 @@
-#ifndef __MMI_H__
+#ifndef __MMI_H__
#define __MMI_H__
/*
void *m_alloc(size_t);
diff --git a/plugins/CryptoPP/src/resource.h b/plugins/CryptoPP/src/resource.h
index 106d77a2ca..085aec493a 100644
--- a/plugins/CryptoPP/src/resource.h
+++ b/plugins/CryptoPP/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
diff --git a/plugins/CryptoPP/src/stdafx.cpp b/plugins/CryptoPP/src/stdafx.cpp
index dd87776a41..b493fd18e2 100644
--- a/plugins/CryptoPP/src/stdafx.cpp
+++ b/plugins/CryptoPP/src/stdafx.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
diff --git a/plugins/CryptoPP/src/utf8.cpp b/plugins/CryptoPP/src/utf8.cpp
index 83d4e4a97a..8b33910201 100644
--- a/plugins/CryptoPP/src/utf8.cpp
+++ b/plugins/CryptoPP/src/utf8.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "commonheaders.h"
LPSTR szOut = nullptr;
LPWSTR wszOut = nullptr;
diff --git a/plugins/CryptoPP/src/utf8.h b/plugins/CryptoPP/src/utf8.h
index 5a9b3eaceb..c68b5e7d5c 100644
--- a/plugins/CryptoPP/src/utf8.h
+++ b/plugins/CryptoPP/src/utf8.h
@@ -1,4 +1,4 @@
-#ifndef __UTF_8__
+#ifndef __UTF_8__
#define __UTF_8__
LPSTR __cdecl utf8encode(LPCWSTR str);
diff --git a/plugins/CryptoPP/src/version.h b/plugins/CryptoPP/src/version.h
index 60042bfccb..e4fe939268 100644
--- a/plugins/CryptoPP/src/version.h
+++ b/plugins/CryptoPP/src/version.h
@@ -1,4 +1,4 @@
-#define __MAJOR_VERSION 1
+#define __MAJOR_VERSION 1
#define __MINOR_VERSION 0
#define __RELEASE_NUM 4
#define __BUILD_NUM 8