File tree 4 files changed +21
-13
lines changed
4 files changed +21
-13
lines changed Original file line number Diff line number Diff line change 1
1
//
2
- // AxolotlKeyFetch.h
3
- // AxolotlKit
4
- //
5
- // Created by Frederic Jacobs on 21/07/14.
6
- // Copyright (c) 2014 Frederic Jacobs. All rights reserved.
2
+ // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
7
3
//
8
4
9
5
#import < Foundation/Foundation.h>
10
6
7
+ NS_ASSUME_NONNULL_BEGIN
8
+
11
9
@interface PreKeyBundle : NSObject <NSSecureCoding >
12
10
13
11
@property (nonatomic , readonly ) NSData *identityKey;
29
27
identityKey : (NSData *)identityKey ;
30
28
31
29
@end
30
+
31
+ NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change 1
1
//
2
- // AxolotlKeyFetch.m
3
- // AxolotlKit
4
- //
5
- // Created by Frederic Jacobs on 21/07/14.
6
- // Copyright (c) 2014 Frederic Jacobs. All rights reserved.
2
+ // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
7
3
//
8
4
9
5
#import " PreKeyBundle.h"
10
6
7
+ NS_ASSUME_NONNULL_BEGIN
11
8
12
9
static NSString * const kCoderPKBIdentityKey = @" kCoderPKBIdentityKey" ;
13
10
static NSString * const kCoderPKBregistrationId = @" kCoderPKBregistrationId" ;
@@ -62,7 +59,8 @@ - (nullable instancetype)initWithRegistrationId:(int)registrationId
62
59
return self;
63
60
}
64
61
65
- - (id )initWithCoder : (NSCoder *)aDecoder {
62
+ - (nullable instancetype )initWithCoder : (NSCoder *)aDecoder
63
+ {
66
64
int registrationId = [aDecoder decodeIntForKey: kCoderPKBregistrationId ];
67
65
int deviceId = [aDecoder decodeIntForKey: kCoderPKBdeviceId ];
68
66
int preKeyId = [aDecoder decodeIntForKey: kCoderPKBpreKeyId ];
@@ -103,3 +101,5 @@ +(BOOL)supportsSecureCoding{
103
101
}
104
102
105
103
@end
104
+
105
+ NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change 1
1
//
2
- // Copyright (c) 2018 Open Whisper Systems. All rights reserved.
2
+ // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
3
3
//
4
4
5
5
#import < Foundation/Foundation.h>
6
6
7
+ NS_ASSUME_NONNULL_BEGIN
8
+
7
9
@interface NSData (keyVersionByte)
8
10
9
11
- (instancetype )prependKeyType ;
12
14
- (nullable instancetype )removeKeyTypeAndReturnError : (NSError **)outError ;
13
15
14
16
@end
17
+
18
+ NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change 1
1
//
2
- // Copyright (c) 2018 Open Whisper Systems. All rights reserved.
2
+ // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
3
3
//
4
4
5
5
#import " NSData+keyVersionByte.h"
6
6
#import " AxolotlExceptions.h"
7
7
#import < SignalCoreKit/SCKExceptionWrapper.h>
8
8
9
+ NS_ASSUME_NONNULL_BEGIN
10
+
9
11
@implementation NSData (keyVersionByte)
10
12
11
13
const Byte DJB_TYPE = 0x05 ;
@@ -46,3 +48,5 @@ - (instancetype)throws_removeKeyType
46
48
}
47
49
48
50
@end
51
+
52
+ NS_ASSUME_NONNULL_END
You can’t perform that action at this time.
0 commit comments