Merge branch 'check_pr_653' into upstream-openssl

Destination.cpp

@@ -171,7 +171,7 @@ namespace client
   
 	std::shared_ptr<const i2p::data::LeaseSet> LeaseSetDestination::FindLeaseSet (const i2p::data::IdentHash& ident)
 	{
-		std::lock_guard<std::mutex> lock(m_RemoteLeaseSetsMutex);
+		std::unique_lock<std::mutex> lock(m_RemoteLeaseSetsMutex);
 		auto it = m_RemoteLeaseSets.find (ident);
 		if (it != m_RemoteLeaseSets.end ())
 		{
@@ -185,10 +185,8 @@ namespace client
 						if(ls && !ls->IsExpired())
 						{
 							ls->PopulateLeases();
-							{
-								std::lock_guard<std::mutex> _lock(m_RemoteLeaseSetsMutex);
-								m_RemoteLeaseSets[ident] = ls;
-							}
+							std::unique_lock<std::mutex> lock(m_RemoteLeaseSetsMutex);
+							m_RemoteLeaseSets[ident] = ls;
 						}
 					});
 				}
@@ -203,10 +201,7 @@ namespace client
 			if (ls && !ls->IsExpired ())
 			{
 				ls->PopulateLeases (); // since we don't store them in netdb
-				{
-					std::lock_guard<std::mutex> lock(m_RemoteLeaseSetsMutex);
-					m_RemoteLeaseSets[ident] = ls;
-				}
+				m_RemoteLeaseSets[ident] = ls;
 				return ls;
 			}	
 		}

I2CP.cpp

@@ -104,6 +104,7 @@ namespace client
 		auto path = remoteSession->GetSharedRoutingPath ();
 		std::shared_ptr<i2p::tunnel::OutboundTunnel> outboundTunnel;
 		std::shared_ptr<const i2p::data::Lease> remoteLease;
+		bool unconfirmedTags=false;
 		if (path)
 		{
 			if (!remoteSession->CleanupUnconfirmedTags ()) // no stuck tags
@@ -112,9 +113,12 @@ namespace client
 				remoteLease = path->remoteLease;
 			}
 			else
+			{
 				remoteSession->SetSharedRoutingPath (nullptr);
+				unconfirmedTags=true;
+			}
 		}
-		else
+		if (!path || unconfirmedTags)
 		{
 			outboundTunnel = GetTunnelPool ()->GetNextOutboundTunnel ();
 			auto leases = remote->GetNonExpiredLeases ();

Makefile.mingw

@@ -37,11 +37,16 @@ ifeq ($(USE_WIN32_APP), yes)
 	DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
 endif
 
-ifeq ($(USE_AESNI),1)
+ifeq ($(USE_AESNI),yes)
 	CPU_FLAGS = -maes -DAESNI
 else
 	CPU_FLAGS = -msse
 endif
 
+ifeq ($(USE_ASLR),yes)
+	LDFLAGS += -Wl,--nxcompat -Wl,--high-entropy-va \
+      -Wl,--dynamicbase,--export-all-symbols
+endif
+
 obj/%.o : %.rc
 	$(WINDRES) -i $< -o $@