merge of '3e6cfe9a01136316f39f1bd294a515e6bc91ff8e'

and 'b4b595d294ace07f7fde583957d8e00e96af347c'
This commit is contained in:
kytv
2014-11-28 20:39:57 +00:00
22 changed files with 250 additions and 58 deletions

View File

@@ -1339,10 +1339,10 @@ public class IndexBean {
// as of 0.9.17, add a random key if not previously present
byte[] rk = new byte[32];
_context.random().nextBytes(rk);
config.setProperty(OPT + p, Base64.encode(rk));
config.setProperty(p, Base64.encode(rk));
p = OPT + "outbound.randomKey";
_context.random().nextBytes(rk);
config.setProperty(OPT + p, Base64.encode(rk));
config.setProperty(p, Base64.encode(rk));
}
}