Added back -key/-enc/-mac options for non-default keys.