diff --git a/danessl.c b/danessl.c
index 3be90fb..541ba29 100644
--- a/danessl.c
+++ b/danessl.c
@@ -373,7 +373,7 @@ static X509_NAME *akid_issuer_name(AUTHORITY_KEYID *akid)
     return 0;
 }
 
-static int set_issuer_name(X509 *cert, AUTHORITY_KEYID *akid, X509_NAME *subj)
+static int set_issuer_name(X509 *cert, AUTHORITY_KEYID *akid, const X509_NAME *subj)
 {
     X509_NAME *name = akid_issuer_name(akid);
 
@@ -428,7 +428,7 @@ static int wrap_issuer(
     int ret = 1;
     X509 *cert = 0;
     AUTHORITY_KEYID *akid;
-    X509_NAME *name = X509_get_issuer_name(subject);
+    const X509_NAME *name = X509_get_issuer_name(subject);
     EVP_PKEY *newkey = key ? key : X509_get_pubkey(subject);
 
 #define WRAP_MID 0		/* Ensure intermediate. */
@@ -767,9 +767,9 @@ static const char *parse_dns_name(const GENERAL_NAME *gn)
 
 static char *parse_subject_name(X509 *cert)
 {
-    X509_NAME *name = X509_get_subject_name(cert);
-    X509_NAME_ENTRY *entry;
-    ASN1_STRING *entry_str;
+    const X509_NAME *name = X509_get_subject_name(cert);
+    const X509_NAME_ENTRY *entry;
+    const ASN1_STRING *entry_str;
     unsigned char *namebuf;
     int nid = NID_commonName;
     int len;