GD SMP: use fixed size arrays in packets (28946477) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/smp/smp_packets.pdl

+8 −15

Original line number	Diff line number	Diff line
		@@ -80,13 +80,11 @@ packet PairingResponse : Command (code = PAIRING_RESPONSE) {
		}

		packet PairingConfirm : Command (code = PAIRING_CONFIRM) {
		// confirm_value : 8[16], // Initiating device sends Mconfirm, responding device sends Sconfirm
		_payload_,
		confirm_value : 8[16], // Initiating device sends Mconfirm, responding device sends Sconfirm
		}

		packet PairingRandom : Command (code = PAIRING_RANDOM) {
		// random_value : 8[16], // Initiating device sends Mrand, responding device sends Srand
		_payload_,
		random_value : 8[16], // Initiating device sends Mrand, responding device sends Srand
		}

		enum PairingFailedReason : 8 {
		@@ -111,8 +109,7 @@ packet PairingFailed : Command (code = PAIRING_FAILED) {
		}

		packet EncryptionInformation : Command (code = ENCRYPTION_INFORMATION) {
		// long_term_key : 8[16],
		_payload_,
		long_term_key : 8[16],
		}

		packet MasterIdentification : Command (code = MASTER_IDENTIFICATION) {
		@@ -121,8 +118,7 @@ packet MasterIdentification : Command (code = MASTER_IDENTIFICATION) {
		}

		packet IdentityInformation : Command (code = IDENTITY_INFORMATION) {
		// identity_resolving_key : 8[16],
		_payload_,
		identity_resolving_key : 8[16],
		}

		enum AddrType : 8 {
		@@ -136,8 +132,7 @@ packet IdentityAddressInformation : Command (code = IDENTITY_ADDRESS_INFORMATION
		}

		packet SigningInformation : Command (code = SIGNING_INFORMATION) {
		// signature_key : 8[16],
		_payload_,
		signature_key : 8[16],
		}

		packet SecurityRequest : Command (code = SECURITY_REQUEST) {
		@@ -145,14 +140,12 @@ packet SecurityRequest : Command (code = SECURITY_REQUEST) {
		}

		packet PairingPublicKey : Command (code = PAIRING_PUBLIC_KEY) {
		// public_key_x : 8[32],
		// public_key_y : 8[32],
		_payload_,
		public_key_x : 8[32],
		public_key_y : 8[32],
		}

		packet PairingDhKeyCheck : Command (code = PAIRING_DH_KEY_CHECK) {
		// dh_key_check : 8[16],
		_payload_,
		dh_key_check : 8[16],
		}

		enum KeypressNotificationType : 8 {