crypto: improve key handling