kbengine · kbengine · Mar 12, 2014 · Mar 12, 2014 · Mar 12, 2014 · Mar 12, 2014
diff --git a/kbe/src/kbengine_vs90.sln b/kbe/src/kbengine_vs90.sln
@@ -2,6 +2,10 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstdkbe", "lib\cstdkbe\cstdkbe90.vcproj", "{A04109A7-46C9-42F9-AB29-8E3D84450172}"
+	ProjectSection(ProjectDependencies) = postProject
+		{26195A87-700C-42D6-A271-20B6CACC6249} = {26195A87-700C-42D6-A271-20B6CACC6249}
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8} = {678E55F0-E0F7-4E52-82E4-9AD50F0753B8}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entitydef", "lib\entitydef\entitydef90.vcproj", "{44FA54E8-0A60-4A6C-A449-118872E75502}"
 EndProject
@@ -242,6 +246,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencie
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{C57D8946-CC54-4360-89FA-DAC04E93423A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay32", "lib\third_party\openssl\vcbuild\libeay32\libeay32.vcproj", "{26195A87-700C-42D6-A271-20B6CACC6249}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay32", "lib\third_party\openssl\vcbuild\ssleay32\ssleay32.vcproj", "{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{89F7F2F7-EB4D-4810-AA06-A96D592678E6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Consumer_Release_Indie|Win32 = Consumer_Release_Indie|Win32
@@ -1446,35 +1456,113 @@ Global
 		{9085A36E-CAF8-4E86-93AF-373D2554026B}.Release|Win32.Build.0 = Release|Win32
 		{9085A36E-CAF8-4E86-93AF-373D2554026B}.Static_Release|Win32.ActiveCfg = Release|Win32
 		{9085A36E-CAF8-4E86-93AF-373D2554026B}.Static_Release|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Consumer_Release_Indie|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Consumer_Release_Indie|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Consumer_Release|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Consumer_Release|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Debug|Win32.ActiveCfg = Debug|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Debug|Win32.Build.0 = Debug|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Editor_Debug|Win32.ActiveCfg = Debug|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Editor_Debug|Win32.Build.0 = Debug|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Editor_Hybrid_Indie|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Editor_Hybrid_Indie|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Editor_Hybrid|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Editor_Hybrid|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Evaluation|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Evaluation|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Exporter_Debug|Win32.ActiveCfg = Debug|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Exporter_Debug|Win32.Build.0 = Debug|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Exporter_Release|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Exporter_Release|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Hybrid|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Hybrid|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.PGInstrument|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.PGInstrument|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.PGUpdate|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.PGUpdate|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.PyModule_Hybrid|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.PyModule_Hybrid|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Release_Indie|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Release_Indie|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Release|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Release|Win32.Build.0 = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{26195A87-700C-42D6-A271-20B6CACC6249}.Static_Release|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Consumer_Release_Indie|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Consumer_Release_Indie|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Consumer_Release|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Consumer_Release|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Debug|Win32.Build.0 = Debug|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Editor_Debug|Win32.ActiveCfg = Debug|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Editor_Debug|Win32.Build.0 = Debug|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Editor_Hybrid_Indie|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Editor_Hybrid_Indie|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Editor_Hybrid|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Editor_Hybrid|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Evaluation|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Evaluation|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Exporter_Debug|Win32.ActiveCfg = Debug|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Exporter_Debug|Win32.Build.0 = Debug|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Exporter_Release|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Exporter_Release|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Hybrid|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Hybrid|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.PGInstrument|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.PGInstrument|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.PGUpdate|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.PGUpdate|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.PyModule_Hybrid|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.PyModule_Hybrid|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Release_Indie|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Release_Indie|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Release|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Release|Win32.Build.0 = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8}.Static_Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0E9791DB-593A-465F-98BC-681011311618} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{17E1E049-C309-4D79-843F-AE483C264AEA} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{447F05A8-F581-4CAC-A466-5AC7936E207E} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{86937F53-C189-40EF-8CE8-8759D8E7D480} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{C6E20F84-3247-4AD6-B051-B073268F73BA} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{1ABB1158-909C-4AD4-9F81-CB38BBA5D950} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{18CAE28C-B454-46C1-87A0-493D91D97F03} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{D06B6426-4762-44CC-8BAD-D79052507F2F} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{45A08C1B-D249-42C4-932C-615ED3924CBB} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
-		{896616D2-A5D2-4548-859E-D59905F46140} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{A04109A7-46C9-42F9-AB29-8E3D84450172} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{24CB1A43-C6E1-442E-AF99-A91D26BA8FA0} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{6C92BA78-CFAA-4524-A636-F044B0280AB0} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{44FA54E8-0A60-4A6C-A449-118872E75502} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{0E032FA8-BB7B-40F6-8CB1-15F204113B24} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{F67B2C56-D1B1-4EA7-B16E-EF8E7F1B6C5F} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{9085A36E-CAF8-4E86-93AF-373D2554026B} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{5EF24499-4F74-4AF6-8048-650BE7BD7808} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{7A411D5D-DA3B-474D-B08B-3DD787A1F375} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{2992ABDB-0853-4C43-B9E2-98D4211192EE} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{56D453A7-787B-49E3-84BC-465EED38DE8A} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{5EF24499-4F74-4AF6-8048-650BE7BD7808} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{863B8043-533C-499D-B48E-F5EC91A6CB9B} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
-		{2992ABDB-0853-4C43-B9E2-98D4211192EE} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{896616D2-A5D2-4548-859E-D59905F46140} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
 		{3F8B2057-492F-4332-99DE-3E12F20ED489} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{6C92BA78-CFAA-4524-A636-F044B0280AB0} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{24CB1A43-C6E1-442E-AF99-A91D26BA8FA0} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{9085A36E-CAF8-4E86-93AF-373D2554026B} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{A04109A7-46C9-42F9-AB29-8E3D84450172} = {C57D8946-CC54-4360-89FA-DAC04E93423A}
+		{89DA21A1-625B-4482-B386-D7C0AF97E477} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{1BAD0518-F2BB-42F5-83E7-9E1804FAD7C1} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{FE88370E-80F7-49BD-A8D1-E7A2CA699E44} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{9EA2E328-E6BE-4DF0-A8DC-05C08A0B822B} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{69C18C83-5753-4F36-BF5A-6EE217304D2D} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{4AF743A4-8C2F-4424-BB4F-A5B0B5C128BD} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{E17527D0-CCA7-4063-924B-C09A1BD43EC3} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{78EE8B08-4E07-4C07-9592-BC4D09503155} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{E999D336-32D1-48CC-A71F-FC552BD5093B} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{41F36752-539B-48E7-A75B-37905F54CFF7} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{7817D13F-1FAA-47D8-8C9F-B790FE2D6B0A} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{04C620E9-BE02-498E-A713-B9E470D75F15} = {89F7F2F7-EB4D-4810-AA06-A96D592678E6}
+		{86937F53-C189-40EF-8CE8-8759D8E7D480} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{C6E20F84-3247-4AD6-B051-B073268F73BA} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{447F05A8-F581-4CAC-A466-5AC7936E207E} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{0E9791DB-593A-465F-98BC-681011311618} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{17E1E049-C309-4D79-843F-AE483C264AEA} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{18CAE28C-B454-46C1-87A0-493D91D97F03} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{ECC7CEAC-A5E5-458E-BB9E-2413CC847881} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{D06B6426-4762-44CC-8BAD-D79052507F2F} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{45A08C1B-D249-42C4-932C-615ED3924CBB} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{1ABB1158-909C-4AD4-9F81-CB38BBA5D950} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{26195A87-700C-42D6-A271-20B6CACC6249} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
+		{678E55F0-E0F7-4E52-82E4-9AD50F0753B8} = {8BF90F4F-766B-4B4D-B7F3-BF4189A29F4E}
 	EndGlobalSection
 EndGlobal
diff --git a/kbe/src/lib/network/websocket_protocol.cpp b/kbe/src/lib/network/websocket_protocol.cpp
@@ -25,9 +25,14 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 #include "cstdkbe/sha1.hpp"
 
 #if KBE_PLATFORM == PLATFORM_WIN32
+#ifdef _DEBUG
+#pragma comment(lib, "libeay32_d.lib")
+#pragma comment(lib, "ssleay32_d.lib")
+#else
 #pragma comment(lib, "libeay32.lib")
 #pragma comment(lib, "ssleay32.lib")
 #endif
+#endif
 
 namespace KBEngine{
 namespace html5{

diff --git a/kbe/src/lib/third_party/openssl/vcbuild/include/openssl/aes.h b/kbe/src/lib/third_party/openssl/vcbuild/include/openssl/aes.h
@@ -0,0 +1,138 @@
+/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#ifndef HEADER_AES_H
+#define HEADER_AES_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_AES
+#error AES is disabled.
+#endif
+
+#define AES_ENCRYPT	1
+#define AES_DECRYPT	0
+
+/* Because array size can't be a const in C, the following two are macros.
+   Both sizes are in bytes. */
+#define AES_MAXNR 14
+#define AES_BLOCK_SIZE 16
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* This should be a hidden type, but EVP requires that the size be known */
+struct aes_key_st {
+#ifdef AES_LONG
+    unsigned long rd_key[4 *(AES_MAXNR + 1)];
+#else
+    unsigned int rd_key[4 *(AES_MAXNR + 1)];
+#endif
+    int rounds;
+};
+typedef struct aes_key_st AES_KEY;
+
+const char *AES_options(void);
+
+int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+	AES_KEY *key);
+int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+	AES_KEY *key);
+
+void AES_encrypt(const unsigned char *in, unsigned char *out,
+	const AES_KEY *key);
+void AES_decrypt(const unsigned char *in, unsigned char *out,
+	const AES_KEY *key);
+
+void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
+	const AES_KEY *key, const int enc);
+void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
+	const unsigned long length, const AES_KEY *key,
+	unsigned char *ivec, const int enc);
+void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+	const unsigned long length, const AES_KEY *key,
+	unsigned char *ivec, int *num, const int enc);
+void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
+	const unsigned long length, const AES_KEY *key,
+	unsigned char *ivec, int *num, const int enc);
+void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
+	const unsigned long length, const AES_KEY *key,
+	unsigned char *ivec, int *num, const int enc);
+void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
+			    const int nbits,const AES_KEY *key,
+			    unsigned char *ivec,const int enc);
+void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+	const unsigned long length, const AES_KEY *key,
+	unsigned char *ivec, int *num);
+void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+	const unsigned long length, const AES_KEY *key,
+	unsigned char ivec[AES_BLOCK_SIZE],
+	unsigned char ecount_buf[AES_BLOCK_SIZE],
+	unsigned int *num);
+
+/* For IGE, see also http://www.links.org/files/openssl-ige.pdf */
+/* NB: the IV is _two_ blocks long */
+void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
+		     const unsigned long length, const AES_KEY *key,
+		     unsigned char *ivec, const int enc);
+/* NB: the IV is _four_ blocks long */
+void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
+			const unsigned long length, const AES_KEY *key,
+			const AES_KEY *key2, const unsigned char *ivec,
+			const int enc);
+
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* !HEADER_AES_H */