Implement parsing private key DER and PEM data

This commit is contained in:
Sergey Abramchuk
2017-09-07 14:07:42 +03:00
parent 9df7dee2df
commit 6d0b1d28b0
+33 -5
View File
@@ -14,7 +14,7 @@
@interface OpenVPNPrivateKey () @interface OpenVPNPrivateKey ()
@property (nonatomic, assign) mbedtls_pk_context *key; @property (nonatomic, assign) mbedtls_pk_context *ctx;
@end @end
@@ -23,8 +23,8 @@
- (instancetype)init { - (instancetype)init {
self = [super init]; self = [super init];
if (self) { if (self) {
self.key = malloc(sizeof(mbedtls_pk_context)); self.ctx = malloc(sizeof(mbedtls_pk_context));
mbedtls_pk_init(self.key); mbedtls_pk_init(self.ctx);
} }
return self; return self;
} }
@@ -32,18 +32,46 @@
+ (nullable OpenVPNPrivateKey *)keyWithPEM:(NSData *)pemData password:(NSString *)password error:(out NSError **)error { + (nullable OpenVPNPrivateKey *)keyWithPEM:(NSData *)pemData password:(NSString *)password error:(out NSError **)error {
OpenVPNPrivateKey *key = [OpenVPNPrivateKey new]; OpenVPNPrivateKey *key = [OpenVPNPrivateKey new];
NSString *pemString = [[NSString alloc] initWithData:pemData encoding:NSUTF8StringEncoding];
int result = mbedtls_pk_parse_key(key.ctx, (const unsigned char *)pemString.UTF8String, pemData.length + 1, (const unsigned char *)password.UTF8String, password.length + 1);
if (result < 0) {
if (error) {
NSString *reason = [NSError reasonFromResult:result];
*error = [NSError errorWithDomain:OpenVPNIdentityErrorDomain code:result userInfo:@{
NSLocalizedDescriptionKey: @"Failed to read PEM data.",
NSLocalizedFailureReasonErrorKey: reason
}];
}
return nil;
}
return key; return key;
} }
+ (nullable OpenVPNPrivateKey *)keyWithDER:(NSData *)derData password:(NSString *)password error:(out NSError **)error { + (nullable OpenVPNPrivateKey *)keyWithDER:(NSData *)derData password:(NSString *)password error:(out NSError **)error {
OpenVPNPrivateKey *key = [OpenVPNPrivateKey new]; OpenVPNPrivateKey *key = [OpenVPNPrivateKey new];
int result = mbedtls_pk_parse_key(key.ctx, derData.bytes, derData.length, (const unsigned char *)password.UTF8String, password.length + 1);
if (result < 0) {
if (error) {
NSString *reason = [NSError reasonFromResult:result];
*error = [NSError errorWithDomain:OpenVPNIdentityErrorDomain code:result userInfo:@{
NSLocalizedDescriptionKey: @"Failed to read DER data.",
NSLocalizedFailureReasonErrorKey: reason
}];
}
return nil;
}
return key; return key;
} }
- (void)dealloc { - (void)dealloc {
mbedtls_pk_free(self.key); mbedtls_pk_free(self.ctx);
free(self.key); free(self.ctx);
} }
@end @end