[Pki-devel] [PATCH] Remove platform specific logic from patches for mock