Skip to content
Snippets Groups Projects
Commit 802cfe6a authored by Oliver Wiese's avatar Oliver Wiese
Browse files

update ObjectivePGP

parent 4729da9d
Branches
Tags
No related merge requests found
Showing
with 15 additions and 16 deletions
...@@ -109,6 +109,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -109,6 +109,8 @@ NS_ASSUME_NONNULL_BEGIN
*/ */
+ (nullable NSData *)decrypt:(NSData *)data andVerifySignature:(BOOL)verifySignature usingKeys:(NSArray<PGPKey *> *)keys passphraseForKey:(nullable NSString * _Nullable(^NS_NOESCAPE)(PGPKey * _Nullable key))passphraseBlock error:(NSError * __autoreleasing _Nullable *)error; + (nullable NSData *)decrypt:(NSData *)data andVerifySignature:(BOOL)verifySignature usingKeys:(NSArray<PGPKey *> *)keys passphraseForKey:(nullable NSString * _Nullable(^NS_NOESCAPE)(PGPKey * _Nullable key))passphraseBlock error:(NSError * __autoreleasing _Nullable *)error;
+ (nullable NSData *)decrypt:(NSData *)data verified:(BOOL * _Nullable)verified usingKeys:(NSArray<PGPKey *> *)keys passphraseForKey:(nullable NSString * _Nullable(^NS_NOESCAPE)(PGPKey * _Nullable key))passphraseForKeyBlock decryptionError:(NSError * __autoreleasing _Nullable *)decryptionError verificationError:(NSError * __autoreleasing _Nullable *)verificationError;
/** /**
Return list of key identifiers used in the given message. Determine keys that a message has been encrypted. Return list of key identifiers used in the given message. Determine keys that a message has been encrypted.
......
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <ObjectivePGP/PGPTypes.h> #import <ObjectivePGP/PGPTypes.h>
#import <ObjectivePGP/PGPKey.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class PGPKey;
NS_SWIFT_NAME(KeyGenerator) @interface PGPKeyGenerator : NSObject NS_SWIFT_NAME(KeyGenerator) @interface PGPKeyGenerator : NSObject
@property (nonatomic) int keyBitsLength; @property (nonatomic) int keyBitsLength;
......
...@@ -27,7 +27,7 @@ NS_SWIFT_NAME(PartialKey) @interface PGPPartialKey : NSObject <PGPExportable, NS ...@@ -27,7 +27,7 @@ NS_SWIFT_NAME(PartialKey) @interface PGPPartialKey : NSObject <PGPExportable, NS
@property (nonatomic, readonly) PGPKeyType type; @property (nonatomic, readonly) PGPKeyType type;
@property (nonatomic, copy) PGPPacket *primaryKeyPacket; @property (nonatomic, copy) PGPPacket *primaryKeyPacket;
@property (nonatomic, copy) NSArray<PGPUser *> *users; @property (nonatomic, copy) NSArray<PGPUser *> *users;
@property (nonatomic, copy, nullable, readonly) PGPUser *primaryUser; @property (nonatomic, copy, nullable, readonly) PGPUser *primaryUser; // calculated
@property (nonatomic, copy, readonly) NSArray<PGPPartialSubKey *> *subKeys; @property (nonatomic, copy, readonly) NSArray<PGPPartialSubKey *> *subKeys;
@property (nonatomic, copy, readonly) NSArray<PGPSignaturePacket *> *directSignatures; @property (nonatomic, copy, readonly) NSArray<PGPSignaturePacket *> *directSignatures;
@property (nonatomic, nullable, copy, readonly) PGPSignaturePacket *revocationSignature; @property (nonatomic, nullable, copy, readonly) PGPSignaturePacket *revocationSignature;
......
No preview for this file type
No preview for this file type
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
// rfc1950 (zlib format) // rfc1950 (zlib format)
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <ObjectivePGP/ObjectivePGP.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// This notice may not be removed from this file. // This notice may not be removed from this file.
// //
#import <ObjectivePGP/ObjectivePGP.h> #import "PGPPartialKey.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// This notice may not be removed from this file. // This notice may not be removed from this file.
// //
#import <ObjectivePGP/ObjectivePGP.h> #import "PGPPartialSubKey.h"
@interface PGPPartialSubKey () @interface PGPPartialSubKey ()
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// //
#import "PGPPublicKeyPacket.h" #import "PGPPublicKeyPacket.h"
#import <ObjectivePGP/ObjectivePGP.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
// Tag 6 // Tag 6
#import "PGPPacketFactory.h" #import "PGPPacketFactory.h"
#import <ObjectivePGP/ObjectivePGP.h> #import "PGPFingerprint.h"
#import "PGPKeyID.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -21,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -21,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) NSDate *createDate; @property (nonatomic, readonly) NSDate *createDate;
@property (nonatomic, readonly) UInt16 V3validityPeriod; // obsolete @property (nonatomic, readonly) UInt16 V3validityPeriod; // obsolete
@property (nonatomic, readonly) PGPPublicKeyAlgorithm publicKeyAlgorithm; @property (nonatomic, readonly) PGPPublicKeyAlgorithm publicKeyAlgorithm;
@property (nonatomic, readonly) BOOL isSupported;
// generated properties // generated properties
@property (nonatomic, readonly) NSUInteger keySize; @property (nonatomic, readonly) NSUInteger keySize;
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#import "PGPPublicKeyPacket+Private.h" #import "PGPPublicKeyPacket+Private.h"
#import "PGPS2K.h" #import "PGPS2K.h"
#import "PGPSecretKeyPacket.h" #import "PGPSecretKeyPacket.h"
#import <ObjectivePGP/ObjectivePGP.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// //
#import "PGPSignaturePacket.h" #import "PGPSignaturePacket.h"
#import <ObjectivePGP/ObjectivePGP.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
// This notice may not be removed from this file. // This notice may not be removed from this file.
// //
#import <ObjectivePGP/ObjectivePGP.h> #import "PGPUser.h"
#import <ObjectivePGP/PGPUserIDPacket.h> #import "PGPUserIDPacket.h"
#import <ObjectivePGP/PGPUserAttributePacket.h> #import "PGPUserAttributePacket.h"
#import <ObjectivePGP/PGPSignaturePacket.h> #import "PGPSignaturePacket.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// This notice may not be removed from this file. // This notice may not be removed from this file.
// //
#import <ObjectivePGP/ObjectivePGP-Private.h> #import "PGPUserAttributeSubpacket.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -17,7 +17,7 @@ You want to help, great! Go ahead and fork our repo, make your changes and send ...@@ -17,7 +17,7 @@ You want to help, great! Go ahead and fork our repo, make your changes and send
## Contribution ## Contribution
You are welcome to contribute. See [CONTRIBUTING.md](https://github.com/krzyzanowskim/ObjectivePGP/blob/master/CONTRIBUTING.md) You are welcome to contribute. See [CONTRIBUTING.md](https://github.com/krzyzanowskim/ObjectivePGP/blob/master/CONTRIBUTING.md)
Please create [Pull Request](https://github.com/krzyzanowskim/ObjectivePGP/pulls) against `develop` branch. Please create [Pull Request](https://github.com/krzyzanowskim/ObjectivePGP/pulls).
## The license ## The license
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment