Remove phone numbers from scannable QR Code

Initially they were there to offer richer error messages when the wrong
code was scanned.

However, we found that people were posting them publicly,
misunderstanding the QR codes to be a kind of personal identifier.

For one, this isn't useful because the QR codes, like safety numbers,
are unique *per* conversation. So they aren't useful in a generic sense.
And secondly this is bad because the QR code contains both parties phone
numbers.

// FREEBIE

Example/TSKitiOSTestApp/Podfile.lock

@@ -35,7 +35,7 @@ PODS:
   - ProtocolBuffers (1.9.10)
   - Reachability (3.2)
   - SAMKeychain (1.5.0)
-  - SignalServiceKit (0.6.0):
+  - SignalServiceKit (0.7.0):
     - '25519'
     - AFNetworking
     - AxolotlKit
@@ -130,7 +130,7 @@ SPEC CHECKSUMS:
   ProtocolBuffers: d088180c10072b3d24a9939a6314b7b9bcc2340b
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 1fc9ae02f576365395758b12888c84704eebc423
-  SignalServiceKit: c580eb2197f87212fcba9f7faf56163f410225e9
+  SignalServiceKit: f32dd13f4bdc46276e2e090719f3a88288fd78ad
   SocketRocket: 3f77ec2104cc113add553f817ad90a77114f5d43
   SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c

SignalServiceKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SignalServiceKit"
-  s.version          = "0.6.0"
+  s.version          = "0.7.0"
   s.summary          = "An Objective-C library for communicating with the Signal messaging service."
 
   s.description      = <<-DESC

protobuf/OWSFingerprintProtos.proto

@@ -1,18 +1,18 @@
 package textsecure;
 
-option java_package = "org.whispersystems.libaxolotl.fingerprint";
+option java_package = "org.whispersystems.libsignal.fingerprint";
 option java_outer_classname = "FingerprintProtos";
 
 import "objectivec-descriptor.proto";
 option (google.protobuf.objectivec_file_options).class_prefix = "OWSFingerprintProtos";
 
