[6640] trunkの r6550-6639 をブランチにマージした。 (Ttssh2-commit) - Tera Term

Revision: 6640
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6640
Author:   yutakapon
Date:     2017-03-18 20:12:07 +0900 (Sat, 18 Mar 2017)
Log Message:
-----------
trunkの r6550-6639 をブランチにマージした。

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6550

Modified Paths:
--------------
    branches/openssl_1_1_0/TTXSamples/TTXttyrec/ReadMe-ja.txt
    branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyplay.c
    branches/openssl_1_1_0/cygterm/Makefile
    branches/openssl_1_1_0/cygterm/README
    branches/openssl_1_1_0/cygterm/README-j
    branches/openssl_1_1_0/doc/convtext.bat
    branches/openssl_1_1_0/doc/en/html/about/copyright.html
    branches/openssl_1_1_0/doc/en/html/about/ctrlseq.html
    branches/openssl_1_1_0/doc/en/html/about/difference.html
    branches/openssl_1_1_0/doc/en/html/about/foreword.html
    branches/openssl_1_1_0/doc/en/html/about/history.html
    branches/openssl_1_1_0/doc/en/html/about/module.html
    branches/openssl_1_1_0/doc/en/html/about/requests.html
    branches/openssl_1_1_0/doc/en/html/about/requirements.html
    branches/openssl_1_1_0/doc/en/html/commandline/teraterm.html
    branches/openssl_1_1_0/doc/en/html/commandline/ttssh.html
    branches/openssl_1_1_0/doc/en/html/index.html
    branches/openssl_1_1_0/doc/en/html/macro/command/index.html
    branches/openssl_1_1_0/doc/en/html/menu/setup-additional.html
    branches/openssl_1_1_0/doc/en/html/reference/develop.txt
    branches/openssl_1_1_0/doc/en/html/setup/teraterm-ini.html
    branches/openssl_1_1_0/doc/en/html/setup/teraterm-misc.html
    branches/openssl_1_1_0/doc/en/html/usage/tips/vim.html
    branches/openssl_1_1_0/doc/en/teraterm.hhc
    branches/openssl_1_1_0/doc/en/teraterm.hhp
    branches/openssl_1_1_0/doc/ja/html/about/copyright.html
    branches/openssl_1_1_0/doc/ja/html/about/difference.html
    branches/openssl_1_1_0/doc/ja/html/about/history.html
    branches/openssl_1_1_0/doc/ja/html/about/module.html
    branches/openssl_1_1_0/doc/ja/html/about/requirements.html
    branches/openssl_1_1_0/doc/ja/html/commandline/teraterm.html
    branches/openssl_1_1_0/doc/ja/html/commandline/ttssh.html
    branches/openssl_1_1_0/doc/ja/html/index.html
    branches/openssl_1_1_0/doc/ja/html/macro/command/index.html
    branches/openssl_1_1_0/doc/ja/html/menu/setup-additional.html
    branches/openssl_1_1_0/doc/ja/html/reference/develop.txt
    branches/openssl_1_1_0/doc/ja/html/setup/teraterm-ini.html
    branches/openssl_1_1_0/doc/ja/html/setup/teraterm-misc.html
    branches/openssl_1_1_0/doc/ja/html/usage/tips/vim.html
    branches/openssl_1_1_0/doc/ja/teraterm.hhc
    branches/openssl_1_1_0/doc/ja/teraterm.hhp
    branches/openssl_1_1_0/doc/makechm.bat
    branches/openssl_1_1_0/installer/build.bat
    branches/openssl_1_1_0/installer/release/TERATERM.INI
    branches/openssl_1_1_0/installer/release/lang/English.lng
    branches/openssl_1_1_0/installer/release/lang/French.lng
    branches/openssl_1_1_0/installer/release/lang/German.lng
    branches/openssl_1_1_0/installer/release/lang/Japanese.lng
    branches/openssl_1_1_0/installer/release/lang/Korean.lng
    branches/openssl_1_1_0/installer/release/lang/Russian.lng
    branches/openssl_1_1_0/installer/release/lang/Simplified Chinese.lng
    branches/openssl_1_1_0/installer/release/lang/Traditional Chinese.lng
    branches/openssl_1_1_0/installer/teraterm.iss
    branches/openssl_1_1_0/libs/buildall.bat
    branches/openssl_1_1_0/teraterm/common/helpid.h
    branches/openssl_1_1_0/teraterm/common/tt_res.h
    branches/openssl_1_1_0/teraterm/common/tttypes.h
    branches/openssl_1_1_0/teraterm/teraterm/addsetting.cpp
    branches/openssl_1_1_0/teraterm/teraterm/clipboar.c
    branches/openssl_1_1_0/teraterm/teraterm/filesys.cpp
    branches/openssl_1_1_0/teraterm/teraterm/ttdde.c
    branches/openssl_1_1_0/teraterm/teraterm/ttermpro.rc
    branches/openssl_1_1_0/teraterm/teraterm/vtterm.c
    branches/openssl_1_1_0/teraterm/teraterm/vtwin.cpp
    branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.def
    branches/openssl_1_1_0/teraterm/ttpdlg/ttdlg.c
    branches/openssl_1_1_0/teraterm/ttpmacro/ttl.c
    branches/openssl_1_1_0/teraterm/ttpmacro/ttmdde.h
    branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.c
    branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.h
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.rc
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v12.vcxproj
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v14.vcxproj
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v9.vcproj
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.vcproj
    branches/openssl_1_1_0/teraterm/ttpset/ttset.c
    branches/openssl_1_1_0/ttssh2/putty/libputty.c
    branches/openssl_1_1_0/ttssh2/putty/libputty.h
    branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj
    branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj.filters
    branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj
    branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj.filters
    branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj
    branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj.filters
    branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj
    branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj.filters
    branches/openssl_1_1_0/ttssh2/putty/putty.v9.vcproj
    branches/openssl_1_1_0/ttssh2/putty/putty.vcproj
    branches/openssl_1_1_0/ttssh2/ttxssh/hosts.c
    branches/openssl_1_1_0/ttssh2/ttxssh/hosts.h
    branches/openssl_1_1_0/ttssh2/ttxssh/keyfiles.c
    branches/openssl_1_1_0/ttssh2/ttxssh/ssh.c
    branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.c
    branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.rc

Added Paths:
-----------
    branches/openssl_1_1_0/TTProxy/TTProxy.v15.sln
    branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj
    branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.sln
    branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj
    branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXSamples.v15.sln
    branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj.filters
    branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj
    branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj.filters
    branches/openssl_1_1_0/cygterm/COPYING
    branches/openssl_1_1_0/doc/en/html/macro/command/setflowctrl.html
    branches/openssl_1_1_0/doc/ja/html/macro/command/setflowctrl.html
    branches/openssl_1_1_0/libs/SFMT/
    branches/openssl_1_1_0/libs/buildSFMT.bat
    branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj
    branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj
    branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj
    branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/ttermpro.v15.sln
    branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj
    branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj
    branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj
    branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj
    branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj.filters
    branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj
    branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj.filters
    branches/openssl_1_1_0/tests/#35822-random.ttl
    branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.sln
    branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.vcxproj
    branches/openssl_1_1_0/ttssh2/matcher/matcher.v15.vcxproj
    branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj
    branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj.filters
    branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj
    branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj.filters
    branches/openssl_1_1_0/ttssh2/ttssh/ttssh.v15.vcxproj
    branches/openssl_1_1_0/ttssh2/ttssh.v15.sln
    branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj
    branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters

Removed Paths:
-------------
    branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-common.h
    branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params.h
    branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params19937.h
    branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.c
    branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.h
    branches/openssl_1_1_0/tests/#35822.ttl

Property Changed:
----------------
    branches/openssl_1_1_0/
    branches/openssl_1_1_0/TTProxy/
    branches/openssl_1_1_0/TTXKanjiMenu/
    branches/openssl_1_1_0/TTXSamples/
    branches/openssl_1_1_0/cygterm/
    branches/openssl_1_1_0/doc/en/html/reference/
    branches/openssl_1_1_0/doc/ja/html/reference/
    branches/openssl_1_1_0/installer/teraterm.iss
    branches/openssl_1_1_0/teraterm/
    branches/openssl_1_1_0/ttpmenu/

-------------- next part --------------
Index: branches/openssl_1_1_0
===================================================================

--- branches/openssl_1_1_0	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/ssh_ed25519:5495-5544
 /branches/vs2015_warn:6194-6285
