Fix cert scanner CA matching and add key matching