-message FingerprintData {
-  optional bytes publicKey  = 1;
-  optional bytes identifier = 2;
+message LogicalFingerprint {
+  optional bytes identityData = 1;
+//  optional bytes identifier = 2;
 }
 
-message CombinedFingerprint {
-  optional uint32          version           = 1;
-  optional FingerprintData localFingerprint  = 2;
-  optional FingerprintData remoteFingerprint = 3;
+message LogicalFingerprints {
+  optional uint32             version           = 1;
+  optional LogicalFingerprint localFingerprint  = 2;
+  optional LogicalFingerprint remoteFingerprint = 3;
 }

src/Security/OWSFingerprint.h

@@ -7,26 +7,31 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSFingerprint : NSObject
 
+#pragma mark - Initializers
+
 - (instancetype)init NS_UNAVAILABLE;
 
 - (instancetype)initWithMyStableId:(NSString *)myStableId
                      myIdentityKey:(NSData *)myIdentityKeyWithoutKeyType
                      theirStableId:(NSString *)theirStableId
                   theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType
+                         theirName:(NSString *)theirName
                     hashIterations:(uint32_t)hashIterations NS_DESIGNATED_INITIALIZER;
 
 + (instancetype)fingerprintWithMyStableId:(NSString *)myStableId
                             myIdentityKey:(NSData *)myIdentityKeyWithoutKeyType
                             theirStableId:(NSString *)theirStableId
                          theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType
+                                theirName:(NSString *)theirName
                            hashIterations:(uint32_t)hashIterations;
 
 + (instancetype)fingerprintWithMyStableId:(NSString *)myStableId
                             myIdentityKey:(NSData *)myIdentityKeyWithoutKeyType
                             theirStableId:(NSString *)theirStableId
-                         theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType;
+                         theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType
+                                theirName:(NSString *)theirName;
 
-- (BOOL)matchesCombinedFingerprintData:(NSData *)combinedFingerprintData error:(NSError **)error;
+#pragma mark - Properties
 
 @property (nonatomic, readonly) NSData *myStableIdData;
 @property (nonatomic, readonly) NSData *myIdentityKey;
@@ -34,7 +39,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSData *theirStableIdData;
 @property (nonatomic, readonly) NSData *theirIdentityKey;
 @property (nonatomic, readonly) NSString *displayableText;
-@property (nonatomic, readonly) UIImage *image;
+@property (nullable, nonatomic, readonly) UIImage *image;
+
+#pragma mark - Instance Methods
+
+- (BOOL)matchesLogicalFingerprintsData:(NSData *)data error:(NSError **)error;
 
 @end
 

src/Security/OWSFingerprint.m

@@ -11,13 +11,17 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-static uint32_t const OWSFingerprintVersion = 0;
+static uint32_t const OWSFingerprintHashingVersion = 0;
+static uint32_t const OWSFingerprintScannableFormatVersion = 1;
 static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
 
 @interface OWSFingerprint ()
 
 @property (nonatomic, readonly) NSUInteger hashIterations;
 @property (nonatomic, readonly) NSString *text;
+@property (nonatomic, readonly) NSData *myFingerprintData;
+@property (nonatomic, readonly) NSData *theirFingerprintData;
+@property (nonatomic, readonly) NSString *theirName;
 
 @end
 
@@ -27,6 +31,7 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
                      myIdentityKey:(NSData *)myIdentityKeyWithoutKeyType
                      theirStableId:(NSString *)theirStableId
                   theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType
+                         theirName:(NSString *)theirName
                     hashIterations:(uint32_t)hashIterations
 {
     NSParameterAssert(theirIdentityKeyWithoutKeyType.length == 32);
@@ -42,9 +47,11 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
     _theirStableId = theirStableId;
     _theirStableIdData = [theirStableId dataUsingEncoding:NSUTF8StringEncoding];
     _theirIdentityKey = [theirIdentityKeyWithoutKeyType prependKeyType];
+    _theirName = theirName;
     _hashIterations = hashIterations;
-    _text = [self generateText];
-    _image = [self generateImage];
+
+    _myFingerprintData = [self dataForStableId:_myStableIdData publicKey:_myIdentityKey];
+    _theirFingerprintData = [self dataForStableId:_theirStableIdData publicKey:_theirIdentityKey];
 
     return self;
 }
@@ -53,12 +60,14 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
                             myIdentityKey:(NSData *)myIdentityKeyWithoutKeyType
                             theirStableId:(NSString *)theirStableId
                          theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType
+                                theirName:(NSString *)theirName
                            hashIterations:(uint32_t)hashIterations
 {
     return [[self alloc] initWithMyStableId:myStableId
                               myIdentityKey:myIdentityKeyWithoutKeyType
                               theirStableId:theirStableId
                            theirIdentityKey:theirIdentityKeyWithoutKeyType
+                                  theirName:theirName
                              hashIterations:hashIterations];
 }
 
@@ -66,19 +75,21 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
                             myIdentityKey:(NSData *)myIdentityKeyWithoutKeyType
                             theirStableId:(NSString *)theirStableId
                          theirIdentityKey:(NSData *)theirIdentityKeyWithoutKeyType
+                                theirName:(NSString *)theirName
 {
     return [[self alloc] initWithMyStableId:myStableId
                               myIdentityKey:myIdentityKeyWithoutKeyType
                               theirStableId:theirStableId
                            theirIdentityKey:theirIdentityKeyWithoutKeyType
+                                  theirName:theirName
                              hashIterations:OWSFingerprintDefaultHashIterations];
 }
 
-- (BOOL)matchesCombinedFingerprintData:(NSData *)data error:(NSError **)error
+- (BOOL)matchesLogicalFingerprintsData:(NSData *)data error:(NSError **)error
 {
-    OWSFingerprintProtosCombinedFingerprint *combinedFingerprint;
+    OWSFingerprintProtosLogicalFingerprints *logicalFingerprints;
     @try {
-        combinedFingerprint = [OWSFingerprintProtosCombinedFingerprint parseFromData:data];
+        logicalFingerprints = [OWSFingerprintProtosLogicalFingerprints parseFromData:data];
     } @catch (NSException *exception) {
         if ([exception.name isEqualToString:@"InvalidProtocolBuffer"]) {
             NSString *description = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE", @"alert body");
@@ -91,59 +102,39 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
         }
     }
 
-    if (combinedFingerprint.version < OWSFingerprintVersion) {
-        DDLogWarn(@"%@ Verification failed. We're running an old version.", self.tag);
+    if (logicalFingerprints.version < OWSFingerprintScannableFormatVersion) {
+        DDLogWarn(@"%@ Verification failed. They're running an old version.", self.tag);
         NSString *description
             = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION", @"alert body");
         *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
         return NO;
     }
 
-    if (combinedFingerprint.version > OWSFingerprintVersion) {
-        DDLogWarn(@"%@ Verification failed. They're running an old version.", self.tag);
+    if (logicalFingerprints.version > OWSFingerprintScannableFormatVersion) {
+        DDLogWarn(@"%@ Verification failed. We're running an old version.", self.tag);
         NSString *description = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION", @"alert body");
         *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
         return NO;
     }
 
     // Their local is *our* remote.
-    OWSFingerprintProtosFingerprintData *localFingerprint = combinedFingerprint.remoteFingerprint;
-    OWSFingerprintProtosFingerprintData *remoteFingerprint = combinedFingerprint.localFingerprint;
-
-    if (![remoteFingerprint.identifier isEqual:self.theirStableIdData]) {
-        DDLogWarn(@"%@ Verification failed. We're expecting a different contact.", self.tag);
-        NSString *errorFormat = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_WITH_MISMATCHED_REMOTE_IDENTIFIER",
-            @"Alert body {{expected phone number}}, {{actual phone number we found}}");
-        NSString *expected = [[NSString alloc] initWithData:self.theirStableIdData encoding:NSUTF8StringEncoding];
-        NSString *actual = [[NSString alloc] initWithData:remoteFingerprint.identifier encoding:NSUTF8StringEncoding];
-        NSString *description = [NSString stringWithFormat:errorFormat, expected, actual];
-
-        *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
-        return NO;
-    }
-
-    if (![localFingerprint.identifier isEqual:self.myStableIdData]) {
-        DDLogWarn(@"%@ Verification failed. They presented the wrong fingerprint.", self.tag);
-        NSString *errorFormat = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_WITH_MISMATCHED_LOCAL_IDENTIFIER",
-            @"Alert body {{expected phone number}}, {{actual phone number we found}}");
-        NSString *expected = [[NSString alloc] initWithData:self.myStableIdData encoding:NSUTF8StringEncoding];
-        NSString *actual = [[NSString alloc] initWithData:localFingerprint.identifier encoding:NSUTF8StringEncoding];
-        NSString *description = [NSString stringWithFormat:errorFormat, expected, actual];
-
-        *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
-        return NO;
-    }
-
-    if (![localFingerprint.publicKey isEqual:self.myIdentityKey]) {
-        DDLogWarn(@"%@ Verification failed. They have the wrong key for us", self.tag);
-        NSString *description = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_WITH_MISMATCHED_KEYS", @"Alert body");
+    OWSFingerprintProtosLogicalFingerprint *localFingerprint = logicalFingerprints.remoteFingerprint;
+    OWSFingerprintProtosLogicalFingerprint *remoteFingerprint = logicalFingerprints.localFingerprint;
+
+    if (![remoteFingerprint.identityData isEqual:[self scannableData:self.theirFingerprintData]]) {
+        DDLogWarn(@"%@ Verification failed. We have the wrong fingerprint for them", self.tag);
+        NSString *descriptionFormat = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM",
+            @"Alert body when verifying with {{contact name}}");
+        NSString *description = [NSString stringWithFormat:descriptionFormat, self.theirName];
         *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
         return NO;
     }
 
-    if (![remoteFingerprint.publicKey isEqual:self.theirIdentityKey]) {
-        DDLogWarn(@"%@ Verification failed. We have the wrong key for them", self.tag);
-        NSString *description = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_WITH_MISMATCHED_KEYS", @"Alert body");
+    if (![localFingerprint.identityData isEqual:[self scannableData:self.myFingerprintData]]) {
+        DDLogWarn(@"%@ Verification failed. They have the wrong fingerprint for us", self.tag);
+        NSString *descriptionFormat = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILED_THEY_HAVE_WRONG_KEY_FOR_ME",
+            @"Alert body when verifying with {{contact name}}");
+        NSString *description = [NSString stringWithFormat:descriptionFormat, self.theirName];
         *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
         return NO;
     }
@@ -152,11 +143,10 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
     return YES;
 }
 
-
-- (NSString *)generateText
+- (NSString *)text
 {
-    NSString *myDisplayString = [self stringForStableId:self.myStableIdData publicKey:self.myIdentityKey];
-    NSString *theirDisplayString = [self stringForStableId:self.theirStableIdData publicKey:self.theirIdentityKey];
+    NSString *myDisplayString = [self stringForFingerprintData:self.myFingerprintData];
+    NSString *theirDisplayString = [self stringForFingerprintData:self.theirFingerprintData];
 
     if ([theirDisplayString compare:myDisplayString] == NSOrderedAscending) {
         return [NSString stringWithFormat:@"%@%@", theirDisplayString, myDisplayString];
@@ -200,9 +190,12 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
  * @return
  *      All-number textual representation
  */
-- (NSString *)stringForStableId:(NSData *)stableIdData publicKey:(NSData *)publicKey
+- (NSData *)dataForStableId:(NSData *)stableIdData publicKey:(NSData *)publicKey
 {
-    NSData *versionData = [self dataFromShort:OWSFingerprintVersion];
+    NSParameterAssert(stableIdData);
+    NSParameterAssert(publicKey);
+
+    NSData *versionData = [self dataFromShort:OWSFingerprintHashingVersion];
     NSMutableData *hash = [NSMutableData dataWithData:versionData];
     [hash appendData:publicKey];
     [hash appendData:stableIdData];
@@ -215,17 +208,27 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
         hash = [NSMutableData dataWithBytes:digest length:CC_SHA512_DIGEST_LENGTH];
     }
 
+    return [hash copy];
+}
+
+
+- (NSString *)stringForFingerprintData:(NSData *)data
+{
+    NSParameterAssert(data);
+
     return [NSString stringWithFormat:@"%@%@%@%@%@%@",
-                     [self encodedChunkFromData:hash offset:0],
-                     [self encodedChunkFromData:hash offset:5],
-                     [self encodedChunkFromData:hash offset:10],
-                     [self encodedChunkFromData:hash offset:15],
-                     [self encodedChunkFromData:hash offset:20],
-                     [self encodedChunkFromData:hash offset:25]];
+                     [self encodedChunkFromData:data offset:0],
+                     [self encodedChunkFromData:data offset:5],
+                     [self encodedChunkFromData:data offset:10],
+                     [self encodedChunkFromData:data offset:15],
+                     [self encodedChunkFromData:data offset:20],
+                     [self encodedChunkFromData:data offset:25]];
 }
 
 - (NSString *)encodedChunkFromData:(NSData *)data offset:(uint)offset
 {
+    NSParameterAssert(data);
+
     uint8_t fiveBytes[5];
     [data getBytes:fiveBytes range:NSMakeRange(offset, 5)];
 
@@ -244,27 +247,33 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
     return result;
 }
 
-- (nullable UIImage *)generateImage
+- (NSData *)scannableData:(NSData *)data
+{
+    return [data subdataWithRange:NSMakeRange(0, 32)];
+}
+
+- (nullable UIImage *)image
 {
-    OWSFingerprintProtosCombinedFingerprintBuilder *combinedFingerprintBuilder =
-        [OWSFingerprintProtosCombinedFingerprintBuilder new];
+    OWSFingerprintProtosLogicalFingerprintsBuilder *logicalFingerprintsBuilder =
+        [OWSFingerprintProtosLogicalFingerprintsBuilder new];
 
-    [combinedFingerprintBuilder setVersion:OWSFingerprintVersion];
+    logicalFingerprintsBuilder.version = OWSFingerprintScannableFormatVersion;
 
-    OWSFingerprintProtosFingerprintDataBuilder *remoteFingerprintDataBuilder =
-        [OWSFingerprintProtosFingerprintDataBuilder new];
-    [remoteFingerprintDataBuilder setPublicKey:self.theirIdentityKey];
-    [remoteFingerprintDataBuilder setIdentifier:self.theirStableIdData];
-    [combinedFingerprintBuilder setRemoteFingerprintBuilder:remoteFingerprintDataBuilder];
+    OWSFingerprintProtosLogicalFingerprintBuilder *remoteFingerprintBuilder =
+        [OWSFingerprintProtosLogicalFingerprintBuilder new];
 
-    OWSFingerprintProtosFingerprintDataBuilder *localFingerprintDataBuilder =
-        [OWSFingerprintProtosFingerprintDataBuilder new];
-    [localFingerprintDataBuilder setPublicKey:self.myIdentityKey];
-    [localFingerprintDataBuilder setIdentifier:self.myStableIdData];
-    [combinedFingerprintBuilder setLocalFingerprintBuilder:localFingerprintDataBuilder];
+    remoteFingerprintBuilder.identityData = [self scannableData:self.theirFingerprintData];
+    logicalFingerprintsBuilder.remoteFingerprint = [remoteFingerprintBuilder build];
+
+    OWSFingerprintProtosLogicalFingerprintBuilder *localFingerprintBuilder =
+        [OWSFingerprintProtosLogicalFingerprintBuilder new];
+
+    localFingerprintBuilder.identityData = [self scannableData:self.myFingerprintData];
+    logicalFingerprintsBuilder.localFingerprint = [localFingerprintBuilder build];
 
     // Build ByteMode QR (Latin-1 encodable data)
-    NSData *fingerprintData = [combinedFingerprintBuilder build].data;
+    NSData *fingerprintData = [logicalFingerprintsBuilder build].data;
+
     DDLogDebug(@"%@ Building fingerprint with data: %@", self.tag, fingerprintData);
 
     CIFilter *filter = [CIFilter filterWithName:@"CIQRCodeGenerator"];

src/Security/OWSFingerprintBuilder.h

@@ -5,11 +5,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class TSStorageManager;
 @class OWSFingerprint;
+@protocol ContactsManagerProtocol;
 
 @interface OWSFingerprintBuilder : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager
+                       contactsManager:(id<ContactsManagerProtocol>)contactsManager NS_DESIGNATED_INITIALIZER;
 
 /**
  * Builds a fingerprint combining your current credentials with their most recently accepted credentials.

src/Security/OWSFingerprintBuilder.m

@@ -2,6 +2,7 @@
 //  Copyright © 2016 Open Whisper Systems. All rights reserved.
 
 #import "OWSFingerprintBuilder.h"
+#import "ContactsManagerProtocol.h"
 #import "OWSFingerprint.h"
 #import "TSStorageManager+IdentityKeyStore.h"
 #import "TSStorageManager+keyingMaterial.h"
@@ -12,12 +13,14 @@ NS_ASSUME_NONNULL_BEGIN
 @interface OWSFingerprintBuilder ()
 
 @property (nonatomic, readonly) TSStorageManager *storageManager;
+@property (nonatomic, readonly) id<ContactsManagerProtocol> contactsManager;
 
 @end
 
 @implementation OWSFingerprintBuilder
 
 - (instancetype)initWithStorageManager:(TSStorageManager *)storageManager
+                       contactsManager:(id<ContactsManagerProtocol>)contactsManager
 {
     self = [super init];
     if (!self) {
@@ -25,6 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     _storageManager = storageManager;
+    _contactsManager = contactsManager;
 
     return self;
 }
@@ -38,12 +42,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (OWSFingerprint *)fingerprintWithTheirSignalId:(NSString *)theirSignalId theirIdentityKey:(NSData *)theirIdentityKey
 {
+    NSString *theirName = [self.contactsManager nameStringForPhoneIdentifier:theirSignalId];
+
     NSString *mySignalId = [self.storageManager localNumber];
     NSData *myIdentityKey = [self.storageManager identityKeyPair].publicKey;
+
     return [OWSFingerprint fingerprintWithMyStableId:mySignalId
                                        myIdentityKey:myIdentityKey
                                        theirStableId:theirSignalId
-                                    theirIdentityKey:theirIdentityKey];
+                                    theirIdentityKey:theirIdentityKey
+                                           theirName:theirName];
 }
 
 @end

src/Security/OWSFingerprintProtos.pb.h

@@ -4,10 +4,10 @@
 
 // @@protoc_insertion_point(imports)
 
-@class OWSFingerprintProtosCombinedFingerprint;
-@class OWSFingerprintProtosCombinedFingerprintBuilder;
-@class OWSFingerprintProtosFingerprintData;
-@class OWSFingerprintProtosFingerprintDataBuilder;
+@class OWSFingerprintProtosLogicalFingerprint;
+@class OWSFingerprintProtosLogicalFingerprintBuilder;
+@class OWSFingerprintProtosLogicalFingerprints;
+@class OWSFingerprintProtosLogicalFingerprintsBuilder;
 @class ObjectiveCFileOptions;
 @class ObjectiveCFileOptionsBuilder;
 @class PBDescriptorProto;
@@ -61,138 +61,128 @@
 + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry;
 @end
 
-#define FingerprintData_publicKey @"publicKey"
-#define FingerprintData_identifier @"identifier"
-@interface OWSFingerprintProtosFingerprintData : PBGeneratedMessage<GeneratedMessageProtocol> {
+#define LogicalFingerprint_identityData @"identityData"
+@interface OWSFingerprintProtosLogicalFingerprint : PBGeneratedMessage<GeneratedMessageProtocol> {
 @private
-  BOOL hasPublicKey_:1;
-  BOOL hasIdentifier_:1;
-  NSData* publicKey;
-  NSData* identifier;
+  BOOL hasIdentityData_:1;
+  NSData* identityData;
 }
-- (BOOL) hasPublicKey;
-- (BOOL) hasIdentifier;
-@property (readonly, strong) NSData* publicKey;
-@property (readonly, strong) NSData* identifier;
+- (BOOL) hasIdentityData;
+@property (readonly, strong) NSData* identityData;
 
 + (instancetype) defaultInstance;
 - (instancetype) defaultInstance;
 
 - (BOOL) isInitialized;
 - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output;
-- (OWSFingerprintProtosFingerprintDataBuilder*) builder;
-+ (OWSFingerprintProtosFingerprintDataBuilder*) builder;
-+ (OWSFingerprintProtosFingerprintDataBuilder*) builderWithPrototype:(OWSFingerprintProtosFingerprintData*) prototype;
-- (OWSFingerprintProtosFingerprintDataBuilder*) toBuilder;
-
-+ (OWSFingerprintProtosFingerprintData*) parseFromData:(NSData*) data;
-+ (OWSFingerprintProtosFingerprintData*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
-+ (OWSFingerprintProtosFingerprintData*) parseFromInputStream:(NSInputStream*) input;
-+ (OWSFingerprintProtosFingerprintData*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
-+ (OWSFingerprintProtosFingerprintData*) parseFromCodedInputStream:(PBCodedInputStream*) input;
-+ (OWSFingerprintProtosFingerprintData*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) builder;
++ (OWSFingerprintProtosLogicalFingerprintBuilder*) builder;
++ (OWSFingerprintProtosLogicalFingerprintBuilder*) builderWithPrototype:(OWSFingerprintProtosLogicalFingerprint*) prototype;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) toBuilder;
+
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromData:(NSData*) data;
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromInputStream:(NSInputStream*) input;
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input;
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
 @end
 
-@interface OWSFingerprintProtosFingerprintDataBuilder : PBGeneratedMessageBuilder {
+@interface OWSFingerprintProtosLogicalFingerprintBuilder : PBGeneratedMessageBuilder {
 @private
-  OWSFingerprintProtosFingerprintData* resultFingerprintData;
+  OWSFingerprintProtosLogicalFingerprint* resultLogicalFingerprint;
 }
 
-- (OWSFingerprintProtosFingerprintData*) defaultInstance;
+- (OWSFingerprintProtosLogicalFingerprint*) defaultInstance;
 
-- (OWSFingerprintProtosFingerprintDataBuilder*) clear;
-- (OWSFingerprintProtosFingerprintDataBuilder*) clone;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) clear;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) clone;
 
-- (OWSFingerprintProtosFingerprintData*) build;
-- (OWSFingerprintProtosFingerprintData*) buildPartial;
+- (OWSFingerprintProtosLogicalFingerprint*) build;
+- (OWSFingerprintProtosLogicalFingerprint*) buildPartial;
 
-- (OWSFingerprintProtosFingerprintDataBuilder*) mergeFrom:(OWSFingerprintProtosFingerprintData*) other;
-- (OWSFingerprintProtosFingerprintDataBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
-- (OWSFingerprintProtosFingerprintDataBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) mergeFrom:(OWSFingerprintProtosLogicalFingerprint*) other;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
 
-- (BOOL) hasPublicKey;
-- (NSData*) publicKey;
-- (OWSFingerprintProtosFingerprintDataBuilder*) setPublicKey:(NSData*) value;
-- (OWSFingerprintProtosFingerprintDataBuilder*) clearPublicKey;
-
-- (BOOL) hasIdentifier;
-- (NSData*) identifier;
-- (OWSFingerprintProtosFingerprintDataBuilder*) setIdentifier:(NSData*) value;
-- (OWSFingerprintProtosFingerprintDataBuilder*) clearIdentifier;
+- (BOOL) hasIdentityData;
+- (NSData*) identityData;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) setIdentityData:(NSData*) value;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) clearIdentityData;
 @end
 
-#define CombinedFingerprint_version @"version"
-#define CombinedFingerprint_localFingerprint @"localFingerprint"
-#define CombinedFingerprint_remoteFingerprint @"remoteFingerprint"
-@interface OWSFingerprintProtosCombinedFingerprint : PBGeneratedMessage<GeneratedMessageProtocol> {
+#define LogicalFingerprints_version @"version"
+#define LogicalFingerprints_localFingerprint @"localFingerprint"
+#define LogicalFingerprints_remoteFingerprint @"remoteFingerprint"
+@interface OWSFingerprintProtosLogicalFingerprints : PBGeneratedMessage<GeneratedMessageProtocol> {
 @private
   BOOL hasLocalFingerprint_:1;
   BOOL hasRemoteFingerprint_:1;
   BOOL hasVersion_:1;
-  OWSFingerprintProtosFingerprintData* localFingerprint;
-  OWSFingerprintProtosFingerprintData* remoteFingerprint;
+  OWSFingerprintProtosLogicalFingerprint* localFingerprint;
+  OWSFingerprintProtosLogicalFingerprint* remoteFingerprint;
   UInt32 version;
 }
 - (BOOL) hasVersion;
 - (BOOL) hasLocalFingerprint;
 - (BOOL) hasRemoteFingerprint;
 @property (readonly) UInt32 version;
-@property (readonly, strong) OWSFingerprintProtosFingerprintData* localFingerprint;
-@property (readonly, strong) OWSFingerprintProtosFingerprintData* remoteFingerprint;
+@property (readonly, strong) OWSFingerprintProtosLogicalFingerprint* localFingerprint;
+@property (readonly, strong) OWSFingerprintProtosLogicalFingerprint* remoteFingerprint;
 
 + (instancetype) defaultInstance;
 - (instancetype) defaultInstance;
 
 - (BOOL) isInitialized;
 - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) builder;
-+ (OWSFingerprintProtosCombinedFingerprintBuilder*) builder;
-+ (OWSFingerprintProtosCombinedFingerprintBuilder*) builderWithPrototype:(OWSFingerprintProtosCombinedFingerprint*) prototype;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) toBuilder;
-
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromData:(NSData*) data;
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromInputStream:(NSInputStream*) input;
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input;
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) builder;
++ (OWSFingerprintProtosLogicalFingerprintsBuilder*) builder;
++ (OWSFingerprintProtosLogicalFingerprintsBuilder*) builderWithPrototype:(OWSFingerprintProtosLogicalFingerprints*) prototype;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) toBuilder;
+
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromData:(NSData*) data;
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromInputStream:(NSInputStream*) input;
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromCodedInputStream:(PBCodedInputStream*) input;
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
 @end
 
-@interface OWSFingerprintProtosCombinedFingerprintBuilder : PBGeneratedMessageBuilder {
+@interface OWSFingerprintProtosLogicalFingerprintsBuilder : PBGeneratedMessageBuilder {
 @private
-  OWSFingerprintProtosCombinedFingerprint* resultCombinedFingerprint;
+  OWSFingerprintProtosLogicalFingerprints* resultLogicalFingerprints;
 }
 
-- (OWSFingerprintProtosCombinedFingerprint*) defaultInstance;
+- (OWSFingerprintProtosLogicalFingerprints*) defaultInstance;
 
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clear;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clone;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clear;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clone;
 
-- (OWSFingerprintProtosCombinedFingerprint*) build;
-- (OWSFingerprintProtosCombinedFingerprint*) buildPartial;
+- (OWSFingerprintProtosLogicalFingerprints*) build;
+- (OWSFingerprintProtosLogicalFingerprints*) buildPartial;
 
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeFrom:(OWSFingerprintProtosCombinedFingerprint*) other;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeFrom:(OWSFingerprintProtosLogicalFingerprints*) other;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
 
 - (BOOL) hasVersion;
 - (UInt32) version;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setVersion:(UInt32) value;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clearVersion;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setVersion:(UInt32) value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clearVersion;
 
 - (BOOL) hasLocalFingerprint;
-- (OWSFingerprintProtosFingerprintData*) localFingerprint;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setLocalFingerprint:(OWSFingerprintProtosFingerprintData*) value;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setLocalFingerprintBuilder:(OWSFingerprintProtosFingerprintDataBuilder*) builderForValue;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeLocalFingerprint:(OWSFingerprintProtosFingerprintData*) value;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clearLocalFingerprint;
+- (OWSFingerprintProtosLogicalFingerprint*) localFingerprint;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setLocalFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setLocalFingerprintBuilder:(OWSFingerprintProtosLogicalFingerprintBuilder*) builderForValue;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeLocalFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clearLocalFingerprint;
 
 - (BOOL) hasRemoteFingerprint;
-- (OWSFingerprintProtosFingerprintData*) remoteFingerprint;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setRemoteFingerprint:(OWSFingerprintProtosFingerprintData*) value;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setRemoteFingerprintBuilder:(OWSFingerprintProtosFingerprintDataBuilder*) builderForValue;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeRemoteFingerprint:(OWSFingerprintProtosFingerprintData*) value;
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clearRemoteFingerprint;
+- (OWSFingerprintProtosLogicalFingerprint*) remoteFingerprint;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setRemoteFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setRemoteFingerprintBuilder:(OWSFingerprintProtosLogicalFingerprintBuilder*) builderForValue;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeRemoteFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clearRemoteFingerprint;
 @end
 
 

src/Security/OWSFingerprintProtos.pb.m

@@ -21,55 +21,43 @@ static PBExtensionRegistry* extensionRegistry = nil;
 }
 @end
 
-@interface OWSFingerprintProtosFingerprintData ()
-@property (strong) NSData* publicKey;
-@property (strong) NSData* identifier;
+@interface OWSFingerprintProtosLogicalFingerprint ()
+@property (strong) NSData* identityData;
 @end
 
-@implementation OWSFingerprintProtosFingerprintData
+@implementation OWSFingerprintProtosLogicalFingerprint
 
-- (BOOL) hasPublicKey {
-  return !!hasPublicKey_;
+- (BOOL) hasIdentityData {
+  return !!hasIdentityData_;
 }
-- (void) setHasPublicKey:(BOOL) _value_ {
-  hasPublicKey_ = !!_value_;
+- (void) setHasIdentityData:(BOOL) _value_ {
+  hasIdentityData_ = !!_value_;
 }
-@synthesize publicKey;
-- (BOOL) hasIdentifier {
-  return !!hasIdentifier_;
-}
-- (void) setHasIdentifier:(BOOL) _value_ {
-  hasIdentifier_ = !!_value_;
-}
-@synthesize identifier;
+@synthesize identityData;
 - (instancetype) init {
   if ((self = [super init])) {
-    self.publicKey = [NSData data];
-    self.identifier = [NSData data];
+    self.identityData = [NSData data];
   }
   return self;
 }
-static OWSFingerprintProtosFingerprintData* defaultOWSFingerprintProtosFingerprintDataInstance = nil;
+static OWSFingerprintProtosLogicalFingerprint* defaultOWSFingerprintProtosLogicalFingerprintInstance = nil;
 + (void) initialize {
-  if (self == [OWSFingerprintProtosFingerprintData class]) {
-    defaultOWSFingerprintProtosFingerprintDataInstance = [[OWSFingerprintProtosFingerprintData alloc] init];
+  if (self == [OWSFingerprintProtosLogicalFingerprint class]) {
+    defaultOWSFingerprintProtosLogicalFingerprintInstance = [[OWSFingerprintProtosLogicalFingerprint alloc] init];
   }
 }
 + (instancetype) defaultInstance {
-  return defaultOWSFingerprintProtosFingerprintDataInstance;
+  return defaultOWSFingerprintProtosLogicalFingerprintInstance;
 }
 - (instancetype) defaultInstance {
-  return defaultOWSFingerprintProtosFingerprintDataInstance;
+  return defaultOWSFingerprintProtosLogicalFingerprintInstance;
 }
 - (BOOL) isInitialized {
   return YES;
 }
 - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output {
-  if (self.hasPublicKey) {
-    [output writeData:1 value:self.publicKey];
-  }
-  if (self.hasIdentifier) {
-    [output writeData:2 value:self.identifier];
+  if (self.hasIdentityData) {
+    [output writeData:1 value:self.identityData];
   }
   [self.unknownFields writeToCodedOutputStream:output];
 }
@@ -80,61 +68,52 @@ static OWSFingerprintProtosFingerprintData* defaultOWSFingerprintProtosFingerpri
   }
 
   size_ = 0;
-  if (self.hasPublicKey) {
-    size_ += computeDataSize(1, self.publicKey);
-  }
-  if (self.hasIdentifier) {
-    size_ += computeDataSize(2, self.identifier);
+  if (self.hasIdentityData) {
+    size_ += computeDataSize(1, self.identityData);
   }
   size_ += self.unknownFields.serializedSize;
   memoizedSerializedSize = size_;
   return size_;
 }
-+ (OWSFingerprintProtosFingerprintData*) parseFromData:(NSData*) data {
-  return (OWSFingerprintProtosFingerprintData*)[[[OWSFingerprintProtosFingerprintData builder] mergeFromData:data] build];
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromData:(NSData*) data {
+  return (OWSFingerprintProtosLogicalFingerprint*)[[[OWSFingerprintProtosLogicalFingerprint builder] mergeFromData:data] build];
 }
-+ (OWSFingerprintProtosFingerprintData*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
-  return (OWSFingerprintProtosFingerprintData*)[[[OWSFingerprintProtosFingerprintData builder] mergeFromData:data extensionRegistry:extensionRegistry] build];
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+  return (OWSFingerprintProtosLogicalFingerprint*)[[[OWSFingerprintProtosLogicalFingerprint builder] mergeFromData:data extensionRegistry:extensionRegistry] build];
 }
-+ (OWSFingerprintProtosFingerprintData*) parseFromInputStream:(NSInputStream*) input {
-  return (OWSFingerprintProtosFingerprintData*)[[[OWSFingerprintProtosFingerprintData builder] mergeFromInputStream:input] build];
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromInputStream:(NSInputStream*) input {
+  return (OWSFingerprintProtosLogicalFingerprint*)[[[OWSFingerprintProtosLogicalFingerprint builder] mergeFromInputStream:input] build];
 }
-+ (OWSFingerprintProtosFingerprintData*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
-  return (OWSFingerprintProtosFingerprintData*)[[[OWSFingerprintProtosFingerprintData builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build];
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+  return (OWSFingerprintProtosLogicalFingerprint*)[[[OWSFingerprintProtosLogicalFingerprint builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build];
 }
-+ (OWSFingerprintProtosFingerprintData*) parseFromCodedInputStream:(PBCodedInputStream*) input {
-  return (OWSFingerprintProtosFingerprintData*)[[[OWSFingerprintProtosFingerprintData builder] mergeFromCodedInputStream:input] build];
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input {
+  return (OWSFingerprintProtosLogicalFingerprint*)[[[OWSFingerprintProtosLogicalFingerprint builder] mergeFromCodedInputStream:input] build];
 }
-+ (OWSFingerprintProtosFingerprintData*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
-  return (OWSFingerprintProtosFingerprintData*)[[[OWSFingerprintProtosFingerprintData builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build];
++ (OWSFingerprintProtosLogicalFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+  return (OWSFingerprintProtosLogicalFingerprint*)[[[OWSFingerprintProtosLogicalFingerprint builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build];
 }
-+ (OWSFingerprintProtosFingerprintDataBuilder*) builder {
-  return [[OWSFingerprintProtosFingerprintDataBuilder alloc] init];
++ (OWSFingerprintProtosLogicalFingerprintBuilder*) builder {
+  return [[OWSFingerprintProtosLogicalFingerprintBuilder alloc] init];
 }
-+ (OWSFingerprintProtosFingerprintDataBuilder*) builderWithPrototype:(OWSFingerprintProtosFingerprintData*) prototype {
-  return [[OWSFingerprintProtosFingerprintData builder] mergeFrom:prototype];
++ (OWSFingerprintProtosLogicalFingerprintBuilder*) builderWithPrototype:(OWSFingerprintProtosLogicalFingerprint*) prototype {
+  return [[OWSFingerprintProtosLogicalFingerprint builder] mergeFrom:prototype];
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) builder {
-  return [OWSFingerprintProtosFingerprintData builder];
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) builder {
+  return [OWSFingerprintProtosLogicalFingerprint builder];
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) toBuilder {
-  return [OWSFingerprintProtosFingerprintData builderWithPrototype:self];
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) toBuilder {
+  return [OWSFingerprintProtosLogicalFingerprint builderWithPrototype:self];
 }
 - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent {
-  if (self.hasPublicKey) {
-    [output appendFormat:@"%@%@: %@\n", indent, @"publicKey", self.publicKey];
-  }
-  if (self.hasIdentifier) {
-    [output appendFormat:@"%@%@: %@\n", indent, @"identifier", self.identifier];
+  if (self.hasIdentityData) {
+    [output appendFormat:@"%@%@: %@\n", indent, @"identityData", self.identityData];
   }
   [self.unknownFields writeDescriptionTo:output withIndent:indent];
 }
 - (void) storeInDictionary:(NSMutableDictionary *)dictionary {
-  if (self.hasPublicKey) {
-    [dictionary setObject: self.publicKey forKey: @"publicKey"];
-  }
-  if (self.hasIdentifier) {
-    [dictionary setObject: self.identifier forKey: @"identifier"];
+  if (self.hasIdentityData) {
+    [dictionary setObject: self.identityData forKey: @"identityData"];
   }
   [self.unknownFields storeInDictionary:dictionary];
 }
@@ -142,81 +121,73 @@ static OWSFingerprintProtosFingerprintData* defaultOWSFingerprintProtosFingerpri
   if (other == self) {
     return YES;
   }
-  if (![other isKindOfClass:[OWSFingerprintProtosFingerprintData class]]) {
+  if (![other isKindOfClass:[OWSFingerprintProtosLogicalFingerprint class]]) {
     return NO;
   }
-  OWSFingerprintProtosFingerprintData *otherMessage = other;
+  OWSFingerprintProtosLogicalFingerprint *otherMessage = other;
   return
-      self.hasPublicKey == otherMessage.hasPublicKey &&
-      (!self.hasPublicKey || [self.publicKey isEqual:otherMessage.publicKey]) &&
-      self.hasIdentifier == otherMessage.hasIdentifier &&
-      (!self.hasIdentifier || [self.identifier isEqual:otherMessage.identifier]) &&
+      self.hasIdentityData == otherMessage.hasIdentityData &&
+      (!self.hasIdentityData || [self.identityData isEqual:otherMessage.identityData]) &&
       (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
 }
 - (NSUInteger) hash {
   __block NSUInteger hashCode = 7;
-  if (self.hasPublicKey) {
-    hashCode = hashCode * 31 + [self.publicKey hash];
-  }
-  if (self.hasIdentifier) {
-    hashCode = hashCode * 31 + [self.identifier hash];
+  if (self.hasIdentityData) {
+    hashCode = hashCode * 31 + [self.identityData hash];
   }
   hashCode = hashCode * 31 + [self.unknownFields hash];
   return hashCode;
 }
 @end
 
-@interface OWSFingerprintProtosFingerprintDataBuilder()
-@property (strong) OWSFingerprintProtosFingerprintData* resultFingerprintData;
+@interface OWSFingerprintProtosLogicalFingerprintBuilder()
+@property (strong) OWSFingerprintProtosLogicalFingerprint* resultLogicalFingerprint;
 @end
 
-@implementation OWSFingerprintProtosFingerprintDataBuilder
-@synthesize resultFingerprintData;
+@implementation OWSFingerprintProtosLogicalFingerprintBuilder
+@synthesize resultLogicalFingerprint;
 - (instancetype) init {
   if ((self = [super init])) {
-    self.resultFingerprintData = [[OWSFingerprintProtosFingerprintData alloc] init];
+    self.resultLogicalFingerprint = [[OWSFingerprintProtosLogicalFingerprint alloc] init];
   }
   return self;
 }
 - (PBGeneratedMessage*) internalGetResult {
-  return resultFingerprintData;
+  return resultLogicalFingerprint;
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) clear {
-  self.resultFingerprintData = [[OWSFingerprintProtosFingerprintData alloc] init];
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) clear {
+  self.resultLogicalFingerprint = [[OWSFingerprintProtosLogicalFingerprint alloc] init];
   return self;
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) clone {
-  return [OWSFingerprintProtosFingerprintData builderWithPrototype:resultFingerprintData];
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) clone {
+  return [OWSFingerprintProtosLogicalFingerprint builderWithPrototype:resultLogicalFingerprint];
 }
-- (OWSFingerprintProtosFingerprintData*) defaultInstance {
-  return [OWSFingerprintProtosFingerprintData defaultInstance];
+- (OWSFingerprintProtosLogicalFingerprint*) defaultInstance {
+  return [OWSFingerprintProtosLogicalFingerprint defaultInstance];
 }
-- (OWSFingerprintProtosFingerprintData*) build {
+- (OWSFingerprintProtosLogicalFingerprint*) build {
   [self checkInitialized];
   return [self buildPartial];
 }
-- (OWSFingerprintProtosFingerprintData*) buildPartial {
-  OWSFingerprintProtosFingerprintData* returnMe = resultFingerprintData;
-  self.resultFingerprintData = nil;
+- (OWSFingerprintProtosLogicalFingerprint*) buildPartial {
+  OWSFingerprintProtosLogicalFingerprint* returnMe = resultLogicalFingerprint;
+  self.resultLogicalFingerprint = nil;
   return returnMe;
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) mergeFrom:(OWSFingerprintProtosFingerprintData*) other {
-  if (other == [OWSFingerprintProtosFingerprintData defaultInstance]) {
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) mergeFrom:(OWSFingerprintProtosLogicalFingerprint*) other {
+  if (other == [OWSFingerprintProtosLogicalFingerprint defaultInstance]) {
     return self;
   }
-  if (other.hasPublicKey) {
-    [self setPublicKey:other.publicKey];
-  }
-  if (other.hasIdentifier) {
-    [self setIdentifier:other.identifier];
+  if (other.hasIdentityData) {
+    [self setIdentityData:other.identityData];
   }
   [self mergeUnknownFields:other.unknownFields];
   return self;
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input {
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input {
   return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]];
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
   PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields];
   while (YES) {
     SInt32 tag = [input readTag];
@@ -232,57 +203,37 @@ static OWSFingerprintProtosFingerprintData* defaultOWSFingerprintProtosFingerpri
         break;
       }
       case 10: {
-        [self setPublicKey:[input readData]];
-        break;
-      }
-      case 18: {
-        [self setIdentifier:[input readData]];
+        [self setIdentityData:[input readData]];
         break;
       }
     }
   }
 }
-- (BOOL) hasPublicKey {
-  return resultFingerprintData.hasPublicKey;
-}
-- (NSData*) publicKey {
-  return resultFingerprintData.publicKey;
-}
-- (OWSFingerprintProtosFingerprintDataBuilder*) setPublicKey:(NSData*) value {
-  resultFingerprintData.hasPublicKey = YES;
-  resultFingerprintData.publicKey = value;
-  return self;
-}
-- (OWSFingerprintProtosFingerprintDataBuilder*) clearPublicKey {
-  resultFingerprintData.hasPublicKey = NO;
-  resultFingerprintData.publicKey = [NSData data];
-  return self;
-}
-- (BOOL) hasIdentifier {
-  return resultFingerprintData.hasIdentifier;
+- (BOOL) hasIdentityData {
+  return resultLogicalFingerprint.hasIdentityData;
 }
-- (NSData*) identifier {
-  return resultFingerprintData.identifier;
+- (NSData*) identityData {
+  return resultLogicalFingerprint.identityData;
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) setIdentifier:(NSData*) value {
-  resultFingerprintData.hasIdentifier = YES;
-  resultFingerprintData.identifier = value;
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) setIdentityData:(NSData*) value {
+  resultLogicalFingerprint.hasIdentityData = YES;
+  resultLogicalFingerprint.identityData = value;
   return self;
 }
-- (OWSFingerprintProtosFingerprintDataBuilder*) clearIdentifier {
-  resultFingerprintData.hasIdentifier = NO;
-  resultFingerprintData.identifier = [NSData data];
+- (OWSFingerprintProtosLogicalFingerprintBuilder*) clearIdentityData {
+  resultLogicalFingerprint.hasIdentityData = NO;
+  resultLogicalFingerprint.identityData = [NSData data];
   return self;
 }
 @end
 
-@interface OWSFingerprintProtosCombinedFingerprint ()
+@interface OWSFingerprintProtosLogicalFingerprints ()
 @property UInt32 version;
-@property (strong) OWSFingerprintProtosFingerprintData* localFingerprint;
-@property (strong) OWSFingerprintProtosFingerprintData* remoteFingerprint;
+@property (strong) OWSFingerprintProtosLogicalFingerprint* localFingerprint;
+@property (strong) OWSFingerprintProtosLogicalFingerprint* remoteFingerprint;
 @end
 
-@implementation OWSFingerprintProtosCombinedFingerprint
+@implementation OWSFingerprintProtosLogicalFingerprints
 
 - (BOOL) hasVersion {
   return !!hasVersion_;
@@ -308,22 +259,22 @@ static OWSFingerprintProtosFingerprintData* defaultOWSFingerprintProtosFingerpri
 - (instancetype) init {
   if ((self = [super init])) {
     self.version = 0;
-    self.localFingerprint = [OWSFingerprintProtosFingerprintData defaultInstance];
-    self.remoteFingerprint = [OWSFingerprintProtosFingerprintData defaultInstance];
+    self.localFingerprint = [OWSFingerprintProtosLogicalFingerprint defaultInstance];
+    self.remoteFingerprint = [OWSFingerprintProtosLogicalFingerprint defaultInstance];
   }
   return self;
 }
-static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombinedFingerprintInstance = nil;
+static OWSFingerprintProtosLogicalFingerprints* defaultOWSFingerprintProtosLogicalFingerprintsInstance = nil;
 + (void) initialize {
-  if (self == [OWSFingerprintProtosCombinedFingerprint class]) {
-    defaultOWSFingerprintProtosCombinedFingerprintInstance = [[OWSFingerprintProtosCombinedFingerprint alloc] init];
+  if (self == [OWSFingerprintProtosLogicalFingerprints class]) {
+    defaultOWSFingerprintProtosLogicalFingerprintsInstance = [[OWSFingerprintProtosLogicalFingerprints alloc] init];
   }
 }
 + (instancetype) defaultInstance {
-  return defaultOWSFingerprintProtosCombinedFingerprintInstance;
+  return defaultOWSFingerprintProtosLogicalFingerprintsInstance;
 }
 - (instancetype) defaultInstance {
-  return defaultOWSFingerprintProtosCombinedFingerprintInstance;
+  return defaultOWSFingerprintProtosLogicalFingerprintsInstance;
 }
 - (BOOL) isInitialized {
   return YES;
@@ -360,35 +311,35 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
   memoizedSerializedSize = size_;
   return size_;
 }
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromData:(NSData*) data {
-  return (OWSFingerprintProtosCombinedFingerprint*)[[[OWSFingerprintProtosCombinedFingerprint builder] mergeFromData:data] build];
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromData:(NSData*) data {
+  return (OWSFingerprintProtosLogicalFingerprints*)[[[OWSFingerprintProtosLogicalFingerprints builder] mergeFromData:data] build];
 }
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
-  return (OWSFingerprintProtosCombinedFingerprint*)[[[OWSFingerprintProtosCombinedFingerprint builder] mergeFromData:data extensionRegistry:extensionRegistry] build];
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+  return (OWSFingerprintProtosLogicalFingerprints*)[[[OWSFingerprintProtosLogicalFingerprints builder] mergeFromData:data extensionRegistry:extensionRegistry] build];
 }
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromInputStream:(NSInputStream*) input {
-  return (OWSFingerprintProtosCombinedFingerprint*)[[[OWSFingerprintProtosCombinedFingerprint builder] mergeFromInputStream:input] build];
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromInputStream:(NSInputStream*) input {
+  return (OWSFingerprintProtosLogicalFingerprints*)[[[OWSFingerprintProtosLogicalFingerprints builder] mergeFromInputStream:input] build];
 }
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
-  return (OWSFingerprintProtosCombinedFingerprint*)[[[OWSFingerprintProtosCombinedFingerprint builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build];
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+  return (OWSFingerprintProtosLogicalFingerprints*)[[[OWSFingerprintProtosLogicalFingerprints builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build];
 }
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input {
-  return (OWSFingerprintProtosCombinedFingerprint*)[[[OWSFingerprintProtosCombinedFingerprint builder] mergeFromCodedInputStream:input] build];
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromCodedInputStream:(PBCodedInputStream*) input {
+  return (OWSFingerprintProtosLogicalFingerprints*)[[[OWSFingerprintProtosLogicalFingerprints builder] mergeFromCodedInputStream:input] build];
 }
-+ (OWSFingerprintProtosCombinedFingerprint*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
-  return (OWSFingerprintProtosCombinedFingerprint*)[[[OWSFingerprintProtosCombinedFingerprint builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build];
++ (OWSFingerprintProtosLogicalFingerprints*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+  return (OWSFingerprintProtosLogicalFingerprints*)[[[OWSFingerprintProtosLogicalFingerprints builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build];
 }
-+ (OWSFingerprintProtosCombinedFingerprintBuilder*) builder {
-  return [[OWSFingerprintProtosCombinedFingerprintBuilder alloc] init];
++ (OWSFingerprintProtosLogicalFingerprintsBuilder*) builder {
+  return [[OWSFingerprintProtosLogicalFingerprintsBuilder alloc] init];
 }
-+ (OWSFingerprintProtosCombinedFingerprintBuilder*) builderWithPrototype:(OWSFingerprintProtosCombinedFingerprint*) prototype {
-  return [[OWSFingerprintProtosCombinedFingerprint builder] mergeFrom:prototype];
++ (OWSFingerprintProtosLogicalFingerprintsBuilder*) builderWithPrototype:(OWSFingerprintProtosLogicalFingerprints*) prototype {
+  return [[OWSFingerprintProtosLogicalFingerprints builder] mergeFrom:prototype];
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) builder {
-  return [OWSFingerprintProtosCombinedFingerprint builder];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) builder {
+  return [OWSFingerprintProtosLogicalFingerprints builder];
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) toBuilder {
-  return [OWSFingerprintProtosCombinedFingerprint builderWithPrototype:self];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) toBuilder {
+  return [OWSFingerprintProtosLogicalFingerprints builderWithPrototype:self];
 }
 - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent {
   if (self.hasVersion) {
@@ -428,10 +379,10 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
   if (other == self) {
     return YES;
   }
-  if (![other isKindOfClass:[OWSFingerprintProtosCombinedFingerprint class]]) {
+  if (![other isKindOfClass:[OWSFingerprintProtosLogicalFingerprints class]]) {
     return NO;
   }
-  OWSFingerprintProtosCombinedFingerprint *otherMessage = other;
+  OWSFingerprintProtosLogicalFingerprints *otherMessage = other;
   return
       self.hasVersion == otherMessage.hasVersion &&
       (!self.hasVersion || self.version == otherMessage.version) &&
@@ -457,42 +408,42 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
 }
 @end
 
-@interface OWSFingerprintProtosCombinedFingerprintBuilder()
-@property (strong) OWSFingerprintProtosCombinedFingerprint* resultCombinedFingerprint;
+@interface OWSFingerprintProtosLogicalFingerprintsBuilder()
+@property (strong) OWSFingerprintProtosLogicalFingerprints* resultLogicalFingerprints;
 @end
 
-@implementation OWSFingerprintProtosCombinedFingerprintBuilder
-@synthesize resultCombinedFingerprint;
+@implementation OWSFingerprintProtosLogicalFingerprintsBuilder
+@synthesize resultLogicalFingerprints;
 - (instancetype) init {
   if ((self = [super init])) {
-    self.resultCombinedFingerprint = [[OWSFingerprintProtosCombinedFingerprint alloc] init];
+    self.resultLogicalFingerprints = [[OWSFingerprintProtosLogicalFingerprints alloc] init];
   }
   return self;
 }
 - (PBGeneratedMessage*) internalGetResult {
-  return resultCombinedFingerprint;
+  return resultLogicalFingerprints;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clear {
-  self.resultCombinedFingerprint = [[OWSFingerprintProtosCombinedFingerprint alloc] init];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clear {
+  self.resultLogicalFingerprints = [[OWSFingerprintProtosLogicalFingerprints alloc] init];
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clone {
-  return [OWSFingerprintProtosCombinedFingerprint builderWithPrototype:resultCombinedFingerprint];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clone {
+  return [OWSFingerprintProtosLogicalFingerprints builderWithPrototype:resultLogicalFingerprints];
 }
-- (OWSFingerprintProtosCombinedFingerprint*) defaultInstance {
-  return [OWSFingerprintProtosCombinedFingerprint defaultInstance];
+- (OWSFingerprintProtosLogicalFingerprints*) defaultInstance {
+  return [OWSFingerprintProtosLogicalFingerprints defaultInstance];
 }
-- (OWSFingerprintProtosCombinedFingerprint*) build {
+- (OWSFingerprintProtosLogicalFingerprints*) build {
   [self checkInitialized];
   return [self buildPartial];
 }
-- (OWSFingerprintProtosCombinedFingerprint*) buildPartial {
-  OWSFingerprintProtosCombinedFingerprint* returnMe = resultCombinedFingerprint;
-  self.resultCombinedFingerprint = nil;
+- (OWSFingerprintProtosLogicalFingerprints*) buildPartial {
+  OWSFingerprintProtosLogicalFingerprints* returnMe = resultLogicalFingerprints;
+  self.resultLogicalFingerprints = nil;
   return returnMe;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeFrom:(OWSFingerprintProtosCombinedFingerprint*) other {
-  if (other == [OWSFingerprintProtosCombinedFingerprint defaultInstance]) {
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeFrom:(OWSFingerprintProtosLogicalFingerprints*) other {
+  if (other == [OWSFingerprintProtosLogicalFingerprints defaultInstance]) {
     return self;
   }
   if (other.hasVersion) {
@@ -507,10 +458,10 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
   [self mergeUnknownFields:other.unknownFields];
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input {
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input {
   return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]];
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
   PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields];
   while (YES) {
     SInt32 tag = [input readTag];
@@ -530,7 +481,7 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
         break;
       }
       case 18: {
-        OWSFingerprintProtosFingerprintDataBuilder* subBuilder = [OWSFingerprintProtosFingerprintData builder];
+        OWSFingerprintProtosLogicalFingerprintBuilder* subBuilder = [OWSFingerprintProtosLogicalFingerprint builder];
         if (self.hasLocalFingerprint) {
           [subBuilder mergeFrom:self.localFingerprint];
         }
@@ -539,7 +490,7 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
         break;
       }
       case 26: {
-        OWSFingerprintProtosFingerprintDataBuilder* subBuilder = [OWSFingerprintProtosFingerprintData builder];
+        OWSFingerprintProtosLogicalFingerprintBuilder* subBuilder = [OWSFingerprintProtosLogicalFingerprint builder];
         if (self.hasRemoteFingerprint) {
           [subBuilder mergeFrom:self.remoteFingerprint];
         }
@@ -551,79 +502,79 @@ static OWSFingerprintProtosCombinedFingerprint* defaultOWSFingerprintProtosCombi
   }
 }
 - (BOOL) hasVersion {
-  return resultCombinedFingerprint.hasVersion;
+  return resultLogicalFingerprints.hasVersion;
 }
 - (UInt32) version {
-  return resultCombinedFingerprint.version;
+  return resultLogicalFingerprints.version;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setVersion:(UInt32) value {
-  resultCombinedFingerprint.hasVersion = YES;
-  resultCombinedFingerprint.version = value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setVersion:(UInt32) value {
+  resultLogicalFingerprints.hasVersion = YES;
+  resultLogicalFingerprints.version = value;
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clearVersion {
-  resultCombinedFingerprint.hasVersion = NO;
-  resultCombinedFingerprint.version = 0;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clearVersion {
+  resultLogicalFingerprints.hasVersion = NO;
+  resultLogicalFingerprints.version = 0;
   return self;
 }
 - (BOOL) hasLocalFingerprint {
-  return resultCombinedFingerprint.hasLocalFingerprint;
+  return resultLogicalFingerprints.hasLocalFingerprint;
 }
-- (OWSFingerprintProtosFingerprintData*) localFingerprint {
-  return resultCombinedFingerprint.localFingerprint;
+- (OWSFingerprintProtosLogicalFingerprint*) localFingerprint {
+  return resultLogicalFingerprints.localFingerprint;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setLocalFingerprint:(OWSFingerprintProtosFingerprintData*) value {
-  resultCombinedFingerprint.hasLocalFingerprint = YES;
-  resultCombinedFingerprint.localFingerprint = value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setLocalFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value {
+  resultLogicalFingerprints.hasLocalFingerprint = YES;
+  resultLogicalFingerprints.localFingerprint = value;
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setLocalFingerprintBuilder:(OWSFingerprintProtosFingerprintDataBuilder*) builderForValue {
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setLocalFingerprintBuilder:(OWSFingerprintProtosLogicalFingerprintBuilder*) builderForValue {
   return [self setLocalFingerprint:[builderForValue build]];
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeLocalFingerprint:(OWSFingerprintProtosFingerprintData*) value {
-  if (resultCombinedFingerprint.hasLocalFingerprint &&
-      resultCombinedFingerprint.localFingerprint != [OWSFingerprintProtosFingerprintData defaultInstance]) {
-    resultCombinedFingerprint.localFingerprint =
-      [[[OWSFingerprintProtosFingerprintData builderWithPrototype:resultCombinedFingerprint.localFingerprint] mergeFrom:value] buildPartial];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeLocalFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value {
+  if (resultLogicalFingerprints.hasLocalFingerprint &&
+      resultLogicalFingerprints.localFingerprint != [OWSFingerprintProtosLogicalFingerprint defaultInstance]) {
+    resultLogicalFingerprints.localFingerprint =
+      [[[OWSFingerprintProtosLogicalFingerprint builderWithPrototype:resultLogicalFingerprints.localFingerprint] mergeFrom:value] buildPartial];
   } else {
-    resultCombinedFingerprint.localFingerprint = value;
+    resultLogicalFingerprints.localFingerprint = value;
   }
-  resultCombinedFingerprint.hasLocalFingerprint = YES;
+  resultLogicalFingerprints.hasLocalFingerprint = YES;
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clearLocalFingerprint {
-  resultCombinedFingerprint.hasLocalFingerprint = NO;
-  resultCombinedFingerprint.localFingerprint = [OWSFingerprintProtosFingerprintData defaultInstance];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clearLocalFingerprint {
+  resultLogicalFingerprints.hasLocalFingerprint = NO;
+  resultLogicalFingerprints.localFingerprint = [OWSFingerprintProtosLogicalFingerprint defaultInstance];
   return self;
 }
 - (BOOL) hasRemoteFingerprint {
-  return resultCombinedFingerprint.hasRemoteFingerprint;
+  return resultLogicalFingerprints.hasRemoteFingerprint;
 }
-- (OWSFingerprintProtosFingerprintData*) remoteFingerprint {
-  return resultCombinedFingerprint.remoteFingerprint;
+- (OWSFingerprintProtosLogicalFingerprint*) remoteFingerprint {
+  return resultLogicalFingerprints.remoteFingerprint;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setRemoteFingerprint:(OWSFingerprintProtosFingerprintData*) value {
-  resultCombinedFingerprint.hasRemoteFingerprint = YES;
-  resultCombinedFingerprint.remoteFingerprint = value;
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setRemoteFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value {
+  resultLogicalFingerprints.hasRemoteFingerprint = YES;
+  resultLogicalFingerprints.remoteFingerprint = value;
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) setRemoteFingerprintBuilder:(OWSFingerprintProtosFingerprintDataBuilder*) builderForValue {
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) setRemoteFingerprintBuilder:(OWSFingerprintProtosLogicalFingerprintBuilder*) builderForValue {
   return [self setRemoteFingerprint:[builderForValue build]];
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) mergeRemoteFingerprint:(OWSFingerprintProtosFingerprintData*) value {
-  if (resultCombinedFingerprint.hasRemoteFingerprint &&
-      resultCombinedFingerprint.remoteFingerprint != [OWSFingerprintProtosFingerprintData defaultInstance]) {
-    resultCombinedFingerprint.remoteFingerprint =
-      [[[OWSFingerprintProtosFingerprintData builderWithPrototype:resultCombinedFingerprint.remoteFingerprint] mergeFrom:value] buildPartial];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) mergeRemoteFingerprint:(OWSFingerprintProtosLogicalFingerprint*) value {
+  if (resultLogicalFingerprints.hasRemoteFingerprint &&
+      resultLogicalFingerprints.remoteFingerprint != [OWSFingerprintProtosLogicalFingerprint defaultInstance]) {
+    resultLogicalFingerprints.remoteFingerprint =
+      [[[OWSFingerprintProtosLogicalFingerprint builderWithPrototype:resultLogicalFingerprints.remoteFingerprint] mergeFrom:value] buildPartial];
   } else {
-    resultCombinedFingerprint.remoteFingerprint = value;
+    resultLogicalFingerprints.remoteFingerprint = value;
   }
-  resultCombinedFingerprint.hasRemoteFingerprint = YES;
+  resultLogicalFingerprints.hasRemoteFingerprint = YES;
   return self;
 }
-- (OWSFingerprintProtosCombinedFingerprintBuilder*) clearRemoteFingerprint {
-  resultCombinedFingerprint.hasRemoteFingerprint = NO;
-  resultCombinedFingerprint.remoteFingerprint = [OWSFingerprintProtosFingerprintData defaultInstance];
+- (OWSFingerprintProtosLogicalFingerprintsBuilder*) clearRemoteFingerprint {
+  resultLogicalFingerprints.hasRemoteFingerprint = NO;
+  resultLogicalFingerprints.remoteFingerprint = [OWSFingerprintProtosLogicalFingerprint defaultInstance];
   return self;
 }
 @end

tests/Security/OWSFingerprintTest.m

@@ -23,6 +23,7 @@
                                                                    myIdentityKey:aliceIdentityKey
                                                                    theirStableId:bobStableId
                                                                 theirIdentityKey:bobIdentityKey
+                                                                       theirName:@"Bob"
                                                                   hashIterations:2];
 
     NSString *displayableText = aliceFingerprint.displayableText;
@@ -53,18 +54,21 @@
                                                                    myIdentityKey:aliceIdentityKey
                                                                    theirStableId:bobStableId
                                                                 theirIdentityKey:bobIdentityKey
+                                                                       theirName:@"Bob"
                                                                   hashIterations:2];
 
     OWSFingerprint *bobFingerprint = [OWSFingerprint fingerprintWithMyStableId:bobStableId
                                                                  myIdentityKey:bobIdentityKey
                                                                  theirStableId:aliceStableId
                                                               theirIdentityKey:aliceIdentityKey
+                                                                     theirName:@"Alice"
                                                                 hashIterations:2];
 
     OWSFingerprint *charlieFingerprint = [OWSFingerprint fingerprintWithMyStableId:charlieStableId
                                                                      myIdentityKey:charlieIdentityKey
                                                                      theirStableId:aliceStableId
                                                                   theirIdentityKey:aliceIdentityKey
+                                                                         theirName:@"Alice"
                                                                     hashIterations:2];
 
     XCTAssertEqualObjects(aliceFingerprint.displayableText, bobFingerprint.displayableText);