* The feature that stopped alpine from saving passwords in the password

     file prevented users from actually saving their passwords in Windows
     and MAC OS. Fix the code so that passwords will be saved. Also,
     update the documentation of this feature.

   * Fix a buffer overflow bug in the XOAUTH2 code (off by one error).

   * Update PC-Alpine to work with Libressl version 3.0.2 instead of
     version 2.5.5 (update build.bat and lib files from the LibreSSL
     build).

   * Erase SSLXXXXXX file.

   * ssl_nt.c actually directs the code to ssl_libressl.c or ssl_win.c.
     The file ssl_libressl.c is the file ssl_unix.c from the unix osdep
     directory. The file ssl_win.c is the native SSL windows code. The
     Unix side provides S/MIME support for Alpine and the latest
     encryption protocols support for Alpine when connecting to a secure
     server, while the windows side provide TLSv1_3 support for Alpine,
     but not S/MIME support.

     In order to provide unix code for TLSv1_3 (once LibreSSL supports it)
     edit the file os_nt.c and remove the comments on the #ifdef section.
     This would provide both TLSv1_3 and S/MIME support with unix code. On
     the other hand, when we provide TLSv1_3 with the Windows code we need
     to undefine DF_ENCRYPTION_RANGE, and this is done in the file
     include/config.wnt.h. The way this is done as of this moment is by
     commenting an #else directive that preceedes this #undefine.

   * Update makefile.nt and friends in the windows side to account for the
     addition of XOAUTH2, and the use of only ssl_nt.c when dealing with
     Alpine.

   * Define SMIME_SSLCERTS as c:\libressl\ssl\certs, so that these
     certificates be considered while checking a digital S/MIME signature.

   * Improvements to the SMARTTIME24 token to account for changes in year.

1 files changed, 158 insertions, 0 deletions

diff --git a/libressl/include/openssl/obj_mac.h b/libressl/include/openssl/obj_mac.h
index e11e2832..2699111e 100644
--- a/libressl/include/openssl/obj_mac.h
+++ b/libressl/include/openssl/obj_mac.h
@@ -2549,6 +2549,20 @@
 #define NID_dcObject		390
 #define OBJ_dcObject		OBJ_Enterprises,1466L,344L
 
+#define OBJ_extendedValidation		OBJ_Enterprises,311L,60L
+
+#define LN_jurisdictionLocalityName		"jurisdictionLocalityName"
+#define NID_jurisdictionLocalityName		956
+#define OBJ_jurisdictionLocalityName		OBJ_extendedValidation,2L,1L,1L
+
+#define LN_jurisdictionStateOrProvinceName		"jurisdictionStateOrProvinceName"
+#define NID_jurisdictionStateOrProvinceName		957
+#define OBJ_jurisdictionStateOrProvinceName		OBJ_extendedValidation,2L,1L,2L
+
+#define LN_jurisdictionCountryName		"jurisdictionCountryName"
+#define NID_jurisdictionCountryName		958
+#define OBJ_jurisdictionCountryName		OBJ_extendedValidation,2L,1L,3L
+
 #define SN_mime_mhs		"mime-mhs"
 #define LN_mime_mhs		"MIME MHS"
 #define NID_mime_mhs		504
@@ -3881,6 +3895,16 @@
 #define NID_id_GostR3410_2001_ParamSet_cc		854
 #define OBJ_id_GostR3410_2001_ParamSet_cc		OBJ_cryptocom,1L,8L,1L
 
+#define SN_sm3		"SM3"
+#define LN_sm3		"sm3"
+#define NID_sm3		968
+#define OBJ_sm3		1L,2L,156L,10197L,1L,401L
+
+#define SN_sm3WithRSAEncryption		"RSA-SM3"
+#define LN_sm3WithRSAEncryption		"sm3WithRSAEncryption"
+#define NID_sm3WithRSAEncryption		969
+#define OBJ_sm3WithRSAEncryption		1L,2L,156L,10197L,1L,504L
+
 #define SN_camellia_128_cbc		"CAMELLIA-128-CBC"
 #define LN_camellia_128_cbc		"camellia-128-cbc"
 #define NID_camellia_128_cbc		751
