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

Fix incorrect password length and increase size of the buffers

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-09-07 20:04:32 +03:00
parent b5b8834c75
commit 5746b24e5f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenVPN Adapter/OpenVPNPrivateKey.m
View File

@@ -42,7 +42,10 @@
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);
size_t pem_length = strlen(pemString.UTF8String) + 1;
size_t password_length = password != nil ? strlen(password.UTF8String) : 0;
int result = mbedtls_pk_parse_key(key.ctx, (const unsigned char *)pemString.UTF8String, pem_length, (const unsigned char *)password.UTF8String, password_length);
if (result < 0) {
if (error) {
NSString *reason = [NSError reasonFromResult:result];
@@ -61,7 +64,9 @@
+ (nullable OpenVPNPrivateKey *)keyWithDER:(NSData *)derData password:(NSString *)password error:(out NSError **)error {
OpenVPNPrivateKey *key = [OpenVPNPrivateKey new];
int result = mbedtls_pk_parse_key(key.ctx, derData.bytes, derData.length, (const unsigned char *)password.UTF8String, password.length + 1);
size_t password_length = password != nil ? strlen(password.UTF8String) : 0;
int result = mbedtls_pk_parse_key(key.ctx, derData.bytes, derData.length, (const unsigned char *)password.UTF8String, password_length);
if (result < 0) {
if (error) {
NSString *reason = [NSError reasonFromResult:result];
@@ -78,8 +83,8 @@
}
- (NSData *)pemData:(out NSError **)error {
size_t buffer_length = (self.size / 8) * 2;
unsigned char *pem_buffer = malloc(buffer_length);
size_t buffer_length = mbedtls_pk_get_len(self.ctx) * 10;
unsigned char *pem_buffer = calloc(buffer_length, sizeof(unsigned char));
int result = mbedtls_pk_write_key_pem(self.ctx, pem_buffer, buffer_length);
if (result < 0) {
@@ -102,8 +107,8 @@
}
- (NSData *)derData:(out NSError **)error {
size_t buffer_length = (self.size / 8) * 2;
unsigned char *der_buffer = malloc(buffer_length);
size_t buffer_length = mbedtls_pk_get_len(self.ctx) * 10;
unsigned char *der_buffer = calloc(buffer_length, sizeof(unsigned char));
int result = mbedtls_pk_write_key_der(self.ctx, der_buffer, buffer_length);
if (result < 0) {