github/OpenVPNAdapter
4
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-02-11 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return error object if parsing finished with failure

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-09-06 22:58:41 +03:00
parent 6c008afc59
commit da4abe9ba1
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenVPN Adapter/OpenVPNCertificate.m
View File

@@ -8,6 +8,8 @@
#import <mbedtls/x509_crt.h>
#import "NSError+Message.h"
#import "OpenVPNError.h"
#import "OpenVPNCertificate.h"
@interface OpenVPNCertificate ()
@@ -34,9 +36,13 @@
NSString *pemString = [[NSString alloc] initWithData:pemData encoding:NSUTF8StringEncoding];
int result = mbedtls_x509_crt_parse(certificate.crt, (const unsigned char *)pemString.UTF8String, pemData.length + 1);
if (result != 0) {
if (result < 0) {
if (error) {
// TODO: Return parse error
NSString *reason = [NSError reasonFromResult:result];
*error = [NSError errorWithDomain:OpenVPNIdentityErrorDomain code:result userInfo:@{
NSLocalizedDescriptionKey: @"Failed to parse PEM data.",
NSLocalizedFailureReasonErrorKey: reason
}];
}
return nil;
@@ -49,9 +55,13 @@
OpenVPNCertificate *certificate = [OpenVPNCertificate new];
int result = mbedtls_x509_crt_parse_der(certificate.crt, derData.bytes, derData.length);
if (result != 0) {
if (result < 0) {
if (error) {
// TODO: Return parse error
NSString *reason = [NSError reasonFromResult:result];
*error = [NSError errorWithDomain:OpenVPNIdentityErrorDomain code:result userInfo:@{
NSLocalizedDescriptionKey: @"Failed to parse DER data.",
NSLocalizedFailureReasonErrorKey: reason
}];
}
return nil;