diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b5b0d51ca..11cb01e23 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -332,6 +332,8 @@ add_library(core STATIC
hle/service/pm/pm_app.h
hle/service/pm/pm_dbg.cpp
hle/service/pm/pm_dbg.h
+ hle/service/ps/ps_ps.cpp
+ hle/service/ps/ps_ps.h
hle/service/ptm/ptm.cpp
hle/service/ptm/ptm.h
hle/service/ptm/ptm_gets.cpp
diff --git a/src/core/hle/service/ps/ps_ps.cpp b/src/core/hle/service/ps/ps_ps.cpp
new file mode 100644
index 000000000..6f85d1966
--- /dev/null
+++ b/src/core/hle/service/ps/ps_ps.cpp
@@ -0,0 +1,41 @@
+// Copyright 2018 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/hle/ipc_helpers.h"
+#include "core/hle/service/ps/ps_ps.h"
+
+namespace Service {
+namespace PS {
+
+PS_PS::PS_PS() : ServiceFramework("ps:ps", DefaultMaxSessions) {
+ static const FunctionInfo functions[] = {
+ // clang-format off
+ {0x00010244, nullptr, "SignRsaSha256"},
+ {0x00020244, nullptr, "VerifyRsaSha256"},
+ {0x00040204, nullptr, "EncryptDecryptAes"},
+ {0x00050284, nullptr, "EncryptSignDecryptVerifyAesCcm"},
+ {0x00060040, nullptr, "GetRomId"},
+ {0x00070040, nullptr, "GetRomId2"},
+ {0x00080040, nullptr, "GetRomMakerCode"},
+ {0x00090000, nullptr, "GetCTRCardAutoStartupBit"},
+ {0x000A0000, nullptr, "GetLocalFriendCodeSeed"},
+ {0x000B0000, nullptr, "GetDeviceId"},
+ {0x000C0000, nullptr, "SeedRNG"},
+ {0x000D0042, nullptr, "GenerateRandomBytes"},
+ {0x000E0082, nullptr, "InterfaceForPXI_0x04010084"},
+ {0x000F0082, nullptr, "InterfaceForPXI_0x04020082"},
+ {0x00100042, nullptr, "InterfaceForPXI_0x04030044"},
+ {0x00110042, nullptr, "InterfaceForPXI_0x04040044"},
+ // clang-format on
+ };
+
+ RegisterHandlers(functions);
+};
+
+void InstallInterfaces(SM::ServiceManager& service_manager) {
+ std::make_shared<PS_PS>()->InstallAsService(service_manager);
+}
+
+} // namespace PS
+} // namespace Service
diff --git a/src/core/hle/service/ps/ps_ps.h b/src/core/hle/service/ps/ps_ps.h
new file mode 100644
index 000000000..56363ae6c
--- /dev/null
+++ b/src/core/hle/service/ps/ps_ps.h
@@ -0,0 +1,231 @@
+// Copyright 2018 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+namespace Service {
+namespace PS {
+
+class PS_PS final : public ServiceFramework<PS_PS> {
+public:
+ PS_PS();
+ ~PS_PS() = default;
+
+private:
+ /**
+ * PS_PS::SignRsaSha256 service function
+ * Inputs:
+ * 0 : Header Code[0x00010244]
+ * 1-8 : SHA256 hash to sign.
+ * 9 : Unused. Intended as the signature size.
+ * 10 : Descriptor for static buffer
+ * 11 : RSA context buffer (static_buffer_id=0)
+ * 12 : Descriptor for mapping a write-only buffer in the target process
+ * 13 : Signature buffer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : Descriptor for mapping a write-only buffer in the target process
+ * 3 : Signature buffer. Size for the translate-header is hard-coded to 0x100.
+ */
+ void SignRsaSha256(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::VerifyRsaSha256 service function
+ * Inputs:
+ * 0 : Header Code[0x00020244]
+ * 1-8 : SHA256 hash to compare with.
+ * 9 : Unused. Intended as the signature size.
+ * 10 : Descriptor for static buffer
+ * 11 : RSA context buffer (static_buffer_id=0)
+ * 12 : Descriptor for mapping a read-only buffer in the target process
+ * 13 : Signature buffer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : Descriptor for mapping a read-only buffer in the target process
+ * 3 : Signature buffer. Size for the translate-header is hard-coded to 0x100.
+ */
+ void VerifyRsaSha256(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::EncryptDecryptAes service function
+ * Inputs:
+ * 0 : Header Code[0x00040204]
+ * 1 : Size in bytes
+ * 2 : Unused. Destination size in bytes
+ * 3-6 : IV / CTR
+ * 7 : u8 Algorithm Type (0..5)
+ * 8 : u8 Key Type (0..7)
+ * 9 : (size<<4) | 10
+ * 10 : Source pointer
+ * 11 : (size<<4) | 12
+ * 12 : Destination pointer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2-5 : Output IV / CTR
+ */
+ void EncryptDecryptAes(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::EncryptSignDecryptVerifyAesCcm service function
+ * Inputs:
+ * 0 : Header Code[0x00050284]
+ * 1 : Input buffer size
+ * 2 : Output buffer size
+ * 3 : Total CBC-MAC associated data, in bytes.
+ * 4 : Total data size, in bytes.
+ * 5 : MAC size in bytes.
+ * 6-8 : Nonce
+ * 9 : Algorithm Type (0..5)
+ * 10 : Key Type (0..7)
+ * 11 : (inbufsize<<8) | 0x4
+ * 12 : Source pointer
+ * 13 : (outbufsize<<8) | 0x14
+ * 14 : Destination pointer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+ void EncryptSignDecryptVerifyAesCcm(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GetRomId service function
+ * Inputs:
+ * 0 : Header Code[0x00060040]
+ * 1 :
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+ void GetRomId(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GetRomId2 service function
+ * Inputs:
+ * 0 : Header Code[0x00070040]
+ * 1 :
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+ void GetRomId2(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GetRomMakerCode service function
+ * Inputs:
+ * 0 : Header Code[0x00080040]
+ * 1 :
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+ void GetRomMakerCode(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GetCTRCardAutoStartupBit service function
+ * Inputs:
+ * 0 : Header Code[0x00090000]
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : u8, 0 = auto startup bit not set, 1 = auto startup bit set
+ */
+ void GetCTRCardAutoStartupBit(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GetLocalFriendCodeSeed service function
+ * Inputs:
+ * 0 : Header Code[0x000A0000]
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : LocalFriendCodeSeed lower word
+ * 3 : LocalFriendCodeSeed upper word
+ */
+ void GetLocalFriendCodeSeed(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GetDeviceId service function
+ * Inputs:
+ * 0 : Header Code[0x000B0000]
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : u32, DeviceID
+ */
+ void GetDeviceId(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::SeedRNG service function
+ * Inputs:
+ * 0 : Header Code[0x000C0000]
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+ void SeedRNG(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::GenerateRandomBytes service function
+ * Inputs:
+ * 0 : Header Code[0x000D0042]
+ * 1 : Output buffer size
+ * 2 : (Size<<8) | 0x4
+ * 3 : Output buffer pointer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+ void GenerateRandomBytes(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::InterfaceForPXI_0x04010084 service function
+ * Inputs:
+ * 0 : Header Code[0x000E0082]
+ * 1 : Input buffer size
+ * 2 : Output buffer size
+ * 3 : (insize<<8) | 0x4
+ * 4 : Input buffer pointer
+ * 5 : (outsize<<8) | 0x14
+ * 6 : Output buffer pointer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 :
+ */
+ void InterfaceForPXI_0x04010084(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::InterfaceForPXI_0x04020082 service function
+ * Inputs:
+ * 0 : Header Code[0x000F0082]
+ * 1 : insize
+ * 2 : u8 flag
+ * 3 : (insize<<8) | 0x4
+ * 4 : Input buffer pointer
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 :
+ */
+ void InterfaceForPXI_0x04020082(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::InterfaceForPXI_0x04030044 service function
+ * Inputs:
+ * 0 : Header Code[0x00100042]
+ * 1 :
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 :
+ */
+ void InterfaceForPXI_0x04030044(Kernel::HLERequestContext& ctx);
+
+ /**
+ * PS_PS::InterfaceForPXI_0x04040044 service function
+ * Inputs:
+ * 0 : Header Code[0x00110042]
+ * 1 :
+ * Outputs:
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 :
+ */
+ void InterfaceForPXI_0x04040044(Kernel::HLERequestContext& ctx);
+};
+
+/// Initializes the PS_PS Service
+void InstallInterfaces(SM::ServiceManager& service_manager);
+
+} // namespace PS
+} // namespace Service
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index f596d6d48..cc84aced4 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -44,6 +44,7 @@
#include "core/hle/service/ns/ns.h"
#include "core/hle/service/nwm/nwm.h"
#include "core/hle/service/pm/pm.h"
+#include "core/hle/service/ps/ps_ps.h"
#include "core/hle/service/ptm/ptm.h"
#include "core/hle/service/pxi/pxi.h"
#include "core/hle/service/qtm/qtm.h"
@@ -225,6 +226,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
ERR::InstallInterfaces();
+ PS::InstallInterfaces(*sm);
PXI::InstallInterfaces(*sm);
NS::InstallInterfaces(*sm);
AC::InstallInterfaces(*sm);