Merge branch 'master' into read_consistency

builds/install/misc/firebird.conf.in

@@ -422,22 +422,29 @@
 #
 # Type: string
 
-# AuthServer and AuthClient determine what authentication methods will be used
-# by network server and client redirector. Secure remote passwords plugin
-# is default one. Except configured by default SRP plugin firebird also has
-# Legacy_Auth plugin which is used to emulate pre-FB3 login protocol making it
-# possible for client to talk to old servers and for server to listen to requests
-# from old clients. Legacy_Auth is VERY unsecure. On windows Win_Sspi plugin may
-# be also used - it implements windows trusted authentication and backward
+# AuthServer and AuthClient determine which authentication methods will be used
+# by network server and client redirector. The Secure remote password plugin
+# using SHA-256 for the client proof is the default for both client and Server.
+# Additionally, the default client configuration (AuthClient) also supports old Srp
+# plugin using SHA-1 for the client proof. This enables backwards compatibility
+# with old Firebird 3 servers but does not comply with NIST security requirements.
+#
+# The default client configuration (AuthClient) also supports the pre-Firebird 3 legacy 
+# authentication protocol (Legacy_Auth). This is again for backwards 
+# compatibility but has many known weaknesses and is deprecated for current use.
+#
+# The default Windows client configuration (AuthClient) also includes support for
+# the Win_Sspi plugin. This implements windows trusted authentication and is backward
 # compatible with 2.1 and 2.5 clients and servers running on windows.
 #
 # Per-database configurable.
 #
-#AuthServer = Srp
+#AuthServer = Srp256
 #
 # Per-connection and per-database configurable.
 #
-#AuthClient = Srp, Win_Sspi, Legacy_Auth
+#AuthClient = Srp256, Srp, Legacy_Auth           #Non Windows clients
+#AuthClient = Srp256, Srp, Win_Sspi, Legacy_Auth #Windows clients
 #
 # If you need to use server plugins that do not provide encryption key (both Legacy_Auth
 # & Win_Sspi) you should also turn off required encryption on the wire with WireCrypt
@@ -1029,3 +1036,22 @@
 # Type: string
 #
 #ServerMode = Super
+
+# ============================
+# Settings of External Connections Pool 
+# ============================
+
+# Set the maximum number of inactive (idle) external connections to retain at 
+# the pool. Valid values are between 0 and 1000. If set to zero, pool is disabed, 
+# i.e. external connection is destroyed immediately after the use.
+# 
+# Type: integer
+# 
+#ExtConnPoolSize = 0
+
+# Set the time before destroyng inactive external connection, seconds. 
+# Valid values are between 1 and 86400. 
+# 
+# Type: integer
+# 
+#ExtConnPoolLifeTime = 7200

builds/posix/make.shared.variables

@@ -27,7 +27,7 @@ AllObjects=
 CO1:= $(call dirObjects,common)
 CO2:= $(call dirObjects,common/classes)
 CO3:= $(call dirObjects,common/config)
-CO4:= $(call dirObjects,common/tomcrypt)
+CO4:= $(call dirObjects,common/sha2)
 #CO5:= $(call dirObjects,common/exceptions)
 #CO6:= $(call dirObjects,common/sync)
 Common_Objects:= $(CO1) $(CO2) $(CO3) $(CO4)

builds/posix/prefix.linux_riscv64

@@ -0,0 +1,28 @@
+# The contents of this file are subject to the Interbase Public
+# License Version 1.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy
+# of the License at http://www.Inprise.com/IPL.html
+#
+# Software distributed under the License is distributed on an
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+# or implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code was created by Inprise Corporation
+# and its predecessors. Portions created by Inprise Corporation are
+# Copyright (C) Inprise Corporation.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# Start of file prefix.linux:  $(VERSION)  $(PLATFORM)
+#      14 Apr 2008     Alan Barclay    alan AT escribe.co.uk
+#      2018, "Manuel A. Fernandez Montecelo" <manuel.montezelo@gmail.com>
+
+
+#LD=@CXX@
+
+#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
+
+PROD_FLAGS=-O3 -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks
+DEV_FLAGS=-ggdb -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor

builds/win32/msvc10/common.vcxproj

@@ -87,6 +87,7 @@
     <ClCompile Include="..\..\..\src\common\sdl.cpp" />
     <ClCompile Include="..\..\..\src\common\security.cpp" />
     <ClCompile Include="..\..\..\src\common\sha.cpp" />
