The overall goal of this project is to develop a Diagnostic Security Module (DSM) framework for creating an end-to-end security architecture for the integration of modern Plug-in Electric Vehicles (PEV) with Electric Vehicle Supply Equipment (EVSE) and a Building Energy Management System (BEMS). The DSM framework will create a secure communications channel to coordinate PEV charging activities with a BEMS operator while notifying the BEMS operator of any cyber security problems associated with the PEV or EVSE. The DSMs will integrate with a wide range of device types (EVSE, PEVs, etc) and vendors, and provide enhanced awareness of the security state when implementing an integrated building and PEV environment.