山賀正人のブログ

diff -ru ../krb5-1.18.2.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c ./src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
--- ../krb5-1.18.2.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2020-05-22 09:21:40.000000000 +0900
+++ ./src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2020-10-19 16:05:26.762009395 +0900
@@ -185,7 +185,7 @@
     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
 #endif

-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)

 /* 1.1 standardizes constructor and destructor names, renaming
  * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */

diff -ru ../s-nail-14.9.14.ORG/include/mx/cred-auth.h ./include/mx/cred-auth.h
--- ../s-nail-14.9.14.ORG/include/mx/cred-auth.h        2019-07-28 06:16:38.000000000 +0900
+++ ./include/mx/cred-auth.h    2019-08-05 10:18:45.708201373 +0900
@@ -20,8 +20,6 @@
 #define mx_CRED_AUTH_H

 #include <mx/nail.h>
-#ifdef mx_HAVE_NET
-
 #include <mx/url.h>

 #define mx_HEADER
@@ -56,6 +54,5 @@
       enum cproto cproto, char const *addr);

 #include <su/code-ou.h>
-#endif /* mx_HAVE_NET */
 #endif /* mx_CRED_AUTH_H */
 /* s-it-mode */
diff -ru ../s-nail-14.9.14.ORG/include/mx/termcap.h ./include/mx/termcap.h
--- ../s-nail-14.9.14.ORG/include/mx/termcap.h  2019-07-28 06:16:38.000000000 +0900
+++ ./include/mx/termcap.h      2019-08-05 10:38:45.258437684 +0900
@@ -221,6 +221,6 @@
 # define mx_TERMCAP_SUSPEND(CPL) do{;}while(0);
 #endif

-#include <su/code-ou.h>
+#include <su/code.h>
 #endif /* mx_TERMCAP_H */
 /* s-it-mode */
diff -ru ../s-nail-14.9.14.ORG/include/mx/url.h ./include/mx/url.h
--- ../s-nail-14.9.14.ORG/include/mx/url.h      2019-07-28 06:16:38.000000000 +0900
+++ ./include/mx/url.h  2019-08-05 10:17:37.118187860 +0900
@@ -24,7 +24,7 @@
 #define mx_HEADER
 #include <su/code-in.h>

-#ifdef mx_HAVE_NET /* XXX only for now */
+/* XXX only for now */
 enum mx_url_flags{
    mx_URL_TLS_REQUIRED = 1u<<0, /* Whether protocol always uses SSL/TLS.. */
    mx_URL_TLS_OPTIONAL = 1u<<1, /* ..may later upgrade to SSL/TLS */
@@ -62,7 +62,6 @@
    char const *url_p_eu_h_p; /* .url_proto://.url_eu_h_p */
    char const *url_p_eu_h_p_p; /* .url_proto://.url_eu_h_p[/.url_path] */
 };
-#endif /* mx_HAVE_NET */

 /* URL en- and decoding according to (enough of) RFC 3986 (RFC 1738).
  * These return a newly autorec_alloc()ated result, or NIL on length excess */