From 9e642e9b42ccf155854eb16f3239e4225a617b00 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Fri, 3 Apr 2020 09:28:42 +0200
Subject: [PATCH] remove dead code
---
enzevalos_iphone/Certificate.swift | 2 --
enzevalos_iphone/SMIME.swift | 5 +++--
enzevalos_iphone/c/certificate-helpers.c | 7 +------
enzevalos_iphone/c/certificate-helpers.h | 1 -
enzevalos_iphone/c/smime-helpers.c | 1 -
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/enzevalos_iphone/Certificate.swift b/enzevalos_iphone/Certificate.swift
index fdaf83a1..5ad3a33b 100644
--- a/enzevalos_iphone/Certificate.swift
+++ b/enzevalos_iphone/Certificate.swift
@@ -112,8 +112,6 @@ extension cert_info {
if cStr != nil {
swiftStr = String(cString: cStr!)
- // same here
- // cStr?.deallocate()
}
return swiftStr
diff --git a/enzevalos_iphone/SMIME.swift b/enzevalos_iphone/SMIME.swift
index 023d97c5..4d47ed14 100644
--- a/enzevalos_iphone/SMIME.swift
+++ b/enzevalos_iphone/SMIME.swift
@@ -127,12 +127,13 @@ class SMIME {
if keys.count != 1 {
print("Incorrect amount of keys: ", keys.count)
continue
- //todo exception
+ // ToDo exception
}
if certs.count == 0
{
print("No certs")
- continue//do exception
+ continue
+ // ToDo exception
}
certsAndKeysSplit.append((certs.joined(separator: "\r\n"), keys[0]))
}
diff --git a/enzevalos_iphone/c/certificate-helpers.c b/enzevalos_iphone/c/certificate-helpers.c
index a8a2f211..44057539 100644
--- a/enzevalos_iphone/c/certificate-helpers.c
+++ b/enzevalos_iphone/c/certificate-helpers.c
@@ -32,9 +32,7 @@ cert_info * get_cert_data(const char *pem)
emails = get_emails(cert);
size = emails->size;
-
- //int size = info->num_emails; Unitialized memory, meaning i will grow beyond the real size ->SEGFAULT
-
+
//ELIMINATED MAIN MEMORY LEAK; STILL HAVE A SMALL ONE: after running a couple of minutes nonstop loading certs 70mb
info->num_emails = size;
@@ -71,7 +69,6 @@ char * get_issuer(X509 *cert) {
bio_to_str(out, &res);
deinit:
BIO_free(out);
- //X509_NAME_free(name);
return res;
}
@@ -85,7 +82,6 @@ char * get_subject(X509 *cert) {
bio_to_str(out, &res);
deinit:
BIO_free(out);
-// X509_NAME_free(name);
return res;
}
@@ -143,7 +139,6 @@ array_with_length *get_emails(X509 *cert) {
res->arr = arr;
deinit:
sk_OPENSSL_STRING_free(list);
- // X509_email_free(list);
return res;
}
diff --git a/enzevalos_iphone/c/certificate-helpers.h b/enzevalos_iphone/c/certificate-helpers.h
index e55116b7..d96c2f67 100644
--- a/enzevalos_iphone/c/certificate-helpers.h
+++ b/enzevalos_iphone/c/certificate-helpers.h
@@ -43,7 +43,6 @@ char * get_subject(X509 *cert);
char * get_start_date(X509 *cert);
char * get_end_date(X509 *cert);
array_with_length *get_emails(X509 *cert);
-// X509 *get_cert_from_pem(const char *pem);
cert_info * get_cert_data(const char *pem);
cert_info * new_cert_info(void);
diff --git a/enzevalos_iphone/c/smime-helpers.c b/enzevalos_iphone/c/smime-helpers.c
index 0d5569e2..020d6cde 100644
--- a/enzevalos_iphone/c/smime-helpers.c
+++ b/enzevalos_iphone/c/smime-helpers.c
@@ -158,7 +158,6 @@ deinit:
BIO_free(in);
BIO_free(out); // also frees tmp
sk_X509_pop_free(cert_stack, X509_free);
- //X509_free(rec_cert);
return res;
}
--
GitLab