forked from I2P_Developers/i2p.i2p
merge of '598d00efae4c9b675b64fd626bc2eab2b921e0c5'
and 'd38686d88680521e54d7bcb8be24e21d252eb946'
This commit is contained in:
@@ -102,6 +102,25 @@ iD8DBQFHphOV+h38a3n8zjMRAll+AJ9KA6WiDJcTN4qfrslSemUMr+FBrwCeM8pF
|
||||
D8usM7Dxp5yrDrCYZ5AIijc=
|
||||
=SrXI
|
||||
-----END PGP SIGNATURE-----
|
||||
*/
|
||||
/*
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
*/
|
||||
/* HungryHobo's key */
|
||||
private static final String DEFAULT_TRUSTED_KEY4 =
|
||||
"l3G6um9nB9EDLkT9cUusz5fX-GxXSWE5zaj2~V8lUL~XsGuFf8gKqzJLK" +
|
||||
"NkAw0CgDIDsLRHHuUaF7ZHo5Z7HG~9JJU9Il4G2jyNYtg5S8AzG0UxkEt" +
|
||||
"-JeBEqIxv5GDn6OFKr~wTI0UafJbegEWokl-8m-GPWf0vW-yPMjL7y5MI=";
|
||||
/*
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.10 (GNU/Linux)
|
||||
|
||||
iEYEARECAAYFAkysnNIACgkQHix7YXbc3BJVfwCeNGUHaWSqZUbWN9L8VyQLpwxI
|
||||
JXQAnA28vDmMMMH/WPbC5ixmJeGGNUiR
|
||||
=3oMC
|
||||
-----END PGP SIGNATURE-----
|
||||
*/
|
||||
|
||||
private static final int VERSION_BYTES = 16;
|
||||
@@ -148,6 +167,7 @@ D8usM7Dxp5yrDrCYZ5AIijc=
|
||||
addKey(DEFAULT_TRUSTED_KEY, "jrandom@mail.i2p");
|
||||
addKey(DEFAULT_TRUSTED_KEY2, "zzz@mail.i2p");
|
||||
//addKey(DEFAULT_TRUSTED_KEY3, "complication@mail.i2p");
|
||||
addKey(DEFAULT_TRUSTED_KEY4, "HungryHobo@mail.i2p");
|
||||
}
|
||||
if (_log.shouldLog(Log.DEBUG))
|
||||
_log.debug("TrustedUpdate created, trusting " + _trustedKeys.size() + " keys.");
|
||||
|
11
core/java/src/net/i2p/crypto/package.html
Normal file
11
core/java/src/net/i2p/crypto/package.html
Normal file
@@ -0,0 +1,11 @@
|
||||
<html>
|
||||
<body>
|
||||
<p>
|
||||
These classes provide a number of low-level cryptographic routines.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
These cryptographic routines include symmetric and asymmetric encryption and decryption, hashing, secure random number generation...
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
7
core/java/src/net/i2p/package.html
Normal file
7
core/java/src/net/i2p/package.html
Normal file
@@ -0,0 +1,7 @@
|
||||
<html>
|
||||
<body>
|
||||
<p>
|
||||
Core I2P package, contains information about the I2P version and an entry point to access important elements.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
7
core/java/src/net/i2p/time/package.html
Normal file
7
core/java/src/net/i2p/time/package.html
Normal file
@@ -0,0 +1,7 @@
|
||||
<html>
|
||||
<body>
|
||||
<p>
|
||||
Provides classes for time synchronisation using NTP.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
Reference in New Issue
Block a user