Decode the CA Certificate from binary, not from PEM format.

[moonshot-ui.git] / src / moonshot-crypto-utils.c

diff --git a/src/moonshot-crypto-utils.c b/src/moonshot-crypto-utils.c
index c28e835..a14c610 100644 (file)
--- a/src/moonshot-crypto-utils.c
+++ b/src/moonshot-crypto-utils.c
@@ -2,33 +2,28 @@
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 
+#include <stdio.h>
 
-char* get_cert_valid_before(const char* cert_string, int cert_string_len, char* datebuf, int len)
+char* get_cert_valid_before(const unsigned char* buf, int len, char* datebuf, int datebuf_len)
 {
-    datebuf[0]='\0';    
+    datebuf[0]='\0';
 
-    BIO* cert_bio = BIO_new_mem_buf(cert_string, cert_string_len);
-
-    if (cert_bio == NULL) {
-        return "Error calling PEM_new_mem_buf!";
-    }
-
-    X509 *x = PEM_read_bio_X509(cert_bio, NULL, 0, NULL);
+    unsigned char *p = (unsigned char*) buf;
+    X509* x = d2i_X509(NULL, &p, len);
     if (x == NULL) {
-        return "Error calling PEM_read_bio_X509!";
+        return "Error calling d2i_X509()!";
     }
 
     BIO* out_bio = BIO_new(BIO_s_mem());
     ASN1_TIME* time = X509_get_notAfter(x);
 
     if (ASN1_TIME_print(out_bio, time)) {
-        int write = BIO_read(out_bio, datebuf, len - 1);
+        int write = BIO_read(out_bio, datebuf, datebuf_len - 1);
         datebuf[write]='\0';
     }
 
-    datebuf[len - 1] = '\0';
+    datebuf[datebuf_len - 1] = '\0';
     BIO_free(out_bio);
-    BIO_free(cert_bio);
     X509_free(x);
     return "";
 }