*wanted* to add on the last check-in. The second argument to hmacmd5_generate is no longer unused, it is a flag to say whether good entropy is needed or not. This change was approved by Brian. The control channel key generator needed it to be able to do its job all on-the-fly.