PS4 Firmware 8.0 Compatibility (Fix #328)

thestr4ng3r · thestr4ng3r · commit 4dac2253df4b · 2020-10-18T14:24:37.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ secret.tar
 keystore-env.sh
 compile_commands.json
 .ccls-cache
+.gdb_history
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -31,6 +31,7 @@ android {
                 arguments "-DCHIAKI_ENABLE_TESTS=OFF",
                         "-DCHIAKI_ENABLE_CLI=OFF",
                         "-DCHIAKI_ENABLE_GUI=OFF",
+                        "-DCHIAKI_ENABLE_SETSU=OFF",
                         "-DCHIAKI_ENABLE_ANDROID=ON",
                         "-DCHIAKI_LIB_ENABLE_OPUS=OFF",
                         "-DCHIAKI_LIB_OPENSSL_EXTERNAL_PROJECT=ON"
diff --git a/android/app/src/main/cpp/chiaki-jni.c b/android/app/src/main/cpp/chiaki-jni.c
@@ -702,13 +702,19 @@ JNIEXPORT void JNICALL JNI_FCN(registStart)(JNIEnv *env, jobject obj, jobject re
 			  ")V");
 
 	jclass regist_info_class = E->GetObjectClass(env, regist_info_obj);
+
+	jobject target_obj = E->GetObjectField(env, regist_info_obj, E->GetFieldID(env, regist_info_class, "target", "L"BASE_PACKAGE"/Target;"));
+	jclass target_class = E->GetObjectClass(env, target_obj);
+	jint target_value = E->GetIntField(env, target_obj, E->GetFieldID(env, target_class, "value", "I"));
+
 	jstring host_string = E->GetObjectField(env, regist_info_obj, E->GetFieldID(env, regist_info_class, "host", "Ljava/lang/String;"));
 	jboolean broadcast = E->GetBooleanField(env, regist_info_obj, E->GetFieldID(env, regist_info_class, "broadcast", "Z"));
 	jstring psn_online_id_string = E->GetObjectField(env, regist_info_obj, E->GetFieldID(env, regist_info_class, "psnOnlineId", "Ljava/lang/String;"));
 	jbyteArray psn_account_id_array = E->GetObjectField(env, regist_info_obj, E->GetFieldID(env, regist_info_class, "psnAccountId", "[B"));
 	jint pin = E->GetIntField(env, regist_info_obj, E->GetFieldID(env, regist_info_class, "pin", "I"));
 
 	ChiakiRegistInfo regist_info = { 0 };
+	regist_info.target = (ChiakiTarget)target_value;
 	regist_info.host = E->GetStringUTFChars(env, host_string, NULL);
 	regist_info.broadcast = broadcast;
 	if(psn_online_id_string)
diff --git a/android/app/src/main/java/com/metallic/chiaki/lib/Chiaki.kt b/android/app/src/main/java/com/metallic/chiaki/lib/Chiaki.kt
@@ -3,11 +3,19 @@ package com.metallic.chiaki.lib
 import android.os.Parcelable
 import android.util.Log
 import android.view.Surface
+import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import java.lang.Exception
 import java.net.InetSocketAddress
 import kotlin.math.abs
 
+enum class Target(val value: Int)
+{
+	PS4_8(800),
+	PS4_9(900),
+	PS4_10(1000)
+}
+
 enum class VideoResolutionPreset(val value: Int)
 {
 	RES_360P(1),
@@ -316,6 +324,7 @@ class DiscoveryService(
 
 @Parcelize
 data class RegistInfo(
+	val target: Target,
 	val host: String,
 	val broadcast: Boolean,
 	val psnOnlineId: String?,
diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt
@@ -28,6 +28,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.metallic.chiaki.R
 import com.metallic.chiaki.common.ext.RevealActivity
 import com.metallic.chiaki.lib.RegistInfo
+import com.metallic.chiaki.lib.Target
 import kotlinx.android.synthetic.main.activity_regist.*
 import java.lang.IllegalArgumentException
 
@@ -63,26 +64,28 @@ class RegistActivity: AppCompatActivity(), RevealActivity
 
 		registButton.setOnClickListener { doRegist() }
 
-		ps4VersionRadioGroup.check(when(viewModel.ps4Version.value ?: RegistViewModel.PS4Version.GE_7) {
+		ps4VersionRadioGroup.check(when(viewModel.ps4Version.value ?: RegistViewModel.PS4Version.GE_8) {
+			RegistViewModel.PS4Version.GE_8 -> R.id.ps4VersionGE8RadioButton
 			RegistViewModel.PS4Version.GE_7 -> R.id.ps4VersionGE7RadioButton
 			RegistViewModel.PS4Version.LT_7 -> R.id.ps4VersionLT7RadioButton
 		})
 
 		ps4VersionRadioGroup.setOnCheckedChangeListener { _, checkedId ->
 			viewModel.ps4Version.value = when(checkedId)
 			{
+				R.id.ps4VersionGE8RadioButton -> RegistViewModel.PS4Version.GE_8
 				R.id.ps4VersionGE7RadioButton -> RegistViewModel.PS4Version.GE_7
 				R.id.ps4VersionLT7RadioButton -> RegistViewModel.PS4Version.LT_7
 				else -> RegistViewModel.PS4Version.GE_7
 			}
 		}
 
 		viewModel.ps4Version.observe(this, Observer {
-			psnAccountIdHelpGroup.visibility = if(it == RegistViewModel.PS4Version.GE_7) View.VISIBLE else View.GONE
+			psnAccountIdHelpGroup.visibility = if(it == RegistViewModel.PS4Version.LT_7) View.GONE else View.VISIBLE
 			psnIdTextInputLayout.hint = getString(when(it!!)
 			{
-				RegistViewModel.PS4Version.GE_7 -> R.string.hint_regist_psn_account_id
 				RegistViewModel.PS4Version.LT_7 -> R.string.hint_regist_psn_online_id
+				else -> R.string.hint_regist_psn_account_id
 			})
 		})
 	}
@@ -98,14 +101,14 @@ class RegistActivity: AppCompatActivity(), RevealActivity
 		val psnId = psnIdEditText.text.toString().trim()
 		val psnOnlineId: String? = if(ps4Version == RegistViewModel.PS4Version.LT_7) psnId else null
 		val psnAccountId: ByteArray? =
-			if(ps4Version == RegistViewModel.PS4Version.GE_7)
+			if(ps4Version != RegistViewModel.PS4Version.LT_7)
 				try { Base64.decode(psnId, Base64.DEFAULT) } catch(e: IllegalArgumentException) { null }
 			else
 				null
 		val psnIdValid = when(ps4Version)
 		{
-			RegistViewModel.PS4Version.GE_7 -> psnAccountId != null && psnAccountId.size == RegistInfo.ACCOUNT_ID_SIZE
 			RegistViewModel.PS4Version.LT_7 -> psnOnlineId?.isNotEmpty() ?: false
+			else -> psnAccountId != null && psnAccountId.size == RegistInfo.ACCOUNT_ID_SIZE
 		}
 
 
@@ -117,8 +120,8 @@ class RegistActivity: AppCompatActivity(), RevealActivity
 			if(!psnIdValid)
 				getString(when(ps4Version)
 				{
-					RegistViewModel.PS4Version.GE_7 -> R.string.regist_psn_account_id_invalid
 					RegistViewModel.PS4Version.LT_7 -> R.string.regist_psn_online_id_invalid
+					else -> R.string.regist_psn_account_id_invalid
 				})
 			else
 				null
@@ -127,7 +130,14 @@ class RegistActivity: AppCompatActivity(), RevealActivity
 		if(!hostValid || !psnIdValid || !pinValid)
 			return
 
-		val registInfo = RegistInfo(host, broadcast, psnOnlineId, psnAccountId, pin.toInt())
+		val target = when(ps4Version)
+		{
+			RegistViewModel.PS4Version.GE_8 -> Target.PS4_10
+			RegistViewModel.PS4Version.GE_7 -> Target.PS4_9
+			RegistViewModel.PS4Version.LT_7 -> Target.PS4_8
+		}
+
+		val registInfo = RegistInfo(target, host, broadcast, psnOnlineId, psnAccountId, pin.toInt())
 
 		Intent(this, RegistExecuteActivity::class.java).also {
 			it.putExtra(RegistExecuteActivity.EXTRA_REGIST_INFO, registInfo)
diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistViewModel.kt
@@ -23,9 +23,10 @@ import androidx.lifecycle.ViewModel
 class RegistViewModel: ViewModel()
 {
 	enum class PS4Version {
+		GE_8,
 		GE_7,
 		LT_7
 	}
 
-	val ps4Version = MutableLiveData<PS4Version>(PS4Version.GE_7)
+	val ps4Version = MutableLiveData<PS4Version>(PS4Version.GE_8)
 }
diff --git a/android/app/src/main/res/layout/activity_regist.xml b/android/app/src/main/res/layout/activity_regist.xml
@@ -70,12 +70,21 @@
                 app:layout_constraintTop_toBottomOf="@id/broadcastCheckBox">
 
                 <com.google.android.material.radiobutton.MaterialRadioButton
-                    android:id="@+id/ps4VersionGE7RadioButton"
+                    android:id="@+id/ps4VersionGE8RadioButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/regist_option_ps4_ge_7"
+                    android:text="@string/regist_option_ps4_ge_8"
                     android:layout_weight="1"
                     android:checked="true"/>
+
+                <com.google.android.material.radiobutton.MaterialRadioButton
+                    android:id="@+id/ps4VersionGE7RadioButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:text="@string/regist_option_ps4_ge_7" />
+
                 <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/ps4VersionLT7RadioButton"
                     android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -28,7 +28,8 @@
     <string name="hint_regist_host">Host</string>
     <string name="regist_broadcast">Broadcast</string>
     <string name="regist_option_ps4_lt_7">PS4 &lt; 7.0</string>
-    <string name="regist_option_ps4_ge_7">PS4 ≥ 7.0</string>
+    <string name="regist_option_ps4_ge_7">PS4 ≥ 7.0, &lt; 8</string>
+    <string name="regist_option_ps4_ge_8">PS4 ≥ 8.0</string>
     <string name="regist_psn_account_id_help">About obtaining your Account ID, see</string>
     <string name="regist_psn_account_id_help_url">https://github.com/thestr4ng3r/chiaki/blob/master/README.md#obtaining-your-psn-accountid</string>
     <string name="hint_regist_psn_online_id">PSN Online ID (username, case-sensitive)</string>
diff --git a/gui/include/registdialog.h b/gui/include/registdialog.h
@@ -41,16 +41,19 @@ class RegistDialog : public QDialog
 
 		QLineEdit *host_edit;
 		QCheckBox *broadcast_check_box;
-		QRadioButton *psn_online_id_radio_button;
+		QRadioButton *ps4_pre9_radio_button;
+		QRadioButton *ps4_pre10_radio_button;
+		QRadioButton *ps4_10_radio_button;
 		QLineEdit *psn_online_id_edit;
-		QRadioButton *psn_account_id_radio_button;
 		QLineEdit *psn_account_id_edit;
 		QLineEdit *pin_edit;
 		QDialogButtonBox *button_box;
 		QPushButton *register_button;
 
 		RegisteredHost registered_host;
 
+		bool NeedAccountId();
+
 	private slots:
 		void ValidateInput();
 
diff --git a/gui/src/registdialog.cpp b/gui/src/registdialog.cpp
@@ -59,20 +59,29 @@ RegistDialog::RegistDialog(Settings *settings, const QString &host, QWidget *par
 	broadcast_check_box->setChecked(host.isEmpty());
 
 	auto UpdatePSNIDEdits = [this]() {
-		psn_online_id_edit->setEnabled(psn_online_id_radio_button->isChecked());
-		psn_account_id_edit->setEnabled(psn_account_id_radio_button->isChecked());
+		bool need_account_id = NeedAccountId();
+		psn_online_id_edit->setEnabled(!need_account_id);
+		psn_account_id_edit->setEnabled(need_account_id);
 	};
 
-	psn_online_id_radio_button = new QRadioButton(tr("PSN Online-ID (username, case-sensitive) for PS4 < 7.0:"), this);
-	psn_online_id_edit = new QLineEdit(this);
-	form_layout->addRow(psn_online_id_radio_button, psn_online_id_edit);
-	connect(psn_online_id_radio_button, &QRadioButton::toggled, this, UpdatePSNIDEdits);
+	auto version_layout = new QVBoxLayout(nullptr);
+	ps4_pre9_radio_button = new QRadioButton(tr("< 7.0"), this);
+	version_layout->addWidget(ps4_pre9_radio_button);
+	connect(ps4_pre9_radio_button, &QRadioButton::toggled, this, UpdatePSNIDEdits);
+	ps4_pre10_radio_button = new QRadioButton(tr(">= 7.0, < 8.0"), this);
+	version_layout->addWidget(ps4_pre10_radio_button);
+	connect(ps4_pre10_radio_button, &QRadioButton::toggled, this, UpdatePSNIDEdits);
+	ps4_10_radio_button = new QRadioButton(tr(">= 8.0"), this);
+	version_layout->addWidget(ps4_10_radio_button);
+	connect(ps4_10_radio_button, &QRadioButton::toggled, this, UpdatePSNIDEdits);
+	form_layout->addRow(tr("PS4 Firmware:"), version_layout);
 
-	psn_account_id_radio_button = new QRadioButton(tr("PSN Account-ID (base64) for PS4 >= 7.0:"), this);
+	psn_online_id_edit = new QLineEdit(this);
+	form_layout->addRow(tr("PSN Online-ID (username, case-sensitive):"), psn_online_id_edit);
 	psn_account_id_edit = new QLineEdit(this);
-	form_layout->addRow(psn_account_id_radio_button, psn_account_id_edit);
-	psn_account_id_radio_button->setChecked(true);
-	connect(psn_account_id_radio_button, &QRadioButton::toggled, this, UpdatePSNIDEdits);
+	form_layout->addRow(tr("PSN Account-ID (base64):"), psn_account_id_edit);
+
+	ps4_10_radio_button->setChecked(true);
 
 	UpdatePSNIDEdits();
 
@@ -96,11 +105,17 @@ RegistDialog::~RegistDialog()
 {
 }
 
+bool RegistDialog::NeedAccountId()
+{
+	return !ps4_pre9_radio_button->isChecked();
+}
+
 void RegistDialog::ValidateInput()
 {
+	bool need_account_id = NeedAccountId();
 	bool valid = !host_edit->text().trimmed().isEmpty()
-				 && (!psn_online_id_radio_button->isChecked() || !psn_online_id_edit->text().trimmed().isEmpty())
-				 && (!psn_account_id_radio_button->isChecked() || !psn_account_id_radio_button->text().trimmed().isEmpty())
+				 && !(!need_account_id && psn_online_id_edit->text().trimmed().isEmpty())
+				 && !(need_account_id && psn_account_id_edit->text().trimmed().isEmpty())
 				 && pin_edit->text().length() == PIN_LENGTH;
 	register_button->setEnabled(valid);
 }
@@ -111,8 +126,16 @@ void RegistDialog::accept()
 	QByteArray host = host_edit->text().trimmed().toUtf8();
 	info.host = host.constData();
 
+	if(ps4_pre9_radio_button->isChecked())
+		info.target = CHIAKI_TARGET_PS4_8;
+	else if(ps4_pre10_radio_button->isChecked())
+		info.target = CHIAKI_TARGET_PS4_9;
+	else
+		info.target = CHIAKI_TARGET_PS4_10;
+
+	bool need_account_id = NeedAccountId();
 	QByteArray psn_id; // keep this out of the if scope
-	if(psn_online_id_radio_button->isChecked())
+	if(!need_account_id)
 	{
 		psn_id = psn_online_id_edit->text().trimmed().toUtf8();
 		info.psn_online_id = psn_id.constData();
diff --git a/lib/include/chiaki/common.h b/lib/include/chiaki/common.h
@@ -72,6 +72,15 @@ CHIAKI_EXPORT const char *chiaki_error_string(ChiakiErrorCode code);
 CHIAKI_EXPORT void *chiaki_aligned_alloc(size_t alignment, size_t size);
 CHIAKI_EXPORT void chiaki_aligned_free(void *ptr);
 
+typedef enum
+{
+	// values must not change
+	CHIAKI_TARGET_PS4_UNKNOWN = 0,
+	CHIAKI_TARGET_PS4_8 = 800,
+	CHIAKI_TARGET_PS4_9 = 900,
+	CHIAKI_TARGET_PS4_10 = 1000
+} ChiakiTarget;
+
 /**
  * Perform initialization of global state needed for using the Chiaki lib
  */
diff --git a/lib/include/chiaki/regist.h b/lib/include/chiaki/regist.h
@@ -33,6 +33,7 @@ extern "C" {
 
 typedef struct chiaki_regist_info_t
 {
+	ChiakiTarget target;
 	const char *host;
 	bool broadcast;
 
@@ -94,7 +95,7 @@ CHIAKI_EXPORT void chiaki_regist_stop(ChiakiRegist *regist);
 /**
  * @param psn_account_id must be exactly of size CHIAKI_PSN_ACCOUNT_ID_SIZE
  */
-CHIAKI_EXPORT ChiakiErrorCode chiaki_regist_request_payload_format(uint8_t *buf, size_t *buf_size, ChiakiRPCrypt *crypt, const char *psn_online_id, const uint8_t *psn_account_id);
+CHIAKI_EXPORT ChiakiErrorCode chiaki_regist_request_payload_format(ChiakiTarget target, const uint8_t *ambassador, uint8_t *buf, size_t *buf_size, ChiakiRPCrypt *crypt, const char *psn_online_id, const uint8_t *psn_account_id, uint32_t pin);
 
 #ifdef __cplusplus
 }
diff --git a/lib/include/chiaki/rpcrypt.h b/lib/include/chiaki/rpcrypt.h
@@ -31,15 +31,18 @@ extern "C" {
 
 typedef struct chiaki_rpcrypt_t
 {
+	ChiakiTarget target;
 	uint8_t bright[CHIAKI_RPCRYPT_KEY_SIZE];
 	uint8_t ambassador[CHIAKI_RPCRYPT_KEY_SIZE];
 } ChiakiRPCrypt;
 
-CHIAKI_EXPORT void chiaki_rpcrypt_bright_ambassador(uint8_t *bright, uint8_t *ambassador, const uint8_t *nonce, const uint8_t *morning);
-CHIAKI_EXPORT void chiaki_rpcrypt_aeropause(uint8_t *aeropause, const uint8_t *ambassador);
+CHIAKI_EXPORT void chiaki_rpcrypt_bright_ambassador(ChiakiTarget target, uint8_t *bright, uint8_t *ambassador, const uint8_t *nonce, const uint8_t *morning);
+CHIAKI_EXPORT void chiaki_rpcrypt_aeropause_ps4_pre10(uint8_t *aeropause, const uint8_t *ambassador);
+CHIAKI_EXPORT void chiaki_rpcrypt_aeropause(size_t key_1_off, uint8_t *aeropause, const uint8_t *ambassador);
 
-CHIAKI_EXPORT void chiaki_rpcrypt_init_auth(ChiakiRPCrypt *rpcrypt, const uint8_t *nonce, const uint8_t *morning);
-CHIAKI_EXPORT void chiaki_rpcrypt_init_regist(ChiakiRPCrypt *rpcrypt, const uint8_t *ambassador, uint32_t pin);
+CHIAKI_EXPORT void chiaki_rpcrypt_init_auth(ChiakiRPCrypt *rpcrypt, ChiakiTarget target, const uint8_t *nonce, const uint8_t *morning);
+CHIAKI_EXPORT void chiaki_rpcrypt_init_regist_ps4_pre10(ChiakiRPCrypt *rpcrypt, const uint8_t *ambassador, uint32_t pin);
+CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_init_regist(ChiakiRPCrypt *rpcrypt, const uint8_t *ambassador, size_t key_0_off, uint32_t pin);
 CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_generate_iv(ChiakiRPCrypt *rpcrypt, uint8_t *iv, uint64_t counter);
 CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_encrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, const uint8_t *in, uint8_t *out, size_t sz);
 CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_decrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, const uint8_t *in, uint8_t *out, size_t sz);
diff --git a/lib/include/chiaki/session.h b/lib/include/chiaki/session.h
@@ -43,22 +43,16 @@ extern "C" {
 #define CHIAKI_RP_APPLICATION_REASON_IN_USE				0x80108b10
 #define CHIAKI_RP_APPLICATION_REASON_CRASH				0x80108b15
 #define CHIAKI_RP_APPLICATION_REASON_RP_VERSION			0x80108b11
-// unknown: 0x80108bff
+#define CHIAKI_RP_APPLICATION_REASON_UNKNOWN			0x80108bff
 
 CHIAKI_EXPORT const char *chiaki_rp_application_reason_string(uint32_t reason);
 
-typedef enum {
-	CHIAKI_RP_VERSION_UNKNOWN = 0,
-	CHIAKI_RP_VERSION_8_0 = 800,
-	CHIAKI_RP_VERSION_9_0 = 900
-} ChiakiRpVersion;
-
 /**
  * @return RP-Version string or NULL
  */
-CHIAKI_EXPORT const char *chiaki_rp_version_string(ChiakiRpVersion version);
+CHIAKI_EXPORT const char *chiaki_rp_version_string(ChiakiTarget target);
 
-CHIAKI_EXPORT ChiakiRpVersion chiaki_rp_version_parse(const char *rp_version_str);
+CHIAKI_EXPORT ChiakiTarget chiaki_rp_version_parse(const char *rp_version_str);
 
 
 #define CHIAKI_RP_DID_SIZE 32
@@ -171,7 +165,7 @@ typedef struct chiaki_session_t
 		ChiakiConnectVideoProfile video_profile;
 	} connect_info;
 
-	ChiakiRpVersion rp_version;
+	ChiakiTarget target;
 
 	uint8_t nonce[CHIAKI_RPCRYPT_KEY_SIZE];
 	ChiakiRPCrypt rpcrypt;
diff --git a/lib/src/ctrl.c b/lib/src/ctrl.c
diff --git a/lib/src/regist.c b/lib/src/regist.c
diff --git a/lib/src/rpcrypt.c b/lib/src/rpcrypt.c
diff --git a/lib/src/session.c b/lib/src/session.c
diff --git a/test/regist.c b/test/regist.c
diff --git a/test/rpcrypt.c b/test/rpcrypt.c

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,10 @@ import androidx.lifecycle.ViewModel`
`23`	`23`	`class RegistViewModel: ViewModel()`
`24`	`24`	`{`
`25`	`25`	`enum class PS4Version {`
	`26`	`+ GE_8,`
`26`	`27`	`GE_7,`
`27`	`28`	`LT_7`
`28`	`29`	`}`
`29`	`30`
`30`		`- val ps4Version = MutableLiveData<PS4Version>(PS4Version.GE_7)`
	`31`	`+ val ps4Version = MutableLiveData<PS4Version>(PS4Version.GE_8)`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ extern "C" {`
`33`	`33`
`34`	`34`	`typedef struct chiaki_regist_info_t`
`35`	`35`	`{`
	`36`	`+ ChiakiTarget target;`
`36`	`37`	`const char *host;`
`37`	`38`	`bool broadcast;`
`38`	`39`
`@@ -94,7 +95,7 @@ CHIAKI_EXPORT void chiaki_regist_stop(ChiakiRegist *regist);`
`94`	`95`	`/**`
`95`	`96`	`* @param psn_account_id must be exactly of size CHIAKI_PSN_ACCOUNT_ID_SIZE`
`96`	`97`	`*/`
`97`		`-CHIAKI_EXPORT ChiakiErrorCode chiaki_regist_request_payload_format(uint8_t buf, size_t buf_size, ChiakiRPCrypt crypt, const char psn_online_id, const uint8_t *psn_account_id);`
	`98`	`+CHIAKI_EXPORT ChiakiErrorCode chiaki_regist_request_payload_format(ChiakiTarget target, const uint8_t ambassador, uint8_t buf, size_t buf_size, ChiakiRPCrypt crypt, const char psn_online_id, const uint8_t psn_account_id, uint32_t pin);`
`98`	`99`
`99`	`100`	`#ifdef __cplusplus`
`100`	`101`	`}`