From e5dd47ef92e46f93d2a851f05554b88b5718adec Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Thu, 15 Jun 2023 16:05:17 -0400 Subject: [PATCH] Address review comments. --- .../attestation_verifier/DeviceAttestationVerifier.h | 4 ++-- .../Framework/CHIP/MTRDeviceAttestationDelegate.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/credentials/attestation_verifier/DeviceAttestationVerifier.h b/src/credentials/attestation_verifier/DeviceAttestationVerifier.h index d51dab15f636b2..0f32a91b206cdd 100644 --- a/src/credentials/attestation_verifier/DeviceAttestationVerifier.h +++ b/src/credentials/attestation_verifier/DeviceAttestationVerifier.h @@ -317,7 +317,7 @@ class DeviceAttestationVerifier } } - VendorId BasicInformationVendorId() const { return mBasicInformationVendorId; } + uint16_t BasicInformationVendorId() const { return mBasicInformationVendorId; } uint16_t BasicInformationProductId() const { return mBasicInformationProductId; } @@ -325,7 +325,7 @@ class DeviceAttestationVerifier Platform::ScopedMemoryBufferWithSize mPaiDerBuffer; Platform::ScopedMemoryBufferWithSize mDacDerBuffer; Platform::ScopedMemoryBufferWithSize mCdBuffer; - VendorId mBasicInformationVendorId; + uint16_t mBasicInformationVendorId; uint16_t mBasicInformationProductId; }; diff --git a/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegate.h b/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegate.h index e468cd170e51c2..889ba88096e69e 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegate.h +++ b/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegate.h @@ -28,26 +28,26 @@ NS_ASSUME_NONNULL_BEGIN + (instancetype)new NS_UNAVAILABLE; /** - * The vendor ID from the Device Attestation Certificate. May be nil only if attestation was unsucessful. + * The vendor ID from the Device Attestation Certificate. May be nil only if attestation was unsuccessful. */ @property (nonatomic, readonly, nullable) NSNumber * vendorID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); /** - * The product ID from the Device Attestation Certificate. May be nil only if attestation was unsucessful. + * The product ID from the Device Attestation Certificate. May be nil only if attestation was unsuccessful. */ @property (nonatomic, readonly, nullable) NSNumber * productID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); /** * The vendor ID value from the device's Basic Information cluster that was used - * for device attestation. If attestation succeds, this must match the vendor + * for device attestation. If attestation succeeds, this must match the vendor * ID from the certification declaration. */ @property (nonatomic, readonly) NSNumber * basicInformationVendorID MTR_NEWLY_AVAILABLE; /** - * The product ID value from the device's Basic Information cluster that was used - * for device attestation. If attestation succeds, this must match one of the - * product IDs from the certification declaration. + * The product ID value from the device's Basic Information cluster that was + * used for device attestation. If attestation succeeds, this must match one of + * the product IDs from the certification declaration. */ @property (nonatomic, readonly) NSNumber * basicInformationProductID MTR_NEWLY_AVAILABLE;