unify public and secret key lists

LE MERGE