+    <ClCompile Include="..\..\..\src\common\sha2\sha2.cpp" />
     <ClCompile Include="..\..\..\src\common\StatementMetadata.cpp" />
     <ClCompile Include="..\..\..\src\common\StatusArg.cpp" />
     <ClCompile Include="..\..\..\src\common\StatusHolder.cpp" />
@@ -193,6 +194,7 @@
     <ClInclude Include="..\..\..\src\common\sdltable.h" />
     <ClInclude Include="..\..\..\src\common\sdl_proto.h" />
     <ClInclude Include="..\..\..\src\common\sha.h" />
+    <ClInclude Include="..\..\..\src\common\sha2\sha2.h" />
     <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h" />
     <ClInclude Include="..\..\..\src\common\StatementMetadata.h" />
     <ClInclude Include="..\..\..\src\common\StatusArg.h" />

builds/win32/msvc10/common.vcxproj.filters

@@ -219,6 +219,9 @@
     <ClCompile Include="..\..\..\src\common\DecFloat.cpp">
       <Filter>classes</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\common\sha2\sha2.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp">
       <Filter>classes</Filter>
     </ClCompile>
@@ -548,5 +551,8 @@
     <ClInclude Include="..\..\..\src\common\classes\BlobWrapper.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\sha2\sha2.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

builds/win32/msvc12/common.vcxproj

@@ -83,6 +83,7 @@
     <ClCompile Include="..\..\..\src\common\sdl.cpp" />
     <ClCompile Include="..\..\..\src\common\security.cpp" />
     <ClCompile Include="..\..\..\src\common\sha.cpp" />
+    <ClCompile Include="..\..\..\src\common\sha2\sha2.cpp" />
     <ClCompile Include="..\..\..\src\common\StatementMetadata.cpp" />
     <ClCompile Include="..\..\..\src\common\StatusArg.cpp" />
     <ClCompile Include="..\..\..\src\common\StatusHolder.cpp" />
@@ -189,6 +190,7 @@
     <ClInclude Include="..\..\..\src\common\sdltable.h" />
     <ClInclude Include="..\..\..\src\common\sdl_proto.h" />
     <ClInclude Include="..\..\..\src\common\sha.h" />
+    <ClInclude Include="..\..\..\src\common\sha2\sha2.h" />
     <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h" />
     <ClInclude Include="..\..\..\src\common\StatementMetadata.h" />
     <ClInclude Include="..\..\..\src\common\StatusArg.h" />

builds/win32/msvc12/common.vcxproj.filters

@@ -225,6 +225,9 @@
     <ClCompile Include="..\..\..\src\common\classes\BlobWrapper.cpp">
       <Filter>classes</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\common\sha2\sha2.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -548,5 +551,8 @@
     <ClInclude Include="..\..\..\src\common\classes\BlobWrapper.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\sha2\sha2.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

builds/win32/msvc14/common.vcxproj

@@ -83,6 +83,7 @@
     <ClCompile Include="..\..\..\src\common\sdl.cpp" />
     <ClCompile Include="..\..\..\src\common\security.cpp" />
     <ClCompile Include="..\..\..\src\common\sha.cpp" />
+    <ClCompile Include="..\..\..\src\common\sha2\sha2.cpp" />
     <ClCompile Include="..\..\..\src\common\StatementMetadata.cpp" />
     <ClCompile Include="..\..\..\src\common\StatusArg.cpp" />
     <ClCompile Include="..\..\..\src\common\StatusHolder.cpp" />
@@ -189,6 +190,7 @@
     <ClInclude Include="..\..\..\src\common\sdltable.h" />
     <ClInclude Include="..\..\..\src\common\sdl_proto.h" />
     <ClInclude Include="..\..\..\src\common\sha.h" />
+    <ClInclude Include="..\..\..\src\common\sha2\sha2.h" />
     <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h" />
     <ClInclude Include="..\..\..\src\common\StatementMetadata.h" />
     <ClInclude Include="..\..\..\src\common\StatusArg.h" />

builds/win32/msvc14/common.vcxproj.filters

@@ -225,6 +225,9 @@
     <ClCompile Include="..\..\..\src\common\classes\BlobWrapper.cpp">
       <Filter>classes</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\common\sha2\sha2.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -548,5 +551,8 @@
     <ClInclude Include="..\..\..\src\common\classes\BlobWrapper.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\sha2\sha2.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>