madmaxoft
6bdd3ee35e
Merged branch 'master' into SslWebAdmin.
2014-05-01 23:20:00 +02:00
madmaxoft
cb07541029
Fixed a warning in Noise.
2014-05-01 23:10:37 +02:00
madmaxoft
e24bdc9328
More ClientHandle fixes.
2014-05-01 23:03:23 +02:00
madmaxoft
ed75d3a836
Fixed warnings in ClientHandle.
2014-05-01 22:58:58 +02:00
madmaxoft
fb173a756c
Fixed warnings in cByteBuffer.
2014-05-01 22:54:22 +02:00
madmaxoft
a4d8c6d656
Fixed warning in BlockID.
2014-05-01 22:47:02 +02:00
madmaxoft
a91129af4a
Fixed warnings in cBlockArea.
2014-05-01 22:44:52 +02:00
madmaxoft
b6b86b7270
Fixed warnings in FastNBT.
2014-05-01 22:43:37 +02:00
madmaxoft
a6eba4ff8b
Fixed warning in cCallbackSslContext::cDataCallbacks.
2014-05-01 22:41:41 +02:00
madmaxoft
e175ae551c
Fixed warning in cBlockArea.
2014-05-01 22:41:18 +02:00
madmaxoft
4a95271790
Merge branch 'master' into SslWebAdmin
2014-05-01 22:16:29 +02:00
Mattes D
a4416874bb
Merge pull request #973 from mc-server/ItemNoCopyConstructor
...
Removed the explicit copy constructor for cItem.
2014-05-01 22:14:34 +02:00
madmaxoft
30e81156eb
Added a missing return statement.
2014-05-01 22:02:45 +02:00
madmaxoft
b0056cdcf8
Removed the explicit copy constructor for cItem.
...
The compiler generates an implicit one with the same contents and warns about it. The function left in for ToLua to generate the binding for it.
2014-05-01 22:02:25 +02:00
madmaxoft
9221b45898
cSslContext has virtual destructor now.
2014-05-01 21:23:37 +02:00
Mattes D
a2cffb0363
Fixed MSVC2013 compilation.
2014-05-01 20:22:23 +02:00
madmaxoft
3e854bc596
ProtoProxy: Renamed PublicKey to CryptoKey.
2014-05-01 20:20:12 +02:00
worktycho
2576effc19
Merge pull request #971 from worktycho/polarssl-local
...
Keep a cloned copy of polarssl
2014-05-01 19:19:47 +01:00
Tycho
9928698d6d
Merged change to enable testing to be disabled
...
This is confirmed upstream but is unlikely to get into the repository for
several weeks
2014-05-01 09:53:43 -07:00
Tycho
ed071538d5
Changed polarssl repo to point to cloned copy of polarssl
2014-05-01 09:47:22 -07:00
Mattes D
d9e5dbf165
Renamed PublicKey to CryptoKey in CMakeLists.txt
2014-05-01 18:06:23 +02:00
madmaxoft
772b57ca04
Anvil saver pads data to 4K boundaries.
...
Fixes #524 .
2014-05-01 18:00:10 +02:00
madmaxoft
1587b21edd
Renamed cPublicKey to cCryptoKey.
...
The class can hold both the private key and the public key, bad naming on PolarSSL's part.
Also somewhat fixed the cert and key loading in cHTTPServer.
2014-05-01 15:21:41 +02:00
madmaxoft
60850fe3e8
Fixed crashes in the SSL HTTP connection.
2014-05-01 15:08:15 +02:00
madmaxoft
dc2d2ce53c
Added a mention to run as admin.
2014-05-01 12:27:07 +02:00
madmaxoft
cf821bc9a4
Added scripts for generating HTTPS cert and key.
2014-05-01 11:48:45 +02:00
madmaxoft
272c232efb
Implemented SSL connection for WebAdmin.
...
Fixes FS-319.
2014-05-01 11:48:03 +02:00
madmaxoft
a04cb6d146
Fixed HTTP message parsing, prepared for SSL.
2014-05-01 11:34:15 +02:00
madmaxoft
e1b6a16945
Added a (disabled) test of low-security ciphersuites.
...
Enabling this allows the connection to be sniffed and decoded using Wireshark, when given the SSL private key.
2014-05-01 11:33:29 +02:00
madmaxoft
e2bf3783e8
Fixed BufferedSslContext's buffer reading and writing.
2014-05-01 11:32:25 +02:00
madmaxoft
47feb91e57
cSslContext supports setting own cert / privkey.
2014-05-01 00:28:27 +02:00
madmaxoft
e6786074d5
Added cBufferedSslContext implementation.
2014-05-01 00:27:42 +02:00
madmaxoft
ab2dfb44fa
If webadmin.ini doesn't exist, example one is written immediately.
2014-04-30 17:37:25 +02:00
madmaxoft
f2b5790776
Fixed a warning when an empty item is being created.
2014-04-30 17:36:51 +02:00
madmaxoft
ae2d18daee
Ladders set as transparent.
2014-04-30 17:13:56 +02:00
madmaxoft
58929a9948
Removed the unused cBlockingTCPLink class.
2014-04-30 17:06:46 +02:00
Mattes D
014fab58e6
Merge pull request #965 from mc-server/SslWrappers
...
Ssl wrappers
2014-04-30 17:05:13 +02:00
madmaxoft
1dbdb8ed91
Delayed sending the KeepAlive packet for 3 seconds after login.
...
This should alleviate #889 .
2014-04-29 23:10:50 +02:00
madmaxoft
c045bb3f4c
Removed unneeded #includes.
2014-04-29 17:45:20 +02:00
madmaxoft
6cb2d2461f
Moved the rest of the Crypto objects into their own respective files.
2014-04-29 17:37:15 +02:00
madmaxoft
d9f7ae6a4d
Moved cPublicKey to its separate file in PolarSSL++.
2014-04-29 17:13:08 +02:00
madmaxoft
7e972f6a5d
Merge branch 'master' into SslWrappers
2014-04-29 15:41:24 +02:00
madmaxoft
015bf244b5
Added BiomeToString() API function.
2014-04-29 15:36:29 +02:00
madmaxoft
5d33ce226f
Added BiomeToString() API function.
2014-04-29 15:36:05 +02:00
madmaxoft
e39f2a21d5
Fixed ProtoProxy.
2014-04-29 11:48:57 +02:00
madmaxoft
79ec770d77
Added missing initialization.
2014-04-29 11:17:47 +02:00
madmaxoft
ec33bbe294
Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.
2014-04-29 11:04:54 +02:00
madmaxoft
709ae320e0
Disabled MSVC warnings about constant bool expressions.
2014-04-28 22:30:07 +02:00
madmaxoft
55a7f392cc
Hopefully fixed repeated clang warnings.
2014-04-28 22:22:07 +02:00
madmaxoft
dffd38e53b
Fixed a MSVC warning.
2014-04-28 22:21:49 +02:00
