@@ -143,11 +143,13 @@
 	read_ret = asn1_x509_read_object(x509_der_buf, x509_der_buf_len, &x509);
 	if (read_ret != 0) {
 		return(-1);
 	}
 
-	*outbuf = x509.issuer.asn1rep;
+	if (outbuf) {
+		*outbuf = x509.issuer.asn1rep;
+	}
 
 	return(x509.issuer.asn1rep_len);
 }
 
 ssize_t x509_to_subject(void *x509_der_buf, size_t x509_der_buf_len, void **outbuf) {
@@ -157,11 +159,13 @@
 	read_ret = asn1_x509_read_object(x509_der_buf, x509_der_buf_len, &x509);
 	if (read_ret != 0) {
 		return(-1);
 	}
 
-	*outbuf = x509.subject.asn1rep;
+	if (outbuf) {
+		*outbuf = x509.subject.asn1rep;
+	}
 
 	return(x509.subject.asn1rep_len);
 }
 
 ssize_t x509_to_serial(void *x509_der_buf, size_t x509_der_buf_len, void **outbuf) {
@@ -171,9 +175,11 @@
 	read_ret = asn1_x509_read_object(x509_der_buf, x509_der_buf_len, &x509);
 	if (read_ret != 0) {
 		return(-1);
 	}
 
-	*outbuf = x509.serial_number.asn1rep;
+	if (outbuf) {
+		*outbuf = x509.serial_number.asn1rep;
+	}
 
 	return(x509.serial_number.asn1rep_len);
 }