山賀正人のブログ

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 */

元 #if OPENSSL_VERSION_NUMBER < 0x10100000L
新 #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)

--- ./etc/uams/openssl_compat.h.ORG     2018-11-29 18:30:45.000000000 +0900
+++ ./etc/uams/openssl_compat.h 2019-04-26 07:40:55.857191351 +0900
@@ -11,7 +11,7 @@
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H

-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
 {
    /* If the fields p and g in d are NULL, the corresponding input

--- ./contrib/shell_utils/afpstats.ORG  2014-12-11 20:26:32.000000000 +0900
+++ ./contrib/shell_utils/afpstats      2018-12-25 19:34:54.635154719 +0900
@@ -23,7 +23,7 @@

     reply = iface.GetUsers()
     for name in reply:
-        print name
+        print(name)

 if __name__ == '__main__':
     main()

元 #if OPENSSL_VERSION_NUMBER < 0x10100000L
新 #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)

元 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
新 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)

diff -ruN ../krb5-1.17.ORG/src/plugins/preauth/pkinit/asn1t_add.h ./src/plugins/preauth/pkinit/asn1t_add.h
--- ../krb5-1.17.ORG/src/plugins/preauth/pkinit/asn1t_add.h	1970-01-01 09:00:00.000000000 +0900
+++ ./src/plugins/preauth/pkinit/asn1t_add.h	2019-04-24 20:09:19.848554267 +0900
@@ -0,0 +1,23 @@
+#ifndef HEADER_ASN1T_ADD_H
+#define HEADER_ASN1T_ADD_H
+#include <openssl/asn1t.h>
+
+# define static_ASN1_ITEM_start(itname) \
+	static const ASN1_ITEM itname##_it = {
+
+# define ASN1_ITEM_end(itname) \
+		};
+
+# define static_ASN1_SEQUENCE_END_name(stname, tname) \
+	;\
+	static_ASN1_ITEM_start(tname) \
+		ASN1_ITYPE_SEQUENCE,\
+		V_ASN1_SEQUENCE,\
+		tname##_seq_tt,\
+		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
+		NULL,\
+		sizeof(stname),\
+		#stname \
+	ASN1_ITEM_end(tname)
+
+#endif /* HEADER_ASN1T_ADD_H */
diff -ruN ../krb5-1.17.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c ./src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
--- ../krb5-1.17.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2019-01-09 01:02:37.000000000 +0900
+++ ./src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2019-04-24 20:14:54.578620209 +0900
@@ -189,7 +189,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. */
@@ -3053,7 +3053,7 @@
     return retval;
 }

-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x20900000L)

 /*
  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
diff -ruN ../krb5-1.17.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h ./src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
--- ../krb5-1.17.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h	2019-01-09 01:02:37.000000000 +0900
+++ ./src/plugins/preauth/pkinit/pkinit_crypto_openssl.h	2019-04-24 20:15:42.128629575 +0900
@@ -46,8 +46,11 @@
 #include <openssl/asn1.h>
 #include <openssl/pem.h>

-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x20900000L)
 #include <openssl/asn1t.h>
+# ifdef LIBRESSL_VERSION_NUMBER
+#   include "asn1t_add.h"
+# endif
 #else
 #include <openssl/asn1_mac.h>
 #endif

diff -ruN ../krb5-1.17.ORG/src/Makefile.in ./src/Makefile.in
--- ../krb5-1.17.ORG/src/Makefile.in    2019-01-09 01:02:37.000000000 +0900
+++ ./src/Makefile.in   2019-04-24 16:45:55.157416835 +0900
@@ -1,3 +1,4 @@
+localstatedir=@localstatedir@
 datadir=@datadir@

 mydir=.