-/tags/teraterm-4_89:6182
\ No newline at end of property
+/tags/teraterm-4_89:6182
+/trunk:6550-6639
\ No newline at end of property
Index: branches/openssl_1_1_0/TTProxy
===================================================================
--- branches/openssl_1_1_0/TTProxy	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/TTProxy	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/TTProxy:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/TTProxy:6194-6285
+/trunk/TTProxy:6550-6639
\ No newline at end of property
Copied: branches/openssl_1_1_0/TTProxy/TTProxy.v15.sln (from rev 6639, trunk/TTProxy/TTProxy.v15.sln)
===================================================================
--- branches/openssl_1_1_0/TTProxy/TTProxy.v15.sln	                        (rev 0)
+++ branches/openssl_1_1_0/TTProxy/TTProxy.v15.sln	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTProxy", "TTProxy.v15.vcxproj", "{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Debug|Win32.Build.0 = Debug|Win32
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.ActiveCfg = Release|Win32
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj (from rev 6639, trunk/TTProxy/TTProxy.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}</ProjectGuid>
+    <RootNamespace>TTProxy</RootNamespace>
+    <ProjectName>TTProxy</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>TTXProxy</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>TTXProxy</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="StdAfx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="TTProxy.cpp" />
+    <ClCompile Include="YCL\include\YCL\libc.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTProxy.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="TTX.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Hooker.h" />
+    <ClInclude Include="Logger.h" />
+    <ClInclude Include="ProxyWSockHook.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="SSLSocket.h" />
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="TTProxy.h" />
+    <ClInclude Include="YCL\include\YCL\Array.h" />
+    <ClInclude Include="YCL\include\YCL\ComboBoxCtrl.h" />
+    <ClInclude Include="YCL\include\YCL\common.h" />
+    <ClInclude Include="YCL\include\YCL\Dialog.h" />
+    <ClInclude Include="YCL\include\YCL\DynamicLinkLibrary.h" />
+    <ClInclude Include="YCL\include\YCL\EditBoxCtrl.h" />
+    <ClInclude Include="YCL\include\YCL\Enumeration.h" />
+    <ClInclude Include="YCL\include\YCL\FileVersion.h" />
+    <ClInclude Include="YCL\include\YCL\HASHCODE.h" />
+    <ClInclude Include="YCL\include\YCL\Hashtable.h" />
+    <ClInclude Include="YCL\include\YCL\IniFile.h" />
+    <ClInclude Include="YCL\include\YCL\Integer.h" />
+    <ClInclude Include="YCL\include\YCL\Object.h" />
+    <ClInclude Include="YCL\include\YCL\Pointer.h" />
+    <ClInclude Include="YCL\include\YCL\Resource.h" />
+    <ClInclude Include="YCL\include\YCL\StringBuffer.h" />
+    <ClInclude Include="YCL\include\YCL\StringUtil.h" />
+    <ClInclude Include="YCL\include\YCL\ValueCtrl.h" />
+    <ClInclude Include="YCL\include\YCL\Vector.h" />
+    <ClInclude Include="YCL\include\YCL\Window.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj.filters (from rev 6639, trunk/TTProxy/TTProxy.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTProxy/TTProxy.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{3cd46c63-801a-45aa-88e0-52572525db2d}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{2a7e6b97-89c1-4fe1-abf6-cdd5617422b1}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="YCL">
+      <UniqueIdentifier>{076290f0-a284-406f-9e4c-8425b4904132}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{f6ee589e-87d8-4a70-b138-b10962385824}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="StdAfx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TTProxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="YCL\include\YCL\libc.cpp">
+      <Filter>YCL</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTProxy.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Hooker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ProxyWSockHook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SSLSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StdAfx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TTProxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Array.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\ComboBoxCtrl.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\common.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Dialog.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\DynamicLinkLibrary.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\EditBoxCtrl.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Enumeration.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\FileVersion.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\HASHCODE.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Hashtable.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\IniFile.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Integer.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Object.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Pointer.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Resource.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\StringBuffer.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\StringUtil.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\ValueCtrl.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Vector.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Window.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="TTX.def">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Index: branches/openssl_1_1_0/TTXKanjiMenu
===================================================================
--- branches/openssl_1_1_0/TTXKanjiMenu	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/TTXKanjiMenu	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/TTXKanjiMenu:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/TTXKanjiMenu:6194-6285
+/trunk/TTXKanjiMenu:6550-6639
\ No newline at end of property
Copied: branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.sln (from rev 6639, trunk/TTXKanjiMenu/ttxkanjimenu.v15.sln)
===================================================================
--- branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.sln	                        (rev 0)
+++ branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.sln	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxkanjimenu", "ttxkanjimenu.v15.vcxproj", "{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Debug|Win32.Build.0 = Debug|Win32
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Release|Win32.ActiveCfg = Release|Win32
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj (from rev 6639, trunk/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}</ProjectGuid>
+    <RootNamespace>ttxkanjimenu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>ttxkanjimenu</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTXENCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTXENCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxkanjimenu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxkanjimenu.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj.filters (from rev 6639, trunk/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXKanjiMenu/ttxkanjimenu.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxkanjimenu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxkanjimenu.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Index: branches/openssl_1_1_0/TTXSamples
===================================================================
--- branches/openssl_1_1_0/TTXSamples	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/TTXSamples	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/TTXSamples:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/TTXSamples:6194-6285
+/trunk/TTXSamples:6550-6639
\ No newline at end of property
Copied: branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0ECAF69B-08B4-414A-B822-BE8459E463D8}</ProjectGuid>
+    <RootNamespace>TTXAdditionalTitle</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXAdditionalTitle</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAdditionalTitle.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{49a19dbf-c584-4494-be1f-8dbe6fdb5357}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAdditionalTitle.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}</ProjectGuid>
+    <RootNamespace>TTXAlwaysOnTop</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXAlwaysOnTop</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAlwaysOnTop.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{3de8b3b0-0e46-470e-8b42-34e7dc070906}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAlwaysOnTop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{25709A86-E6B8-4CDA-906C-02D935E05978}</ProjectGuid>
+    <RootNamespace>TTXCallSysMenu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXCallSysMenu</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCallSysMenu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{7db37478-ecb8-4585-bc40-626409df0a4c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCallSysMenu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EE8BFC38-7000-42F1-BBC3-17F19855918A}</ProjectGuid>
+    <RootNamespace>TTXCommandLineOpt</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXCommandLineOpt</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCommandLineOpt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{ea93460b-20a9-4d07-acd5-813091583716}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCommandLineOpt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2B2B8D6E-4A84-49DD-8291-46172FCE422A}</ProjectGuid>
+    <RootNamespace>TTXCopyIniFile</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXCopyIniFile</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCopyIniFile.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{874b45ff-d6e1-41fa-9990-dc82e1fa2c39}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCopyIniFile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}</ProjectGuid>
+    <RootNamespace>TTXFixedWinSize</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXFixedWinSize</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXFixedWinSize.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{c85cfa6a-7901-487a-827f-eab5a026442e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXFixedWinSize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}</ProjectGuid>
+    <RootNamespace>TTXKcodeChange</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXKcodeChange</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXKcodeChange.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXKcodeChange/TTXKcodeChange.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{61de082d-3825-47ff-b56b-2afbe6cb421d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXKcodeChange.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{80BE71D1-BEA3-4A5D-8F13-362D6364892D}</ProjectGuid>
+    <RootNamespace>TTXOutputBuffering</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXOutputBuffering</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXOutputBuffering.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{eac98687-8494-4f5a-9a22-74285b3cb27e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXOutputBuffering.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3C656364-FAEA-41D2-B227-52187D3C2529}</ProjectGuid>
+    <RootNamespace>TTXRecurringCommand</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXRecurringCommand</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXRecurringCommand.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXRecurringCommand.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{33cf655f-cf52-4333-b6c4-58fa615a79f2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXRecurringCommand.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXRecurringCommand.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}</ProjectGuid>
+    <RootNamespace>TTXResizeMenu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXResizeMenu</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeMenu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{bc141cd6-562f-4b1b-948c-94914a36ffac}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeMenu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{11EF5960-4922-49DC-9E64-B0845FC7C88C}</ProjectGuid>
+    <RootNamespace>TTXResizeWin</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXResizeWin</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeWin.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXResizeWin/TTXResizeWin.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{b55f30ea-c34a-4cf2-a10f-8389a7654919}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeWin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXSamples.v15.sln (from rev 6639, trunk/TTXSamples/TTXSamples.v15.sln)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXSamples.v15.sln	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXSamples.v15.sln	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,111 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXAlwaysOnTop", "TTXAlwaysOnTop\TTXAlwaysOnTop.v15.vcxproj", "{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXResizeWin", "TTXResizeWin\TTXResizeWin.v15.vcxproj", "{11EF5960-4922-49DC-9E64-B0845FC7C88C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXResizeMenu", "TTXResizeMenu\TTXResizeMenu.v15.vcxproj", "{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXFixedWinSize", "TTXFixedWinSize\TTXFixedWinSize.v15.vcxproj", "{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXttyrec", "TTXttyrec\TTXttyrec.v15.vcxproj", "{5798E37E-0428-457E-A652-EE0A75130327}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXttyplay", "TTXttyrec\TTXttyplay.v15.vcxproj", "{3181E887-2183-4FB8-84CC-CA5B4D48BC71}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXtest", "ttxtest\TTXtest.v15.vcxproj", "{9E20E276-1905-44AE-BC67-C1A1F3C42135}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXKcodeChange", "TTXKcodeChange\TTXKcodeChange.v15.vcxproj", "{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXViewMode", "TTXViewMode\TTXViewMode.v15.vcxproj", "{2296FB66-3FA4-4136-8252-ABECEEAC2D70}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCopyIniFile", "TTXCopyIniFile\TTXCopyIniFile.v15.vcxproj", "{2B2B8D6E-4A84-49DD-8291-46172FCE422A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXAdditionalTitle", "TTXAdditionalTitle\TTXAdditionalTitle.v15.vcxproj", "{0ECAF69B-08B4-414A-B822-BE8459E463D8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCallSysMenu", "TTXCallSysMenu\TTXCallSysMenu.v15.vcxproj", "{25709A86-E6B8-4CDA-906C-02D935E05978}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCommandLineOpt", "TTXCommandLineOpt\TTXCommandLineOpt.v15.vcxproj", "{EE8BFC38-7000-42F1-BBC3-17F19855918A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXRecurringCommand", "TTXRecurringCommand\TTXRecurringCommand.v15.vcxproj", "{3C656364-FAEA-41D2-B227-52187D3C2529}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXShowCommandLine", "TTXShowCommandLine\TTXShowCommandLine.v15.vcxproj", "{80ED9927-27F9-473A-802C-FB10DEB5ECC6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXOutputBuffering", "TTXOutputBuffering\TTXOutputBuffering.v15.vcxproj", "{80BE71D1-BEA3-4A5D-8F13-362D6364892D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Debug|Win32.Build.0 = Debug|Win32
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Release|Win32.ActiveCfg = Release|Win32
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Release|Win32.Build.0 = Release|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Debug|Win32.Build.0 = Debug|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Release|Win32.ActiveCfg = Release|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Release|Win32.Build.0 = Release|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Debug|Win32.Build.0 = Debug|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Release|Win32.ActiveCfg = Release|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Release|Win32.Build.0 = Release|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Debug|Win32.Build.0 = Debug|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Release|Win32.ActiveCfg = Release|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Release|Win32.Build.0 = Release|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Debug|Win32.Build.0 = Debug|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Release|Win32.ActiveCfg = Release|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Release|Win32.Build.0 = Release|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Debug|Win32.Build.0 = Debug|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Release|Win32.ActiveCfg = Release|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Release|Win32.Build.0 = Release|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Debug|Win32.Build.0 = Debug|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Release|Win32.ActiveCfg = Release|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Release|Win32.Build.0 = Release|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Debug|Win32.Build.0 = Debug|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Release|Win32.ActiveCfg = Release|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Release|Win32.Build.0 = Release|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Debug|Win32.Build.0 = Debug|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Release|Win32.ActiveCfg = Release|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Release|Win32.Build.0 = Release|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Debug|Win32.Build.0 = Debug|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Release|Win32.ActiveCfg = Release|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Release|Win32.Build.0 = Release|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Debug|Win32.Build.0 = Debug|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Release|Win32.ActiveCfg = Release|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Release|Win32.Build.0 = Release|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Debug|Win32.ActiveCfg = Debug|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Debug|Win32.Build.0 = Debug|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Release|Win32.ActiveCfg = Release|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Release|Win32.Build.0 = Release|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Debug|Win32.Build.0 = Debug|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Release|Win32.ActiveCfg = Release|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Release|Win32.Build.0 = Release|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Debug|Win32.Build.0 = Debug|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Release|Win32.ActiveCfg = Release|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Release|Win32.Build.0 = Release|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Debug|Win32.Build.0 = Debug|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Release|Win32.ActiveCfg = Release|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Release|Win32.Build.0 = Release|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Debug|Win32.Build.0 = Debug|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Release|Win32.ActiveCfg = Release|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{80ED9927-27F9-473A-802C-FB10DEB5ECC6}</ProjectGuid>
+    <RootNamespace>TTXShowCommandLine</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXShowCommandLine</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXShowCommandLine.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{e155f1a7-bb1c-4c4a-81fe-475778200096}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXShowCommandLine.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2296FB66-3FA4-4136-8252-ABECEEAC2D70}</ProjectGuid>
+    <RootNamespace>TTXViewMode</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXViewMode</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXViewMode.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXViewMode.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{207e9925-fb82-42d1-a276-7ac21274c358}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXViewMode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXViewMode.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/TTXSamples/TTXttyrec/ReadMe-ja.txt
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXttyrec/ReadMe-ja.txt	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/TTXSamples/TTXttyrec/ReadMe-ja.txt	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,41 +1,40 @@
-TTXttyrec,TTXttyplay -- \x92[\x96\x96\x89\xE6\x96ʃ\x8C\x83R\x81[\x83_\x81[/\x83v\x83\x8C\x83C\x83\x84\x81[
+TTXttyrec, TTXttyplay -- \x92[\x96\x96\x89\xE6\x96ʃ\x8C\x83R\x81[\x83_\x81[/\x83v\x83\x8C\x83C\x83\x84\x81[
 
 \x8B@\x94\:
-  TTXttyrec\x82́A\x92[\x96\x96\x82̉\xE6\x96ʕ\\x8E\xA6\x82\xF0\x98^\x89悵\x83t\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB5\x82܂\xB7\x81B
-  \x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xCCRecord\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82ƕۑ\xB6\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82\xE9\x82̂ŁA
+  TTXttyrec \x82́A\x92[\x96\x96\x82̉\xE6\x96ʕ\\x8E\xA6\x82\xF0\x98^\x89悵\x83t\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB5\x82܂\xB7\x81B
+  \x83t\x83@\x83C\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xCC TTY Record \x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82ƕۑ\xB6\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82\xE9\x82̂ŁA
   \x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肷\x82\xE9\x82Ƙ^\x89悪\x8En\x82܂\xE8\x82܂\xB7\x81B
-  \x8DēxRecord\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82Ƙ^\x89\xE6\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7\x81B
+  \x8Dēx TTY Record \x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82Ƙ^\x89\xE6\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7\x81B
 
-  \x82\xB1\x82̃o\x81[\x83W\x83\x87\x83\x93\x82ł́ATCP\x90ڑ\xB1\x88ȊO\x82ɃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̘^\x89\xE6\x82ɂ\xE0\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
-  \x82\xBD\x82\xBE\x82\xB5\x81A\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x98^\x89悷\x82邽\x82߂ɂ\xCDTera Term 4.60\x88ȍ~\x82\xAA\x95K\x97v\x82ł\xB7\x81B
-  4.60\x88ȑO\x82ł\xE0\x82\xB1\x82̃v\x83\x89\x83O\x83C\x83\x93\x82͎g\x82\xA6\x82܂\xB7\x82\xAA\x81ATCP\x90ڑ\xB1\x82̂ݑΉ\x9E\x82ƂȂ\xE8\x82܂\xB7\x81B
+  \x82\xB1\x82̃o\x81[\x83W\x83\x87\x83\x93\x82ł́ATCP \x90ڑ\xB1\x88ȊO\x82ɃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̘^\x89\xE6\x82ɂ\xE0\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
+  \x82\xBD\x82\xBE\x82\xB5\x81A\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x98^\x89悷\x82邽\x82߂ɂ\xCD Tera Term 4.60 \x88ȍ~\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+  4.60 \x88ȑO\x82ł\xE0\x82\xB1\x82̃v\x83\x89\x83O\x83C\x83\x93\x82͎g\x82\xA6\x82܂\xB7\x82\xAA\x81ATCP \x90ڑ\xB1\x82̂ݑΉ\x9E\x82ƂȂ\xE8\x82܂\xB7\x81B
   \x82\xBB\x82̏ꍇ\x81A\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x8E\x9E\x82ɘ^\x89\xE6\x82\xF0\x8Ds\x82\xC1\x82Ă\xE0\x82Ȃɂ\xE0\x8BL\x98^\x82\xB3\x82\xEA\x82܂\xB9\x82\xF1\x81B
 
-  TTXttyplay\x82́ATTXttyrec\x82ŕۑ\xB6\x82\xB3\x82ꂽ\x83f\x81[\x83^\x82\xF0\x8DĐ\xB6\x82\xB5\x82܂\xB7\x81B
-  \x83t\x83@\x83C\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xCCTtyplay\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82ƃt\x83@\x83C\x83\x8B\x91I\x91\xF0\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82\xE9\x82̂ŁA
+  TTXttyplay \x82́ATTXttyrec \x82ŕۑ\xB6\x82\xB3\x82ꂽ\x83f\x81[\x83^\x82\xF0\x8DĐ\xB6\x82\xB5\x82܂\xB7\x81B
+  \x83t\x83@\x83C\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xCC TTY Replay \x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82ƃt\x83@\x83C\x83\x8B\x91I\x91\xF0\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82\xE9\x82̂ŁA
   \x98^\x89悵\x82\xBD\x83f\x81[\x83^\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x82ƍĐ\xB6\x82\xAA\x8En\x82܂\xE8\x82܂\xB7\x81B
-  TTXttyplay\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x82ɂ́ATera Term 4.60\x88ȍ~\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+  TTXttyplay \x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x82ɂ́ATera Term 4.60 \x88ȍ~\x82\xAA\x95K\x97v\x82ł\xB7\x81B
 
-  \x82܂\xBD\x81A\x83f\x81[\x83^\x8C`\x8E\xAE\x82\xCDttyrec(http://0xcc.net/ttyrec/)\x82Ɠ\xAF\x82\xB6\x82ł\xB7\x82̂ŁA
-  TTXttyrec\x82Ř^\x89悵\x82\xBD\x83f\x81[\x83^\x82\xF0ttyplay\x82ōĐ\xB6\x82\xB5\x82\xBD\x82\xE8\x81Attyrec\x82Ř^\x89悵\x82\xBD\x83f\x81[\x83^\x82\xF0
-  TTXttyplay\x82ōĐ\xB6\x82\xB7\x82鎖\x82\xE0\x89”\\x82ł\xB7\x81B
+  \x83f\x81[\x83^\x8C`\x8E\xAE\x82\xCD ttyrec (http://0xcc.net/ttyrec/) \x82Ɠ\xAF\x82\xB6\x82ł\xB7\x82̂ŁA
+  TTXttyrec \x82Ř^\x89悵\x82\xBD\x83f\x81[\x83^\x82\xF0 ttyplay \x82ōĐ\xB6\x82\xB5\x82\xBD\x82\xE8\x81Attyrec \x82Ř^\x89悵\x82\xBD\x83f\x81[\x83^\x82\xF0
+  TTXttyplay \x82ōĐ\xB6\x82\xB7\x82鎖\x82\xE0\x89”\\x82ł\xB7\x81B
 
 \x89\xF0\x90\xE0:
-  TCP\x90ڑ\xB1\x82̒ʐM\x93\xE0\x97e\x82\xF0\x83t\x83b\x83N\x82\xB7\x82\xE9\x83T\x83\x93\x83v\x83\x8B\x83v\x83\x89\x83O\x83C\x83\x93\x82ł\xB7\x81B
-  Precv\x82\xF0\x83t\x83b\x83N\x82\xB5\x82āA\x8C\xBB\x8D݂̎\x9E\x8D\x8F\x8F\xEE\x95\xF1\x82Ǝ\xF3\x90M\x83f\x81[\x83^\x82\xF0ttyrec\x82̌`\x8E\xAE\x82Ńt\x83@\x83C\x83\x8B\x82\xC9
+  TCP \x90ڑ\xB1\x82̒ʐM\x93\xE0\x97e\x82\xF0\x83t\x83b\x83N\x82\xB7\x82\xE9\x83T\x83\x93\x83v\x83\x8B\x83v\x83\x89\x83O\x83C\x83\x93\x82ł\xB7\x81B
+  Precv \x82\xF0\x83t\x83b\x83N\x82\xB5\x82āA\x8C\xBB\x8D݂̎\x9E\x8D\x8F\x8F\xEE\x95\xF1\x82Ǝ\xF3\x90M\x83f\x81[\x83^\x82\xF0 ttyrec \x82̌`\x8E\xAE\x82Ńt\x83@\x83C\x83\x8B\x82\xC9
   \x8F\x91\x82\xAB\x8D\x9E\x82\xF1\x82ł\xA2\x82邾\x82\xAF\x82ł\xB7\x81B
-  \x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̘^\x89\xE6\x82́ATera Term 4.60\x82Œǉ\xC1\x82\xB3\x82ꂽ\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̃t\x83b\x83N\x82\xF0
+  \x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̘^\x89\xE6\x82́ATera Term 4.60 \x82Œǉ\xC1\x82\xB3\x82ꂽ\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̃t\x83b\x83N\x82\xF0
   \x97\x98\x97p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
 
-  TTXttyplay\x82́ATera Term 4.60\x82Œǉ\xC1\x82\xB3\x82ꂽ\x83\x8D\x83O\x8DĐ\xB6\x82̃t\x83b\x83N\x82𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
-  \x83\x8D\x83O\x8DĐ\xB6\x8E\x9E\x82ɂ͒ʏ\xED\x82͏\x87\x8E\x9F\x83f\x81[\x83^\x82\xF0\x93ǂݍ\x9E\x82ޏ\x8A\x82\xF0\x81AERROR_IO_PENDING\x82\xF0\x95Ԃ\xB7\x8E\x96\x82\xC9
+  TTXttyplay \x82́ATera Term 4.60 \x82Œǉ\xC1\x82\xB3\x82ꂽ\x83\x8D\x83O\x8DĐ\xB6\x82̃t\x83b\x83N\x82𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
+  \x83\x8D\x83O\x8DĐ\xB6\x8E\x9E\x82ɂ͒ʏ\xED\x82͏\x87\x8E\x9F\x83f\x81[\x83^\x82\xF0\x93ǂݍ\x9E\x82ޏ\x8A\x82\xF0\x81AERROR_IO_PENDING \x82\xF0\x95Ԃ\xB7\x8E\x96\x82\xC9
   \x82\xE6\x82\xC1\x82ăE\x83F\x83C\x83g\x82\xF0\x93\xFC\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
 
-  Windows\x82ɂ\xCD gettimeofday() \x82\xAA\x82Ȃ\xA2\x82̂ŁA\x8A֐\x94\x82\xF0\x8F\x91\x82\xAB\x8BN\x82\xB1\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
+  Windows \x82ɂ\xCD gettimeofday() \x82\xAA\x82Ȃ\xA2\x82̂ŁA\x8A֐\x94\x82\xF0\x8F\x91\x82\xAB\x8BN\x82\xB1\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
 
 \x83o\x83O:
   \x81E\x8E\x9E\x8AԐ\xB8\x93x\x82͂\xA0\x82܂\xE8\x82悭\x82\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B
-  \x81E\x8DĐ\xB6\x91\xAC\x93x\x82̕ύX\x8B@\x94\\x82̓\xAE\x8D\xEC\x82͏\xAD\x82\xB5\x89\x{182D42}\xA2\x82ł\xB7\x81B
 
 ToDo:
-  \x81E\x83\x81\x83j\x83\x85\x81[\x8D\x80\x96ړ\x99\x82\xCCUI\x82̍\x91\x8Dۉ\xBB\x82\xF0\x8Ds\x82\xA4\x81B
+  \x81E\x83\x81\x83j\x83\x85\x81[\x8D\x80\x96ړ\x99\x82\xCC UI \x82̍\x91\x8Dۉ\xBB\x82\xF0\x8Ds\x82\xA4\x81B

Modified: branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyplay.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyplay.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -20,6 +20,7 @@
 
 #define ORDER 6001
 #define ID_MENU_REPLAY 55302
+#define ID_MENU_AGAIN  55303
 
 #define BUFFSIZE 2000
 
@@ -42,6 +43,7 @@
 	BOOL enable;
 	BOOL ChangeTitle;
 	BOOL ReplaceHostDlg;
+	BOOL played;
 	HMENU FileMenu;
 	HMENU ControlMenu;
 	int maxwait;
@@ -107,6 +109,7 @@
 	pvar->enable = FALSE;
 	pvar->ChangeTitle = FALSE;
 	pvar->ReplaceHostDlg = FALSE;
+	pvar->played = FALSE;
 	gettimeofday(&(pvar->last), NULL);
 	pvar->wait.tv_sec = 0;
 	pvar->wait.tv_usec = 1;
@@ -315,6 +318,7 @@
 	if (pvar->enable) {
 		RestoreOLDTitle();
 		pvar->enable = FALSE;
+		pvar->played = TRUE;
 	}
 }
 
@@ -328,6 +332,9 @@
 		flag |= MF_GRAYED;
 	}
 	InsertMenu(pvar->FileMenu, ID_FILE_PRINT2, flag, ID_MENU_REPLAY, "TTY R&eplay");
+	if (pvar->played) {
+		InsertMenu(pvar->FileMenu, ID_FILE_PRINT2, flag, ID_MENU_AGAIN, "Replay again");
+	}
 	InsertMenu(pvar->FileMenu, ID_FILE_PRINT2, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL);
 
 //	InsertMenu(menu, ID_HELPMENU, MF_ENABLED, ID_MENU_REPLAY, "&t");
@@ -397,6 +404,16 @@
 			}
 		}
 		return 1;
+	case ID_MENU_AGAIN:
+		if (pvar->played) {
+			// Clear Buffer
+			SendMessage(hWin, WM_COMMAND, MAKELONG(ID_EDIT_CLEARBUFFER, 0), 0);
+			pvar->played = FALSE;
+			pvar->ReplaceHostDlg = TRUE;
+			// Call New-Connection dialog
+			SendMessage(hWin, WM_COMMAND, MAKELONG(ID_FILE_NEWCONNECTION, 0), 0);
+		}
+		return 1;
 	}
 	return 0;
 }

Copied: branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj (from rev 6639, trunk/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5798E37E-0428-457E-A652-EE0A75130327}</ProjectGuid>
+    <RootNamespace>TTXttyrec</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXttyrec</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>rec.$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>rec.$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="gettimeofday.c" />
+    <ClCompile Include="TTXttyrec.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="gettimeofday.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/TTXttyrec/TTXttyrec.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{83b91709-fa4b-4165-be9e-bb0b43840a4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{d0ccabca-8574-4219-b8be-8b7d7e127248}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="gettimeofday.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TTXttyrec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="gettimeofday.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj (from rev 6639, trunk/TTXSamples/ttxtest/TTXtest.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E20E276-1905-44AE-BC67-C1A1F3C42135}</ProjectGuid>
+    <RootNamespace>TTXtest</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXtest</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxtest.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj.filters (from rev 6639, trunk/TTXSamples/ttxtest/TTXtest.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/TTXSamples/ttxtest/TTXtest.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxtest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Index: branches/openssl_1_1_0/cygterm
===================================================================
--- branches/openssl_1_1_0/cygterm	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/cygterm	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/cygterm
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +1 ##
+/trunk/cygterm:6550-6639
\ No newline at end of property
Copied: branches/openssl_1_1_0/cygterm/COPYING (from rev 6639, trunk/cygterm/COPYING)
===================================================================
--- branches/openssl_1_1_0/cygterm/COPYING	                        (rev 0)
+++ branches/openssl_1_1_0/cygterm/COPYING	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Modified: branches/openssl_1_1_0/cygterm/Makefile
===================================================================
--- branches/openssl_1_1_0/cygterm/Makefile	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/cygterm/Makefile	2017-03-18 11:12:07 UTC (rev 6640)
@@ -68,4 +68,4 @@
 	rm -f $(BINDIR)/$(CFG)
 
 $(ARCHIVE) : $(SRC) $(ICO) $(CFG) $(LAUNCH_SRC) README README-j Makefile
-	tar cf - $(SRC) $(ICO) $(CFG) $(LAUNCH_SRC) README README-j Makefile | gzip > $(ARCHIVE)
+	tar cf - $(SRC) $(ICO) $(CFG) $(LAUNCH_SRC) COPYING README README-j Makefile | gzip > $(ARCHIVE)

Modified: branches/openssl_1_1_0/cygterm/README
===================================================================
--- branches/openssl_1_1_0/cygterm/README	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/cygterm/README	2017-03-18 11:12:07 UTC (rev 6640)
@@ -75,6 +75,7 @@
 
     README       -  this file
     README-j     -  original README in Japanese
+    COPYING      -  GNU General Pulic License (GPL) Version 2
     Makefile     -  MAKEFILE for installation
     cygterm.cc   -  program source code
     cygterm.cfg  -  configuration file
@@ -81,7 +82,7 @@
 
     * CygTerm is a free software distributed under the terms of the GNU
       General Public License (GPL) published by Free Software Foundation.
-      See http://www.gnu.org/copyleft/gpl.html.
+      See COPYING. (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
       Note: Any program including non-GPL program can invoke the CygTerm
             executable (cygterm.exe) and communicate with it.

Modified: branches/openssl_1_1_0/cygterm/README-j
===================================================================
--- branches/openssl_1_1_0/cygterm/README-j	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/cygterm/README-j	2017-03-18 11:12:07 UTC (rev 6640)
@@ -73,6 +73,7 @@
 
     README-j     -  $B$3$N%U%!%$%k(B
     README       -  README-j$B1QLu(B
+    COPYING      -  GNU General Public License (GPL) Version 2
     Makefile     -  $B%a%$%/%U%!%$%k(B
     cygterm.cc   -  $B%=!<%9%3!<%I(B
     cygterm.cfg  -  $B ＠ _Dj%U%!%$%k(B
@@ -79,7 +80,7 @@
 
     $B"((B Free Software Foundation $BH/9T(B GNU General Public License (GPL)
        $B$K=`5r$9$k%U%j!<%=%U%H%&%'%"$H$7$FG[I[$7$^$9!#(B
-       http://www.gnu.org/copyleft/gpl.html $B;2>H!#(B
+       COPYING $B;2>H!#(B(https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
        $BJdB-(B: $BB>%W%m%0%i%`$,(B CygTerm$B<B9T7A<0(B(cygterm.exe)$B$r5/F0$7DL?.$7$F(B
              $B;HMQ$9$k$3$H$O!"$=$l$,Hs(BGPL$B%W%m%0%i%`$N>l9g$G$b5v2D$5$l$^$9!#(B

Modified: branches/openssl_1_1_0/doc/convtext.bat
===================================================================
--- branches/openssl_1_1_0/doc/convtext.bat	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/convtext.bat	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,3 +1,5 @@
+perl ..\installer\2sjis.pl --i ..\libs\oniguruma\COPYING --o en\html\reference\Oniguruma-LICENSE.txt --c euc-jp --l unix
+perl ..\installer\2sjis.pl --i ..\libs\oniguruma\COPYING --o ja\html\reference\Oniguruma-LICENSE.txt --c euc-jp --l unix
 perl ..\installer\2sjis.pl --i ..\libs\oniguruma\doc\RE    --o en\html\reference\RE.txt --c euc-jp --l unix
 perl ..\installer\2sjis.pl --i ..\libs\oniguruma\doc\RE.ja --o ja\html\reference\RE.txt --c euc-jp --l unix
 perl ..\installer\2sjis.pl --i ..\libs\openssl\LICENSE  --o en\html\reference\OpenSSL-LICENSE.txt --c euc-jp --l unix
@@ -4,3 +6,7 @@
 perl ..\installer\2sjis.pl --i ..\libs\openssl\LICENSE  --o ja\html\reference\OpenSSL-LICENSE.txt --c euc-jp --l unix
 perl ..\installer\2sjis.pl --i ..\libs\putty\LICENCE  --o en\html\reference\PuTTY-LICENSE.txt --c shiftjis --l crlf
 perl ..\installer\2sjis.pl --i ..\libs\putty\LICENCE  --o ja\html\reference\PuTTY-LICENSE.txt --c shiftjis --l crlf
+perl ..\installer\2sjis.pl --i ..\libs\SFMT\LICENSE.txt --o en\html\reference\SFMT-LICENSE.txt --c shiftjis --l unix
+perl ..\installer\2sjis.pl --i ..\libs\SFMT\LICENSE.txt --o ja\html\reference\SFMT-LICENSE.txt --c shiftjis --l unix
+perl ..\installer\2sjis.pl --i ..\cygterm\COPYING  --o en\html\reference\CygTerm+-LICENSE.txt --c shiftjis --l unix
+perl ..\installer\2sjis.pl --i ..\cygterm\COPYING  --o ja\html\reference\CygTerm+-LICENSE.txt --c shiftjis --l unix

Modified: branches/openssl_1_1_0/doc/en/html/about/copyright.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/copyright.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/copyright.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -31,7 +31,7 @@
 <h3><A NAME="license_teraterm">License</A></h3>
 <pre>
 Copyright (C) 1994-1998 T. Teranishi
-(C) 2004-2016 TeraTerm Project
+(C) 2004-2017 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -118,7 +118,7 @@
 <h3><A NAME="license_ttssh">License</A></h3>
 <pre>
 (C)1998-2001 Robert O'Callahan
-(C) 2004-2016 TeraTerm Project
+(C) 2004-2017 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -148,12 +148,12 @@
   This program is freeware. TTSSH is licensed under BSD style license.
 
   Copyright of original TTSSH belongs to Robert O'Callahan.
-  Copyright of TTSSH supporing SSH2 belongs to Yutaka Hirata.
+  Copyright of TTSSH supporting SSH2 belongs to Yutaka Hirata.
   Copyright of OpenSSL belongs to OpenSSL project.
     OpenSSL is linked to this program statically.
   Copyright of zlib belongs to Greg Roelofs and Jean-loup Gaill.
     zlib is linked to this program statically.
-  Copyright of OpenSSH belongs to each developers. Please see OpenSSH-LICENCE.txt for more information.
+  Copyright of OpenSSH belongs to each developers. Please see OpenSSH-LICENSE.txt for more information.
     This program uses the source code of OpenSSH.
   Copyright of PuTTY belongs to Simon Tatham.
     This program uses the source code of PuTTY.

Modified: branches/openssl_1_1_0/doc/en/html/about/ctrlseq.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/ctrlseq.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/ctrlseq.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -78,7 +78,7 @@
 <tr><td>0x98</td>	<td> ESC X </td>	<td> SOS </td>	<td> Start of string. Introduces a <a href="#SOS">SOS Sequence</a>. </td></tr>
 <tr><td>0x99</td>	<td> </td>	<td> SGCI </td>	<td></td></tr>
 <tr><td>0x9a</td>	<td> </td>	<td> SCI </td>	<td></td></tr>
-<tr><td>0x9b</td>	<td> ESC [ </td>	<td> CSI </td>	<td> Contros Sequence Introducer. Intruduces a <a href="#CSI">CSI Sequence</a>. </td></tr>
+<tr><td>0x9b</td>	<td> ESC [ </td>	<td> CSI </td>	<td> Control Sequence Introducer. Introduces a <a href="#CSI">CSI Sequence</a>. </td></tr>
 <tr><td>0x9c</td>	<td> ESC \ </td>	<td> ST  </td>	<td> String terminator. Ends a DCS, SOS, OSC, PM and APC sequence. </td></tr>
 <tr><td>0x9d</td>	<td> ESC ] </td>	<td> OSC </td>	<td> Operating System Command. Introduces a <a href="#OSC">OSC Sequence</a>. </td></tr>
 <tr><td>0x9e</td>	<td> ESC ^ </td>	<td> PM  </td>	<td> Privacy Message. Introduces a <a href="#PM">PM Sequence</a>. </td></tr>
@@ -160,7 +160,7 @@
    = 2      Erase the complete of line.
 </pre>
 </td></tr>
-<tr><td>CSI <i>Ps</i> L</td>	<td>IL</td>	<td> Inserts <i>Ps</i> lines, stgarting at the cursor. The default value of <i>Ps</i> is 1. </td></tr>
+<tr><td>CSI <i>Ps</i> L</td>	<td>IL</td>	<td> Inserts <i>Ps</i> lines, starting at the cursor. The default value of <i>Ps</i> is 1. </td></tr>
 <tr><td>CSI <i>Ps</i> M</td>	<td>DL</td>	<td> Deletes <i>Ps</i> lines in the scrolling region, starting with the line that has the cursor. The default value of <i>Ps</i> is 1. </td></tr>
 <tr><td>CSI <i>Ps</i> P</td>	<td>DCH</td>	<td> Deletes <i>Ps</i> characters from the cursor position to the right. The default value of <i>Ps</i> is 1. </td></tr>
 <tr><td>CSI <i>Ps</i> S</td>	<td>SU</td>	<td> Scroll up <i>Ps</i> lines. The default value of <i>Ps</i> is 1. </td></tr>
@@ -586,11 +586,11 @@
 	<td> 6 </td>
 	<td> DECOM </td>
 	<td> Enable origin mode.<br>
-             - The home cursor position is at the upper-left corner of ther screen, with in the margins.<br>
+             - The home cursor position is at the upper-left corner of the screen, with in the margins.<br>
              - The starting point for line numbers depends on the current top margin setting.<br>
              - The cursor <em>cannot</em> move outside of the margins.</td>
 	<td> Disables origin mode.<br>
-             - The home cursor position is at the upper-left corner of ther screen.<br>
+             - The home cursor position is at the upper-left corner of the screen.<br>
              - The starting point for line numbers independent of the margins.<br>
              - The cursor <em>can</em> move outside of the margins.</td>
     </tr>
@@ -663,8 +663,8 @@
     <tr>
 	<td> 69 </td>
 	<td> DECLRMM </td>
-	<td> Enable left and right margins. DECSLRM can set marings. SCP cannot save cursor position.</td>
-	<td> Disable left and right margins. DECSLRM cannot set marings. SCP can save cursor position.</td>
+	<td> Enable left and right margins. DECSLRM can set margins. SCP cannot save cursor position.</td>
+	<td> Disable left and right margins. DECSLRM cannot set margins. SCP can save cursor position.</td>
     </tr>
     <tr>
 	<td> 1000 </td>
@@ -766,7 +766,7 @@
 <tr><td> 4</td>		<td>Underlined</td></tr>
 <tr><td> 5</td>		<td>Blink</td></tr>
 <tr><td> 7</td>		<td>Inverse</td></tr>
-<tr><td>22</td>		<td>Normal (neigher bold nor faint)</td></tr>
+<tr><td>22</td>		<td>Normal (neither bold nor faint)</td></tr>
 <tr><td>24</td>		<td>Not underlined</td></tr>
 <tr><td>25</td>		<td>Steady (not blinking)</td></tr>
 <tr><td>27</td>		<td>Positive (not inverse)</td></tr>
@@ -842,7 +842,7 @@
 <i>Pt</i>         Key definition.
 </pre -->
 </td></tr>
-<tr><td>DCS ! { <i>Pt</i> ST </td> <td>DECSTUI</td> <td>Change <a href="../setup/teraterm-term.html#TerminalUID">Terminal Unique ID</a> to <i>Pt</i>. DECSTUI works only when <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> LockUID setting is off.</td>
+<tr><td>DCS ! { <i>Pt</i> ST </td> <td>DECSTUI</td> <td>Change <a href="../setup/teraterm-term.html#TerminalUID">Terminal Unique ID</a> to <i>Pt</i>. DECSTUI works only when <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> LockTUID setting is off.</td>
 <tr><td>DCS $ q <i>Pt</i> ST</td>       <td>DECRQSS</td>        <td>Request selection or setting.
 <pre>
 <i>Pt</i>: the setting that the host asks about.

Modified: branches/openssl_1_1_0/doc/en/html/about/difference.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/difference.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/difference.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -76,7 +76,7 @@
 <tr>
 	<td>Linked library</td>
 	<td>SSLeay, zlib</td>
-	<td>OpenSSL, zlib, Oniguruma, PuTTY</td>
+	<td>OpenSSL(used as the encryption library, but not used as TLS)<br />zlib<br />Oniguruma<br />PuTTY(used for cooperation with Pageant, but not used for SSH communication)</td>
 </tr>
 
 <tr>
@@ -190,7 +190,7 @@
 <tr>
 	<td>Proxy</td>
 	<td>No</td>
-	<td>Yes[*9](HTTP, TELNET, SOCKS4, SOCKS5, SSL, HTTP+SSL, TELNET+SSL, SOCKS4+SSL, SOCKS5+SSL)</td>
+	<td>Yes[*9](HTTP, TELNET, SOCKS4, SOCKS5)</td>
 </tr>
 
 <tr>
@@ -222,7 +222,7 @@
 <ul>
   <li>ANSI color change and continued-line copy.</li>
   <li>Changing mouse cursor type.</li>
-  <li>Adding a comment to loggin file.</li>
+  <li>Adding a comment to logging file.</li>
   <li>Broadcast command feature.</li>
   <li>Selecting all buffer.</li>
   <li>Extend the maximum length of the host name.</li>

Modified: branches/openssl_1_1_0/doc/en/html/about/foreword.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/foreword.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/foreword.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -28,7 +28,7 @@
 </p>
 
 <p>
-Tera Term, pronounced as `tera ta-mu' and also known by the abbreviation `TT'
+Tera Term, <!-- pronounced as `tera ta-mu' and -->also known by the abbreviation `TT'
 was created in 1994 in Japan. The original author of the Tera Term was
 Takashi Teranishi. He was the one who put in place the "backbone" off the
 application that allows to develop it further today - over decade later. 

Modified: branches/openssl_1_1_0/doc/en/html/about/history.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/history.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/history.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -31,6 +31,39 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.94">2017.02.28 (Ver 4.94)</a></h3>
+<ul class="history">
+  <li>Changes
+    <ul>
+      <li>added `&amp;u' parameter to log file name that can convert the logon user name.</li>
+      <li>added new line normalization on pasting. The default is off.
+        <ul>
+          <li>This feature can be enabled on Copy and Paste tab of <a href="../menu/setup-additional.html#NormalizeLineBreak">Additional settings dialog</a>.</li>
+        </ul></li>
+      <li>added the <a href="../macro/command/setflowctrl.html">setflowctrl</a> command.</li>
+    </ul>
+  </li>
+
+  <li>Bug fixes
+    <ul>
+      <li>When Restore setup is called, the AlphaBlend can not be restored immediately.</li>
+      <li>When Paste&lt;CR&gt; works, the end of data will be added invalid character.</li>
+      <li>When Kanji(receive) is set to UTF-8, garbled characters will be shown after invalid byte characters are received.</li>
+    </ul>
+  </li>
+
+  <li>Misc
+    <ul>
+      <li>upgraded TTSSH to <a href="#ttssh_2.80">2.80</a></li>
+      <li>upgraded TTXttyrec Plug-in to <a href="#ttyrec_1.03">1.03</a></li>
+      <li>upgraded Oniguruma to 6.1.3.</li>
+      <li>upgraded SFMT to 1.5.</li>
+      <li>changed starting method of LogMeTT and TTLEditor installer.</li>
+    </ul>
+  </li>
+</ul>
+
+
 <h3><a name="teraterm_4.93">2016.11.30 (Ver 4.93)</a></h3>
 <ul class="history">
   <li>Changes
@@ -1117,7 +1150,7 @@
           <li>added the IMERelatedCursor in the teraterm.ini file. The default is off.</li>
         </ul></li>
       <li>added support for the motion event of xterm style mouse event tracking.</li>
-      <li>added support for the DEC Locater Mode style mouse event tracking.</li>
+      <li>added support for the DEC Locator Mode style mouse event tracking.</li>
       <li>The ttymouse can automatically setup the xterm2 to modify the response of the Secondary DA. </li>
       <li>added the "<a href="../macro/command/filetruncate.html">filetruncate</a>" macro command.</li>
       <li>added the "<a href="../macro/command/dispstr.html">dispstr</a>" macro command.</li>
@@ -2809,6 +2842,51 @@
 <h2><a name="ttssh">TTSSH</a></h2>
 
 
+<h3><a name="ttssh_2.81">2017.05.xx (Ver 2.81)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!--li>Bug fixes
+    <ul>
+      <li></li>
+    </ul>
+  </li-->
+
+  <li>Misc
+    <ul>
+      <li>upgraded PuTTY to 0.68</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h3><a name="ttssh_2.80">2017.02.28 (Ver 2.80)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <li>Bug fixes
+    <ul>
+      <li>When SCP receiving is failed, a local file is removed.</li>
+    </ul>
+  </li>
+
+  <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.2k</li>
+      <li>upgraded zlib to 1.2.11</li>
+    </ul>
+  </li>
+</ul>
+
+
 <h3><a name="ttssh_2.79">2016.11.30 (Ver 2.79)</a></h3>
 <ul class="history">
   <!-- li>Changes
@@ -4487,6 +4565,11 @@
 </ul>
 
 <h2><a name="ttyrec">TTXttyrec</a></h2>
+<h3><a name="ttyrec_1.03">2017.02.28 (Ver 1.03)</a></h3>
+<ul class="history">
+  <li>added [Replay again] entry under [File] menu that can replay again after one relaying.</li>
+</ul>
+
 <h3><a name="ttyrec_1.02">2010.2.20 (Ver 1.02)</a></h3>
 <ul class="history">
   <li>changed the default value of "RecordStartSize" to On.</li>

Modified: branches/openssl_1_1_0/doc/en/html/about/module.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/module.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/module.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -196,7 +196,7 @@
 <table>
 <tr>
  <td>author</td>
- <td>Boris Maisuradze(NeCom Ltd.)</td>
+ <td>Boris Maisuradze(NeoCom Ltd.)</td>
 </tr>
 <tr>
  <td>License&amp;Copyright</td>

Modified: branches/openssl_1_1_0/doc/en/html/about/requests.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/requests.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/requests.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -64,7 +64,7 @@
   <li>ReGIS</li>
   <li>Sixel</li>
   <li>Direct communication I/O from MACRO.</li>
-  <li>Mouse protocol(NetTerm) except xterm and DEC Locater mode.</li>
+  <li>Mouse protocol(NetTerm) except xterm and DEC Locator mode.</li>
 </ul>
 
 <h3 class="cite">Note</h3>

Modified: branches/openssl_1_1_0/doc/en/html/about/requirements.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/about/requirements.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/about/requirements.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -36,7 +36,7 @@
 NOTE2: Supporting x64 and IA-64 Windows.(by WOW64)<br>
 (*1) <a href="http://support.microsoft.com/kb/182108">Windows Sockets2.0</a> requirement<br>
 (*2) Internet Explorer 5 later requirement<br>
-(*3) LogMeTT and TTL Editor can not work.<br>
+(*3) LogMeTT and TTLEditor can not work.<br>
 (*4) <a href="http://support.microsoft.com/kb/188081">Tahoma font</a> is recommended.
 </p>
 

Modified: branches/openssl_1_1_0/doc/en/html/commandline/teraterm.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/commandline/teraterm.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/commandline/teraterm.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -79,7 +79,12 @@
   <dd>Disable TCPLocalEcho and TCPCRSend option</dd>
 
   <dt id="es">/ES</dt>
-  <dd>Enable displaying the "New connection" dialog on startup</dd>
+  <dd>Enable displaying the "<a href="../menu/file-new.html">New connection</a>" dialog on startup<br>
+      When the port type is TCP/IP, "New connection"  dialog is shown basically. 
+      However, the dialog can be not shown when <a href="../setup/teraterm-ini.html#HostDialogOnStartup">HostDialogOnStartup</a> is off.
+      The /ES option can be forced to show the "New connection" dialog regardless of the setting. <br>
+      When the port type is Serial, the "New connection" dialog does not be shown. Also, the /ES option can not be effected.
+      </dd>
 
   <dt id="f">/F=&lt;setup file&gt;</dt>
   <dd>Setup file</a><br>

Modified: branches/openssl_1_1_0/doc/en/html/commandline/ttssh.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/commandline/ttssh.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/commandline/ttssh.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -25,7 +25,7 @@
 
   <dt id="host-url">&lt;scheme&gt;://[&lt;username&gt;[:&lt;password&gt;]@]&lt;host&gt;[:&lt;TCP port&gt;][/]</dt>
   <dd>A user can the URL format.<br>
-      A user can specify ssh, ssh1, ssh2, slogin, slogin1 and slogin2 at the &lt;scheem&gt;.<br>
+      A user can specify ssh, ssh1, ssh2, slogin, slogin1 and slogin2 at the &lt;scheme&gt;.<br>
       If the port number is not specified, 22 is used as the port number and then TCPPort value in teraterm.ini file is ignored.</dd>
 
   <dt id="f">/f=&lt;file&gt;</dt>
@@ -160,7 +160,7 @@
   </dd>
 
   <dt id="nosecuritywarning">/nosecuritywarning</dt>
-  <dd>supress SSH security warning. THIS OPTION PROHIBITED.</dd>
+  <dd>suppress SSH security warning. THIS OPTION PROHIBITED.</dd>
 
 </dl>
 

Modified: branches/openssl_1_1_0/doc/en/html/index.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/index.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/index.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -13,7 +13,7 @@
 
 <p class="center">
 Copyright (C) 1994-1998 T. Teranishi<BR>
-Copyright (C) 2004-2016 TeraTerm Project<BR>
+(C) 2004-2017 TeraTerm Project<BR>
 All Rights Reserved.<BR>
 </p>
 
@@ -139,6 +139,9 @@
  <LI><A HREF="reference/OpenSSL-LICENSE.txt">License of OpenSSL</A></LI>
  <LI><A HREF="reference/OpenSSH-LICENSE.txt">License of OpenSSH</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI>
+ <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI>
+ <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI>
+ <LI><A HREF="reference/CygTerm+-LICENSE.txt">License of CygTerm+</A></LI>
  <LI><A HREF="reference/develop.txt">For developer</A>
  <LI><A HREF="reference/sourcecode.html">Source Code Overview</A></LI>
 </UL>

Modified: branches/openssl_1_1_0/doc/en/html/macro/command/index.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/macro/command/index.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/macro/command/index.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -65,6 +65,7 @@
  <li><a href="setdebug.html">setdebug</a> (version 4.64 or later)
  <li><a href="setdtr.html">setdtr</a> (version 4.59 or later)
  <li><a href="setecho.html">setecho</a>
+ <li><a href="setflowctrl.html">setflowctrl</a> (version 4.94 or later)
  <li><a href="setmulticastname.html">setmulticastname</a> (version 4.62 or later)
  <li><a href="setrts.html">setrts</a> (version 4.59 or later)
  <li><a href="setsync.html">setsync</a>

Copied: branches/openssl_1_1_0/doc/en/html/macro/command/setflowctrl.html (from rev 6639, trunk/doc/en/html/macro/command/setflowctrl.html)
===================================================================
--- branches/openssl_1_1_0/doc/en/html/macro/command/setflowctrl.html	                        (rev 0)
+++ branches/openssl_1_1_0/doc/en/html/macro/command/setflowctrl.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>setflowctrl</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>setflowctrl</h1>
+
+<p>
+Causes Tera Term to change flow control. 
+</p>
+
+<pre class="macro-syntax">
+setflowctrl &lt;value&gt;
+</pre>
+
+<h2>Parameters</h2>
+
+<dl>
+	<dt class="macro">integer &lt;value&gt;</dt>
+	<dd>Set the flow control of serial port by using below flags.
+
+<table>
+ <tr>
+  <th>Value</th>
+  <th>Meaning</th>
+ </tr>
+ <tr>
+  <td>1</td>
+  <td>Xon/Xoff</td>
+ </tr>
+ <tr>
+  <td>2</td>
+  <td>hardware</td>
+ </tr>
+ <tr>
+  <td>3</td>
+  <td>none</td>
+ </tr>
+</table>
+
+	</dd>
+</dl>
+
+<h2>Example</h2>
+
+<pre class="macro-example">
+; change flow control to "none"
+setflowctrl 3
+</pre>
+
+</body>
+</html>

Modified: branches/openssl_1_1_0/doc/en/html/menu/setup-additional.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/menu/setup-additional.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/menu/setup-additional.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -190,6 +190,11 @@
 	Remove trailing new line character when pasting.
       </dd>
 
+      <dt id="NormalizeLineBreak">Normalize line break when pasting</dt>
+      <dd>
+	Normalize new line on pasting. When new line of clipboard is CR and LF, every new line is changed to CR+LF.
+      </dd>
+
       <dt id="ConfirmChangePaste">Confirm change paste</dt>
       <dd>
 	When the Clipboard includes CR/LF, the confirmation
@@ -307,6 +312,7 @@
 SYNOPSIS:
 &amp;h      Host name(or empty when not connecting)
 &amp;p      TCP port number(or empty when not connecting, not TCP connection)
+&amp;u      Logon user name
 %a      Abbreviated weekday name
 %A      Full weekday name
 %b      Abbreviated month name

Index: branches/openssl_1_1_0/doc/en/html/reference
===================================================================
--- branches/openssl_1_1_0/doc/en/html/reference	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/reference	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/doc/en/html/reference
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,6 ##
 OpenSSL-LICENSE.txt
 PuTTY-LICENSE.txt
+Oniguruma-LICENSE.txt
+SFMT-LICENSE.txt
+CygTerm+-LICENSE.txt
 RE.txt
Modified: branches/openssl_1_1_0/doc/en/html/reference/develop.txt
===================================================================
--- branches/openssl_1_1_0/doc/en/html/reference/develop.txt	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/reference/develop.txt	2017-03-18 11:12:07 UTC (rev 6640)
@@ -20,6 +20,8 @@
    Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
 -- Visual Studio Community 2015 Update 3
    Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+-- Visual Studio Community 2017 
+   Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
 -- How to build with batch file
    Please execute the batch file on command prompt of Visual Studio. Otherwise, please configure 
    below environment variables.
@@ -43,10 +45,10 @@
 
 
 * Libraries
-- Oniguruma 6.1.2 (https://github.com/kkos/oniguruma)
+- Oniguruma 6.1.3 (https://github.com/kkos/oniguruma)
 - OpenSSL 1.1.0e (http://www.openssl.org/)
-- zlib 1.2.8 (http://www.zlib.net/)
-- PuTTY 0.67 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
+- zlib 1.2.11 (http://www.zlib.net/)
+- PuTTY 0.68 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
 
 * Notice for SVN commiter
@@ -125,7 +127,7 @@
   2. Oniguruma (used by Tera Term Macro)
      (1) Extract oniguruma source into libs/oniguruma directory.
      (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-     (3) Move 'libs' directory on the command prompt. And run buildoniguruma.bat.
+     (3) Move 'libs' directory on the command prompt. And run buildoniguruma6.bat.
 
   3. OpenSSL (used by TTSSH)
      (1) Extract openssl source into libs/openssl directory.

Modified: branches/openssl_1_1_0/doc/en/html/setup/teraterm-ini.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/setup/teraterm-ini.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/setup/teraterm-ini.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -902,6 +902,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="NormalizeLineBreak"><a href="../menu/setup-additional.html#NormalizeLineBreak">NormalizeLineBreak</a></td>
+		<td style="width:250px;">off</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="Parity"><a href="../menu/setup-serialport.html#BaudRate">Parity</a></td>
 		<td style="width:250px;">none</td>
 		<td style="width:250px;">&lt;-</td>

Modified: branches/openssl_1_1_0/doc/en/html/setup/teraterm-misc.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/setup/teraterm-misc.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/setup/teraterm-misc.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -106,7 +106,7 @@
 <h1><a name="hostdlg">Showing "New Connection" dialog on startup</a></h1>
 
 <p>
-Tera Term shows "New Connection" dialog on startup.<br>
+Tera Term shows "New Connection" dialog on startup when the port type is TCP/IP. (The dialog is not shown when the port type is Serial). <br>
 If you do not want to show this dialog, please change HostDialogOnStartup entry of [Tera Term] section as follows.
 </p>
 

Modified: branches/openssl_1_1_0/doc/en/html/usage/tips/vim.html
===================================================================
--- branches/openssl_1_1_0/doc/en/html/usage/tips/vim.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/html/usage/tips/vim.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -63,6 +63,11 @@
 
 
 <h2><a name="Bracketed">Auto indent can be disabled on pasting from clipboard</a></h2>
+<p class="notice">
+NOTE: When text is pasted by using Vim 8.0.0238 or later , auto indent and completion are disabled not below configuration becasue the vim editor supports Bracketed Paste Mode. <br>
+However, when tmux is used, below configuration is needed because Bracketed Paste Mode is not enabled.
+</p>
+
 <p>
 Basically, the host application can not recognize the difference between the user input and pasting from clipboard.
 However, when a user uses the Bracketed Paste Mode as the xterm extension, the application can recognize its difference and a user can change the behavior of pasting from clipboard.
@@ -73,20 +78,41 @@
 </p>
 
 <pre class="macro-example">
-if &amp;term =~ "xterm"
-    let &amp;t_ti .= "\e[?2004h"
-    let &amp;t_te .= "\e[?2004l"
-    let &amp;pastetoggle = "\e[201~"
+if has("patch-8.0.0238")
+    " When below configuration is not set by using Bracketed Paste Mode supporting version(8.0.0238 or later),
+    " the Bracketed Paste Mode is used while TERM is xterm.
+    " When tmux is used, below configuration is needed because TERM is screen.
+    if &amp;term =~ "screen"
+        let &amp;t_BE = "\e[?2004h"
+        let &amp;t_BD = "\e[?2004l"
+        exec "set t_PS=\e[200~"
+        exec "set t_PE=\e[201~"
+    endif
+else
+    " The Bracketed Paste Mode motion of Vim core will not work well, 
+    " auto indent does not become to disabling, with Vim from 8.0.0210 to 8.0.0237 version.
+    " So, Vim core function is disabled.
+    if has("patch-8.0.0210")
+        set t_BE=
+    endif
 
-    function XTermPasteBegin(ret)
-        set paste
-        return a:ret
-    endfunction
+    " When Vim core does not support Bracketed Paste Mode, below configuration works.
+    if &amp;term =~ "xterm" || &amp;term =~ "screen"
+        let &amp;t_ti .= "\e[?2004h"
+        let &amp;t_te .= "\e[?2004l"
 
-    noremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("0i")
-    inoremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("")
-    cnoremap &lt;special&gt; &lt;Esc&gt;[200~ &lt;nop&gt;
-    cnoremap &lt;special&gt; &lt;Esc&gt;[201~ &lt;nop&gt;
+        function XTermPasteBegin(ret)
+            set pastetoggle=&lt;Esc&gt;[201~
+            set paste
+            return a:ret
+        endfunction
+
+        noremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("0i")
+        inoremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("")
+        vnoremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("c")
+        cnoremap &lt;special&gt; &lt;Esc&gt;[200~ &lt;nop&gt;
+        cnoremap &lt;special&gt; &lt;Esc&gt;[201~ &lt;nop&gt;
+    endif
 endif
 </pre>
 
@@ -99,9 +125,9 @@
 if &amp;term =~ "xterm"
     let &amp;t_SI .= "\e[?2004h"
     let &amp;t_EI .= "\e[?2004l"
-    let &amp;pastetoggle = "\e[201~"
 
     function XTermPasteBegin(ret)
+        set pastetoggle=&lt;Esc&gt;[201~
         set paste
         return a:ret
     endfunction

Modified: branches/openssl_1_1_0/doc/en/teraterm.hhc
===================================================================
--- branches/openssl_1_1_0/doc/en/teraterm.hhc	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/teraterm.hhc	2017-03-18 11:12:07 UTC (rev 6640)
@@ -556,6 +556,21 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License of Oniguruma">
+			<param name="Local" value="html\reference\Oniguruma-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License of SFMT">
+			<param name="Local" value="html\reference\SFMT-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License of CygTerm+">
+			<param name="Local" value="html\reference\CygTerm+-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="For developer">
 			<param name="Local" value="html\reference\develop.txt">
 			<param name="ImageNumber" value="11">
@@ -872,6 +887,11 @@
 					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="setflowctrl">
+					<param name="Local" value="html\macro\command\setflowctrl.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="setmulticastname">
 					<param name="Local" value="html\macro\command\setmulticastname.html">
 					<param name="ImageNumber" value="11">

Modified: branches/openssl_1_1_0/doc/en/teraterm.hhp
===================================================================
--- branches/openssl_1_1_0/doc/en/teraterm.hhp	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/en/teraterm.hhp	2017-03-18 11:12:07 UTC (rev 6640)
@@ -140,6 +140,11 @@
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
 HlpRefDev=html\reference\develop.txt
+HlpRefPutty=html\reference\PuTTY-LICENSE.txt
+HlpRefSource=html\reference\sourcecode.html
+HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt
+HlpRefSFMT=html\reference\SFMT-LICENSE.txt
+HlpRefCygterm=html\reference\CygTerm+-LICENSE.txt
 HlpMacro=html\macro\index.html
 HlpMacroExec=html\macro\howtorun.html
 HlpMacroCommandline=html\macro\commandline.html
@@ -282,7 +287,6 @@
 HlpMacroCommandSendln=html\macro\command\sendln.html
 HlpMacroCommandSendlnbroadcast=html\macro\command\sendlnbroadcast.html
 HlpMacroCommandSendmulticast=html\macro\command\sendmulticast.html
-HlpMacroCommandSetPassword=html\macro\command\setpassword.html
 HlpMacroCommandSetdate=html\macro\command\setdate.html
 HlpMacroCommandSetdir=html\macro\command\setdir.html
 HlpMacroCommandSetdlgpos=html\macro\command\setdlgpos.html
@@ -293,7 +297,9 @@
 HlpMacroCommandSetenv=html\macro\command\setenv.html
 HlpMacroCommandSetexitcode=html\macro\command\setexitcode.html
 HlpMacroCommandSetfileattr=html\macro\command\setfileattr.html
+HlpMacroCommandSetflowctrl=html\macro\command\setflowctrl.html
 HlpMacroCommandSetMulticastName=html\macro\command\setmulticastname.html
+HlpMacroCommandSetPassword=html\macro\command\setpassword.html
 HlpMacroCommandSetrts=html\macro\command\setrts.html
 HlpMacroCommandSetsync=html\macro\command\setsync.html
 HlpMacroCommandSettime=html\macro\command\settime.html

Modified: branches/openssl_1_1_0/doc/ja/html/about/copyright.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/about/copyright.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/about/copyright.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -31,7 +31,7 @@
 <h3><A NAME="license_teraterm">\x83\x89\x83C\x83Z\x83\x93\x83X</A></h3>
 <pre>
 Copyright (C) 1994-1998 T. Teranishi
-(C) 2004-2016 TeraTerm Project
+(C) 2004-2017 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -111,7 +111,7 @@
 <h3><A NAME="license_ttssh">\x83\x89\x83C\x83Z\x83\x93\x83X</A></h3>
 <pre>
 (C)1998-2001 Robert O'Callahan
-(C) 2004-2016 TeraTerm Project
+(C) 2004-2017 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -146,7 +146,7 @@
     \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́AOpenSSL\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
   zlib\x82\xCDGreg Roelofs\x82\xC6Jean-loup Gailly\x8E\x81\x82̒\x98\x8D앨\x82ł\xB7\x81B
     \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́Azlib\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
-  OpenSSH\x82̒\x98\x8D쌠\x82́A\x8Ae\x8AJ\x94\xAD\x8E҂ɂ\xA0\x82\xE8\x82܂\xB7\x81B\x8Fڂ\xB5\x82\xAD\x82͓\xAF\x8D\xAB\x82\xCCOpenSSH-LICENCE.txt\x82\xF0\x82\xB2\x97\x97\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+  OpenSSH\x82̒\x98\x8D쌠\x82́A\x8Ae\x8AJ\x94\xAD\x8E҂ɂ\xA0\x82\xE8\x82܂\xB7\x81B\x8Fڂ\xB5\x82\xAD\x82͓\xAF\x8D\xAB\x82\xCCOpenSSH-LICENSE.txt\x82\xF0\x82\xB2\x97\x97\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
     \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́AOpenSSH\x82̃\\x81[\x83X\x83R\x81[\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
   PuTTY\x82\xCDSimon Tatham\x8E\x81\x82̒\x98\x8D앨\x82ł\xB7\x81B
     \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́APuTTY\x82̃\\x81[\x83X\x83R\x81[\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B

Modified: branches/openssl_1_1_0/doc/ja/html/about/difference.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/about/difference.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/about/difference.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -76,7 +76,7 @@
 <tr>
 	<td>\x83\x8A\x83\x93\x83N\x83\x89\x83C\x83u\x83\x89\x83\x8A</td>
 	<td>SSLeay, zlib</td>
-	<td>OpenSSL, zlib, Oniguruma, PuTTY</td>
+	<td>OpenSSL(\x88Í\x86\x89\xBB\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82Ƃ\xB5\x82Ďg\x97p\x81BTLS\x82̂\xBD\x82߂ɂ͎g\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2)<br />zlib<br />Oniguruma<br />PuTTY(Pageant\x82Ƃ̘A\x8Cg\x82̂\xBD\x82߂Ɏg\x97p\x81BSSH\x92ʐM\x82̂\xBD\x82߂ɂ͎g\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2)</td>
 </tr>
 
 <tr>
@@ -190,7 +190,7 @@
 <tr>
 	<td>\x83v\x83\x8D\x83L\x83V</td>
 	<td>No</td>
-	<td>Yes[*9](HTTP, TELNET, SOCKS4, SOCKS5, SSL, HTTP+SSL, TELNET+SSL, SOCKS4+SSL, SOCKS5+SSL)</td>
+	<td>Yes[*9](HTTP, TELNET, SOCKS4, SOCKS5)</td>
 </tr>
 
 <tr>

Modified: branches/openssl_1_1_0/doc/ja/html/about/history.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/about/history.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/about/history.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -31,6 +31,39 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.94">2017.02.28 (Ver 4.94)</a></h3>
+<ul class="history">
+  <li>\x95ύX
+    <ul>
+      <li>\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x92\x86\x82\xCC &amp;u \x82\xF0\x81A\x83\x8D\x83O\x83I\x83\x93\x92\x86\x82̃\x86\x81[\x83U\x96\xBC\x82ɕϊ\xB7\x82\xB7\x82\xE9\x8B@\x94\\x82\xF0\x92ǉ\xC1\x82\xB5\x82\xBD\x81B</li>
+      <li>\x93\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82ɉ\xFC\x8Ds\x82𐳋K\x89\xBB\x82\xB7\x82\xE9\x8B@\x94\\x82\xF0\x92ǉ\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82ł͖\xB3\x8C\xF8\x81B
+        <ul>
+          <li><a href="../menu/setup-additional.html#NormalizeLineBreak">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCCopy and Paste \x83^\x83u\x82Őݒ\xE8\x82\xF0\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+        </ul></li>
+      <li><a href="../macro/command/setflowctrl.html">setflowctrl</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xF0\x92ǉ\xC1\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>Restore setup\x82\xC5AlphaBlend\x82\xAA\x91\xA6\x8E\x9E\x94\xBD\x89f\x82\xB3\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x93\\x82\xE8\x95t\x82\xAF&lt;CR&gt;\x82ŁA\x83f\x81[\x83^\x82̖\x96\x94\xF6\x82ɃS\x83~\x82\xAA\x95t\x82\xAD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x82\xAA UTF-8 \x90ݒ\xE8\x82̎\x9E\x82ɁAUTF-8 \x82Ƃ\xB5\x82Ă͐\xB3\x82\xB5\x82\xAD\x82Ȃ\xA2\x89\xF3\x82ꂽ\x83o\x83C\x83g\x97\xF1\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xBD\x8C\xE3\x82ɕ\xB6\x8E\x9A\x89\xBB\x82\xAF\x82\xAA\x8BN\x82\xAB\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li><a href="#ttssh_2.80">TTSSH(2.80)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+      <li><a href="#ttyrec_1.03">TTXttyrec Plugin(1.03)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+      <li>Oniguruma 6.1.3\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD</li>
+      <li>SFMT 1.5\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD</li>
+      <li>LogMeTT, TTLEditor \x82̃C\x83\x93\x83X\x83g\x81[\x83\x89\x82̋N\x93\xAE\x95\xFB\x96@\x82\xF0\x95ύX\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
+
 <h3><a name="teraterm_4.93">2016.11.30 (Ver 4.93)</a></h3>
 <ul class="history">
   <li>\x95ύX
@@ -2814,6 +2847,51 @@
 <h2><a name="ttssh">TTSSH</a></h2>
 
 
+<h3><a name="ttssh_2.81">2017.05.xx (Ver 2.81)</a></h3>
+<ul class="history">
+  <!-- li>\x95ύX
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!--li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li></li>
+    </ul>
+  </li-->
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>PuTTY 0.68 \x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h3><a name="ttssh_2.80">2017.02.28 (Ver 2.80)</a></h3>
+<ul class="history">
+  <!-- li>\x95ύX
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>SCP\x82ɂ\xE6\x82\xE9\x83t\x83@\x83C\x83\x8B\x8E\xF3\x90M\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x81A\x83\x8D\x81[\x83J\x83\x8B\x83t\x83@\x83C\x83\x8B\x82̎c\x8A[\x82\xF0\x8D폜\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>OpenSSL 1.0.2k\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD</li>
+      <li>zlib 1.2.11\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD</li>
+    </ul>
+  </li>
+</ul>
+
+
 <h3><a name="ttssh_2.79">2016.11.30 (Ver 2.79)</a></h3>
 <ul class="history">
   <!-- li>\x95ύX
@@ -4493,6 +4571,11 @@
 </ul>
 
 <h2><a name="ttyrec">TTXttyrec</a></h2>
+<h3><a name="ttyrec_1.03">2017.02.28 (Ver 1.03)</a></h3>
+<ul class="history">
+  <li>\x8DĐ\xB6\x8FI\x97\xB9\x8C\xE3\x81A\x8Dēx\x8DĐ\xB6\x82\xB7\x82\xE9\x88ׂ\xCC [Replay again] \x82\xF0 [File] \x83\x81\x83j\x83\x85\x81[\x82ɒǉ\xC1\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+</ul>
+
 <h3><a name="ttyrec_1.02">2010.2.20 (Ver 1.02)</a></h3>
 <ul class="history">
   <li>teraterm.ini \x82\xCC RecordStartSize \x83G\x83\x93\x83g\x83\x8A\x82̃f\x83t\x83H\x83\x8B\x83g\x82\xF0 on \x82ɕύX\x82\xB5\x82\xBD\x81B</li>

Modified: branches/openssl_1_1_0/doc/ja/html/about/module.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/about/module.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/about/module.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -195,7 +195,7 @@
 <table>
 <tr>
  <td>\x8AJ\x94\xAD\x8E\xD2</td>
- <td>Boris Maisuradze(NeCom Ltd.)</td>
+ <td>Boris Maisuradze(NeoCom Ltd.)</td>
 </tr>
 <tr>
  <td>\x83\x89\x83C\x83Z\x83\x93\x83X\x81E\x92\x98\x8D쌠\x93\x99</td>

Modified: branches/openssl_1_1_0/doc/ja/html/about/requirements.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/about/requirements.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/about/requirements.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -11,7 +11,7 @@
 
 <h1>\x93\xAE\x8D\xEC\x8A‹\xAB</h1>
 
-<p>Trea Term \x82͈ȉ\xBA\x82\xCC OS \x82œ\xAE\x8D삵\x82܂\xB7\x81B</p>
+<p>Tera Term \x82͈ȉ\xBA\x82\xCC OS \x82œ\xAE\x8D삵\x82܂\xB7\x81B</p>
 
 <ul class="no-marker">
   <li>Microsoft Windows 95 (*1) (*2) (*3) (*4)</li>
@@ -36,7 +36,7 @@
 \x92\x8D2: x64 \x82\xA8\x82\xE6\x82\xD1 IA-64 Windows \x82\xE0\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B(WOW64 \x82ɂ\xE6\x82\xE9)<br>
 (*1) <a href="http://support.microsoft.com/kb/182108">Windows Sockets2.0</a> \x82\xAA\x95K\x97v\x82ł\xB7\x81B<br>
 (*2) Internet Explorer 5 \x88ȏオ\x95K\x97v\x82ł\xB7\x81B<br>
-(*3) LogMeTT, TTL Editor \x82͓\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br>
+(*3) LogMeTT, TTLEditor \x82͓\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br>
 (*4) <a href="http://support.microsoft.com/kb/188081">Tahoma \x83t\x83H\x83\x93\x83g</a>\x82̃C\x83\x93\x83X\x83g\x81[\x83\x8B\x82𐄏\xA7\x82\xB5\x82܂\xB7\x81B
 </p>
 

Modified: branches/openssl_1_1_0/doc/ja/html/commandline/teraterm.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/commandline/teraterm.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/commandline/teraterm.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -86,7 +86,9 @@
   <dd>TCPLocalEcho/TCPCRSend \x82̐ݒ\xE8\x82𖳌\xF8\x82ɂ\xB7\x82\xE9</dd>
 
   <dt id="es">/ES</dt>
-  <dd>\x8BN\x93\xAE\x8E\x9E\x82\xC9 "New connection" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9</dd>
+  <dd>\x8BN\x93\xAE\x8E\x9E\x82\xC9 "<a href="../menu/file-new.html">New connection</a>" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9<br>
+      Tera Term \x82̓|\x81[\x83g\x82̎\xED\x97ނ\xAA TCP/IP \x82̏ꍇ\x82\xC9 "New connection" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x82\xAA\x81A<a href="../setup/teraterm-ini.html#HostDialogOnStartup">HostDialogOnStartup</a> \x82\xF0 off \x82ɂ\xB7\x82邱\x82ƂŃ_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂł\xAB\x82܂\xB7\x81B/ES \x83I\x83v\x83V\x83\x87\x83\x93\x82\xCD HostDialogOnStartup \x82\xAA off \x82ɂȂ\xC1\x82Ă\xA2\x82Ă\xE0 "New connection" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB3\x82\xB9\x82邽\x82߂ɗp\x82\xA2\x82܂\xB7\x81B<br>
+      Tera Term \x82̓|\x81[\x83g\x82̎\xED\x97ނ\xAA Serial \x82̏ꍇ\x82ɂ\xCD "New connection" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB9\x82\xF1\x81B\x83|\x81[\x83g\x82̎\xED\x97ނ\xAA Serial \x82̏ꍇ\x82\xC9 /ES \x83I\x83v\x83V\x83\x87\x83\x93\x82͂Ȃɂ\xE0\x8D\xEC\x97p\x82\xB5\x82܂\xB9\x82\xF1\x81B</dd>
 
   <dt id="f">/F=&lt;setup file&gt;</dt>
   <dd>\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B<br>

Modified: branches/openssl_1_1_0/doc/ja/html/commandline/ttssh.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/commandline/ttssh.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/commandline/ttssh.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -25,7 +25,7 @@
 
   <dt id="host-url">&lt;scheme&gt;://[&lt;username&gt;[:&lt;password&gt;]@]&lt;host&gt;[:&lt;TCP port&gt;][/]</dt>
   <dd>URL\x8C`\x8E\xAE\x82\xE0\x8Ag\x92\xA3\x82\xB3\x82\xEA\x82܂\xB7\x81B<br>
-      &lt;scheem&gt;\x82ɂ́Assh, ssh1, ssh2, slogin, slogin1, slogin2\x82\xAA\x8Eg\x82\xA6\x82܂\xB7\x81B<br>
+      &lt;scheme&gt;\x82ɂ́Assh, ssh1, ssh2, slogin, slogin1, slogin2\x82\xAA\x8Eg\x82\xA6\x82܂\xB7\x81B<br>
       \x83|\x81[\x83g\x94ԍ\x86\x82\xAA\x8Ew\x92肳\x82\xEA\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82\xCD22\x82\xAA\x8Eg\x82\xED\x82\xEA\x82܂\xB7\x81B(\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCCTCPPort\x82̒l\x82͖\xB3\x8E\x8B\x82\xB3\x82\xEA\x82܂\xB7)</dd>
 
   <dt id="f">/f=&lt;file&gt;</dt>

Modified: branches/openssl_1_1_0/doc/ja/html/index.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/index.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/index.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -13,7 +13,7 @@
 
 <p class="center">
 Copyright (C) 1994-1998 T. Teranishi<BR>
-(C) 2004-2016 TeraTerm Project<BR>
+(C) 2004-2017 TeraTerm Project<BR>
 All Rights Reserved.<BR>
 </p>
 
@@ -139,6 +139,9 @@
  <LI><A HREF="reference/OpenSSL-LICENSE.txt">OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/OpenSSH-LICENSE.txt">OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/Oniguruma-LICENSE.txt">\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/CygTerm+-LICENSE.txt">CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A></LI>
  <LI><A HREF="reference/sourcecode.html">\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0</A></LI>
 </UL>

Modified: branches/openssl_1_1_0/doc/ja/html/macro/command/index.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/macro/command/index.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/macro/command/index.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -65,6 +65,7 @@
  <li><a href="setdebug.html">setdebug</a> (\x83o\x81[\x83W\x83\x87\x83\x93 4.64\x88ȍ~)
  <li><a href="setdtr.html">setdtr</a> (\x83o\x81[\x83W\x83\x87\x83\x93 4.59\x88ȍ~)
  <li><a href="setecho.html">setecho</a>
+ <li><a href="setflowctrl.html">setflowctrl</a> (\x83o\x81[\x83W\x83\x87\x83\x93 4.94\x88ȍ~)
  <li><a href="setmulticastname.html">setmulticastname</a> (\x83o\x81[\x83W\x83\x87\x83\x93 4.62\x88ȍ~)
  <li><a href="setrts.html">setrts</a> (\x83o\x81[\x83W\x83\x87\x83\x93 4.59\x88ȍ~)
  <li><a href="setsync.html">setsync</a>

Copied: branches/openssl_1_1_0/doc/ja/html/macro/command/setflowctrl.html (from rev 6639, trunk/doc/ja/html/macro/command/setflowctrl.html)
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/macro/command/setflowctrl.html	                        (rev 0)
+++ branches/openssl_1_1_0/doc/ja/html/macro/command/setflowctrl.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+  <title>setflowctrl</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>setflowctrl</h1>
+
+<p>
+\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̃t\x83\x8D\x81[\x90\xA7\x8C\xE4\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
+</p>
+
+<pre class="macro-syntax">
+setflowctrl &lt;value&gt;
+</pre>
+
+<h2>\x83p\x83\x89\x83\x81\x81[\x83^</h2>
+
+<dl>
+	<dt class="macro">\x90\xAE\x90\x94 &lt;value&gt;</dt>
+	<dd>\x88ȉ\xBA\x82̃t\x83\x89\x83O\x82ɂ\xE6\x82\xE8\x81A\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̃t\x83\x8D\x81[\x90\xA7\x8C\xE4\x82\xF0\x8Ew\x92肷\x82\xE9\x81B
+
+<table>
+ <tr>
+  <th>\x92l</th>
+  <th>\x88Ӗ\xA1</th>
+ </tr>
+ <tr>
+  <td>1</td>
+  <td>Xon/Xoff</td>
+ </tr>
+ <tr>
+  <td>2</td>
+  <td>hardware</td>
+ </tr>
+ <tr>
+  <td>3</td>
+  <td>none</td>
+ </tr>
+</table>
+
+	</dd>
+</dl>
+
+<h2>\x97\xE1</h2>
+
+<pre class="macro-example">
+; change flow control to "none"
+setflowctrl 3
+</pre>
+
+</body>
+</html>

Modified: branches/openssl_1_1_0/doc/ja/html/menu/setup-additional.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/menu/setup-additional.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/menu/setup-additional.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -188,6 +188,11 @@
 	\x93\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82ɖ\x96\x94\xF6\x82̉\xFC\x8Ds\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B
       </dd>
 
+      <dt id="NormalizeLineBreak">Normalize line break when pasting</dt>
+      <dd>
+	\x93\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82ɉ\xFC\x8Ds\x82𐳋K\x89\xBB\x82\xB5\x82܂\xB7\x81B\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82̓\xE0\x97e\x82̉\xFC\x8Ds\x82\xAA CR \x82\xE2 LF \x82\xBE\x82\xC1\x82\xBD\x8E\x9E\x82ɁA\x82\xB7\x82ׂ\xC4 CR+LF \x82ɕϊ\xB7\x82\xB5\x82܂\xB7\x81B
+      </dd>
+
       <dt id="ConfirmChangePaste">Confirm change paste</dt>
       <dd>
 	\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɉ\xFC\x8Ds\x83R\x81[\x83h(CR/LF)\x82\xF0\x8A܂ޏꍇ\x81A\x83}\x83E\x83X\x82̉E\x83N\x83\x8A\x83b\x83N\x82\xA8\x82\xE6\x82\xD1Alt+V\x82\xC5
@@ -304,6 +309,7 @@
 \x8F\x91\x8E\xAE:
 &amp;h      \x83z\x83X\x83g\x96\xBC\x81B\x96\xA2\x90ڑ\xB1\x82̏ꍇ\x82͋\xF3\x81B
 &amp;p      TCP \x83|\x81[\x83g\x94ԍ\x86\x81B\x96\xA2\x90ڑ\xB1\x82̏ꍇ\x82͋\xF3\x81BTCP \x90ڑ\xB1\x82łȂ\xA2\x82Ƃ\xAB\x82\xE0\x8B\xF3\x81B
+&amp;u      \x83\x8D\x83O\x83I\x83\x93\x92\x86\x82̃\x86\x81[\x83U\x96\xBC\x81B
 %a      \x97j\x93\xFA\x82̏ȗ\xAA\x8C`\x81B
 %A      \x97j\x93\xFA\x82̐\xB3\x8E\xAE\x96\xBC\x81B
 %b      \x8C\x8E\x82̏ȗ\xAA\x8C`\x81B

Index: branches/openssl_1_1_0/doc/ja/html/reference
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/reference	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/reference	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/doc/ja/html/reference
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,6 ##
 OpenSSL-LICENSE.txt
 PuTTY-LICENSE.txt
+Oniguruma-LICENSE.txt
+SFMT-LICENSE.txt
+CygTerm+-LICENSE.txt
 RE.txt
Modified: branches/openssl_1_1_0/doc/ja/html/reference/develop.txt
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/reference/develop.txt	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/reference/develop.txt	2017-03-18 11:12:07 UTC (rev 6640)
@@ -23,6 +23,9 @@
 -- Visual Studio Community 2015 Update 3
    \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
        Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v140_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+-- Visual Studio Community 2017 
+   \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+       Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v141_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 -- \x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83r\x83\x8B\x83h\x82\xB7\x82邽\x82߂\xC9
    Visual Studio \x82̃R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x82\xA9\x82\xE7\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邩\x81A\x88ȉ\xBA\x82̂悤\x82Ɋ‹\xAB\x95ϐ\x94\x82\xF0\x90ݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
    \x8Eg\x97p\x82\xB5\x82\xBD\x82\xA2\x83o\x81[\x83W\x83\x87\x83\x93\x82\xCC Visual Studio \x82\xCC "(x86) Native Tools Command Prompt" \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̃p\x83X\x82Ɋ֌W\x82\xB7\x82\xE9 PATH \x82\xC6 VSINSTALLDIR \x95ϐ\x94\x82\xF0\x8A‹\xAB\x95ϐ\x94\x82ɓo\x98^\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
@@ -44,10 +47,10 @@
 
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
-- Oniguruma 6.1.2 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.0e (http://www.openssl.org/)
-- zlib 1.2.8 (http://www.zlib.net/)
-- PuTTY 0.67 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
+- Oniguruma 6.1.3 (https://github.com/kkos/oniguruma)
+- OpenSSL 1.0.2k (http://www.openssl.org/)
+- zlib 1.2.11 (http://www.zlib.net/)
+- PuTTY 0.68 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
 
 \x81\xA1 SVN \x83R\x83~\x83b\x83^\x81[\x82ւ̒\x8D\x88\xD3
@@ -129,7 +132,7 @@
   2. Oniguruma (used by Tera Term Macro)
      (1) oniguruma \x82̃\\x81[\x83X\x82\xF0 libs/oniguruma \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
      (2) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
-     (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildoniguruma.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
+     (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildoniguruma6.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
   3. OpenSSL (used by TTSSH)
      (1) openssl \x82̃\\x81[\x83X\x82\xF0 libs/openssl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B

Modified: branches/openssl_1_1_0/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/setup/teraterm-ini.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/setup/teraterm-ini.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -902,6 +902,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="NormalizeLineBreak"><a href="../menu/setup-additional.html#NormalizeLineBreak">NormalizeLineBreak</a></td>
+		<td style="width:250px;">off</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="Parity"><a href="../menu/setup-serialport.html#BaudRate">Parity</a></td>
 		<td style="width:250px;">none</td>
 		<td style="width:250px;">&lt;-</td>

Modified: branches/openssl_1_1_0/doc/ja/html/setup/teraterm-misc.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/setup/teraterm-misc.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/setup/teraterm-misc.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -133,7 +133,7 @@
 <h1><a name="hostdlg">\x8BN\x93\xAE\x8E\x9E\x82\xCC "New Connection" \x83_\x83C\x83A\x83\x8D\x83O\x82̕\\x8E\xA6</a></h1>
 
 <p>
-Tera Term \x82͋N\x93\xAE\x8E\x9E\x82\xC9 "New Connection" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x81B<br>
+Tera Term \x82̓|\x81[\x83g\x82̎\xED\x97ނ\xAA TCP/IP \x82̏ꍇ\x81A\x8BN\x93\xAE\x8E\x9E\x82\xC9 "New Connection" \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x81B(Serial\x82̏ꍇ\x82ɂ͕\\x8E\xA6\x82\xB5\x82܂\xB9\x82\xF1)<br>
 \x82\xB1\x82\xEA\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC HostDialogOnStartup \x8Ds\x82\xF0\x88ȉ\xBA\x82̂悤\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 </p>
 

Modified: branches/openssl_1_1_0/doc/ja/html/usage/tips/vim.html
===================================================================
--- branches/openssl_1_1_0/doc/ja/html/usage/tips/vim.html	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/html/usage/tips/vim.html	2017-03-18 11:12:07 UTC (rev 6640)
@@ -63,6 +63,11 @@
 
 
 <h2><a name="Bracketed">\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x82̓\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82Ɏ\xA9\x93\xAE\x83C\x83\x93\x83f\x83\x93\x83g\x82𖳌\xF8\x82ɂ\xB7\x82\xE9</a></h2>
+<p class="notice">
+\x92\x8D: Vim 8.0.0238 \x82\xE6\x82\xE8 Vim \x96{\x91̂\xC5 Bracketed Paste Mode \x82ɑΉ\x9E\x82\xB5\x82\xBD\x88ׁA\x89\xBA\x8BL\x82̐ݒ\xE8\x82\xF0\x92ǉ\xC1\x82\xB5\x82Ȃ\xAD\x82Ă\xE0\x93\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82ɂ͎\xA9\x93\xAE\x83C\x83\x93\x83f\x83\x93\x83g\x82\xE2\x95⊮\x93\x99\x82\xAA\x96\xB3\x8C\xF8\x82ɂȂ\xE8\x82܂\xB7\x81B<br>
+\x82\xB5\x82\xA9\x82\xB5\x81Atmux \x97\x98\x97p\x8E\x9E\x82ɂ\xCD Bracketed Paste Mode \x82\xAA\x97L\x8C\xF8\x82ɂȂ\xE7\x82Ȃ\xA2\x82̂ŁAtmux \x82𕹗p\x82\xB7\x82\xE9\x8Fꍇ\x82͈ˑR\x82Ƃ\xB5\x82ĉ\xBA\x8BL\x82̐ݒ肪\x95K\x97v\x82ɂȂ\xE8\x82܂\xB7\x81B
+</p>
+
 <p>
 \x92ʏ\xED\x81A\x83z\x83X\x83g\x91\xA4\x82̃A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93 (vim \x93\x99) \x82\xA9\x82\xE7\x82́A\x83\x86\x81[\x83U\x82̃L\x81[\x93\xFC\x97͂ƃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x82̓\\x82\xE8\x95t\x82\xAF\x82\xF0\x8B\xE6\x95ʂł\xAB\x82܂\xB9\x82\xF1\x81B
 \x82\xB5\x82\xA9\x82\xB5 xterm \x82̊g\x92\xA3\x8B@\x94\\x82ł\xA0\x82\xE9 Bracketed Paste Mode \x82𗘗p\x82\xB7\x82\xE9\x82Ƃ\xB1\x82\xEA\x82\xE7\x82\xF0\x8B\xE6\x95ʏo\x97\x88\x82\xE9\x82悤\x82ɂȂ邽\x82߁A\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x82̓\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82͓\xAE\x8D\xEC\x82\xF0\x95ς\xA6\x82鎖\x82\xAA\x82ł\xAB\x82܂\xB7\x81B
@@ -73,20 +78,42 @@
 </p>
 
 <pre class="macro-example">
-if &amp;term =~ "xterm"
-    let &amp;t_ti .= "\e[?2004h"
-    let &amp;t_te .= "\e[?2004l"
-    let &amp;pastetoggle = "\e[201~"
+if has("patch-8.0.0238")
+    " Bracketed Paste Mode\x91Ή\x9E\x83o\x81[\x83W\x83\x87\x83\x93(8.0.0238\x88ȍ~)\x82ł́A\x93\xC1\x82ɐݒ肵\x82Ȃ\xA2
+    " \x8Fꍇ\x82\xCDTERM\x82\xAAxterm\x82̎\x9E\x82̂\xDDBracketed Paste Mode\x82\xAA\x8Eg\x82\xED\x82\xEA\x82\xE9\x81B
+    " tmux\x97\x98\x97p\x8E\x9E\x82\xCDTERM\x82\xAAscreen\x82Ȃ̂ŁABracketed Paste Mode\x82𗘗p\x82\xB7\x82\xE9\x82ɂ\xCD
+    " \x88ȉ\xBA\x82̐ݒ肪\x95K\x97v\x82ƂȂ\xE9\x81B
+    if &amp;term =~ "screen"
+        let &amp;t_BE = "\e[?2004h"
+        let &amp;t_BD = "\e[?2004l"
+        exec "set t_PS=\e[200~"
+        exec "set t_PE=\e[201~"
+    endif
+else
+    " 8.0.0210 \x81` 8.0.0237 \x82ł\xCDVim\x96{\x91̂ł\xCCBracketed Paste Mode\x91Ή\x9E\x82̋\x93\x93\xAE\x82\xAA
+    " \x96]\x82܂\xB5\x82\xAD\x82Ȃ\xA2(\x8E\xA9\x93\xAE\x83C\x83\x93\x83f\x83\x93\x83g\x82\xAA\x96\xB3\x8C\xF8\x82ɂȂ\xE7\x82Ȃ\xA2)\x82̂ŁAVim\x96{\x91̑\xA4\x82ł̑Ή\x9E\x82\xF0
+    " \x96\xB3\x8C\xF8\x82ɂ\xB7\x82\xE9\x81B
+    if has("patch-8.0.0210")
+        set t_BE=
+    endif
 
-    function XTermPasteBegin(ret)
-        set paste
-        return a:ret
-    endfunction
+    " Vim\x96{\x91̂\xAABracketed Paste Mode\x82ɑΉ\x9E\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x8E\x9E\x82ׂ̈̐ݒ\xE8\x81B
+    if &amp;term =~ "xterm" || &amp;term =~ "screen"
+        let &amp;t_ti .= "\e[?2004h"
+        let &amp;t_te .= "\e[?2004l"
 
-    noremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("0i")
-    inoremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("")
-    cnoremap &lt;special&gt; &lt;Esc&gt;[200~ &lt;nop&gt;
-    cnoremap &lt;special&gt; &lt;Esc&gt;[201~ &lt;nop&gt;
+        function XTermPasteBegin(ret)
+            set pastetoggle=&lt;Esc&gt;[201~
+            set paste
+            return a:ret
+        endfunction
+
+        noremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("0i")
+        inoremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("")
+        vnoremap &lt;special&gt; &lt;expr&gt; &lt;Esc&gt;[200~ XTermPasteBegin("c")
+        cnoremap &lt;special&gt; &lt;Esc&gt;[200~ &lt;nop&gt;
+        cnoremap &lt;special&gt; &lt;Esc&gt;[201~ &lt;nop&gt;
+    endif
 endif
 </pre>
 
@@ -99,9 +126,9 @@
 if &amp;term =~ "xterm"
     let &amp;t_SI .= "\e[?2004h"
     let &amp;t_EI .= "\e[?2004l"
-    let &amp;pastetoggle = "\e[201~"
 
     function XTermPasteBegin(ret)
+        set pastetoggle=&lt;Esc&gt;[201~
         set paste
         return a:ret
     endfunction

Modified: branches/openssl_1_1_0/doc/ja/teraterm.hhc
===================================================================
--- branches/openssl_1_1_0/doc/ja/teraterm.hhc	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/teraterm.hhc	2017-03-18 11:12:07 UTC (rev 6640)
@@ -56,6 +56,7 @@
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x91Ή\x9E\x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X">
 			<param name="Local" value="html\about\ctrlseq.html">
+			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Q &amp; A ">
@@ -125,6 +126,7 @@
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Tera Term Menu">
 			<param name="Local" value="html\usage\TTMenu\TTMenu.html">
+			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Unicode\x90ݒ\xE8">
@@ -529,6 +531,7 @@
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B">
 			<param name="Local" value="html\setup\lng.html">
+			<param name="ImageNumber" value="11">
 			</OBJECT>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
@@ -562,6 +565,21 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\Oniguruma-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="SFMT \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\SFMT-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\CygTerm+-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF">
 			<param name="Local" value="html\reference\develop.txt">
 			<param name="ImageNumber" value="11">
@@ -569,6 +587,7 @@
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0">
 			<param name="Local" value="html\reference\sourcecode.html">
+			<param name="ImageNumber" value="11">
 			</OBJECT>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
@@ -714,6 +733,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="getmodemstatus">
 					<param name="Local" value="html\macro\command\getmodemstatus.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="gettitle">
@@ -748,6 +768,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="logautoclosemode">
 					<param name="Local" value="html\macro\command\logautoclosemode.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="logclose">
@@ -772,6 +793,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="logrotate">
 					<param name="Local" value="html\macro\command\logrotate.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="logstart">
@@ -874,6 +896,11 @@
 					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="setflowctrl">
+					<param name="Local" value="html\macro\command\setflowctrl.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="setmulticastname">
 					<param name="Local" value="html\macro\command\setmulticastname.html">
 					<param name="ImageNumber" value="11">
@@ -992,6 +1019,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="continue">
 					<param name="Local" value="html\macro\command\continue.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="do, loop">
@@ -1082,6 +1110,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="regexoption">
 					<param name="Local" value="html\macro\command\regexoption.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="sprintf">
@@ -1222,6 +1251,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="filelock">
 					<param name="Local" value="html\macro\command\filelock.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="filemarkptr">
@@ -1286,6 +1316,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="fileunlock">
 					<param name="Local" value="html\macro\command\fileunlock.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="filewrite">
@@ -1361,6 +1392,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="ispassword">
 					<param name="Local" value="html\macro\command\ispassword.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="passwordbox">
@@ -1370,6 +1402,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="setpassword">
 					<param name="Local" value="html\macro\command\setpassword.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 			</UL>
 			<LI> <OBJECT type="text/sitemap">
@@ -1385,30 +1418,37 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="bringupbox">
 					<param name="Local" value="html\macro\command\bringupbox.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="checksum8">
 					<param name="Local" value="html\macro\command\checksum8.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="checksum8file">
 					<param name="Local" value="html\macro\command\checksum8.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="checksum16">
 					<param name="Local" value="html\macro\command\checksum16.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="checksum16file">
 					<param name="Local" value="html\macro\command\checksum16.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="checksum32">
 					<param name="Local" value="html\macro\command\checksum32.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="checksum32file">
 					<param name="Local" value="html\macro\command\checksum32.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="closesbox">
@@ -1423,10 +1463,12 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="crc16">
 					<param name="Local" value="html\macro\command\crc16.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="crc16file">
 					<param name="Local" value="html\macro\command\crc16.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="crc32">
@@ -1466,10 +1508,12 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="getipv4addr">
 					<param name="Local" value="html\macro\command\getipv4addr.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="getipv6addr">
 					<param name="Local" value="html\macro\command\getipv6addr.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="getspecialfolder">
@@ -1509,6 +1553,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="listbox">
 					<param name="Local" value="html\macro\command\listbox.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="messagebox">
@@ -1573,6 +1618,7 @@
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="uptime">
 					<param name="Local" value="html\macro\command\uptime.html">
+					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="var2clipb">
@@ -1610,6 +1656,7 @@
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="\x90ؒf\x8Cシ\x82\xAE\x82ɐڑ\xB1\x82\xB7\x82\xE9\x8Fꍇ\x82̒\x8D\x88ӓ_">
 				<param name="Local" value="html\macro\appendixes\disconnecttiming.html">
+				<param name="ImageNumber" value="11">
 				</OBJECT>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="ASCII \x83R\x81[\x83h\x95\">

Modified: branches/openssl_1_1_0/doc/ja/teraterm.hhp
===================================================================
--- branches/openssl_1_1_0/doc/ja/teraterm.hhp	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/ja/teraterm.hhp	2017-03-18 11:12:07 UTC (rev 6640)
@@ -150,6 +150,11 @@
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
 HlpRefDev=html\reference\develop.txt
+HlpRefPutty=html\reference\PuTTY-LICENSE.txt
+HlpRefSource=html\reference\sourcecode.html
+HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt
+HlpRefSFMT=html\reference\SFMT-LICENSE.txt
+HlpRefCygterm=html\reference\CygTerm+-LICENSE.txt
 HlpMacro=html\macro\index.html
 HlpMacroExec=html\macro\howtorun.html
 HlpMacroCommandline=html\macro\commandline.html
@@ -302,6 +307,7 @@
 HlpMacroCommandSetenv=html\macro\command\setenv.html
 HlpMacroCommandSetexitcode=html\macro\command\setexitcode.html
 HlpMacroCommandSetfileattr=html\macro\command\setfileattr.html
+HlpMacroCommandSetflowctrl=html\macro\command\setflowctrl.html
 HlpMacroCommandSetMulticastName=html\macro\command\setmulticastname.html
 HlpMacroCommandSetPassword=html\macro\command\setpassword.html
 HlpMacroCommandSetrts=html\macro\command\setrts.html

Modified: branches/openssl_1_1_0/doc/makechm.bat
===================================================================
--- branches/openssl_1_1_0/doc/makechm.bat	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/doc/makechm.bat	2017-03-18 11:12:07 UTC (rev 6640)
@@ -5,7 +5,7 @@
 	set HELP_COMPILER=C:\progra~1\htmlhe~1\hhc.exe
 )
 
-REM for winxp installation on other drive or other languaje
+REM for winxp installation on other drive or other language
 if exist "%Programfiles%\HTML Help Workshop\hhc.exe" (
 set HELP_COMPILER="%Programfiles%\HTML Help Workshop\hhc.exe"
 )

Modified: branches/openssl_1_1_0/installer/build.bat
===================================================================
--- branches/openssl_1_1_0/installer/build.bat	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/build.bat	2017-03-18 11:12:07 UTC (rev 6640)
@@ -31,11 +31,17 @@
 goto vs2013
 
 :check_2015
-if "%VS140COMNTOOLS%" == "" goto novs
-if not exist "%VS140COMNTOOLS%\VsDevCmd.bat" goto novs
+if "%VS140COMNTOOLS%" == "" goto check_2017
+if not exist "%VS140COMNTOOLS%\VsDevCmd.bat" goto check_2017
 call "%VS140COMNTOOLS%\VsDevCmd.bat"
 goto vs2015
 
+:check_2017
+if "%VS150COMNTOOLS%" == "" goto novs
+if not exist "%VS150COMNTOOLS%\VsDevCmd.bat" goto novs
+call "%VS150COMNTOOLS%\VsDevCmd.bat"
+goto vs2017
+
 :novs
 echo "Can't find Visual Studio"
 exit /b
@@ -51,6 +57,7 @@
 if /I %VSCMNDIR% EQU "%VS110COMNTOOLS%" goto vs2012
 if /I %VSCMNDIR% EQU "%VS120COMNTOOLS%" goto vs2013
 if /I %VSCMNDIR% EQU "%VS140COMNTOOLS%" goto vs2015
+if /I %VSCMNDIR% EQU "%VS150COMNTOOLS%" goto vs2017
 
 echo Unknown Visual Studio version
 exit /b
@@ -109,6 +116,15 @@
 set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v14.sln
 goto vsend
 
+:vs2017
+set TERATERMSLN=..\teraterm\ttermpro.v15.sln
+set TTSSHSLN=..\ttssh2\ttssh.v15.sln
+set TTPROXYSLN=..\TTProxy\TTProxy.v15.sln
+set TTXKANJISLN=..\TTXKanjiMenu\ttxkanjimenu.v15.sln
+set TTPMENUSLN=..\ttpmenu\ttpmenu.v15.sln
+set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v15.sln
+goto vsend
+
 :vsend
 
 set BUILD=build

Modified: branches/openssl_1_1_0/installer/release/TERATERM.INI
===================================================================
--- branches/openssl_1_1_0/installer/release/TERATERM.INI	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/TERATERM.INI	2017-03-18 11:12:07 UTC (rev 6640)
@@ -559,6 +559,9 @@
 ; Nonblinking cursor
 NonblinkingCursor=off
 
+; Normalize line break when pasting
+NormalizeLineBreakOnPaste=off
+
 ; Polygon cursor for KILLFOCUS
 KillFocusCursor=on
 

Modified: branches/openssl_1_1_0/installer/release/lang/English.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/English.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/English.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -202,6 +202,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=Disable mouse &M button paste
 DLG_TAB_COPYPASTE_SELECTLBUTTON=Select &only by L button
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirm change &paste
 DLG_TAB_CONFIRM_STRING_FILE=&String file
 DLG_TAB_COPYPASTE_DELIMITER=Del&imiter characters

Modified: branches/openssl_1_1_0/installer/release/lang/French.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/French.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/French.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -203,6 +203,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=Interdire coller avec molette
 DLG_TAB_COPYPASTE_SELECTLBUTTON=Selection seulement avec bouton G
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirmer changer coller
 DLG_TAB_CONFIRM_STRING_FILE=Fichier cha\xEEne
 DLG_TAB_COPYPASTE_DELIMITER=Caract\xE8res d\xE9limiteurs

Modified: branches/openssl_1_1_0/installer/release/lang/German.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/German.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/German.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -203,6 +203,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=Einf\xFCgen mit mittlerer Maustaste ein
 DLG_TAB_COPYPASTE_SELECTLBUTTON=&Auswahl nur \xFCber Button
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirm change &paste
 DLG_TAB_CONFIRM_STRING_FILE=&String file
 DLG_TAB_COPYPASTE_DELIMITER=&Begrenzungszeichen

Modified: branches/openssl_1_1_0/installer/release/lang/Japanese.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/Japanese.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/Japanese.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -202,6 +202,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=\x92\x86\x83N\x83\x8A\x83b\x83N\x82ł̓\\x82\xE8\x95t\x82\xAF\x82𖳌\xF8\x82ɂ\xB7\x82\xE9(&M)
 DLG_TAB_COPYPASTE_SELECTLBUTTON=\x8D\xB6\x83N\x83\x8A\x83b\x83N\x82ł̂ݑI\x91\xF0\x82\xF0\x8AJ\x8En\x82\xB7\x82\xE9(&O)
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=\x93\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82ɖ\x96\x94\xF6\x82̉\xFC\x8Ds\x82\xF0\x8D폜\x82\xB7\x82\xE9(&T)
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=\x93\\x82\xE8\x95t\x82\xAF\x8E\x9E\x82ɉ\xFC\x8Ds\x82𐳋K\x89\xBB\x82\xB7\x82\xE9(&N)
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=\x8A댯\x82ȃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82̓\\x82\xE8\x95t\x82\xAF\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9(&P)
 DLG_TAB_CONFIRM_STRING_FILE=\x83L\x81[\x83\x8F\x81[\x83h\x83t\x83@\x83C\x83\x8B(&S)
 DLG_TAB_COPYPASTE_DELIMITER=\x8B\xE6\x90؂蕶\x8E\x9A(&I)

Modified: branches/openssl_1_1_0/installer/release/lang/Korean.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/Korean.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/Korean.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -203,6 +203,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=\xB8\xB6\xBF콺 \xB0\xA1\xBF \xB9\xF6ư \xBAٿ\xA9\xB3ֱ\xE2 \xBA\xF1Ȱ\xBC\xBAȭ(&M)
 DLG_TAB_COPYPASTE_SELECTLBUTTON=\xB8\xB6\xBF콺 \xBF\xDE\xC2\xCA \xB9\xF6ư\xBF\xA1 \xC0\xC7\xC7ؼ\xAD\xB8\xB8 \xBC\xB1\xC5\xC3(&O)
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=\xBA\xAF\xB0\xE6-\xBAٿ\xA9\xB3ֱ\xE2 Ȯ\xC0\xCE(&P)
 DLG_TAB_CONFIRM_STRING_FILE=\xB9\xAE\xC0ڿ\xAD \xC6\xC4\xC0\xCF(&S)
 DLG_TAB_COPYPASTE_DELIMITER=\xB1\xB8\xBA\xD0\xC0\xDA \xB9\xAE\xC0\xDA(&I)

Modified: branches/openssl_1_1_0/installer/release/lang/Russian.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/Russian.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/Russian.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -203,6 +203,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=&\xCE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE2\xF1\xF2\xE0\xE2\xEA\xF3 \xF1\xF0\xE5\xE4\xED\xE5\xE9 \xEA\xED\xEE\xEF\xEA\xEE\xE9 \xEC\xFB\xF8\xE8
 DLG_TAB_COPYPASTE_SELECTLBUTTON=&\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF2\xEE\xEB\xFC\xEA\xEE \xEB\xE5\xE2\xF3\xFE \xEA\xED\xEE\xEF\xEA\xF3 \xEC\xFB\xF8\xE8
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=&\xD0\xE0\xE7\xF0\xE5\xF8\xE8\xF2\xFC \xE2\xF1\xF2\xE0\xE2\xEA\xF3 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF
 DLG_TAB_CONFIRM_STRING_FILE=&\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xFB\xE9 \xF4\xE0\xE9\xEB
 DLG_TAB_COPYPASTE_DELIMITER=&\xD0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFC \xF1\xE8\xEC\xE2\xEE\xEB\xEE\xE2

Modified: branches/openssl_1_1_0/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/Simplified Chinese.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/Simplified Chinese.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -203,6 +203,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=\xBD\xFB\xD3\xC3\xD6м\xFC\xB5\xA5\xBB\xF7ճ\xCC\xF9(&M)
 DLG_TAB_COPYPASTE_SELECTLBUTTON=\xBD\xF6\xD3\xC3\xCA\xF3\xB1\xEA\xD7\xF3\xBC\xFC(&O)
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=\xA1\xB0Σ\xCF\xD5ճ\xCC\xF9\xBC\xF4\xCC\xF9\xB0塱ȷ\xC8\xCF(&P)
 DLG_TAB_CONFIRM_STRING_FILE=\xB9ؼ\xFC\xD7\xD6\xCEļ\xFE(&S)
 DLG_TAB_COPYPASTE_DELIMITER=\xB7ָ\xF4\xB7\xFB(&I)

Modified: branches/openssl_1_1_0/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/openssl_1_1_0/installer/release/lang/Traditional Chinese.lng	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/release/lang/Traditional Chinese.lng	2017-03-18 11:12:07 UTC (rev 6640)
@@ -203,6 +203,7 @@
 DLG_TAB_COPYPASTE_MOUSEPASTEM=\xB8T\xA5Τ\xA4\xC1\xE4\xB3\xE6\xC0\xBB\xB6K\xA4W(&M)
 DLG_TAB_COPYPASTE_SELECTLBUTTON=\xB6ȥηƹ\xAB\xA5\xAA\xC1\xE4(&O)
 DLG_TAB_COPYPASTE_TRIM_TRAILING_NL=&Trim trailing new line character when pasting
+DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK=&Normalize line break when pasting
 DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=\xA1uĵ\xA7i\xB6K\xA4W\xB0ŶKï\xA1v\xBDT\xBB{(&P)
 DLG_TAB_CONFIRM_STRING_FILE=\xC3\xF6\xC1\xE4\xA6r\xA4\xE5\xA5\xF3(&S)
 DLG_TAB_COPYPASTE_DELIMITER=\xA4\xC0\xB9j\xB2\xC5(&I)

Modified: branches/openssl_1_1_0/installer/teraterm.iss
===================================================================
--- branches/openssl_1_1_0/installer/teraterm.iss	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/installer/teraterm.iss	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,33 +1,33 @@
 #define AppName "Tera Term"
-#define AppVer "4.93"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+#define AppVer "4.94"
+#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [InnoIDE_PreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
 
 [PreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [PostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
 
 [_ISToolPreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [_ISToolPostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
 
 [Setup]
-AppCopyright=(C) 2004-2016 TeraTerm Project
+AppCopyright=(C) 2004-2017 TeraTerm Project
 AppName={#AppName}
 #ifndef snapshot
 AppVerName={#AppName} {#AppVer}
@@ -244,10 +244,10 @@
 
 [Run]
 Filename: {app}\ttermpro.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_teraterm}; Components: TeraTerm
-Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Flags: skipifsilent; Components: LogMeTT
-Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Parameters: /SILENT; Flags: skipifnotsilent; Components: LogMeTT
-Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Flags: skipifsilent; Components: TTLEdit
-Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Parameters: /SILENT; Flags: skipifnotsilent; Components: TTLEdit
+Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Flags: skipifsilent runasoriginaluser; Components: LogMeTT
+Filename: {tmp}\Setup_LogMeTT_2_12_1.exe; Parameters: /SILENT; Flags: skipifnotsilent runasoriginaluser; Components: LogMeTT
+Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Flags: skipifsilent runasoriginaluser; Components: TTLEdit
+Filename: {tmp}\Setup_TTLEditor_1_5_1.exe; Parameters: /SILENT; Flags: skipifnotsilent runasoriginaluser; Components: TTLEdit
 Filename: {app}\ttpmenu.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_ttmenu}; Components: TeraTerm_Menu
 Filename: {app}\Collector\Collector.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_collector}; Components: Collector
 


Property changes on: branches/openssl_1_1_0/installer/teraterm.iss
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Copied: branches/openssl_1_1_0/libs/buildSFMT.bat (from rev 6639, trunk/libs/buildSFMT.bat)
===================================================================
--- branches/openssl_1_1_0/libs/buildSFMT.bat	                        (rev 0)
+++ branches/openssl_1_1_0/libs/buildSFMT.bat	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,28 @@
+cd SFMT
+
+if exist "Makefile.msc.release" goto end_mk_release
+echo CFLAGS = /MT /O2 /nologo> Makefile.msc.release
+echo;>> Makefile.msc.release
+echo SFMT.lib: SFMT.c>> Makefile.msc.release
+echo 	cl $(CFLAGS) /c SFMT.c>> Makefile.msc.release
+echo 	lib /out:SFMT.lib SFMT.obj>> Makefile.msc.release
+echo;>> Makefile.msc.release
+echo clean:>> Makefile.msc.release
+echo 	del *.lib *.obj>> Makefile.msc.release
+:end_mk_release
+
+if exist "Makefile.msc.debug" goto end_mk_debug
+echo CFLAGS = /MTd /Od /nologo> Makefile.msc.debug
+echo;>> Makefile.msc.debug
+echo SFMTd.lib: SFMT.c>> Makefile.msc.debug
+echo 	cl $(CFLAGS) /c SFMT.c>> Makefile.msc.debug
+echo 	lib /out:SFMTd.lib SFMT.obj>> Makefile.msc.debug
+echo;>> Makefile.msc.debug
+echo clean:>> Makefile.msc.debug
+echo 	del *.lib *.obj>> Makefile.msc.debug
+:end_mk_debug
+
+nmake /f Makefile.msc.debug
+nmake /f Makefile.msc.release
+
+cd ..

Modified: branches/openssl_1_1_0/libs/buildall.bat
===================================================================
--- branches/openssl_1_1_0/libs/buildall.bat	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/libs/buildall.bat	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,3 +1,4 @@
 CALL buildoniguruma6.bat
 CALL buildzlib.bat
 CALL buildopenssl.bat
+CALL buildSFMT.bat

Index: branches/openssl_1_1_0/teraterm
===================================================================
--- branches/openssl_1_1_0/teraterm	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/teraterm:6194-6285
+/trunk/teraterm:6550-6639
\ No newline at end of property
Modified: branches/openssl_1_1_0/teraterm/common/helpid.h
===================================================================
--- branches/openssl_1_1_0/teraterm/common/helpid.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/common/helpid.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -148,6 +148,11 @@
 #define HlpRefOpenssl   80003
 #define HlpRefOpenssh   80004
 #define HlpRefDev       80005
+#define HlpRefPutty     80006
+#define HlpRefSource    80007
+#define HlpRefOniguruma 80008
+#define HlpRefSFMT      80009
+#define HlpRefCygterm   80010
 
 #define HlpMacro                        90000
 #define HlpMacroExec                    90001
@@ -301,6 +306,7 @@
 #define HlpMacroCommandSetecho          92082
 #define HlpMacroCommandSetexitcode      92083
 #define HlpMacroCommandSetfileattr      92190
+#define HlpMacroCommandSetflowctrl      92215
 #define HlpMacroCommandSetMulticastName 92146
 #define HlpMacroCommandSetPassword      92196
 #define HlpMacroCommandSetrts           92136

Modified: branches/openssl_1_1_0/teraterm/common/tt_res.h
===================================================================
--- branches/openssl_1_1_0/teraterm/common/tt_res.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/common/tt_res.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -214,6 +214,7 @@
 #define IDC_SSH_SETUPDIR_STATIC_VSTORE  2562
 #define IDC_SSH_SETUPDIR_EDIT_VSTORE    2563
 #define IDC_TRIMNLCHAR                  2564
+#define IDC_NORMALIZE_LINEBREAK         2565
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
 #define ID_ACC_NEWCONNECTION            50003
@@ -311,7 +312,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        126
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2565
+#define _APS_NEXT_CONTROL_VALUE         2566
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/openssl_1_1_0/teraterm/common/tttypes.h
===================================================================
--- branches/openssl_1_1_0/teraterm/common/tttypes.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/common/tttypes.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -291,6 +291,15 @@
 #define DBGF_NOUT	4
 #define DBGF_ALL	(DBGF_NORM | DBGF_HEXD | DBGF_NOUT)
 
+// Clipboard Paste Flags (used in ts.PasteFlag)
+#define CPF_DISABLE_RBUTTON        0x0001
+#define CPF_CONFIRM_RBUTTON        0x0002
+#define CPF_DISABLE_MBUTTON        0x0004
+#define CPF_CONFIRM_CHANGEPASTE    0x0010
+#define CPF_CONFIRM_CHANGEPASTE_CR 0x0020
+#define CPF_TRIM_TRAILING_NL       0x0100
+#define CPF_NORMALIZE_LINEBREAK    0x0200
+
 // Title Reporting Type
 #define IdTitleReportIgnore 0
 #define IdTitleReportAccept 8
@@ -496,8 +505,8 @@
 	char LogDefaultName[80];
 	char LogDefaultPath[MAX_PATH];
 	WORD LogAutoStart;
-	int DisablePasteMouseRButton;
-	WORD ConfirmPasteMouseRButton;
+	unsigned int PasteFlag;
+	WORD FallbackToCP932;	// ConfirmPasteMouseRButton \x82\xAA\x94p\x8E~\x82ɂȂ\xC1\x82\xBD\x82̂œ]\x97p
 	WORD DisableAcceleratorSendBreak;
 	int EnableClickableUrl;
 	eterm_lookfeel_t EtermLookfeel;
@@ -532,9 +541,9 @@
 	int TerminalOldWidth;
 	int TerminalOldHeight;
 	WORD MaximizedBugTweak;
-	WORD ConfirmChangePaste;
+	WORD Dummy2;		// \x8B\x8CConfirmChangePaste. PasteFlag\x82ɓ\x9D\x8D\x87\x82\xB5\x82\xBD\x82\xBD\x82ߔp\x8E~\x81B\x91\xBC\x82֓]\x97p
 	WORD SaveVTWinPos;
-	WORD DisablePasteMouseMButton;
+	WORD Dummy3;		// \x8B\x8CDisablePasteMouseMButton. PasteFlag\x82ɓ\x9D\x8D\x87\x82\xB5\x82\xBD\x82\xBD\x82ߔp\x8E~\x81B\x91\xBC\x82֓]\x97p
 	int MouseWheelScrollLine;
 	WORD CRSend_ini;
 	WORD LocalEcho_ini;
@@ -565,7 +574,7 @@
 	WORD DisableMenuDuplicateSession;
 	WORD DisableMenuNewConnection;
 	char TerminalUID[9];
-	WORD ConfirmChangePasteCR;
+	WORD Dummy4;		// \x8B\x8CConfirmChangePasteCR. PasteFlag\x82ɓ\x9D\x8D\x87\x82\xB5\x82\xBD\x82\xBD\x82ߔp\x8E~\x81B\x91\xBC\x82֓]\x97p
 	WORD JumpList;
 	WORD TabStopFlag;
 	DWORD CtrlFlag;
@@ -612,7 +621,7 @@
 	int ZmodemTimeOutInit;
 	int ZmodemTimeOutFin;
 	WORD WaitCom;
-	WORD TrimTrailingNLonPaste;
+	WORD Dummy5;	// \x8B\x8CTrimTrailingNLonPaste. PasteFlag\x82ɓ\x9D\x8D\x87\x82\xB5\x82\xBD\x88הp\x8E~\x81B\x91\xBC\x82֓]\x97p
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -1077,6 +1086,9 @@
  * Increment the number of this macro value
  * when you change TMap or member of TMap.
  *
+ * - At version 4.94, ttset_memfilemap was replaced with ttset_memfilemap_30.
+ *   paste related settings are integrated into tttset.PasteFlag
+ *
  * - At version 4.92, ttset_memfilemap was replaced with ttset_memfilemap_29.
  *   added tttset.TrimTrailingNLonPaste
  *
@@ -1252,4 +1264,4 @@
  *   added tttset.VTCompatTab.
  */
 
-#define TT_FILEMAPNAME "ttset_memfilemap_29"
+#define TT_FILEMAPNAME "ttset_memfilemap_30"

Copied: branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj (from rev 6639, trunk/teraterm/keycode/keycode.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}</ProjectGuid>
+    <RootNamespace>keycode</RootNamespace>
+    <ProjectName>keycode</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE"
+ %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="keycode.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="keycode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keycode.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj.filters (from rev 6639, trunk/teraterm/keycode/keycode.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/keycode/keycode.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{ecd3cbea-075b-4c13-a52a-fd2954d4a8ed}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{30dab4eb-5d58-472d-9cbf-19372fbd61bb}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{2609d358-8047-4097-9b36-5e2502ac3af0}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="keycode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="keycode.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keycode.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj (from rev 6639, trunk/teraterm/svnrev/svnrev.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{80F1C3F0-A213-4D48-85C8-A265990D19A7}</ProjectGuid>
+    <RootNamespace>svnrev</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>svnrev</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="svnrev.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="svnrev.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj.filters (from rev 6639, trunk/teraterm/svnrev/svnrev.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/svnrev/svnrev.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="svnrev.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="svnrev.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/teraterm/teraterm/addsetting.cpp
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/addsetting.cpp	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/addsetting.cpp	2017-03-18 11:12:07 UTC (rev 6640)
@@ -498,6 +498,7 @@
 		SendDlgItemMessage(IDC_DISABLE_PASTE_MBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_TRIMNLCHAR, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_NORMALIZE_LINEBREAK, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CONFIRM_STRING_FILE_LABEL, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CONFIRM_STRING_FILE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
@@ -530,6 +531,9 @@
 	GetDlgItemText(IDC_TRIMNLCHAR, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_TAB_COPYPASTE_TRIM_TRAILING_NL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_TRIMNLCHAR, ts.UIMsg);
+	GetDlgItemText(IDC_NORMALIZE_LINEBREAK, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_NORMALIZE_LINEBREAK, ts.UIMsg);
 	GetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, uimsg, sizeof(uimsg));
 	get_lang_msg("DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, ts.UIMsg);
@@ -553,19 +557,20 @@
 	// (2)DisablePasteMouseRButton
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_RBUTTON);
 	btn2 = (CButton *)GetDlgItem(IDC_CONFIRM_PASTE_RBUTTON);
-	btn->SetCheck(ts.DisablePasteMouseRButton);
-	if (ts.DisablePasteMouseRButton) {
+	if (ts.PasteFlag & CPF_DISABLE_RBUTTON) {
+		btn->SetCheck(BST_CHECKED);
 		btn2->EnableWindow(FALSE);
 	} else {
+		btn->SetCheck(BST_UNCHECKED);
 		btn2->EnableWindow(TRUE);
 	}
 
 	// (3)ConfirmPasteMouseRButton
-	btn2->SetCheck(ts.ConfirmPasteMouseRButton);
+	btn2->SetCheck((ts.PasteFlag & CPF_CONFIRM_RBUTTON)?BST_CHECKED:BST_UNCHECKED);
 
 	// (4)DisablePasteMouseMButton
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_MBUTTON);
-	btn->SetCheck(ts.DisablePasteMouseMButton);
+	btn->SetCheck((ts.PasteFlag & CPF_DISABLE_MBUTTON)?BST_CHECKED:BST_UNCHECKED);
 
 	// (5)SelectOnlyByLButton
 	btn = (CButton *)GetDlgItem(IDC_SELECT_LBUTTON);
@@ -573,17 +578,21 @@
 
 	// (6)TrimTrailingNLonPaste
 	btn = (CButton *)GetDlgItem(IDC_TRIMNLCHAR);
-	btn->SetCheck(ts.TrimTrailingNLonPaste);
+	btn->SetCheck((ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);
 
-	// (7)ConfirmChangePaste
+	// (7)NormalizeLineBreak
+	btn = (CButton *)GetDlgItem(IDC_NORMALIZE_LINEBREAK);
+	btn->SetCheck((ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)?BST_CHECKED:BST_UNCHECKED);
+
+	// (8)ConfirmChangePaste
 	btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
-	btn->SetCheck(ts.ConfirmChangePaste);
+	btn->SetCheck((ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);
 
 	// \x83t\x83@\x83C\x83\x8B\x83p\x83X
 	SetDlgItemText(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile);
 	edit = (CEdit *)GetDlgItem(IDC_CONFIRM_STRING_FILE);
 	btn = (CButton *)GetDlgItem(IDC_CONFIRM_STRING_FILE_PATH);
-	if (ts.ConfirmChangePaste) {
+	if (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE) {
 		edit->EnableWindow(TRUE);
 		btn->EnableWindow(TRUE);
 	} else {
@@ -591,10 +600,10 @@
 		btn->EnableWindow(FALSE);
 	}
 
-	// (8)delimiter characters
+	// (9)delimiter characters
 	SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);
 
-	// (9)PasteDelayPerLine
+	// (10)PasteDelayPerLine
 	_snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);
 	SetDlgItemText(IDC_PASTEDELAY_EDIT, buf);
 
@@ -672,15 +681,30 @@
 
 	// (2)
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_RBUTTON);
-	ts.DisablePasteMouseRButton = btn->GetCheck();
+	if (btn->GetCheck()) {
+		ts.PasteFlag |= CPF_DISABLE_RBUTTON;
+	}
+	else {
+		ts.PasteFlag &= ~CPF_DISABLE_RBUTTON;
+	}
 
 	// (3)
 	btn = (CButton *)GetDlgItem(IDC_CONFIRM_PASTE_RBUTTON);
-	ts.ConfirmPasteMouseRButton = btn->GetCheck();
+	if (btn->GetCheck()) {
+		ts.PasteFlag |= CPF_CONFIRM_RBUTTON;
+	}
+	else {
+		ts.PasteFlag &= ~CPF_CONFIRM_RBUTTON;
+	}
 
 	// (4)
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_MBUTTON);
-	ts.DisablePasteMouseMButton = btn->GetCheck();
+	if (btn->GetCheck()) {
+		ts.PasteFlag |= CPF_DISABLE_MBUTTON;
+	}
+	else {
+		ts.PasteFlag &= ~CPF_DISABLE_MBUTTON;
+	}
 
 	// (5)
 	btn = (CButton *)GetDlgItem(IDC_SELECT_LBUTTON);
@@ -688,17 +712,36 @@
 
 	// (6)
 	btn = (CButton *)GetDlgItem(IDC_TRIMNLCHAR);
-	ts.TrimTrailingNLonPaste = btn->GetCheck();
+	if (btn->GetCheck()) {
+		ts.PasteFlag |= CPF_TRIM_TRAILING_NL;
+	}
+	else {
+		ts.PasteFlag &= ~CPF_TRIM_TRAILING_NL;
+	}
 
-	// (7)IDC_CONFIRM_CHANGE_PASTE
+	// (7)
+	btn = (CButton *)GetDlgItem(IDC_NORMALIZE_LINEBREAK);
+	if (btn->GetCheck()) {
+		ts.PasteFlag |= CPF_NORMALIZE_LINEBREAK;
+	}
+	else {
+		ts.PasteFlag &= ~CPF_NORMALIZE_LINEBREAK;
+	}
+
+	// (8)IDC_CONFIRM_CHANGE_PASTE
 	btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
-	ts.ConfirmChangePaste = btn->GetCheck();
+	if (btn->GetCheck()) {
+		ts.PasteFlag |= CPF_CONFIRM_CHANGEPASTE;
+	}
+	else {
+		ts.PasteFlag &= ~CPF_CONFIRM_CHANGEPASTE;
+	}
 	GetDlgItemText(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
 
-	// (8)
+	// (9)
 	GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
 
-	// (9)
+	// (10)
 	GetDlgItemText(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
 	val = atoi(buf);
 	ts.PasteDelayPerLine = min(max(0, val), 5000);

Modified: branches/openssl_1_1_0/teraterm/teraterm/clipboar.c
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/clipboar.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/clipboar.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -146,7 +146,7 @@
 // \x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x83o\x83b\x83t\x83@\x82̖\x96\x94\xF6\x82ɂ\xA0\x82\xE9 CR / LF \x82\xF0\x82\xB7\x82ׂč폜\x82\xB7\x82\xE9
 BOOL TrimTrailingNL(BOOL AddCR, BOOL Bracketed) {
 	PCHAR tail;
-	if (ts.TrimTrailingNLonPaste) {
+	if (ts.PasteFlag & CPF_TRIM_TRAILING_NL) {
 		for (tail = CBMemPtr+strlen(CBMemPtr)-1; tail >= CBMemPtr; tail--) {
 			if (*tail != '\r' && *tail != '\n') {
 				break;
@@ -158,6 +158,96 @@
 	return TRUE;
 }
 
+// \x89\xFC\x8Ds\x82\xF0 CR+LF \x82ɐ\xB3\x8BK\x89\xBB\x82\xB7\x82\xE9
+BOOL NormalizeLineBreak(BOOL AddCR, BOOL Bracketed) {
+	char *p, *p2;
+	unsigned int len, need_len, alloc_len;
+	HGLOBAL TmpHandle;
+
+	if (!(ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)) {
+		return TRUE;
+	}
+
+	p = CBMemPtr;
+
+	// \x93\\x82\xE8\x95t\x82\xAF\x83f\x81[\x83^\x82̒\xB7\x82\xB3(len)\x81A\x82\xA8\x82\xE6\x82ѐ\xB3\x8BK\x89\xBB\x8C\xE3\x82̃f\x81[\x83^\x82̒\xB7\x82\xB3(need_len)\x82̃J\x83E\x83\x93\x83g
+	for (len=0, need_len=0, p=CBMemPtr; *p != '\0'; p++, len++, need_len++) {
+		if (*p == CR) {
+			need_len++;
+			if (*(p+1) == LF) {
+				len++;
+				p++;
+			}
+		}
+		else if (*p == LF) {
+			need_len++;
+		}
+	}
+
+	// \x90\xB3\x8BK\x89\xBB\x8C\xE3\x82\xE0\x83f\x81[\x83^\x92\xB7\x82\xAA\x95ς\xED\x82\xE7\x82Ȃ\xA2 => \x90\xB3\x8BK\x89\xBB\x82͕K\x97v\x82Ȃ\xB5
+	if (need_len == len) {
+		return TRUE;
+	}
+
+	// AddCR / Bracketed \x82̎\x9E\x82͂\xBB\x82̕\xAA\x82̃o\x83b\x83t\x83@\x82\xE0\x8Cv\x8EZ\x82ɓ\xFC\x82\xEA\x82\xE9
+	// \x82\xA0\x82܂肱\x82\xB1\x82ł͂\xE2\x82肽\x82\xAD\x82Ȃ\xA2\x82񂾂\xAF\x82\xEA\x82\xC7
+	alloc_len = need_len + 1;
+	if (AddCR) {
+		alloc_len++;
+	}
+	if (Bracketed) {
+		// \x8E蔲\x82\xAB
+		alloc_len += 12;
+	}
+
+	// \x83o\x83b\x83t\x83@\x83T\x83C\x83Y\x82\xAA\x90\xB3\x8BK\x89\xBB\x8C\xE3\x82ɕK\x97v\x82ƂȂ\xE9\x92l\x82\xE6\x82菬\x82\xB3\x82\xA2\x8Fꍇ\x82̓o\x83b\x83t\x83@\x82\xF0\x8Am\x95ۂ\xB5\x92\xBC\x82\xB7
+	if (GlobalSize(CBMemHandle) < alloc_len) {
+		GlobalUnlock(CBMemHandle);
+		CBMemPtr = NULL;
+		if ((TmpHandle = GlobalReAlloc(CBMemHandle, alloc_len, 0)) == NULL) {
+			// \x83\x81\x83\x82\x83\x8A\x8DĊ\x84\x82蓖\x82Ď\xB8\x94s
+			CBMemPtr = GlobalLock(CBMemHandle);
+
+			// \x82Ƃ肠\x82\xA6\x82\xB8\x90\xB3\x8BK\x89\xBB\x82Ȃ\xB5\x82œ\\x82\xE8\x95t\x82\xAF\x82鎖\x82ɂ\xB7\x82\xE9
+			return TRUE;
+		}
+		CBMemHandle = TmpHandle;
+		CBMemPtr = GlobalLock(CBMemHandle);
+	}
+
+	p = CBMemPtr + len - 1;
+	p2 = CBMemPtr + need_len;
+	*p2-- = '\0';
+
+	while (len > 0 && p < p2) {
+		if (*p == LF) {
+			*p2-- = *p--;
+			if (--len == 0) {
+				*p2 = CR;
+				break;
+			}
+			if (*p != CR) {
+				*p2-- = CR;
+				if (p2 <= p) {
+					break;
+				}
+				else {
+					continue;
+				}
+			}
+		}
+		else if (*p == CR) {
+			*p2-- = LF;
+			if (p == p2)
+				break;
+		}
+		*p2-- = *p--;
+		len--;
+	}
+
+	return TRUE;
+}
+
 // \x83t\x83@\x83C\x83\x8B\x82ɒ\xE8\x8B`\x82\xB3\x82ꂽ\x95\xB6\x8E\x9A\x97񂪁Atext\x82Ɋ܂܂\xEA\x82邩\x82𒲂ׂ\xE9\x81B
 BOOL search_dict(char *filename, char *text)
 {
@@ -205,7 +295,7 @@
 	int ret = IDOK;
 	BOOL confirm = FALSE;
 
-	if (!ts.ConfirmChangePaste) {
+	if ((ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE) == 0) {
 		return TRUE;
 	}
 
@@ -225,7 +315,7 @@
  */
 
 	if (AddCR) {
-		if (ts.ConfirmChangePasteCR) {
+		if (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE_CR) {
 			confirm = TRUE;
 		}
 	}
@@ -360,6 +450,11 @@
 		return;
 	}
 
+	if (!NormalizeLineBreak(AddCR, Bracketed)) {
+		CBEndPaste();
+		return;
+	}
+
 	if (!CheckClipboardContent(HWin, AddCR, Bracketed)) {
 		CBEndPaste();
 		return;
@@ -392,6 +487,7 @@
 
 	if (AddCR) {
 		CBMemPtr[StrLen++] = '\r';
+		CBMemPtr[StrLen++] = 0;
 	}
 
 	if (Bracketed) {

Modified: branches/openssl_1_1_0/teraterm/teraterm/filesys.cpp
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/filesys.cpp	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/filesys.cpp	2017-03-18 11:12:07 UTC (rev 6640)
@@ -331,6 +331,8 @@
 {
 	char buf[MAXPATHLEN], buf2[MAXPATHLEN], *p = c;
 	char tmphost[1024];
+	char tmpuser[256+1];
+	DWORD len_user = sizeof(tmpuser);
 
 	memset(buf, 0, sizeof(buf));
 
@@ -363,6 +365,11 @@
 					}
 				}
 				break;
+			  case 'u':
+				if (GetUserName(tmpuser, &len_user) != 0) {
+					strncat_s(buf,sizeof(buf),tmpuser,_TRUNCATE);
+				}
+				break;
 			  default:
 				strncpy_s(buf2,sizeof(buf2),p,2);
 				strncat_s(buf,sizeof(buf),buf2,_TRUNCATE);

Modified: branches/openssl_1_1_0/teraterm/teraterm/ttdde.c
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/ttdde.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/ttdde.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -369,6 +369,7 @@
 #define CmdLogRotate    'W'
 #define CmdLogAutoClose 'X'
 #define CmdGetModemStatus 'Y'
+#define CmdSetFlowCtrl  'Z'
 
 HDDEDATA AcceptExecute(HSZ TopicHSz, HDDEDATA Data)
 {
@@ -925,6 +926,24 @@
 		}
 		break;
 
+	case CmdSetFlowCtrl:
+		{
+		int val;
+
+		if (!cv.Open || cv.PortType != IdSerial)
+			return DDE_FNOTPROCESSED;
+
+		val = atoi(ParamFileName);
+		switch(val) {
+			case 1:
+			case 2:
+			case 3:
+				ts.Flow = val;
+				break;
+		}
+		break;
+		}
+
 	case CmdSetRts:  // add 'setrts' (2008.3.12 maya)
 		{
 		int val, ret;

Modified: branches/openssl_1_1_0/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/ttermpro.rc	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/ttermpro.rc	2017-03-18 11:12:07 UTC (rev 6640)
@@ -35,8 +35,8 @@
     LTEXT           "SCP:",IDC_STATIC,15,27,16,8
     EDITTEXT        IDC_SCP_PATH,31,25,122,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Send file",IDOK,7,45,50,14
-    PUSHBUTTON      "SCP",IDC_DAD_SENDFILE,69,45,50,14
-    DEFPUSHBUTTON   "Cancel",IDCANCEL,129,45,50,14
+    DEFPUSHBUTTON   "SCP",IDC_DAD_SENDFILE,69,45,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,129,45,50,14
 END
 
 IDD_COMMENT_DIALOG DIALOGEX 0, 0, 239, 19
@@ -48,7 +48,7 @@
     EDITTEXT        IDC_EDIT_COMMENT,6,3,189,12,ES_AUTOHSCROLL
 END
 
-IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 258, 158
+IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 258, 188
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -66,7 +66,7 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
 END
 
-IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 258, 158
+IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 258, 188
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -85,7 +85,7 @@
     COMBOBOX        IDC_CLIPBOARD_ACCESS,162,114,45,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 158
+IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 258, 188
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -99,18 +99,20 @@
     CONTROL         "Select &only by L button",IDC_SELECT_LBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,200,10
     CONTROL         "&Trim trailing new line character when pasting",IDC_TRIMNLCHAR,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,200,10
-    CONTROL         "Confirm change &paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,200,10
-    LTEXT           "&String file",IDC_CONFIRM_STRING_FILE_LABEL,22,115,68,8
-    EDITTEXT        IDC_CONFIRM_STRING_FILE,95,113,106,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_CONFIRM_STRING_FILE_PATH,206,113,13,12
-    LTEXT           "Del&imiter characters",IDC_DELIMITER,11,130,65,10
-    EDITTEXT        IDC_DELIM_LIST,95,128,130,12,ES_AUTOHSCROLL
-    LTEXT           "P&aste delay per line",IDC_PASTEDELAY_LABEL,11,145,70,10
-    EDITTEXT        IDC_PASTEDELAY_EDIT,95,143,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "ms",IDC_PASTEDELAY_LABEL2,123,145,23,10
+    CONTROL         "&Normalize line break when pasting",IDC_NORMALIZE_LINEBREAK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,200,10
+    CONTROL         "Confirm change &paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,200,10
+    LTEXT           "&String file",IDC_CONFIRM_STRING_FILE_LABEL,22,130,68,8
+    EDITTEXT        IDC_CONFIRM_STRING_FILE,95,128,106,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CONFIRM_STRING_FILE_PATH,206,128,13,12
+    LTEXT           "Del&imiter characters",IDC_DELIMITER,11,145,65,10
+    EDITTEXT        IDC_DELIM_LIST,95,143,130,12,ES_AUTOHSCROLL
+    LTEXT           "P&aste delay per line",IDC_PASTEDELAY_LABEL,11,160,70,10
+    EDITTEXT        IDC_PASTEDELAY_EDIT,95,158,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "ms",IDC_PASTEDELAY_LABEL2,123,160,23,10
 END
 
-IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 258, 158
+IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 258, 188
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -149,7 +151,7 @@
     LTEXT           "(*)Need to Save setup and restart Tera Term",IDC_RESTART,5,147,247,8
 END
 
-IDD_TABSHEET_LOG DIALOGEX 0, 0, 258, 158
+IDD_TABSHEET_LOG DIALOGEX 0, 0, 258, 188
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -178,7 +180,7 @@
     EDITTEXT        IDC_ROTATE_STEP,195,135,30,12,ES_AUTOHSCROLL
 END
 
-IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 258, 158
+IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 258, 188
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
@@ -341,7 +343,7 @@
         LEFTMARGIN, 5
         RIGHTMARGIN, 252
         TOPMARGIN, 5
-        BOTTOMMARGIN, 155
+        BOTTOMMARGIN, 185
     END
 
     IDD_TABSHEET_SEQUENCE, DIALOG
@@ -349,7 +351,7 @@
         LEFTMARGIN, 5
         RIGHTMARGIN, 252
         TOPMARGIN, 5
-        BOTTOMMARGIN, 155
+        BOTTOMMARGIN, 185
     END
 
     IDD_TABSHEET_COPYPASTE, DIALOG
@@ -357,7 +359,7 @@
         LEFTMARGIN, 5
         RIGHTMARGIN, 252
         TOPMARGIN, 5
-        BOTTOMMARGIN, 155
+        BOTTOMMARGIN, 185
     END
 
     IDD_TABSHEET_VISUAL, DIALOG
@@ -365,7 +367,7 @@
         LEFTMARGIN, 5
         RIGHTMARGIN, 252
         TOPMARGIN, 5
-        BOTTOMMARGIN, 155
+        BOTTOMMARGIN, 185
     END
 
     IDD_TABSHEET_LOG, DIALOG
@@ -373,7 +375,7 @@
         LEFTMARGIN, 5
         RIGHTMARGIN, 252
         TOPMARGIN, 5
-        BOTTOMMARGIN, 155
+        BOTTOMMARGIN, 185
     END
 
     IDD_TABSHEET_CYGWIN, DIALOG
@@ -381,7 +383,7 @@
         LEFTMARGIN, 5
         RIGHTMARGIN, 252
         TOPMARGIN, 5
-        BOTTOMMARGIN, 155
+        BOTTOMMARGIN, 185
     END
 
     IDD_BROADCAST_DIALOG, DIALOG
@@ -463,8 +465,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,93,0,0
- PRODUCTVERSION 4,93,0,0
+ FILEVERSION 4,94,0,0
+ PRODUCTVERSION 4,94,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -481,12 +483,12 @@
         BEGIN
             VALUE "CompanyName", "T. Teranishi, TeraTerm Project"
             VALUE "FileDescription", "Tera Term"
-            VALUE "FileVersion", "4, 93, 0, 0"
+            VALUE "FileVersion", "4, 94, 0, 0"
             VALUE "InternalName", "TTERMPRO"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2016 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2017 TeraTerm Project"
             VALUE "OriginalFilename", "TTERMPRO.EXE"
             VALUE "ProductName", "Tera Term"
-            VALUE "ProductVersion", "4, 93, 0, 0"
+            VALUE "ProductVersion", "4, 94, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

Copied: branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj (from rev 6639, trunk/teraterm/teraterm/ttermpro.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}</ProjectGuid>
+    <RootNamespace>ttermpro</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+    <ProjectName>ttermpro</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation />
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="addsetting.cpp" />
+    <ClCompile Include="buffer.c" />
+    <ClCompile Include="clipboar.c" />
+    <ClCompile Include="commlib.c" />
+    <ClCompile Include="filesys.cpp" />
+    <ClCompile Include="ftdlg.cpp" />
+    <ClCompile Include="keyboard.c" />
+    <ClCompile Include="prnabort.cpp" />
+    <ClCompile Include="protodlg.cpp" />
+    <ClCompile Include="teklib.c" />
+    <ClCompile Include="tekwin.cpp" />
+    <ClCompile Include="telnet.c" />
+    <ClCompile Include="teraprn.cpp" />
+    <ClCompile Include="teraterm.cpp" />
+    <ClCompile Include="ttdde.c" />
+    <ClCompile Include="ttdialog.c" />
+    <ClCompile Include="ttfileio.c" />
+    <ClCompile Include="ttime.c" />
+    <ClCompile Include="ttplug.c" />
+    <ClCompile Include="ttsetup.c" />
+    <ClCompile Include="ttwinman.c" />
+    <ClCompile Include="ttwsk.c" />
+    <ClCompile Include="vtdisp.c" />
+    <ClCompile Include="vtterm.c" />
+    <ClCompile Include="vtwin.cpp" />
+    <ClCompile Include="winjump.c" />
+    <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\..\cygterm\cygterm.ico" />
+    <Image Include="..\common\tek.ico" />
+    <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_classic.ico" />
+    <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_classic.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttermpro.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="addsetting.h" />
+    <ClInclude Include="ttfileio.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpdlg\ttpdlg.v12.vcxproj">
+      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpfile\ttpfile.v12.vcxproj">
+      <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpmacro\ttpmacro.v12.vcxproj">
+      <Project>{ba519362-a2c2-4b1a-905b-f00791f9038a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpset\ttpset.v12.vcxproj">
+      <Project>{5cf58947-e861-4a5c-b0b1-e85486f149cd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttptek\ttptek.v12.vcxproj">
+      <Project>{6d08053b-1c68-4a7e-8766-3553f5af010b}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="ttermpro.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj.filters (from rev 6639, trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{c944ea9f-5e84-4cb4-9662-58a9031ec1be}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{9f09ffc2-cdc3-4159-92f7-e637db2a2927}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Source Files %28C%29">
+      <UniqueIdentifier>{962df722-a84a-4837-a367-5e66f4d40803}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{e3efecca-9842-408d-979e-a4c7af432f65}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="addsetting.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filesys.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="prnabort.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="protodlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="tekwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="teraprn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="teraterm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vtwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="buffer.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="clipboar.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="commlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="keyboard.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="teklib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="telnet.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdde.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdialog.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttfileio.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttime.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttplug.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttsetup.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttwinman.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttwsk.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="vtdisp.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="vtterm.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="winjump.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="WSAAsyncGetAddrInfo.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\..\cygterm\cygterm.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\tek.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\Teraterm.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\teraterm_classic.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt_classic.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttermpro.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="addsetting.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttfileio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/teraterm/teraterm/vtterm.c
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/vtterm.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/vtterm.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -132,6 +132,7 @@
 /* JIS -> SJIS conversion flag */
 static BOOL ConvJIS;
 static WORD Kanji;
+static BOOL Fallbacked;
 
 // variables for status line mode
 static int StatusX=0;
@@ -342,6 +343,7 @@
   EUCsupIn = FALSE;
   SSflag = FALSE;
   ConvJIS = FALSE;
+  Fallbacked = FALSE;
 
   cv.Language = ts.Language;
   cv.CRSend = ts.CRSend;
@@ -512,6 +514,8 @@
 		MoveCursor(CursorLeftM, CursorY);
 	else if (CursorX < CursorLeftM)
 		MoveCursor(0, CursorY);
+
+	Fallbacked = FALSE;
 }
 
 void LineFeed(BYTE b, BOOL logFlag)
@@ -537,6 +541,8 @@
 #endif /* NO_COPYLINE_FIX */
 
 	if (LFMode) CarriageReturn(logFlag);
+
+	Fallbacked = FALSE;
 }
 
 void Tab()
@@ -1801,6 +1807,7 @@
 		else
 			MoveCursor(CursorX,Param[1]-1);
 	}
+	Fallbacked = FALSE;
 }
 
 void CSMoveToXY()		// CUP / HVP
@@ -1831,6 +1838,7 @@
 	}
 
 	MoveCursor(NewX, NewY);
+	Fallbacked = FALSE;
 }
 
 void CSDeleteTabStop()
@@ -4921,8 +4929,10 @@
 
 	ConvJIS = FALSE;
 
-	if (ts.KanjiCode==IdSJIS) {
+	if (ts.KanjiCode==IdSJIS ||
+	   (ts.FallbackToCP932 && (ts.KanjiCode==IdUTF8 || ts.KanjiCode==IdUTF8m))) {
 		if ((0x80<b) && (b<0xa0) || (0xdf<b) && (b<0xfd)) {
+			Fallbacked = TRUE;
 			return TRUE; // SJIS kanji
 		}
 		if ((0xa1<=b) && (b<=0xdf)) {
@@ -5040,19 +5050,29 @@
 		ParseControl(b);
 	}
 	else if (b==0x8E) { // SS2
-		if (ts.KanjiCode==IdEUC) {
+		switch (ts.KanjiCode) {
+		case IdEUC:
 			EUCkanaIn = TRUE;
-		}
-		else {
+			break;
+		case IdUTF8:
+		case IdUTF8m:
+			PutChar('?');
+			break;
+		default:
 			ParseControl(b);
 		}
 	}
 	else if (b==0x8F) { // SS3
-		if (ts.KanjiCode==IdEUC) {
+		switch (ts.KanjiCode) {
+		case IdEUC:
 			EUCcount = 2;
 			EUCsupIn = TRUE;
-		}
-		else {
+			break;
+		case IdUTF8:
+		case IdUTF8m:
+			PutChar('?');
+			break;
+		default:
 			ParseControl(b);
 		}
 	}
@@ -5173,6 +5193,8 @@
 		//Kanji = 0;
 		//PutKanji(b);
 		PutChar(b);
+	} else if ((b==0x8E) || (b==0x8F)) {
+		PutChar('?');
 	} else if ((b>=0x80) && (b<=0x9F)) {
 		ParseControl(b);
 	} else if (b>=0xA0) {
@@ -5316,6 +5338,10 @@
 
 	locptr = setlocale(LC_ALL, ts.Locale);
 
+	if (ts.FallbackToCP932 && Fallbacked) {
+		return ParseFirstJP(b);
+	}
+
 	if ((b & 0x80) != 0x80 || ((b & 0xe0) == 0x80 && count == 0)) {
 		// 1\x83o\x83C\x83g\x96ڂ\xA8\x82\xE6\x82\xD12\x83o\x83C\x83g\x96ڂ\xAAASCII\x82̏ꍇ\x82́A\x82\xB7\x82ׂ\xC4ASCII\x8Fo\x97͂Ƃ\xB7\x82\xE9\x81B
 		// 1\x83o\x83C\x83g\x96ڂ\xAAC1\x90\xA7\x8C䕶\x8E\x9A(0x80-0x9f)\x82̏ꍇ\x82\xE0\x93\xAF\x97l\x81B

Modified: branches/openssl_1_1_0/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/openssl_1_1_0/teraterm/teraterm/vtwin.cpp	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/teraterm/vtwin.cpp	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1002,8 +1002,8 @@
 
 	// added ConfirmPasteMouseRButton (2007.3.17 maya)
 	if ((LMR == IdRightButton) &&
-		!ts.DisablePasteMouseRButton &&
-		ts.ConfirmPasteMouseRButton &&
+		(ts.PasteFlag & CPF_DISABLE_RBUTTON) == 0 &&
+		(ts.PasteFlag & CPF_CONFIRM_RBUTTON) != 0 &&
 		cv.Ready &&
 		!mousereport &&
 		(SendVar==NULL) && (FileVar==NULL) &&
@@ -1603,9 +1603,10 @@
 	BGSetupPrimary(TRUE);
 	// 2006/03/17 by 337 : Alpha\x92l\x82\xE0\x91\xA6\x8E\x9E\x95ύX
 	// Layered\x91\x8B\x82ɂȂ\xC1\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82͌\xF8\x89ʂ\xAA\x96\xB3\x82\xA2
-	if (ts.EtermLookfeel.BGUseAlphaBlendAPI) {
-		MySetLayeredWindowAttributes(HVTWin, 0, ts.AlphaBlend, LWA_ALPHA);
-	}
+	//
+	// AlphaBlend \x82𑦎\x9E\x94\xBD\x89f\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
+	// (2016.12.24 yutaka)
+	SetWindowStyle(&ts);
 #else
 	DispApplyANSIColor();
 #endif
@@ -2018,17 +2019,25 @@
 
 			SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_SETTEXT, 0, (LPARAM)ts.ScpSendDir);
 
-			// \x83L\x83\x83\x83\x93\x83Z\x83\x8B\x83{\x83^\x83\x93\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x82ɂ\xB5\x81A\x96\xB3\x88ӎ\xAF\x82\xC9Enter\x83L\x81[\x82\xF0\x89\x9F\x89\xBA\x82\xB5\x82Ă\xE0\x81A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x81B
-			SetFocus(GetDlgItem(hDlgWnd, IDCANCEL));
-			PostMessage(GetDlgItem(hDlgWnd, IDCANCEL), WM_NEXTDLGCTL, 0, 0L) ;
-
 			// SSH2 \x90ڑ\xB1\x82ł͂Ȃ\xA2\x8Fꍇ\x82ɂ\xCD "SCP" \x82𖳌\x{27B0B7}\x82\xE9\x81B
 			if (cv.isSSH != 2) {
 				EnableWindow(GetDlgItem(hDlgWnd, IDC_DAD_SENDFILE), FALSE);
 				EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_PATH), FALSE);
 				EnableWindow(GetDlgItem(hDlgWnd, IDC_STATIC), FALSE);
+
+				// \x83t\x83H\x81[\x83J\x83X\x82̏\x89\x8A\xFA\x8F\xF3\x91Ԃ\xF0 Cancel \x82ɂ\xB7\x82\xE9\x81B
+				// \x8C\xE3\x82\xC5 WM_NEXTDLGCTL \x82𑗂\xE9\x82̂ŁA Cancel \x82̈\xEA\x82‘O\x82\xCC Send file (IDOK) \x82\xC9
+				// \x83t\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9\x81B(SCP \x82͖\xB3\x8C\xF8\x82ɂȂ\xC1\x82Ă\xA2\x82\xE9\x88\xD7)
+				SetFocus(GetDlgItem(hDlgWnd, IDOK));
 			}
+			else {
+				// SSH2 \x90ڑ\xB1\x8E\x9E\x82\xCD SCP (IDC_DAD_SENDFILE) \x82\xAA\x88\xEA\x82‘O
+				SetFocus(GetDlgItem(hDlgWnd, IDC_DAD_SENDFILE));
+			}
 
+			// \x83t\x83H\x81[\x83J\x83X\x82\xF0\x8E\x9F\x82̃{\x83^\x83\x93(Cancel)\x82Ɉڂ\xB7
+			PostMessage(hDlgWnd, WM_NEXTDLGCTL, 0, 0L);
+
 			// TRUE\x82ɂ\xB7\x82\xE9\x82ƃ{\x83^\x83\x93\x82Ƀt\x83H\x81[\x83J\x83X\x82\xAA\x93\x96\x82\xBD\x82\xE7\x82Ȃ\xA2\x81B
 			return FALSE;
 
@@ -2356,7 +2365,7 @@
 	}
 
 	// added DisablePasteMouseMButton (2008.3.2 maya)
-	if (ts.DisablePasteMouseMButton || mousereport) {
+	if ((ts.PasteFlag & CPF_DISABLE_MBUTTON) || mousereport) {
 		ButtonUp(FALSE);
 	}
 	else {
@@ -2537,12 +2546,12 @@
 
 	/*
 	 *  \x83y\x81[\x83X\x83g\x8F\xF0\x8C\x8F:
-	 *  \x81Ets.DisableMouseRButton      -> \x89E\x83{\x83^\x83\x93\x82ɂ\xE6\x82\xE9\x83y\x81[\x83X\x83g\x96\xB3\x8C\xF8
-	 *  \x81Ets.ConfirmPasteMouseRButton -> \x95\\x8E\xA6\x82\xB3\x82ꂽ\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82\xF0\x8Ds\x82\xA4\x82̂ŁA
-	 *                                   \x89E\x83{\x83^\x83\x93\x83A\x83b\x83v\x82ɂ\xE6\x82\xE9\x83y\x81[\x83X\x83g\x82͍s\x82\xED\x82Ȃ\xA2
-	 *  \x81Emousereport                 -> \x83}\x83E\x83X\x83g\x83\x89\x83b\x83L\x83\x93\x83O\x92\x86\x82̓y\x81[\x83X\x83g\x82\xF0\x8Ds\x82\xED\x82Ȃ\xA2
+	 *  \x81Ets.PasteFlag & CPF_DISABLE_RBUTTON -> \x89E\x83{\x83^\x83\x93\x82ɂ\xE6\x82\xE9\x83y\x81[\x83X\x83g\x96\xB3\x8C\xF8
+	 *  \x81Ets.PasteFlag & CPF_CONFIRM_RBUTTON -> \x95\\x8E\xA6\x82\xB3\x82ꂽ\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82\xF0\x8Ds\x82\xA4\x82̂ŁA
+	 *                                          \x89E\x83{\x83^\x83\x93\x83A\x83b\x83v\x82ɂ\xE6\x82\xE9\x83y\x81[\x83X\x83g\x82͍s\x82\xED\x82Ȃ\xA2
+	 *  \x81Emousereport                        -> \x83}\x83E\x83X\x83g\x83\x89\x83b\x83L\x83\x93\x83O\x92\x86\x82̓y\x81[\x83X\x83g\x82\xF0\x8Ds\x82\xED\x82Ȃ\xA2
 	 */
-	if (ts.DisablePasteMouseRButton || ts.ConfirmPasteMouseRButton || mousereport) {
+	if ((ts.PasteFlag & CPF_DISABLE_RBUTTON) || (ts.PasteFlag & CPF_CONFIRM_RBUTTON) || mousereport) {
 		ButtonUp(FALSE);
 	} else {
 		ButtonUp(TRUE);

Copied: branches/openssl_1_1_0/teraterm/ttermpro.v15.sln (from rev 6639, trunk/teraterm/ttermpro.v15.sln)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttermpro.v15.sln	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttermpro.v15.sln	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,69 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.v15.vcxproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keycode", "keycode\keycode.v15.vcxproj", "{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v15.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v15.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v15.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v15.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpset", "ttpset\ttpset.v15.vcxproj", "{5CF58947-E861-4A5C-B0B1-E85486F149CD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttptek", "ttptek\ttptek.v15.vcxproj", "{6D08053B-1C68-4A7E-8766-3553F5AF010B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svnrev", "svnrev\svnrev.v15.vcxproj", "{80F1C3F0-A213-4D48-85C8-A265990D19A7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Debug|Win32.Build.0 = Debug|Win32
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Release|Win32.ActiveCfg = Release|Win32
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Release|Win32.Build.0 = Release|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Debug|Win32.Build.0 = Debug|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Release|Win32.ActiveCfg = Release|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Release|Win32.Build.0 = Release|Win32
+		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
+		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
+		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
+		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
+		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
+		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
+		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
+		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
+		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.Build.0 = Release|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.Build.0 = Debug|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Release|Win32.ActiveCfg = Release|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Release|Win32.Build.0 = Release|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Debug|Win32.Build.0 = Debug|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Release|Win32.ActiveCfg = Release|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Release|Win32.Build.0 = Release|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Debug|Win32.Build.0 = Debug|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Release|Win32.ActiveCfg = Release|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Release|Win32.Build.0 = Release|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Debug|Win32.Build.0 = Debug|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Release|Win32.ActiveCfg = Release|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.def	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.def	2017-03-18 11:12:07 UTC (rev 6640)
@@ -28,6 +28,8 @@
   GetDefaultFName @47
   ExtractFileName @48
   replaceInvalidFileNameChar @74
+  b64encode @75
+  b64decode @76
   
   SJIS2JIS @30
   SJIS2EUC @31

Copied: branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj (from rev 6639, trunk/teraterm/ttpcmn/ttpcmn.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{118E0D32-5553-4F73-9927-E873C1C500E4}</ProjectGuid>
+    <RootNamespace>ttpcmn</RootNamespace>
+    <ProjectName>ttpcmn</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)htmlhelp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>setupapi.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>setupapi.dll; user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)htmlhelp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>setupapi.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)htmlhelp;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>setupapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="language.c" />
+    <ClCompile Include="ttcmn.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\i18n.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="language.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpcmn.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters (from rev 6639, trunk/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{961353de-481a-43ea-a3f7-3aa6a40ecc0c}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{ffbe82db-a752-43d2-9655-1a279ac14ec8}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{1faecde1-7990-40de-9a84-08c3801f8730}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{9abee5ab-c47d-4b80-a1d5-18fcc30c29b2}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\i18n.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="language.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttcmn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\i18n.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="language.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpcmn.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpdlg/ttdlg.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpdlg/ttdlg.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -2704,7 +2704,7 @@
 	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
 	LOGFONT logfont;
 	HFONT font;
-	int msc_ver, vs_ver;
+	int msc_ver, vs_ver, msc_low_ver;
 
 #if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 	// for animation
@@ -2811,16 +2811,25 @@
 			// \x8C\xB8\x8EZ\x82𒲐\xAE\x82\xB7\x82\xE9\x81B
 			// (2015.12.23 yutaka)
 			msc_ver = (_MSC_FULL_VER / 10000000);
+			msc_low_ver = (_MSC_FULL_VER / 100000) % 100;
 			if (msc_ver < 19) {
 				vs_ver = msc_ver - 6;
 			}
 			else {
-				vs_ver = msc_ver - 5;
+				// 1900 = VS2015(VC++14)
+				// 1910 = VS2017(VC++15)
+				if (msc_low_ver == 10) {
+					vs_ver = msc_ver - 4;
+					msc_low_ver = 0;
+				} 
+				else {
+					vs_ver = msc_ver - 5;
+				}
 			}
 
 			_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " %d.%d",
 				vs_ver,
-				(_MSC_FULL_VER / 100000) % 100);
+				msc_low_ver);
 			strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE);
 			if (_MSC_FULL_VER % 100000) {
 				_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " build %d",

Copied: branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj (from rev 6639, trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
+    <RootNamespace>ttpdlg</RootNamespace>
+    <ProjectName>ttpdlg</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>Version.lib;onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>Version.lib;onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="ttdlg.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="dlg_res.h" />
+    <ClInclude Include="svnversion.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\common\Teraterm.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpdlg.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpdlg.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v12.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters (from rev 6639, trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdlg.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="dlg_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="svnversion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\common\Teraterm.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpdlg.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpdlg.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj (from rev 6639, trunk/teraterm/ttpfile/ttpfile.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{311F2B21-AEC4-4384-8209-BB83B54749B4}</ProjectGuid>
+    <RootNamespace>ttpfile</RootNamespace>
+    <ProjectName>ttpfile</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="bplus.c" />
+    <ClCompile Include="ftlib.c" />
+    <ClCompile Include="kermit.c" />
+    <ClCompile Include="quickvan.c" />
+    <ClCompile Include="ttfile.c" />
+    <ClCompile Include="xmodem.c" />
+    <ClCompile Include="ymodem.c" />
+    <ClCompile Include="zmodem.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="bplus.h" />
+    <ClInclude Include="file_res.h" />
+    <ClInclude Include="ftlib.h" />
+    <ClInclude Include="kermit.h" />
+    <ClInclude Include="quickvan.h" />
+    <ClInclude Include="xmodem.h" />
+    <ClInclude Include="zmodem.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Ttpfile.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpfile.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj.filters (from rev 6639, trunk/teraterm/ttpfile/ttpfile.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpfile/ttpfile.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4c3c8ccd-b3e9-440d-80d1-aaf7b21b8b66}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bf5356c3-e3a3-4281-9958-e8f6a7d0c356}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{360711e5-7725-4557-b8cd-c23158cc1480}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{61d48d45-2990-41db-9324-17ab8b0a2d3d}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="bplus.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kermit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="quickvan.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttfile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="xmodem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ymodem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="zmodem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="bplus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="file_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ftlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="kermit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="quickvan.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="xmodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="zmodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Ttpfile.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpfile.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Deleted: branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-common.h
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-common.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-common.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,164 +0,0 @@
-#pragma once
-/**
- * @file SFMT-common.h
- *
- * @brief SIMD oriented Fast Mersenne Twister(SFMT) pseudorandom
- * number generator with jump function. This file includes common functions
- * used in random number generation and jump.
- *
- * @author Mutsuo Saito (Hiroshima University)
- * @author Makoto Matsumoto (The University of Tokyo)
- *
- * Copyright (C) 2006, 2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
- * University.
- * Copyright (C) 2012 Mutsuo Saito, Makoto Matsumoto, Hiroshima
- * University and The University of Tokyo.
- * All rights reserved.
- *
- * The 3-clause BSD License is applied to this software, see
- * LICENSE.txt
- */
-#ifndef SFMT_COMMON_H
-#define SFMT_COMMON_H
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#include "SFMT.h"
-
-inline static void do_recursion(w128_t * r, w128_t * a, w128_t * b,
-				w128_t * c, w128_t * d);
-
-inline static void rshift128(w128_t *out,  w128_t const *in, int shift);
-inline static void lshift128(w128_t *out,  w128_t const *in, int shift);
-
-/**
- * This function simulates SIMD 128-bit right shift by the standard C.
- * The 128-bit integer given in in is shifted by (shift * 8) bits.
- * This function simulates the LITTLE ENDIAN SIMD.
- * @param out the output of this function
- * @param in the 128-bit data to be shifted
- * @param shift the shift value
- */
-#ifdef ONLY64
-inline static void rshift128(w128_t *out, w128_t const *in, int shift) {
-    uint64_t th, tl, oh, ol;
-
-    th = ((uint64_t)in->u[2] << 32) | ((uint64_t)in->u[3]);
-    tl = ((uint64_t)in->u[0] << 32) | ((uint64_t)in->u[1]);
-
-    oh = th >> (shift * 8);
-    ol = tl >> (shift * 8);
-    ol |= th << (64 - shift * 8);
-    out->u[0] = (uint32_t)(ol >> 32);
-    out->u[1] = (uint32_t)ol;
-    out->u[2] = (uint32_t)(oh >> 32);
-    out->u[3] = (uint32_t)oh;
-}
-#else
-inline static void rshift128(w128_t *out, w128_t const *in, int shift)
-{
-    uint64_t th, tl, oh, ol;
-
-    th = ((uint64_t)in->u[3] << 32) | ((uint64_t)in->u[2]);
-    tl = ((uint64_t)in->u[1] << 32) | ((uint64_t)in->u[0]);
-
-    oh = th >> (shift * 8);
-    ol = tl >> (shift * 8);
-    ol |= th << (64 - shift * 8);
-    out->u[1] = (uint32_t)(ol >> 32);
-    out->u[0] = (uint32_t)ol;
-    out->u[3] = (uint32_t)(oh >> 32);
-    out->u[2] = (uint32_t)oh;
-}
-#endif
-/**
- * This function simulates SIMD 128-bit left shift by the standard C.
- * The 128-bit integer given in in is shifted by (shift * 8) bits.
- * This function simulates the LITTLE ENDIAN SIMD.
- * @param out the output of this function
- * @param in the 128-bit data to be shifted
- * @param shift the shift value
- */
-#ifdef ONLY64
-inline static void lshift128(w128_t *out, w128_t const *in, int shift) {
-    uint64_t th, tl, oh, ol;
-
-    th = ((uint64_t)in->u[2] << 32) | ((uint64_t)in->u[3]);
-    tl = ((uint64_t)in->u[0] << 32) | ((uint64_t)in->u[1]);
-
-    oh = th << (shift * 8);
-    ol = tl << (shift * 8);
-    oh |= tl >> (64 - shift * 8);
-    out->u[0] = (uint32_t)(ol >> 32);
-    out->u[1] = (uint32_t)ol;
-    out->u[2] = (uint32_t)(oh >> 32);
-    out->u[3] = (uint32_t)oh;
-}
-#else
-inline static void lshift128(w128_t *out, w128_t const *in, int shift)
-{
-    uint64_t th, tl, oh, ol;
-
-    th = ((uint64_t)in->u[3] << 32) | ((uint64_t)in->u[2]);
-    tl = ((uint64_t)in->u[1] << 32) | ((uint64_t)in->u[0]);
-
-    oh = th << (shift * 8);
-    ol = tl << (shift * 8);
-    oh |= tl >> (64 - shift * 8);
-    out->u[1] = (uint32_t)(ol >> 32);
-    out->u[0] = (uint32_t)ol;
-    out->u[3] = (uint32_t)(oh >> 32);
-    out->u[2] = (uint32_t)oh;
-}
-#endif
-/**
- * This function represents the recursion formula.
- * @param r output
- * @param a a 128-bit part of the internal state array
- * @param b a 128-bit part of the internal state array
- * @param c a 128-bit part of the internal state array
- * @param d a 128-bit part of the internal state array
- */
-#ifdef ONLY64
-inline static void do_recursion(w128_t *r, w128_t *a, w128_t *b, w128_t *c,
-				w128_t *d) {
-    w128_t x;
-    w128_t y;
-
-    lshift128(&x, a, SFMT_SL2);
-    rshift128(&y, c, SFMT_SR2);
-    r->u[0] = a->u[0] ^ x.u[0] ^ ((b->u[0] >> SFMT_SR1) & SFMT_MSK2) ^ y.u[0]
-	^ (d->u[0] << SFMT_SL1);
-    r->u[1] = a->u[1] ^ x.u[1] ^ ((b->u[1] >> SFMT_SR1) & SFMT_MSK1) ^ y.u[1]
-	^ (d->u[1] << SFMT_SL1);
-    r->u[2] = a->u[2] ^ x.u[2] ^ ((b->u[2] >> SFMT_SR1) & SFMT_MSK4) ^ y.u[2]
-	^ (d->u[2] << SFMT_SL1);
-    r->u[3] = a->u[3] ^ x.u[3] ^ ((b->u[3] >> SFMT_SR1) & SFMT_MSK3) ^ y.u[3]
-	^ (d->u[3] << SFMT_SL1);
-}
-#else
-inline static void do_recursion(w128_t *r, w128_t *a, w128_t *b,
-				w128_t *c, w128_t *d)
-{
-    w128_t x;
-    w128_t y;
-
-    lshift128(&x, a, SFMT_SL2);
-    rshift128(&y, c, SFMT_SR2);
-    r->u[0] = a->u[0] ^ x.u[0] ^ ((b->u[0] >> SFMT_SR1) & SFMT_MSK1)
-	^ y.u[0] ^ (d->u[0] << SFMT_SL1);
-    r->u[1] = a->u[1] ^ x.u[1] ^ ((b->u[1] >> SFMT_SR1) & SFMT_MSK2)
-	^ y.u[1] ^ (d->u[1] << SFMT_SL1);
-    r->u[2] = a->u[2] ^ x.u[2] ^ ((b->u[2] >> SFMT_SR1) & SFMT_MSK3)
-	^ y.u[2] ^ (d->u[2] << SFMT_SL1);
-    r->u[3] = a->u[3] ^ x.u[3] ^ ((b->u[3] >> SFMT_SR1) & SFMT_MSK4)
-	^ y.u[3] ^ (d->u[3] << SFMT_SL1);
-}
-#endif
-#endif
-
-#if defined(__cplusplus)
-}
-#endif

Deleted: branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params.h
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,98 +0,0 @@
-#pragma once
-#ifndef SFMT_PARAMS_H
-#define SFMT_PARAMS_H
-
-#if !defined(SFMT_MEXP)
-#if defined(__GNUC__) && !defined(__ICC)
-  #warning "SFMT_MEXP is not defined. I assume MEXP is 19937."
-#endif
-  #define SFMT_MEXP 19937
-#endif
-/*-----------------
-  BASIC DEFINITIONS
-  -----------------*/
-/** Mersenne Exponent. The period of the sequence
- *  is a multiple of 2^MEXP-1.
- * #define SFMT_MEXP 19937 */
-/** SFMT generator has an internal state array of 128-bit integers,
- * and N is its size. */
-#define SFMT_N (SFMT_MEXP / 128 + 1)
-/** N32 is the size of internal state array when regarded as an array
- * of 32-bit integers.*/
-#define SFMT_N32 (SFMT_N * 4)
-/** N64 is the size of internal state array when regarded as an array
- * of 64-bit integers.*/
-#define SFMT_N64 (SFMT_N * 2)
-
-/*----------------------
-  the parameters of SFMT
-  following definitions are in paramsXXXX.h file.
-  ----------------------*/
-/** the pick up position of the array.
-#define SFMT_POS1 122
-*/
-
-/** the parameter of shift left as four 32-bit registers.
-#define SFMT_SL1 18
- */
-
-/** the parameter of shift left as one 128-bit register.
- * The 128-bit integer is shifted by (SFMT_SL2 * 8) bits.
-#define SFMT_SL2 1
-*/
-
-/** the parameter of shift right as four 32-bit registers.
-#define SFMT_SR1 11
-*/
-
-/** the parameter of shift right as one 128-bit register.
- * The 128-bit integer is shifted by (SFMT_SL2 * 8) bits.
-#define SFMT_SR21 1
-*/
-
-/** A bitmask, used in the recursion.  These parameters are introduced
- * to break symmetry of SIMD.
-#define SFMT_MSK1 0xdfffffefU
-#define SFMT_MSK2 0xddfecb7fU
-#define SFMT_MSK3 0xbffaffffU
-#define SFMT_MSK4 0xbffffff6U
-*/
-
-/** These definitions are part of a 128-bit period certification vector.
-#define SFMT_PARITY1	0x00000001U
-#define SFMT_PARITY2	0x00000000U
-#define SFMT_PARITY3	0x00000000U
-#define SFMT_PARITY4	0xc98e126aU
-*/
-
-#if SFMT_MEXP == 607
-  #include "SFMT-params607.h"
-#elif SFMT_MEXP == 1279
-  #include "SFMT-params1279.h"
-#elif SFMT_MEXP == 2281
-  #include "SFMT-params2281.h"
-#elif SFMT_MEXP == 4253
-  #include "SFMT-params4253.h"
-#elif SFMT_MEXP == 11213
-  #include "SFMT-params11213.h"
-#elif SFMT_MEXP == 19937
-  #include "SFMT-params19937.h"
-#elif SFMT_MEXP == 44497
-  #include "SFMT-params44497.h"
-#elif SFMT_MEXP == 86243
-  #include "SFMT-params86243.h"
-#elif SFMT_MEXP == 132049
-  #include "SFMT-params132049.h"
-#elif SFMT_MEXP == 216091
-  #include "SFMT-params216091.h"
-#else
-#if defined(__GNUC__) && !defined(__ICC)
-  #error "SFMT_MEXP is not valid."
-  #undef SFMT_MEXP
-#else
-  #undef SFMT_MEXP
-#endif
-
-#endif
-
-#endif /* SFMT_PARAMS_H */

Deleted: branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params19937.h
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params19937.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/SFMT-params19937.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,50 +0,0 @@
-#pragma once
-#ifndef SFMT_PARAMS19937_H
-#define SFMT_PARAMS19937_H
-
-#define SFMT_POS1	122
-#define SFMT_SL1	18
-#define SFMT_SL2	1
-#define SFMT_SR1	11
-#define SFMT_SR2	1
-#define SFMT_MSK1	0xdfffffefU
-#define SFMT_MSK2	0xddfecb7fU
-#define SFMT_MSK3	0xbffaffffU
-#define SFMT_MSK4	0xbffffff6U
-#define SFMT_PARITY1	0x00000001U
-#define SFMT_PARITY2	0x00000000U
-#define SFMT_PARITY3	0x00000000U
-#define SFMT_PARITY4	0x13c9e684U
-
-
-/* PARAMETERS FOR ALTIVEC */
-#if defined(__APPLE__)	/* For OSX */
-    #define SFMT_ALTI_SL1 \
-	(vector unsigned int)(SFMT_SL1, SFMT_SL1, SFMT_SL1, SFMT_SL1)
-    #define SFMT_ALTI_SR1 \
-	(vector unsigned int)(SFMT_SR1, SFMT_SR1, SFMT_SR1, SFMT_SR1)
-    #define SFMT_ALTI_MSK \
-	(vector unsigned int)(SFMT_MSK1, SFMT_MSK2, SFMT_MSK3, SFMT_MSK4)
-    #define SFMT_ALTI_MSK64 \
-	(vector unsigned int)(SFMT_MSK2, SFMT_MSK1, SFMT_MSK4, SFMT_MSK3)
-    #define SFMT_ALTI_SL2_PERM \
-	(vector unsigned char)(1,2,3,23,5,6,7,0,9,10,11,4,13,14,15,8)
-    #define SFMT_ALTI_SL2_PERM64 \
-	(vector unsigned char)(1,2,3,4,5,6,7,31,9,10,11,12,13,14,15,0)
-    #define SFMT_ALTI_SR2_PERM \
-	(vector unsigned char)(7,0,1,2,11,4,5,6,15,8,9,10,17,12,13,14)
-    #define SFMT_ALTI_SR2_PERM64 \
-	(vector unsigned char)(15,0,1,2,3,4,5,6,17,8,9,10,11,12,13,14)
-#else	/* For OTHER OSs(Linux?) */
-    #define SFMT_ALTI_SL1	{SFMT_SL1, SFMT_SL1, SFMT_SL1, SFMT_SL1}
-    #define SFMT_ALTI_SR1	{SFMT_SR1, SFMT_SR1, SFMT_SR1, SFMT_SR1}
-    #define SFMT_ALTI_MSK	{SFMT_MSK1, SFMT_MSK2, SFMT_MSK3, SFMT_MSK4}
-    #define SFMT_ALTI_MSK64	{SFMT_MSK2, SFMT_MSK1, SFMT_MSK4, SFMT_MSK3}
-    #define SFMT_ALTI_SL2_PERM	{1,2,3,23,5,6,7,0,9,10,11,4,13,14,15,8}
-    #define SFMT_ALTI_SL2_PERM64 {1,2,3,4,5,6,7,31,9,10,11,12,13,14,15,0}
-    #define SFMT_ALTI_SR2_PERM	{7,0,1,2,11,4,5,6,15,8,9,10,17,12,13,14}
-    #define SFMT_ALTI_SR2_PERM64 {15,0,1,2,3,4,5,6,17,8,9,10,11,12,13,14}
-#endif	/* For OSX */
-#define SFMT_IDSTR	"SFMT-19937:122-18-1-11-1:dfffffef-ddfecb7f-bffaffff-bffffff6"
-
-#endif /* SFMT_PARAMS19937_H */

Deleted: branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.c
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,433 +0,0 @@
-/**
- * @file  SFMT.c
- * @brief SIMD oriented Fast Mersenne Twister(SFMT)
- *
- * @author Mutsuo Saito (Hiroshima University)
- * @author Makoto Matsumoto (Hiroshima University)
- *
- * Copyright (C) 2006, 2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
- * University.
- * Copyright (C) 2012 Mutsuo Saito, Makoto Matsumoto, Hiroshima
- * University and The University of Tokyo.
- * Copyright (C) 2013 Mutsuo Saito, Makoto Matsumoto and Hiroshima
- * University.
- * All rights reserved.
- *
- * The 3-clause BSD License is applied to this software, see
- * LICENSE.txt
- */
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#include <string.h>
-#include <assert.h>
-#include "SFMT.h"
-#include "SFMT-params.h"
-#include "SFMT-common.h"
-
-#if defined(__BIG_ENDIAN__) && !defined(__amd64) && !defined(BIG_ENDIAN64)
-#define BIG_ENDIAN64 1
-#endif
-#if defined(HAVE_ALTIVEC) && !defined(BIG_ENDIAN64)
-#define BIG_ENDIAN64 1
-#endif
-#if defined(ONLY64) && !defined(BIG_ENDIAN64)
-  #if defined(__GNUC__)
-    #error "-DONLY64 must be specified with -DBIG_ENDIAN64"
-  #endif
-#undef ONLY64
-#endif
-
-/**
- * parameters used by sse2.
- */
-static const w128_t sse2_param_mask = {{SFMT_MSK1, SFMT_MSK2,
-                                        SFMT_MSK3, SFMT_MSK4}};
-/*----------------
-  STATIC FUNCTIONS
-  ----------------*/
-inline static int idxof(int i);
-inline static void gen_rand_array(sfmt_t * sfmt, w128_t *array, int size);
-inline static uint32_t func1(uint32_t x);
-inline static uint32_t func2(uint32_t x);
-static void period_certification(sfmt_t * sfmt);
-#if defined(BIG_ENDIAN64) && !defined(ONLY64)
-inline static void swap(w128_t *array, int size);
-#endif
-
-#if defined(HAVE_ALTIVEC)
-  #include "SFMT-alti.h"
-#elif defined(HAVE_SSE2)
-  #if defined(_MSC_VER)
-    #include "SFMT-sse2-msc.h"
-  #else
-    #include "SFMT-sse2.h"
-  #endif
-#endif
-
-/**
- * This function simulate a 64-bit index of LITTLE ENDIAN
- * in BIG ENDIAN machine.
- */
-#ifdef ONLY64
-inline static int idxof(int i) {
-    return i ^ 1;
-}
-#else
-inline static int idxof(int i) {
-    return i;
-}
-#endif
-
-#if (!defined(HAVE_ALTIVEC)) && (!defined(HAVE_SSE2))
-/**
- * This function fills the user-specified array with pseudorandom
- * integers.
- *
- * @param sfmt SFMT internal state
- * @param array an 128-bit array to be filled by pseudorandom numbers.
- * @param size number of 128-bit pseudorandom numbers to be generated.
- */
-inline static void gen_rand_array(sfmt_t * sfmt, w128_t *array, int size) {
-    int i, j;
-    w128_t *r1, *r2;
-
-    r1 = &sfmt->state[SFMT_N - 2];
-    r2 = &sfmt->state[SFMT_N - 1];
-    for (i = 0; i < SFMT_N - SFMT_POS1; i++) {
-        do_recursion(&array[i], &sfmt->state[i], &sfmt->state[i + SFMT_POS1], r1, r2);
-        r1 = r2;
-        r2 = &array[i];
-    }
-    for (; i < SFMT_N; i++) {
-        do_recursion(&array[i], &sfmt->state[i],
-                     &array[i + SFMT_POS1 - SFMT_N], r1, r2);
-        r1 = r2;
-        r2 = &array[i];
-    }
-    for (; i < size - SFMT_N; i++) {
-        do_recursion(&array[i], &array[i - SFMT_N],
-                     &array[i + SFMT_POS1 - SFMT_N], r1, r2);
-        r1 = r2;
-        r2 = &array[i];
-    }
-    for (j = 0; j < 2 * SFMT_N - size; j++) {
-        sfmt->state[j] = array[j + size - SFMT_N];
-    }
-    for (; i < size; i++, j++) {
-        do_recursion(&array[i], &array[i - SFMT_N],
-                     &array[i + SFMT_POS1 - SFMT_N], r1, r2);
-        r1 = r2;
-        r2 = &array[i];
-        sfmt->state[j] = array[i];
-    }
-}
-#endif
-
-#if defined(BIG_ENDIAN64) && !defined(ONLY64) && !defined(HAVE_ALTIVEC)
-inline static void swap(w128_t *array, int size) {
-    int i;
-    uint32_t x, y;
-
-    for (i = 0; i < size; i++) {
-        x = array[i].u[0];
-        y = array[i].u[2];
-        array[i].u[0] = array[i].u[1];
-        array[i].u[2] = array[i].u[3];
-        array[i].u[1] = x;
-        array[i].u[3] = y;
-    }
-}
-#endif
-/**
- * This function represents a function used in the initialization
- * by init_by_array
- * @param x 32-bit integer
- * @return 32-bit integer
- */
-static uint32_t func1(uint32_t x) {
-    return (x ^ (x >> 27)) * (uint32_t)1664525UL;
-}
-
-/**
- * This function represents a function used in the initialization
- * by init_by_array
- * @param x 32-bit integer
- * @return 32-bit integer
- */
-static uint32_t func2(uint32_t x) {
-    return (x ^ (x >> 27)) * (uint32_t)1566083941UL;
-}
-
-/**
- * This function certificate the period of 2^{MEXP}
- * @param sfmt SFMT internal state
- */
-static void period_certification(sfmt_t * sfmt) {
-    int inner = 0;
-    int i, j;
-    uint32_t work;
-    uint32_t *psfmt32 = &sfmt->state[0].u[0];
-    const uint32_t parity[4] = {SFMT_PARITY1, SFMT_PARITY2,
-                                SFMT_PARITY3, SFMT_PARITY4};
-
-    for (i = 0; i < 4; i++)
-        inner ^= psfmt32[idxof(i)] & parity[i];
-    for (i = 16; i > 0; i >>= 1)
-        inner ^= inner >> i;
-    inner &= 1;
-    /* check OK */
-    if (inner == 1) {
-        return;
-    }
-    /* check NG, and modification */
-    for (i = 0; i < 4; i++) {
-        work = 1;
-        for (j = 0; j < 32; j++) {
-            if ((work & parity[i]) != 0) {
-                psfmt32[idxof(i)] ^= work;
-                return;
-            }
-            work = work << 1;
-        }
-    }
-}
-
-/*----------------
-  PUBLIC FUNCTIONS
-  ----------------*/
-#define UNUSED_VARIABLE(x) (void)(x)
-/**
- * This function returns the identification string.
- * The string shows the word size, the Mersenne exponent,
- * and all parameters of this generator.
- * @param sfmt SFMT internal state
- */
-const char *sfmt_get_idstring(sfmt_t * sfmt) {
-    UNUSED_VARIABLE(sfmt);
-    return SFMT_IDSTR;
-}
-
-/**
- * This function returns the minimum size of array used for \b
- * fill_array32() function.
- * @param sfmt SFMT internal state
- * @return minimum size of array used for fill_array32() function.
- */
-int sfmt_get_min_array_size32(sfmt_t * sfmt) {
-    UNUSED_VARIABLE(sfmt);
-    return SFMT_N32;
-}
-
-/**
- * This function returns the minimum size of array used for \b
- * fill_array64() function.
- * @param sfmt SFMT internal state
- * @return minimum size of array used for fill_array64() function.
- */
-int sfmt_get_min_array_size64(sfmt_t * sfmt) {
-    UNUSED_VARIABLE(sfmt);
-    return SFMT_N64;
-}
-
-#if !defined(HAVE_SSE2) && !defined(HAVE_ALTIVEC)
-/**
- * This function fills the internal state array with pseudorandom
- * integers.
- * @param sfmt SFMT internal state
- */
-void sfmt_gen_rand_all(sfmt_t * sfmt) {
-    int i;
-    w128_t *r1, *r2;
-
-    r1 = &sfmt->state[SFMT_N - 2];
-    r2 = &sfmt->state[SFMT_N - 1];
-    for (i = 0; i < SFMT_N - SFMT_POS1; i++) {
-        do_recursion(&sfmt->state[i], &sfmt->state[i],
-                     &sfmt->state[i + SFMT_POS1], r1, r2);
-        r1 = r2;
-        r2 = &sfmt->state[i];
-    }
-    for (; i < SFMT_N; i++) {
-        do_recursion(&sfmt->state[i], &sfmt->state[i],
-                     &sfmt->state[i + SFMT_POS1 - SFMT_N], r1, r2);
-        r1 = r2;
-        r2 = &sfmt->state[i];
-    }
-}
-#endif
-
-#ifndef ONLY64
-/**
- * This function generates pseudorandom 32-bit integers in the
- * specified array[] by one call. The number of pseudorandom integers
- * is specified by the argument size, which must be at least 624 and a
- * multiple of four.  The generation by this function is much faster
- * than the following gen_rand function.
- *
- * For initialization, init_gen_rand or init_by_array must be called
- * before the first call of this function. This function can not be
- * used after calling gen_rand function, without initialization.
- *
- * @param sfmt SFMT internal state
- * @param array an array where pseudorandom 32-bit integers are filled
- * by this function.  The pointer to the array must be \b "aligned"
- * (namely, must be a multiple of 16) in the SIMD version, since it
- * refers to the address of a 128-bit integer.  In the standard C
- * version, the pointer is arbitrary.
- *
- * @param size the number of 32-bit pseudorandom integers to be
- * generated.  size must be a multiple of 4, and greater than or equal
- * to (MEXP / 128 + 1) * 4.
- *
- * @note \b memalign or \b posix_memalign is available to get aligned
- * memory. Mac OSX doesn't have these functions, but \b malloc of OSX
- * returns the pointer to the aligned memory block.
- */
-void sfmt_fill_array32(sfmt_t * sfmt, uint32_t *array, int size) {
-    assert(sfmt->idx == SFMT_N32);
-    assert(size % 4 == 0);
-    assert(size >= SFMT_N32);
-
-    gen_rand_array(sfmt, (w128_t *)array, size / 4);
-    sfmt->idx = SFMT_N32;
-}
-#endif
-
-/**
- * This function generates pseudorandom 64-bit integers in the
- * specified array[] by one call. The number of pseudorandom integers
- * is specified by the argument size, which must be at least 312 and a
- * multiple of two.  The generation by this function is much faster
- * than the following gen_rand function.
- *
- * @param sfmt SFMT internal state
- * For initialization, init_gen_rand or init_by_array must be called
- * before the first call of this function. This function can not be
- * used after calling gen_rand function, without initialization.
- *
- * @param array an array where pseudorandom 64-bit integers are filled
- * by this function.  The pointer to the array must be "aligned"
- * (namely, must be a multiple of 16) in the SIMD version, since it
- * refers to the address of a 128-bit integer.  In the standard C
- * version, the pointer is arbitrary.
- *
- * @param size the number of 64-bit pseudorandom integers to be
- * generated.  size must be a multiple of 2, and greater than or equal
- * to (MEXP / 128 + 1) * 2
- *
- * @note \b memalign or \b posix_memalign is available to get aligned
- * memory. Mac OSX doesn't have these functions, but \b malloc of OSX
- * returns the pointer to the aligned memory block.
- */
-void sfmt_fill_array64(sfmt_t * sfmt, uint64_t *array, int size) {
-    assert(sfmt->idx == SFMT_N32);
-    assert(size % 2 == 0);
-    assert(size >= SFMT_N64);
-
-    gen_rand_array(sfmt, (w128_t *)array, size / 2);
-    sfmt->idx = SFMT_N32;
-
-#if defined(BIG_ENDIAN64) && !defined(ONLY64)
-    swap((w128_t *)array, size /2);
-#endif
-}
-
-/**
- * This function initializes the internal state array with a 32-bit
- * integer seed.
- *
- * @param sfmt SFMT internal state
- * @param seed a 32-bit integer used as the seed.
- */
-void sfmt_init_gen_rand(sfmt_t * sfmt, uint32_t seed) {
-    int i;
-
-    uint32_t *psfmt32 = &sfmt->state[0].u[0];
-
-    psfmt32[idxof(0)] = seed;
-    for (i = 1; i < SFMT_N32; i++) {
-        psfmt32[idxof(i)] = 1812433253UL * (psfmt32[idxof(i - 1)]
-                                            ^ (psfmt32[idxof(i - 1)] >> 30))
-            + i;
-    }
-    sfmt->idx = SFMT_N32;
-    period_certification(sfmt);
-}
-
-/**
- * This function initializes the internal state array,
- * with an array of 32-bit integers used as the seeds
- * @param sfmt SFMT internal state
- * @param init_key the array of 32-bit integers, used as a seed.
- * @param key_length the length of init_key.
- */
-void sfmt_init_by_array(sfmt_t * sfmt, uint32_t *init_key, int key_length) {
-    int i, j, count;
-    uint32_t r;
-    int lag;
-    int mid;
-    int size = SFMT_N * 4;
-    uint32_t *psfmt32 = &sfmt->state[0].u[0];
-
-    if (size >= 623) {
-        lag = 11;
-    } else if (size >= 68) {
-        lag = 7;
-    } else if (size >= 39) {
-        lag = 5;
-    } else {
-        lag = 3;
-    }
-    mid = (size - lag) / 2;
-
-    memset(sfmt, 0x8b, sizeof(sfmt_t));
-    if (key_length + 1 > SFMT_N32) {
-        count = key_length + 1;
-    } else {
-        count = SFMT_N32;
-    }
-    r = func1(psfmt32[idxof(0)] ^ psfmt32[idxof(mid)]
-              ^ psfmt32[idxof(SFMT_N32 - 1)]);
-    psfmt32[idxof(mid)] += r;
-    r += key_length;
-    psfmt32[idxof(mid + lag)] += r;
-    psfmt32[idxof(0)] = r;
-
-    count--;
-    for (i = 1, j = 0; (j < count) && (j < key_length); j++) {
-        r = func1(psfmt32[idxof(i)] ^ psfmt32[idxof((i + mid) % SFMT_N32)]
-                  ^ psfmt32[idxof((i + SFMT_N32 - 1) % SFMT_N32)]);
-        psfmt32[idxof((i + mid) % SFMT_N32)] += r;
-        r += init_key[j] + i;
-        psfmt32[idxof((i + mid + lag) % SFMT_N32)] += r;
-        psfmt32[idxof(i)] = r;
-        i = (i + 1) % SFMT_N32;
-    }
-    for (; j < count; j++) {
-        r = func1(psfmt32[idxof(i)] ^ psfmt32[idxof((i + mid) % SFMT_N32)]
-                  ^ psfmt32[idxof((i + SFMT_N32 - 1) % SFMT_N32)]);
-        psfmt32[idxof((i + mid) % SFMT_N32)] += r;
-        r += i;
-        psfmt32[idxof((i + mid + lag) % SFMT_N32)] += r;
-        psfmt32[idxof(i)] = r;
-        i = (i + 1) % SFMT_N32;
-    }
-    for (j = 0; j < SFMT_N32; j++) {
-        r = func2(psfmt32[idxof(i)] + psfmt32[idxof((i + mid) % SFMT_N32)]
-                  + psfmt32[idxof((i + SFMT_N32 - 1) % SFMT_N32)]);
-        psfmt32[idxof((i + mid) % SFMT_N32)] ^= r;
-        r -= i;
-        psfmt32[idxof((i + mid + lag) % SFMT_N32)] ^= r;
-        psfmt32[idxof(i)] = r;
-        i = (i + 1) % SFMT_N32;
-    }
-
-    sfmt->idx = SFMT_N32;
-    period_certification(sfmt);
-}
-#if defined(__cplusplus)
-}
-#endif

Deleted: branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.h
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/SFMT.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,295 +0,0 @@
-#pragma once
-/**
- * @file SFMT.h
- *
- * @brief SIMD oriented Fast Mersenne Twister(SFMT) pseudorandom
- * number generator using C structure.
- *
- * @author Mutsuo Saito (Hiroshima University)
- * @author Makoto Matsumoto (The University of Tokyo)
- *
- * Copyright (C) 2006, 2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
- * University.
- * Copyright (C) 2012 Mutsuo Saito, Makoto Matsumoto, Hiroshima
- * University and The University of Tokyo.
- * All rights reserved.
- *
- * The 3-clause BSD License is applied to this software, see
- * LICENSE.txt
- *
- * @note We assume that your system has inttypes.h.  If your system
- * doesn't have inttypes.h, you have to typedef uint32_t and uint64_t,
- * and you have to define PRIu64 and PRIx64 in this file as follows:
- * @verbatim
- typedef unsigned int uint32_t
- typedef unsigned long long uint64_t
- #define PRIu64 "llu"
- #define PRIx64 "llx"
- ＠ endverbatim
- * uint32_t must be exactly 32-bit unsigned integer type (no more, no
- * less), and uint64_t must be exactly 64-bit unsigned integer type.
- * PRIu64 and PRIx64 are used for printf function to print 64-bit
- * unsigned int and 64-bit unsigned int in hexadecimal format.
- */
-
-#ifndef SFMTST_H
-#define SFMTST_H
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <assert.h>
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-  #include <inttypes.h>
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
-  typedef unsigned int uint32_t;
-  typedef unsigned __int64 uint64_t;
-  #define inline __inline
-#else
-  #include <inttypes.h>
-  #if defined(__GNUC__)
-    #define inline __inline__
-  #endif
-#endif
-
-#ifndef PRIu64
-  #if defined(_MSC_VER) || defined(__BORLANDC__)
-    #define PRIu64 "I64u"
-    #define PRIx64 "I64x"
-  #else
-    #define PRIu64 "llu"
-    #define PRIx64 "llx"
-  #endif
-#endif
-
-#include "SFMT-params.h"
-
-/*------------------------------------------
-  128-bit SIMD like data type for standard C
-  ------------------------------------------*/
-#if defined(HAVE_ALTIVEC)
-  #if !defined(__APPLE__)
-    #include <altivec.h>
-  #endif
-/** 128-bit data structure */
-union W128_T {
-    vector unsigned int s;
-    uint32_t u[4];
-    uint64_t u64[2];
-};
-#elif defined(HAVE_SSE2)
-  #include <emmintrin.h>
-
-/** 128-bit data structure */
-union W128_T {
-    uint32_t u[4];
-    uint64_t u64[2];
-    __m128i si;
-};
-#else
-/** 128-bit data structure */
-union W128_T {
-    uint32_t u[4];
-    uint64_t u64[2];
-};
-#endif
-
-/** 128-bit data type */
-typedef union W128_T w128_t;
-
-/**
- * SFMT internal state
- */
-struct SFMT_T {
-    /** the 128-bit internal state array */
-    w128_t state[SFMT_N];
-    /** index counter to the 32-bit internal state array */
-    int idx;
-};
-
-typedef struct SFMT_T sfmt_t;
-
-void sfmt_fill_array32(sfmt_t * sfmt, uint32_t * array, int size);
-void sfmt_fill_array64(sfmt_t * sfmt, uint64_t * array, int size);
-void sfmt_init_gen_rand(sfmt_t * sfmt, uint32_t seed);
-void sfmt_init_by_array(sfmt_t * sfmt, uint32_t * init_key, int key_length);
-const char * sfmt_get_idstring(sfmt_t * sfmt);
-int sfmt_get_min_array_size32(sfmt_t * sfmt);
-int sfmt_get_min_array_size64(sfmt_t * sfmt);
-void sfmt_gen_rand_all(sfmt_t * sfmt);
-
-#ifndef ONLY64
-/**
- * This function generates and returns 32-bit pseudorandom number.
- * init_gen_rand or init_by_array must be called before this function.
- * @param sfmt SFMT internal state
- * @return 32-bit pseudorandom number
- */
-inline static uint32_t sfmt_genrand_uint32(sfmt_t * sfmt) {
-    uint32_t r;
-    uint32_t * psfmt32 = &sfmt->state[0].u[0];
-
-    if (sfmt->idx >= SFMT_N32) {
-        sfmt_gen_rand_all(sfmt);
-        sfmt->idx = 0;
-    }
-    r = psfmt32[sfmt->idx++];
-    return r;
-}
-#endif
-/**
- * This function generates and returns 64-bit pseudorandom number.
- * init_gen_rand or init_by_array must be called before this function.
- * The function gen_rand64 should not be called after gen_rand32,
- * unless an initialization is again executed.
- * @param sfmt SFMT internal state
- * @return 64-bit pseudorandom number
- */
-inline static uint64_t sfmt_genrand_uint64(sfmt_t * sfmt) {
-#if defined(BIG_ENDIAN64) && !defined(ONLY64)
-    uint32_t * psfmt32 = &sfmt->state[0].u[0];
-    uint32_t r1, r2;
-#else
-    uint64_t r;
-#endif
-    uint64_t * psfmt64 = &sfmt->state[0].u64[0];
-    assert(sfmt->idx % 2 == 0);
-
-    if (sfmt->idx >= SFMT_N32) {
-        sfmt_gen_rand_all(sfmt);
-        sfmt->idx = 0;
-    }
-#if defined(BIG_ENDIAN64) && !defined(ONLY64)
-    r1 = psfmt32[sfmt->idx];
-    r2 = psfmt32[sfmt->idx + 1];
-    sfmt->idx += 2;
-    return ((uint64_t)r2 << 32) | r1;
-#else
-    r = psfmt64[sfmt->idx / 2];
-    sfmt->idx += 2;
-    return r;
-#endif
-}
-
-/* =================================================
-   The following real versions are due to Isaku Wada
-   ================================================= */
-/**
- * converts an unsigned 32-bit number to a double on [0,1]-real-interval.
- * @param v 32-bit unsigned integer
- * @return double on [0,1]-real-interval
- */
-inline static double sfmt_to_real1(uint32_t v)
-{
-    return v * (1.0/4294967295.0);
-    /* divided by 2^32-1 */
-}
-
-/**
- * generates a random number on [0,1]-real-interval
- * @param sfmt SFMT internal state
- * @return double on [0,1]-real-interval
- */
-inline static double sfmt_genrand_real1(sfmt_t * sfmt)
-{
-    return sfmt_to_real1(sfmt_genrand_uint32(sfmt));
-}
-
-/**
- * converts an unsigned 32-bit integer to a double on [0,1)-real-interval.
- * @param v 32-bit unsigned integer
- * @return double on [0,1)-real-interval
- */
-inline static double sfmt_to_real2(uint32_t v)
-{
-    return v * (1.0/4294967296.0);
-    /* divided by 2^32 */
-}
-
-/**
- * generates a random number on [0,1)-real-interval
- * @param sfmt SFMT internal state
- * @return double on [0,1)-real-interval
- */
-inline static double sfmt_genrand_real2(sfmt_t * sfmt)
-{
-    return sfmt_to_real2(sfmt_genrand_uint32(sfmt));
-}
-
-/**
- * converts an unsigned 32-bit integer to a double on (0,1)-real-interval.
- * @param v 32-bit unsigned integer
- * @return double on (0,1)-real-interval
- */
-inline static double sfmt_to_real3(uint32_t v)
-{
-    return (((double)v) + 0.5)*(1.0/4294967296.0);
-    /* divided by 2^32 */
-}
-
-/**
- * generates a random number on (0,1)-real-interval
- * @param sfmt SFMT internal state
- * @return double on (0,1)-real-interval
- */
-inline static double sfmt_genrand_real3(sfmt_t * sfmt)
-{
-    return sfmt_to_real3(sfmt_genrand_uint32(sfmt));
-}
-
-/**
- * converts an unsigned 32-bit integer to double on [0,1)
- * with 53-bit resolution.
- * @param v 32-bit unsigned integer
- * @return double on [0,1)-real-interval with 53-bit resolution.
- */
-inline static double sfmt_to_res53(uint64_t v)
-{
-    return v * (1.0/18446744073709551616.0);
-}
-
-/**
- * generates a random number on [0,1) with 53-bit resolution
- * @param sfmt SFMT internal state
- * @return double on [0,1) with 53-bit resolution
- */
-inline static double sfmt_genrand_res53(sfmt_t * sfmt)
-{
-    return sfmt_to_res53(sfmt_genrand_uint64(sfmt));
-}
-
-
-/* =================================================
-   The following function are added by Saito.
-   ================================================= */
-/**
- * generates a random number on [0,1) with 53-bit resolution from two
- * 32 bit integers
- */
-inline static double sfmt_to_res53_mix(uint32_t x, uint32_t y)
-{
-    return sfmt_to_res53(x | ((uint64_t)y << 32));
-}
-
-/**
- * generates a random number on [0,1) with 53-bit resolution
- * using two 32bit integers.
- * @param sfmt SFMT internal state
- * @return double on [0,1) with 53-bit resolution
- */
-inline static double sfmt_genrand_res53_mix(sfmt_t * sfmt)
-{
-    uint32_t x, y;
-
-    x = sfmt_genrand_uint32(sfmt);
-    y = sfmt_genrand_uint32(sfmt);
-    return sfmt_to_res53_mix(x, y);
-}
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttl.c
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttl.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttl.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -6254,6 +6254,8 @@
 			Err = TTLSetExitCode(); break;
 		case RsvSetFileAttr:
 			Err = TTLSetFileAttr(); break;
+		case RsvSetFlowCtrl:
+			Err = TTLCommCmdInt(CmdSetFlowCtrl,0); break;
 		case RsvSetRts:
 			Err = TTLCommCmdInt(CmdSetRts,0); break;
 		case RsvSetSync:

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttmdde.h
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttmdde.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttmdde.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -63,6 +63,7 @@
 #define CmdLogRotate    'W'
 #define CmdLogAutoClose 'X'
 #define CmdGetModemStatus 'Y'
+#define CmdSetFlowCtrl  'Z'
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.c
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -348,6 +348,7 @@
 		else if (_stricmp(Str,"setecho")==0) *WordId = RsvSetEcho;
 		else if (_stricmp(Str,"setenv")==0) *WordId = RsvSetEnv;    // reactivate 'setenv' (2007.8.31 maya)
 		else if (_stricmp(Str,"setexitcode")==0) *WordId = RsvSetExitCode;
+		else if (_stricmp(Str,"setflowctrl")==0) *WordId = RsvSetFlowCtrl;
 		else if (_stricmp(Str,"setpassword")==0) *WordId = RsvSetPassword;    // add 'setpassword'  (2012.5.23 yutaka)
 		else if (_stricmp(Str,"setrts")==0) *WordId = RsvSetRts;    // add 'setrts'  (2008.3.12 maya)
 		else if (_stricmp(Str,"setsync")==0) *WordId = RsvSetSync;

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.h
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttmparse.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -248,6 +248,7 @@
 #define RsvUptime		212
 #define RsvGetModemStatus	213
 #define RsvDirnameBox   214
+#define RsvSetFlowCtrl   215
 
 #define RsvOperator     1000
 #define RsvBNot         1001

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.rc	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.rc	2017-03-18 11:12:07 UTC (rev 6640)
@@ -147,8 +147,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,93,0,0
- PRODUCTVERSION 4,93,0,0
+ FILEVERSION 4,94,0,0
+ PRODUCTVERSION 4,94,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -165,12 +165,12 @@
         BEGIN
             VALUE "CompanyName", "T. Teranishi, TeraTerm Project"
             VALUE "FileDescription", "TTPMACRO"
-            VALUE "FileVersion", "4, 93, 0, 0"
+            VALUE "FileVersion", "4, 94, 0, 0"
             VALUE "InternalName", "TTPMACRO"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2016 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2017 TeraTerm Project"
             VALUE "OriginalFilename", "TTPMACRO.EXE"
             VALUE "ProductName", "TTPMACRO"
-            VALUE "ProductVersion", "4, 93, 0, 0"
+            VALUE "ProductVersion", "4, 94, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -63,7 +63,7 @@
  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -78,9 +78,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_s.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_s.lib;SFMT.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -100,7 +100,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -114,9 +114,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;SFMTd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -142,7 +142,6 @@
     <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
-    <ClCompile Include="SFMT.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h" />
@@ -163,10 +162,6 @@
     <ClInclude Include="ttmmain.h" />
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
-    <ClInclude Include="SFMT.h" />
-    <ClInclude Include="SFMT-common.h" />
-    <ClInclude Include="SFMT-params.h" />
-    <ClInclude Include="SFMT-params19937.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Ttmacro.ico" />

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -64,7 +64,7 @@
  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -79,9 +79,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_s.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_s.lib;SFMT.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -100,7 +100,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -114,9 +114,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;SFMTd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -142,7 +142,6 @@
     <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
-    <ClCompile Include="SFMT.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h" />
@@ -163,10 +162,6 @@
     <ClInclude Include="ttmmain.h" />
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
-    <ClInclude Include="SFMT.h" />
-    <ClInclude Include="SFMT-common.h" />
-    <ClInclude Include="SFMT-params.h" />
-    <ClInclude Include="SFMT-params19937.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Ttmacro.ico" />

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -64,7 +64,7 @@
  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -79,9 +79,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -101,7 +101,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -115,9 +115,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -144,7 +144,6 @@
     <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
-    <ClCompile Include="SFMT.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\ttlib.h" />
@@ -165,10 +164,6 @@
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
     <ClInclude Include="ttm_res.h" />
-    <ClInclude Include="SFMT.h" />
-    <ClInclude Include="SFMT-common.h" />
-    <ClInclude Include="SFMT-params.h" />
-    <ClInclude Include="SFMT-params19937.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Ttmacro.ico" />

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -64,7 +64,7 @@
  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -79,9 +79,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -101,7 +101,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -115,9 +115,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -144,7 +144,6 @@
     <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
-    <ClCompile Include="SFMT.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\ttlib.h" />
@@ -165,10 +164,6 @@
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
     <ClInclude Include="ttm_res.h" />
-    <ClInclude Include="SFMT.h" />
-    <ClInclude Include="SFMT-common.h" />
-    <ClInclude Include="SFMT-params.h" />
-    <ClInclude Include="SFMT-params19937.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Ttmacro.ico" />

Copied: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj (from rev 6639, trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BA519362-A2C2-4B1A-905B-F00791F9038A}</ProjectGuid>
+    <RootNamespace>ttpmacro</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+    <ProjectName>ttpmacro</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE"
+ %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;Version.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="errdlg.cpp" />
+    <ClCompile Include="inpdlg.cpp" />
+    <ClCompile Include="ListDlg.cpp" />
+    <ClCompile Include="msgdlg.cpp" />
+    <ClCompile Include="statdlg.cpp" />
+    <ClCompile Include="ttl.c" />
+    <ClCompile Include="ttmacro.cpp" />
+    <ClCompile Include="ttmbuff.c" />
+    <ClCompile Include="ttmdde.c" />
+    <ClCompile Include="ttmdlg.cpp" />
+    <ClCompile Include="ttmenc.c" />
+    <ClCompile Include="ttmlib.c" />
+    <ClCompile Include="ttmmain.cpp" />
+    <ClCompile Include="ttmparse.c" />
+    <ClCompile Include="wait4all.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="errdlg.h" />
+    <ClInclude Include="inpdlg.h" />
+    <ClInclude Include="ListDlg.h" />
+    <ClInclude Include="msgdlg.h" />
+    <ClInclude Include="statdlg.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="ttl.h" />
+    <ClInclude Include="ttmacro.h" />
+    <ClInclude Include="ttmbuff.h" />
+    <ClInclude Include="ttmdde.h" />
+    <ClInclude Include="ttmdlg.h" />
+    <ClInclude Include="ttmenc.h" />
+    <ClInclude Include="ttmlib.h" />
+    <ClInclude Include="ttmmain.h" />
+    <ClInclude Include="ttmmsg.h" />
+    <ClInclude Include="ttmparse.h" />
+    <ClInclude Include="ttm_res.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Ttmacro.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpmacro.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="ttpmacro.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

Copied: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters (from rev 6639, trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{924f64f3-99d1-4df3-a201-68b1b1a000c5}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a572c283-2f72-45e8-8e83-9b17b3960cb5}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{51ae6c43-0b05-42b4-881b-b0b848091d1b}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Source Files %28C%29">
+      <UniqueIdentifier>{1744405b-5e2a-4278-ac2e-19f0db3d82d1}</UniqueIdentifier>
+      <Extensions>c</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="errdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="inpdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ListDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="msgdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="statdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmacro.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\i18n.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttl.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmbuff.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmdde.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmenc.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmparse.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="wait4all.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="errdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inpdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ListDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="msgdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="statdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttm_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmacro.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmbuff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmenc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmmain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmmsg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Ttmacro.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpmacro.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v9.vcproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.v9.vcproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -50,7 +50,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;&#x0D;&#x0A;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -73,10 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib Version.lib iphlpapi.lib"
+				AdditionalDependencies="onig_s.lib SFMT.lib Version.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -139,7 +139,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				WarningLevel="3"
@@ -161,10 +161,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib Version.lib iphlpapi.lib"
+				AdditionalDependencies="onig_sd.lib SFMTd.lib Version.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -311,22 +311,6 @@
 				RelativePath="ttmparse.h"
 				>
 			</File>
-			<File
-				RelativePath="SFMT.h"
-				>
-			</File>
-			<File
-				RelativePath="SFMT-common.h"
-				>
-			</File>
-			<File
-				RelativePath="SFMT-params.h"
-				>
-			</File>
-			<File
-				RelativePath="SFMT-params19937.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -403,10 +387,6 @@
 				RelativePath=".\wait4all.c"
 				>
 			</File>
-			<File
-				RelativePath="SFMT.c"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.vcproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpmacro/ttpmacro.vcproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -49,7 +49,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;&#x0D;&#x0A;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -72,10 +72,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib Version.lib iphlpapi.lib"
+				AdditionalDependencies="onig_s.lib SFMT.lib Version.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -139,7 +139,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(SolutionDir)common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				WarningLevel="3"
@@ -161,10 +161,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib Version.lib iphlpapi.lib"
+				AdditionalDependencies="onig_sd.lib SFMTd.lib Version.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -257,22 +257,6 @@
 				>
 			</File>
 			<File
-				RelativePath="SFMT-common.h"
-				>
-			</File>
-			<File
-				RelativePath="SFMT-params.h"
-				>
-			</File>
-			<File
-				RelativePath="SFMT-params19937.h"
-				>
-			</File>
-			<File
-				RelativePath="SFMT.h"
-				>
-			</File>
-			<File
 				RelativePath="statdlg.h"
 				>
 			</File>
@@ -373,10 +357,6 @@
 				>
 			</File>
 			<File
-				RelativePath="SFMT.c"
-				>
-			</File>
-			<File
 				RelativePath="ttl.c"
 				>
 			</File>

Copied: branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj (from rev 6639, trunk/teraterm/ttpset/ttpset.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5CF58947-E861-4A5C-B0B1-E85486F149CD}</ProjectGuid>
+    <RootNamespace>ttpset</RootNamespace>
+    <ProjectName>ttpset</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessToFile>false</PreprocessToFile>
+      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="ttset.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\teraterm.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\tttypes.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpset.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj.filters (from rev 6639, trunk/teraterm/ttpset/ttpset.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttpset/ttpset.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{231eb625-d36d-4fcd-b765-38c34ddf68b4}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bc796587-a18b-4d16-a02f-fd5d92b753a1}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{0c0e3885-2eac-4958-8c3d-2b3501e30482}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{a485420e-6b4b-47df-9138-6d817f8e258b}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpset.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/teraterm/ttpset/ttset.c
===================================================================
--- branches/openssl_1_1_0/teraterm/ttpset/ttset.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/teraterm/ttpset/ttset.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -512,6 +512,7 @@
 	ts->PortFlag = 0;			// Port flags
 	ts->WindowFlag = 0;			// Window flags
 	ts->CtrlFlag = 0;			// Control sequence flags
+	ts->PasteFlag = 0;			// Clipboard Paste flags
 	ts->TelPort = 23;
 
 	ts->DisableTCPEchoCR = FALSE;
@@ -1465,28 +1466,29 @@
 	                        ts->ZModemRcvCommand, sizeof(ts->ZModemRcvCommand), FName);
 
 #ifndef NO_COPYLINE_FIX
-
 	/* Enable continued-line copy  -- special option */
 	ts->EnableContinuedLineCopy =
 		GetOnOff(Section, "EnableContinuedLineCopy", FName, FALSE);
 #endif							/* NO_COPYLINE_FIX */
 
-	ts->DisablePasteMouseRButton =
-		GetOnOff(Section, "DisablePasteMouseRButton", FName, FALSE);
+	if (GetOnOff(Section, "DisablePasteMouseRButton", FName, FALSE))
+		ts->PasteFlag |= CPF_DISABLE_RBUTTON;
 
-	// added DisablePasteMouseMButton (2008.3.2 maya)
-	ts->DisablePasteMouseMButton =
-		GetOnOff(Section, "DisablePasteMouseMButton", FName, TRUE);
+	if (GetOnOff(Section, "DisablePasteMouseMButton", FName, TRUE))
+		ts->PasteFlag |= CPF_DISABLE_MBUTTON;
 
-	// added ConfirmPasteMouseRButton (2007.3.17 maya)
-	ts->ConfirmPasteMouseRButton =
-		GetOnOff(Section, "ConfirmPasteMouseRButton", FName, FALSE);
+	if (GetOnOff(Section, "ConfirmPasteMouseRButton", FName, FALSE))
+		ts->PasteFlag |= CPF_CONFIRM_RBUTTON;
 
-	// added ConfirmChangePaste (2008.2.3 yutaka)
-	ts->ConfirmChangePaste =
-		GetOnOff(Section, "ConfirmChangePaste", FName, TRUE);
+	if (GetOnOff(Section, "ConfirmChangePaste", FName, TRUE))
+		ts->PasteFlag |= CPF_CONFIRM_CHANGEPASTE;
+
+	if (GetOnOff(Section, "ConfirmChangePasteCR", FName, TRUE))
+		ts->PasteFlag |= CPF_CONFIRM_CHANGEPASTE_CR;
+
 	GetPrivateProfileString(Section, "ConfirmChangePasteStringFile", "",
 	                        Temp, sizeof(Temp), FName);
+
 	strncpy_s(ts->ConfirmChangePasteStringFile, sizeof(ts->ConfirmChangePasteStringFile), Temp,
 	          _TRUNCATE);
 
@@ -1766,9 +1768,6 @@
 	if (GetOnOff(Section, "LockTUID", FName, TRUE))
 		ts->TermFlag |= TF_LOCKTUID;
 
-	// Confirm PasteCR
-	ts->ConfirmChangePasteCR = GetOnOff(Section, "ConfirmChangePasteCR", FName, TRUE);
-
 	// Jump List
 	ts->JumpList = GetOnOff(Section, "JumpList", FName, TRUE);
 
@@ -1921,9 +1920,17 @@
 		ts->ZmodemTimeOutFin = 1;
 
 	// Trim trailing new line character when pasting
-	ts->TrimTrailingNLonPaste =
-		GetOnOff(Section, "TrimTrailingNLonPaste", FName, FALSE);
+	if (GetOnOff(Section, "TrimTrailingNLonPaste", FName, FALSE))
+		ts->PasteFlag |= CPF_TRIM_TRAILING_NL;
 
+	// Normalize line break when pasting
+	if (GetOnOff(Section, "NormalizeLineBreakOnPaste", FName, FALSE))
+		ts->PasteFlag |= CPF_NORMALIZE_LINEBREAK;
+
+
+	// Fallback to CP932 (Experimental)
+	ts->FallbackToCP932 = GetOnOff(Section, "FallbackToCP932", FName, FALSE);
+
 	// CygTerm Configuration File
 	ReadCygtermConfFile(ts);
 }
@@ -2126,19 +2133,21 @@
 	WriteInt(Section, "ConnectingTimeout", FName, ts->ConnectingTimeout);
 
 	WriteOnOff(Section, "DisablePasteMouseRButton", FName,
-	           ts->DisablePasteMouseRButton);
+	           (WORD) (ts->PasteFlag & CPF_DISABLE_RBUTTON));
 
-	// added DisablePasteMouseMButton (2008.3.2 maya)
 	WriteOnOff(Section, "DisablePasteMouseMButton", FName,
-	           ts->DisablePasteMouseMButton);
+	           (WORD) (ts->PasteFlag & CPF_DISABLE_MBUTTON));
 
-	// added ConfirmPasteMouseRButton (2007.3.17 maya)
 	WriteOnOff(Section, "ConfirmPasteMouseRButton", FName,
-	           ts->ConfirmPasteMouseRButton);
+	           (WORD) (ts->PasteFlag & CPF_CONFIRM_RBUTTON));
 
 	// added ConfirmChangePaste
 	WriteOnOff(Section, "ConfirmChangePaste", FName,
-	           ts->ConfirmChangePaste);
+	           (WORD) (ts->PasteFlag & CPF_CONFIRM_CHANGEPASTE));
+
+	WriteOnOff(Section, "ConfirmChangePasteCR", FName,
+	           (WORD) (ts->PasteFlag & CPF_CONFIRM_CHANGEPASTE_CR));
+
 	WritePrivateProfileString(Section, "ConfirmChangePasteStringFile",
 	                          ts->ConfirmChangePasteStringFile, FName);
 
@@ -3034,9 +3043,6 @@
 	// Lock Terminal UID
 	WriteOnOff(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
 
-	// Confirm PasteCR
-	WriteOnOff(Section, "ConfirmChangePasteCR", FName, ts->ConfirmChangePasteCR);
-
 	// Jump List
 	WriteOnOff(Section, "JumpList", FName, ts->JumpList);
 
@@ -3183,8 +3189,13 @@
 	WritePrivateProfileString(Section, "ZmodemTimeouts", Temp, FName);
 
 	// Trim trailing new line character when pasting
-	WriteOnOff(Section, "TrimTrailingNLonPaste", FName, ts->TrimTrailingNLonPaste);
+	WriteOnOff(Section, "TrimTrailingNLonPaste", FName,
+		(WORD) (ts->PasteFlag & CPF_TRIM_TRAILING_NL));
 
+	// Normalize line break when pasting
+	WriteOnOff(Section, "NormalizeLineBreakOnPaste", FName,
+		(WORD) (ts->PasteFlag & CPF_NORMALIZE_LINEBREAK));
+
 	// CygTerm Configuration File
 	WriteCygtermConfFile(ts);
 }

Copied: branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj (from rev 6639, trunk/teraterm/ttptek/ttptek.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6D08053B-1C68-4A7E-8766-3553F5AF010B}</ProjectGuid>
+    <RootNamespace>ttptek</RootNamespace>
+    <ProjectName>ttptek</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="tekesc.c" />
+    <ClCompile Include="tttek.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="tekesc.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttptek.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj.filters (from rev 6639, trunk/teraterm/ttptek/ttptek.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/teraterm/ttptek/ttptek.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{cd70a60d-5951-488c-93cc-0c2419f89c8b}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93efeea4-5f64-40cc-aed8-ba244e2256ed}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{93c1d8ea-0c5e-44c9-bc67-c1d9be0cbb9a}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67c506c6-8a75-4b2e-ba7a-e0439cddeab9}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="tekesc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="tttek.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="tekesc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttptek.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/tests/#35822-random.ttl (from rev 6639, trunk/tests/#35822-random.ttl)
===================================================================
--- branches/openssl_1_1_0/tests/#35822-random.ttl	                        (rev 0)
+++ branches/openssl_1_1_0/tests/#35822-random.ttl	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,37 @@
+intdim res 11
+
+statusbox "0% done." "stat"
+
+uptime stime
+
+for i 1 100
+	for j 1 110000
+		random val 10
+		res[val] = res[val] + 1
+	next
+	sprintf2 stat "%d%% done." i
+	statusbox stat "stat"
+next
+
+uptime etime
+
+str = ''
+for i 0 10
+	sprintf2 tmp '%d\t%d' i res[i]
+	strconcat str tmp
+	strconcat str #13#10
+next
+
+sprintf2 tmp #13#10"%d ms."#13#10 etime - stime
+strconcat str tmp
+
+strspecial str
+;closesbox
+messagebox str 'result'
+
+; gettime filename "35822_%Y%m%d%H%M%S.txt"
+sprintf2 filename "35822_%d.txt" stime
+
+fileopen fp filename 0
+filewrite fp str
+fileclose fp

Deleted: branches/openssl_1_1_0/tests/#35822.ttl
===================================================================
--- branches/openssl_1_1_0/tests/#35822.ttl	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/tests/#35822.ttl	2017-03-18 11:12:07 UTC (rev 6640)
@@ -1,25 +0,0 @@
-intdim res 11
-
-for i 1 1000000
-	random val 10
-	res[val] = res[val] + 1
-next
-
-str = ''
-for i 0 10
-	sprintf2 tmp '%d\t%d' i res[i]
-	strconcat str tmp
-	strconcat str #10
-next
-strspecial str
-messagebox str 'result'
-
-uptime time
-int2str str_time time
-strconcat filename '35822_'
-strconcat filename str_time
-strconcat filename '.txt'
-
-fileopen fp filename 0
-filewrite fp str
-fileclose fp

Index: branches/openssl_1_1_0/ttpmenu
===================================================================
--- branches/openssl_1_1_0/ttpmenu	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttpmenu	2017-03-18 11:12:07 UTC (rev 6640)

Property changes on: branches/openssl_1_1_0/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/ttpmenu:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/ttpmenu:6194-6285
+/trunk/ttpmenu:6550-6639
\ No newline at end of property
Copied: branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.sln (from rev 6639, trunk/ttpmenu/ttpmenu.v15.sln)
===================================================================
--- branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.sln	                        (rev 0)
+++ branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.sln	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmenu", "ttpmenu.v15.vcxproj", "{594F6499-8EDA-44DC-AC41-830A754FF1C8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Debug|Win32.Build.0 = Debug|Win32
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Release|Win32.ActiveCfg = Release|Win32
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.vcxproj (from rev 6639, trunk/ttpmenu/ttpmenu.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/ttpmenu/ttpmenu.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{594F6499-8EDA-44DC-AC41-830A754FF1C8}</ProjectGuid>
+    <RootNamespace>ttpmenu</RootNamespace>
+    <ProjectName>ttpmenu</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>false</StringPooling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\teraterm\common\i18n.c" />
+    <ClCompile Include="..\teraterm\common\ttlib.c" />
+    <ClCompile Include="registry.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+    <ClCompile Include="ttpmenu.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+    <ClCompile Include="winmisc.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="left.ico" />
+    <Image Include="right.ico" />
+    <Image Include="teraterm.ico" />
+    <Image Include="ttpmenu.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpmenu.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/matcher/matcher.v15.vcxproj (from rev 6639, trunk/ttssh2/matcher/matcher.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/ttssh2/matcher/matcher.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/matcher/matcher.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}</ProjectGuid>
+    <RootNamespace>matcher</RootNamespace>
+    <ProjectName>matcher</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(ProjectName)matcher.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="matcher.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+    </ClCompile>
+    <ClCompile Include="test.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/ttssh2/putty/libputty.c
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/libputty.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/libputty.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -6,9 +6,17 @@
 #include <windows.h>
 #include <assert.h>
 
+#include "sshbn.h"
+
+// from SSHBN.C (ver 0.60)
+#define BIGNUM_INTERNAL
+typedef BignumInt *Bignum;
+
 #include "ssh.h"
+
 #include "libputty.h"
 
+
 /*
  * for SSH2
  *   \x8C\xAE\x82̈ꗗ\x82𓾂\xE9
@@ -58,8 +66,10 @@
 	retval = agent_query(request, reqlen, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH2_AGENT_SIGN_RESPONSE)
+	if (resplen < 5 || response[4] != SSH2_AGENT_SIGN_RESPONSE) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -131,8 +141,10 @@
 	retval = agent_query(request, reqlen, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_RESPONSE)
+	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_RESPONSE) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -150,13 +162,86 @@
 	return rsa_public_blob_len(key, maxlen);
 }
 
+const char *putty_get_version()
+{
+	extern const char ver[]; /* in version.c */
+	return ver;
+}
 
 /*
  * Following functions are copied from putty source.
  */
 
+// from SSHBN.C (ver 0.63)
+static Bignum newbn(int length)
+{
+	Bignum b;
 
-// SSHRSA.C
+	assert(length >= 0 && length < INT_MAX / BIGNUM_INT_BITS);
+
+	b = snewn(length + 1, BignumInt);
+	if (!b)
+		abort();		       /* FIXME */
+	memset(b, 0, (length + 1) * sizeof(*b));
+	b[0] = length;
+	return b;
+}
+
+// from SSHBN.C (ver 0.65)
+Bignum bignum_from_bytes(const unsigned char *data, int nbytes)
+{
+	Bignum result;
+	int w, i;
+
+	assert(nbytes >= 0 && nbytes < INT_MAX / 8);
+
+	w = (nbytes + BIGNUM_INT_BYTES - 1) / BIGNUM_INT_BYTES; /* bytes->words */
+
+	result = newbn(w);
+	for (i = 1; i <= w; i++)
+		result[i] = 0;
+	for (i = nbytes; i--;) {
+		unsigned char byte = *data++;
+		result[1 + i / BIGNUM_INT_BYTES] |=
+			(BignumInt)byte << (8 * i % BIGNUM_INT_BITS);
+	}
+
+	while (result[0] > 1 && result[result[0]] == 0)
+		result[0]--;
+	return result;
+}
+
+// from SSHBN.C (ver 0.60)
+/*
+* Read an SSH-1-format bignum from a data buffer. Return the number
+* of bytes consumed, or -1 if there wasn't enough data.
+*/
+int ssh1_read_bignum(const unsigned char *data, int len, Bignum * result)
+{
+	const unsigned char *p = data;
+	int i;
+	int w, b;
+
+	if (len < 2)
+		return -1;
+
+	w = 0;
+	for (i = 0; i < 2; i++)
+		w = (w << 8) + *p++;
+	b = (w + 7) / 8;		       /* bits -> bytes */
+
+	if (len < b + 2)
+		return -1;
+
+	if (!result)		       /* just return length */
+		return b + 2;
+
+	*result = bignum_from_bytes(p, b);
+
+	return p + b - data;
+}
+
+// from SSHRSA.C (putty 0.60)
 /* Given a public blob, determine its length. */
 int rsa_public_blob_len(void *data, int maxlen)
 {
@@ -181,7 +266,7 @@
 	return p - (unsigned char *)data;
 }
 
-// WINDOWS\WINPGNT.C
+// from WINDOWS\WINPGNT.C (putty 0.63)
 /*
  * Acquire a keylist1 from the primary Pageant; this means either
  * calling make_keylist1 (if that's us) or sending a message to the
@@ -195,13 +280,15 @@
 	void *vresponse;
 	int resplen, retval;
 	request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES;
-	PUT_32BIT(request, 4);
+	PUT_32BIT(request, 1);
 
 	retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER)
+	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -213,6 +300,7 @@
 	return ret;
 }
 
+// from WINDOWS\WINPGNT.C (putty 0.63)
 /*
  * Acquire a keylist2 from the primary Pageant; this means either
  * calling make_keylist2 (if that's us) or sending a message to the
@@ -227,13 +315,15 @@
 	int resplen, retval;
 
 	request[4] = SSH2_AGENTC_REQUEST_IDENTITIES;
-	PUT_32BIT(request, 4);
+	PUT_32BIT(request, 1);
 
 	retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER)
+	if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -245,7 +335,7 @@
 	return ret;
 }
 
-// WINDOWS\WINDOW.C
+// from WINDOWS\WINDOW.C (putty 0.60)
 /*
  * Print a modal (Really Bad) message box and perform a fatal exit.
  */

Modified: branches/openssl_1_1_0/ttssh2/putty/libputty.h
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/libputty.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/libputty.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -3,6 +3,9 @@
  */
 // PuTTY is copyright 1997-2007 Simon Tatham.
 
+// MISC.C
+extern void safefree(void *);
+
 // WINDOWS\WINPGNTC.C
 extern int agent_exists(void);
 extern int agent_query(void *in, int inlen, void **out, int *outlen,
@@ -21,8 +24,7 @@
                                 int *outlen);
 int putty_get_ssh1_keylen(unsigned char *key,
                           int maxlen);
+const char *putty_get_version();
 
-void safefree(void *);
-
 static void *get_keylist1(int *length);
 static void *get_keylist2(int *length);

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -66,8 +66,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -74,16 +74,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj.filters
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj.filters	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v10.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -72,8 +72,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -80,16 +80,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj.filters
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj.filters	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v11.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -72,8 +72,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -80,16 +80,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj.filters
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj.filters	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v12.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -72,8 +72,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -80,16 +80,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj.filters
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj.filters	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v14.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj (from rev 6639, trunk/ttssh2/putty/putty.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{98CA1284-8F6C-4791-BF57-7E5FAD33744E}</ProjectGuid>
+    <RootNamespace>putty</RootNamespace>
+    <ProjectName>putty</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libs\putty\CONF.C" />
+    <ClCompile Include="..\..\libs\putty\MISC.C" />
+    <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
+    <ClCompile Include="libputty.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libputty.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj.filters (from rev 6639, trunk/ttssh2/putty/putty.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Putty Files">
+      <UniqueIdentifier>{6907d95d-706b-4797-acc8-556c5fc25181}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libs\putty\CONF.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\MISC.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="libputty.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libputty.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.v9.vcproj
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.v9.vcproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.v9.vcproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -149,47 +149,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\INT64.H"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\MISC.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\MISC.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\NETWORK.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTY.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTYMEM.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\puttyps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSH.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSHBN.C"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\TREE234.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\TREE234.H"
+				RelativePath="..\..\libs\putty\VERSION.C"
 				>
 			</File>
 			<File
@@ -208,10 +176,6 @@
 				RelativePath="..\..\libs\putty\WINDOWS\WINSECUR.C"
 				>
 			</File>
-			<File
-				RelativePath="..\..\libs\putty\WINDOWS\WINSTUFF.H"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\libputty.c"

Modified: branches/openssl_1_1_0/ttssh2/putty/putty.vcproj
===================================================================
--- branches/openssl_1_1_0/ttssh2/putty/putty.vcproj	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/putty/putty.vcproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -148,54 +148,18 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\INT64.H"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\MISC.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\MISC.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\NETWORK.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTY.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTYMEM.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\puttyps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSH.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSHBN.C"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\TREE234.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\TREE234.H"
+				RelativePath="..\..\libs\putty\VERSION.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\WINDOWS\WINHELP.H"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\WINDOWS\WINMISC.C"
 				>
 			</File>
@@ -207,10 +171,6 @@
 				RelativePath="..\..\libs\putty\WINDOWS\WINSECUR.C"
 				>
 			</File>
-			<File
-				RelativePath="..\..\libs\putty\WINDOWS\WINSTUFF.H"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\libputty.c"

Copied: branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj (from rev 6639, trunk/ttssh2/puttyrev/puttyrev.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{61EB955F-2794-4607-860F-0AA296FA58BD}</ProjectGuid>
+    <RootNamespace>puttyrev</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>puttyrev</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)ttxssh\$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)ttxssh\$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="puttyrev.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="puttyrev.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj.filters (from rev 6639, trunk/ttssh2/puttyrev/puttyrev.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/puttyrev/puttyrev.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="puttyrev.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="puttyrev.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/ttssh/ttssh.v15.vcxproj (from rev 6639, trunk/ttssh2/ttssh/ttssh.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttssh/ttssh.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/ttssh/ttssh.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3D8EF809-7131-4AB2-B442-032A8F49DE33}</ProjectGuid>
+    <RootNamespace>ttssh</RootNamespace>
+    <ProjectName>ttssh</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Image Include="ttsecure.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ttssh.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttssh.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/ttssh.v15.sln (from rev 6639, trunk/ttssh2/ttssh.v15.sln)
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttssh.v15.sln	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/ttssh.v15.sln	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matcher", "matcher\matcher.v15.vcxproj", "{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttssh", "ttssh\ttssh.v15.vcxproj", "{3D8EF809-7131-4AB2-B442-032A8F49DE33}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxssh", "ttxssh\ttxssh.v15.vcxproj", "{5638BB89-44E3-4D55-BA98-A01142B4223E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "putty", "putty\putty.v15.vcxproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "puttyrev", "puttyrev\puttyrev.v15.vcxproj", "{61EB955F-2794-4607-860F-0AA296FA58BD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Debug|Win32.Build.0 = Debug|Win32
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Release|Win32.ActiveCfg = Release|Win32
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Release|Win32.Build.0 = Release|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Debug|Win32.Build.0 = Debug|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Release|Win32.ActiveCfg = Release|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Release|Win32.Build.0 = Release|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.Build.0 = Debug|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.ActiveCfg = Release|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.Build.0 = Release|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.Build.0 = Debug|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.ActiveCfg = Release|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.Build.0 = Release|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Debug|Win32.Build.0 = Debug|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Release|Win32.ActiveCfg = Release|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: branches/openssl_1_1_0/ttssh2/ttxssh/hosts.c
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/hosts.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/hosts.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -264,128 +264,8 @@
 	return index;
 }
 
-// 
-// BASE64\x83f\x83R\x81[\x83h\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x81B(rfc1521)
-// src\x83o\x83b\x83t\x83@\x82\xCD null-terminate \x82\xB5\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xA0\x82\xE8\x81B
-//
-int uudecode(unsigned char *src, int srclen, unsigned char *target, int targsize)
-{
-	char pad = '=';
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace(ch))	/* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == pad)
-			break;
-
-		pos = strchr(base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if (tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if (tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - base64) >> 4;
-				target[tarindex+1]  = ((pos - base64) & 0x0f) << 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if (tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - base64) >> 2;
-				target[tarindex+1]  = ((pos - base64) & 0x03) << 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if (tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == pad) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for (; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != pad)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for (; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
-
-
 // SSH2\x8C\xAE\x82\xCD BASE64 \x8C`\x8E\xAE\x82Ŋi\x94[\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9
-static Key *parse_uudecode(char *data)
+static Key *parse_base64data(char *data)
 {
 	int count;
 	unsigned char *blob = NULL;
@@ -403,7 +283,7 @@
 	// BASE64\x83f\x83R\x81[\x83h
 	ch = data[count];
 	data[count] = '\0';  // \x82\xB1\x82\xB1\x82͉\xFC\x8Ds\x83R\x81[\x83h\x82̂͂\xB8\x82Ȃ̂ŏ\x91\x82\xAB\x92ׂ\xB5\x82Ă\xE0\x96\xE2\x91\xE8\x82Ȃ\xA2\x82͂\xB8
-	n = uudecode(data, count, blob, len);
+	n = b64decode(blob, len, data);
 	data[count] = ch;
 	if (n < 0) {
 		goto error;
@@ -594,8 +474,8 @@
 
 			index += eat_spaces(data + index);  // update index
 
-			// uudecode
-			key2 = parse_uudecode(data + index);
+			// base64 decode
+			key2 = parse_base64data(data + index);
 			if (key2 == NULL) {
 				return index + eat_to_end_of_line(data + index);
 			}
@@ -872,8 +752,8 @@
 
 			index += eat_spaces(data + index);  // update index
 
-			// uudecode
-			key = parse_uudecode(data + index);
+			// base64 decode
+			key = parse_base64data(data + index);
 			if (key == NULL) {
 				return index + eat_to_end_of_line(data + index);
 			}

Modified: branches/openssl_1_1_0/ttssh2/ttxssh/hosts.h
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/hosts.h	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/hosts.h	2017-03-18 11:12:07 UTC (rev 6640)
@@ -71,8 +71,6 @@
 void HOSTS_notify_disconnecting(PTInstVar pvar);
 void HOSTS_end(PTInstVar pvar);
 
-int uudecode(unsigned char *src, int srclen, unsigned char *target, int targsize);
-
 int HOSTS_compare_public_key(Key *src, Key *key);
 int HOSTS_hostkey_foreach(PTInstVar pvar, hostkeys_foreach_fn *callback, void *ctx);
 void HOSTS_add_host_key(PTInstVar pvar, Key *key);

Modified: branches/openssl_1_1_0/ttssh2/ttxssh/keyfiles.c
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/keyfiles.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/keyfiles.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -404,7 +404,7 @@
 			break;
 	}
 
-	/* uudecode */
+	/* base64 decode */
 	m1len = sizeof(MARK_BEGIN) - 1;
 	m2len = sizeof(MARK_END) - 1;
 	cp = buffer_ptr(blob);
@@ -433,18 +433,18 @@
 		goto error;
 	}
 
-	// \x83t\x83@\x83C\x83\x8B\x82̃X\x83L\x83\x83\x83\x93\x82\xAA\x8FI\x82\xED\x82\xC1\x82\xBD\x82̂ŁAuudecode\x82\xB7\x82\xE9\x81B
+	// \x83t\x83@\x83C\x83\x8B\x82̃X\x83L\x83\x83\x83\x93\x82\xAA\x8FI\x82\xED\x82\xC1\x82\xBD\x82̂ŁAbase64 decode\x82\xB7\x82\xE9\x81B
 	len = buffer_len(encoded);
 	if ((cp = buffer_append_space(copy_consumed, len)) == NULL) {
 		//error("%s: buffer_append_space", __func__);
 		goto error;
 	}
-	if ((dlen = uudecode(buffer_ptr(encoded), buffer_len(encoded), cp, len)) < 0) {
-		//error("%s: uudecode failed", __func__);
+	if ((dlen = b64decode(cp, len, buffer_ptr(encoded))) < 0) {
+		//error("%s: base64 decode failed", __func__);
 		goto error;
 	}
 	if ((unsigned int)dlen > len) {
-		//error("%s: crazy uudecode length %d > %u", __func__, dlen, len);
+		//error("%s: crazy base64 length %d > %u", __func__, dlen, len);
 		goto error;
 	}
 

Modified: branches/openssl_1_1_0/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/ssh.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/ssh.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -273,6 +273,7 @@
 static void ssh2_channel_delete(Channel_t *c)
 {
 	bufchain_t *ch, *ptr;
+	enum scp_state prev_state;
 
 	ch = c->bufchain;
 	while (ch) {
@@ -284,6 +285,9 @@
 	}
 
 	if (c->type == TYPE_SCP) {
+		// SCP\x8F\x88\x97\x9D\x82̍Ō\xE3\x82̏\xF3\x91Ԃ\xF0\x95ۑ\xB6\x82\xB7\x82\xE9\x81B
+		prev_state = c->scp.state;
+
 		c->scp.state = SCP_CLOSING;
 		if (c->scp.localfp != NULL) {
 			fclose(c->scp.localfp);
@@ -294,6 +298,11 @@
 					filetime.modtime = c->scp.filemtime;
 					_utime(c->scp.localfilefull, &filetime);
 				}
+
+				// SCP\x8E\xF3\x90M\x82\xAA\x90\xAC\x8C\x{1C2D42}Ă\xA2\x82Ȃ\xAF\x82\xEA\x82΁A\x83\x8D\x81[\x83J\x83\x8B\x82ɍ\xEC\x82\xC1\x82\xBD\x83t\x83@\x83C\x83\x8B\x82̎c\x8A[\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B
+				// (2017.2.12 yutaka)
+				if (prev_state != SCP_CLOSING)
+					remove(c->scp.localfilefull);
 			}
 		}
 		if (c->scp.progress_window != NULL) {

Modified: branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.c	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.c	2017-03-18 11:12:07 UTC (rev 6640)
@@ -83,7 +83,7 @@
 
 #include "compat_w95.h"
 
-#include "puttyversion.h"
+#include "libputty.h"
 
 #define MATCH_STR(s, o) strncmp((s), (o), NUM_ELEM(o) - 1)
 #define MATCH_STR_I(s, o) _strnicmp((s), (o), NUM_ELEM(o) - 1)
@@ -2535,11 +2535,7 @@
 	SendMessage(GetDlgItem(dlg, IDC_ZLIB_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
 
 	// PuTTY\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2011.7.26 yutaka)
-#ifdef PUTTYVERSION
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "PuTTY %s", PUTTYVERSION);
-#else
-	_snprintf(buf, sizeof(buf), "PuTTY Unknown");
-#endif
+	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "PuTTY %s", putty_get_version());
 	SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
 }
 
@@ -2607,7 +2603,8 @@
 			SendDlgItemMessage(dlg, IDC_INCLUDES, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_OPENSSL_VERSION, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_ZLIB_VERSION, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(dlg, IDC_WEBSITES, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_PUTTY_VERSION, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE, 0));
+			SendDlgItemMessage(dlg, IDC_WEBSITES, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE, 0));
 			SendDlgItemMessage(dlg, IDC_CRYPTOGRAPHY, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_CREDIT, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_FP_HASH_ALG, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE, 0));

Modified: branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.rc	2017-03-16 15:26:46 UTC (rev 6639)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.rc	2017-03-18 11:12:07 UTC (rev 6640)
@@ -620,8 +620,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,79,0,0
- PRODUCTVERSION 2,79,0,0
+ FILEVERSION 2,80,0,0
+ PRODUCTVERSION 2,80,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -637,12 +637,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "TTXSSH"
-            VALUE "FileVersion", "2, 79, 0, 0"
+            VALUE "FileVersion", "2, 80, 0, 0"
             VALUE "InternalName", "TTXSSH"
-            VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2016 TeraTerm Project"
+            VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2017 TeraTerm Project"
             VALUE "OriginalFilename", "TTXSSH.dll"
             VALUE "ProductName", "TTSSH"
-            VALUE "ProductVersion", "2, 79, 0, 0"
+            VALUE "ProductVersion", "2, 80, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

Copied: branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj (from rev 6639, trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj)
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5638BB89-44E3-4D55-BA98-A01142B4223E}</ProjectGuid>
+    <RootNamespace>ttxssh</RootNamespace>
+    <ProjectName>ttxssh</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>"$(OutDir)puttyrev.exe"</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE"
+ %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\inc32;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>Version.lib 
+
+ %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>dnsapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x12500000</BaseAddress>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>"$(OutDir)puttyrev.exe"</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" 
+ %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\inc32;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>Version.lib 
+ %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>dnsapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x12500000</BaseAddress>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="..\matcher\matcher.c" />
+    <ClCompile Include="arc4random.c" />
+    <ClCompile Include="auth.c" />
+    <ClCompile Include="buffer.c" />
+    <ClCompile Include="cipher-ctr.c" />
+    <ClCompile Include="crypt.c" />
+    <ClCompile Include="dns.c" />
+    <ClCompile Include="ed25519.c" />
+    <ClCompile Include="ed25519_bcrypt_pbkdf.c" />
+    <ClCompile Include="ed25519_blocks.c" />
+    <ClCompile Include="ed25519_blowfish.c" />
+    <ClCompile Include="ed25519_fe25519.c" />
+    <ClCompile Include="ed25519_ge25519.c" />
+    <ClCompile Include="ed25519_hash.c" />
+    <ClCompile Include="ed25519_sc25519.c" />
+    <ClCompile Include="ed25519_verify.c" />
+    <ClCompile Include="fwd.c" />
+    <ClCompile Include="fwdui.c" />
+    <ClCompile Include="hosts.c" />
+    <ClCompile Include="kex.c" />
+    <ClCompile Include="key.c" />
+    <ClCompile Include="keyfiles.c" />
+    <ClCompile Include="pkt.c" />
+    <ClCompile Include="sftp.c" />
+    <ClCompile Include="ssh.c" />
+    <ClCompile Include="ttxssh.c" />
+    <ClCompile Include="util.c" />
+    <ClCompile Include="x11util.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="arc4random.h" />
+    <ClInclude Include="auth.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="chacha_private.h" />
+    <ClInclude Include="cipher.h" />
+    <ClInclude Include="config.h" />
+    <ClInclude Include="crypt.h" />
+    <ClInclude Include="dns.h" />
+    <ClInclude Include="ed25519_blf.h" />
+    <ClInclude Include="ed25519_crypto_api.h" />
+    <ClInclude Include="ed25519_fe25519.h" />
+    <ClInclude Include="ed25519_ge25519.h" />
+    <ClInclude Include="ed25519_sc25519.h" />
+    <ClInclude Include="fwd.h" />
+    <ClInclude Include="fwdui.h" />
+    <ClInclude Include="hosts.h" />
+    <ClInclude Include="kex.h" />
+    <ClInclude Include="key.h" />
+    <ClInclude Include="keyfiles.h" />
+    <ClInclude Include="pkt.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="sftp.h" />
+    <ClInclude Include="ssh.h" />
+    <ClInclude Include="ttxssh.h" />
+    <ClInclude Include="util.h" />
+    <ClInclude Include="x11util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ttsecure.ico" />
+    <Image Include="ttsecure_yellow.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxssh.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\puttyrev\puttyrev.v14.vcxproj">
+      <Project>{61eb955f-2794-4607-860f-0aa296fa58bd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\putty\putty.v14.vcxproj">
+      <Project>{98ca1284-8f6c-4791-bf57-7e5fad33744e}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttxssh.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters (from rev 6639, trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters)
===================================================================
--- branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	                        (rev 0)
+++ branches/openssl_1_1_0/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2017-03-18 11:12:07 UTC (rev 6640)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="arc4random.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="auth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="buffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cipher-ctr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="crypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dns.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_bcrypt_pbkdf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_blocks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_blowfish.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_fe25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_ge25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_hash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_sc25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_verify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fwd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fwdui.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hosts.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="key.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keyfiles.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\matcher\matcher.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pkt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sftp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ssh.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttxssh.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="x11util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="arc4random.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="chacha_private.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dns.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttxssh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="auth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="cipher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_blf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_crypto_api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_fe25519.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_ge25519.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_sc25519.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fwdui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hosts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="kex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="key.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyfiles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pkt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sftp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ssh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="x11util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ttsecure.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="ttsecure_yellow.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bde719e1-d3ce-4efc-8f42-050f934c5441}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{1402d13d-e827-4c6c-b334-555b8a086ca7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{198016f0-824a-4e67-b7ee-51cbf3e2b34f}</UniqueIdentifier>
+      <Extensions>ico;rc</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{95d60503-2363-4800-9a4c-add18d0c56e2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxssh.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttxssh.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file


Tera Term

[Ttssh2-commit] [6640] trunkの r6550-6639 をブランチにマージした。