diff -ur openssh-6.9p1.orig/sshconnect2.c openssh-6.9p1/sshconnect2.c
--- openssh-6.9p1.orig/sshconnect2.c	2015-07-01 14:56:26.766316866 -0700
+++ openssh-6.9p1/sshconnect2.c	2015-07-01 14:59:22.828692366 -0700
@@ -1404,7 +1404,7 @@
 static int
 get_allowed_keytype(Key *k) {
 	char *pattern;
-	char *alg;
+	const char *alg;
 
 	if (k->type == KEY_RSA1 || k->type == KEY_UNSPEC)
 		return KEY_UNSPEC;
diff -ur openssh-6.9p1.orig/x509_nm_cmp.c openssh-6.9p1/x509_nm_cmp.c
--- openssh-6.9p1.orig/x509_nm_cmp.c	2015-07-01 14:56:26.129311890 -0700
+++ openssh-6.9p1/x509_nm_cmp.c	2015-07-01 14:59:14.086624068 -0700
@@ -133,7 +133,7 @@
 	tag = M_ASN1_STRING_type(in);
 	if (tag != V_ASN1_UTF8STRING) {
 		/*OpenSSL method surprisingly require non-const(!?) ASN1_STRING!*/
-		return(ASN1_STRING_to_UTF8(out, in));
+		return(ASN1_STRING_to_UTF8(out, (ASN1_STRING *) in));
 	}
 
 	l = M_ASN1_STRING_length(in);