@@ -4006,6 +4030,54 @@
 #define NID_seed_ofb128		778
 #define OBJ_seed_ofb128		OBJ_kisa,1L,6L
 
+#define SN_ISO_CN		"ISO-CN"
+#define LN_ISO_CN		"ISO CN Member Body"
+#define NID_ISO_CN		970
+#define OBJ_ISO_CN		OBJ_member_body,156L
+
+#define SN_oscca		"oscca"
+#define NID_oscca		971
+#define OBJ_oscca		OBJ_ISO_CN,10197L
+
+#define SN_sm_scheme		"sm-scheme"
+#define NID_sm_scheme		972
+#define OBJ_sm_scheme		OBJ_oscca,1L
+
+#define SN_sm4_ecb		"SM4-ECB"
+#define LN_sm4_ecb		"sm4-ecb"
+#define NID_sm4_ecb		973
+#define OBJ_sm4_ecb		OBJ_sm_scheme,104L,1L
+
+#define SN_sm4_cbc		"SM4-CBC"
+#define LN_sm4_cbc		"sm4-cbc"
+#define NID_sm4_cbc		974
+#define OBJ_sm4_cbc		OBJ_sm_scheme,104L,2L
+
+#define SN_sm4_ofb128		"SM4-OFB"
+#define LN_sm4_ofb128		"sm4-ofb"
+#define NID_sm4_ofb128		975
+#define OBJ_sm4_ofb128		OBJ_sm_scheme,104L,3L
+
+#define SN_sm4_cfb128		"SM4-CFB"
+#define LN_sm4_cfb128		"sm4-cfb"
+#define NID_sm4_cfb128		976
+#define OBJ_sm4_cfb128		OBJ_sm_scheme,104L,4L
+
+#define SN_sm4_cfb1		"SM4-CFB1"
+#define LN_sm4_cfb1		"sm4-cfb1"
+#define NID_sm4_cfb1		977
+#define OBJ_sm4_cfb1		OBJ_sm_scheme,104L,5L
+
+#define SN_sm4_cfb8		"SM4-CFB8"
+#define LN_sm4_cfb8		"sm4-cfb8"
+#define NID_sm4_cfb8		978
+#define OBJ_sm4_cfb8		OBJ_sm_scheme,104L,6L
+
+#define SN_sm4_ctr		"SM4-CTR"
+#define LN_sm4_ctr		"sm4-ctr"
+#define NID_sm4_ctr		979
+#define OBJ_sm4_ctr		OBJ_sm_scheme,104L,7L
+
 #define SN_hmac		"HMAC"
 #define LN_hmac		"hmac"
 #define NID_hmac		855
@@ -4030,6 +4102,56 @@
 #define LN_aes_256_cbc_hmac_sha1		"aes-256-cbc-hmac-sha1"
 #define NID_aes_256_cbc_hmac_sha1		918
 
