From 22eebd83f10a4a9f15ba743a635257f5e6e65870 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 27 Feb 2016 13:11:08 +0100
Subject: [PATCH] common_aes128ctr.c is gone

---
 builds/msvc/vs2010/libsodium/libsodium.vcxproj         | 3 +--
 builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters | 5 +----
 builds/msvc/vs2012/libsodium/libsodium.vcxproj         | 3 +--
 builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters | 5 +----
 builds/msvc/vs2013/libsodium/libsodium.vcxproj         | 3 +--
 builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters | 5 +----
 builds/msvc/vs2015/libsodium/libsodium.vcxproj         | 3 +--
 builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters | 5 +----
 libsodium.vcxproj                                      | 3 +--
 libsodium.vcxproj.filters                              | 5 +----
 10 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index ac92ec2b..fe8ceed4 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -224,7 +224,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
@@ -270,4 +269,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 5ebf2ef1..52baa451 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -178,9 +178,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClCompile>
@@ -839,4 +836,4 @@
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index a8d83590..bdc9edd8 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -224,7 +224,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
@@ -270,4 +269,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 25e7d903..a1d09f30 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -178,9 +178,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClCompile>
@@ -839,4 +836,4 @@
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index b1ec9546..73890aed 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -224,7 +224,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
@@ -270,4 +269,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index f28e6ab6..8ff14a23 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -178,9 +178,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClCompile>
@@ -839,4 +836,4 @@
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 0e471d6f..50bc757f 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -224,7 +224,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
@@ -270,4 +269,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index 22e1aa31..30a61ae0 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -178,9 +178,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClCompile>
@@ -839,4 +836,4 @@
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index f1f312a7..d243b9b2 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -461,7 +461,6 @@
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c" />
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
-    <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\int128_aes128ctr.c" />
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
@@ -499,4 +498,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters
index 480cc37b..a7625e00 100644
--- a/libsodium.vcxproj.filters
+++ b/libsodium.vcxproj.filters
@@ -350,9 +350,6 @@
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -552,4 +549,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>