+#define OBJ_x9_63_scheme		1L,3L,133L,16L,840L,63L,0L
+
+#define OBJ_secg_scheme		OBJ_certicom_arc,1L
+
+#define SN_dhSinglePass_stdDH_sha1kdf_scheme		"dhSinglePass-stdDH-sha1kdf-scheme"
+#define NID_dhSinglePass_stdDH_sha1kdf_scheme		980
+#define OBJ_dhSinglePass_stdDH_sha1kdf_scheme		OBJ_x9_63_scheme,2L
+
+#define SN_dhSinglePass_stdDH_sha224kdf_scheme		"dhSinglePass-stdDH-sha224kdf-scheme"
+#define NID_dhSinglePass_stdDH_sha224kdf_scheme		981
+#define OBJ_dhSinglePass_stdDH_sha224kdf_scheme		OBJ_secg_scheme,11L,0L
+
+#define SN_dhSinglePass_stdDH_sha256kdf_scheme		"dhSinglePass-stdDH-sha256kdf-scheme"
+#define NID_dhSinglePass_stdDH_sha256kdf_scheme		982
+#define OBJ_dhSinglePass_stdDH_sha256kdf_scheme		OBJ_secg_scheme,11L,1L
+
+#define SN_dhSinglePass_stdDH_sha384kdf_scheme		"dhSinglePass-stdDH-sha384kdf-scheme"
+#define NID_dhSinglePass_stdDH_sha384kdf_scheme		983
+#define OBJ_dhSinglePass_stdDH_sha384kdf_scheme		OBJ_secg_scheme,11L,2L
+
+#define SN_dhSinglePass_stdDH_sha512kdf_scheme		"dhSinglePass-stdDH-sha512kdf-scheme"
+#define NID_dhSinglePass_stdDH_sha512kdf_scheme		984
+#define OBJ_dhSinglePass_stdDH_sha512kdf_scheme		OBJ_secg_scheme,11L,3L
+
+#define SN_dhSinglePass_cofactorDH_sha1kdf_scheme		"dhSinglePass-cofactorDH-sha1kdf-scheme"
+#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme		985
+#define OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme		OBJ_x9_63_scheme,3L
+
+#define SN_dhSinglePass_cofactorDH_sha224kdf_scheme		"dhSinglePass-cofactorDH-sha224kdf-scheme"
+#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme		986
+#define OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme		OBJ_secg_scheme,14L,0L
+
+#define SN_dhSinglePass_cofactorDH_sha256kdf_scheme		"dhSinglePass-cofactorDH-sha256kdf-scheme"
+#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme		987
+#define OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme		OBJ_secg_scheme,14L,1L
+
+#define SN_dhSinglePass_cofactorDH_sha384kdf_scheme		"dhSinglePass-cofactorDH-sha384kdf-scheme"
+#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme		988
+#define OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme		OBJ_secg_scheme,14L,2L
+
+#define SN_dhSinglePass_cofactorDH_sha512kdf_scheme		"dhSinglePass-cofactorDH-sha512kdf-scheme"
+#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme		989
+#define OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme		OBJ_secg_scheme,14L,3L
+
+#define SN_dh_std_kdf		"dh-std-kdf"
+#define NID_dh_std_kdf		990
+
+#define SN_dh_cofactor_kdf		"dh-cofactor-kdf"
+#define NID_dh_cofactor_kdf		991
+
 #define SN_teletrust		"teletrust"
 #define NID_teletrust		920
 #define OBJ_teletrust		OBJ_identified_organization,36L
@@ -4102,6 +4224,10 @@
 #define LN_chacha20		"chacha"
 #define NID_chacha20		937
 
+#define SN_chacha20_poly1305		"ChaCha20-Poly1305"
+#define LN_chacha20_poly1305		"chacha20-poly1305"
+#define NID_chacha20_poly1305		967
+
 #define SN_gost89_ecb		"gost89-ecb"
 #define NID_gost89_ecb		938
 
@@ -4178,3 +4304,35 @@
 #define NID_Ed448ph		955
 #define OBJ_Ed448ph		1L,3L,101L,115L
 
+#define SN_kx_rsa		"KxRSA"
+#define LN_kx_rsa		"kx-rsa"
+#define NID_kx_rsa		959
+
+#define SN_kx_ecdhe		"KxECDHE"
+#define LN_kx_ecdhe		"kx-ecdhe"
+#define NID_kx_ecdhe		960
+
+#define SN_kx_dhe		"KxDHE"
+#define LN_kx_dhe		"kx-dhe"
+#define NID_kx_dhe		961
+
+#define SN_kx_gost		"KxGOST"
+#define LN_kx_gost		"kx-gost"
+#define NID_kx_gost		962
+
+#define SN_auth_rsa		"AuthRSA"
+#define LN_auth_rsa		"auth-rsa"
+#define NID_auth_rsa		963
+
+#define SN_auth_ecdsa		"AuthECDSA"
+#define LN_auth_ecdsa		"auth-ecdsa"
+#define NID_auth_ecdsa		964
+
+#define SN_auth_gost01		"AuthGOST01"
+#define LN_auth_gost01		"auth-gost01"
+#define NID_auth_gost01		965
+
+#define SN_auth_null		"AuthNULL"
+#define LN_auth_null		"auth-null"
+#define NID_auth_null		966
+