Update the PC configuration and project files for sha256 and sha512.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 8fbb998f91f043425463c2b235f5b474d7736ff2..f71b7c2254c7cddb3186447f153b541f2191ff4e 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -539,6 +539,14 @@ SOURCE=..\..\Modules\shamodule.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\sha256module.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\sha512module.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\signalmodule.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/config.c b/PC/config.c
index bd040b08b8227fb48ab74d962f67ba55ab20cd48..9ac69e348f184301fc5efaa7ab1fe4551add8b93 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -17,7 +17,7 @@ extern void initgc(void);
 extern void initimageop(void);
 #endif
 extern void initmath(void);
-extern void initmd5(void);
+extern void init_md5(void);
 extern void initnt(void);
 extern void initoperator(void);
 extern void initregex(void);
@@ -25,7 +25,9 @@ extern void initregex(void);
 extern void initrgbimg(void);
 #endif
 extern void initsignal(void);
-extern void initsha(void);
+extern void init_sha(void);
+extern void init_sha256(void);
+extern void init_sha512(void);
 extern void initstrop(void);
 extern void initstruct(void);
 extern void inittime(void);
@@ -86,7 +88,7 @@ struct _inittab _PyImport_Inittab[] = {
         {"imageop", initimageop},
 #endif
         {"math", initmath},
-        {"md5", initmd5},
+        {"_md5", init_md5},
         {"nt", initnt}, /* Use the NT os functions, not posix */
         {"operator", initoperator},
         {"regex", initregex},
@@ -94,7 +96,9 @@ struct _inittab _PyImport_Inittab[] = {
         {"rgbimg", initrgbimg},
 #endif
         {"signal", initsignal},
-        {"sha", initsha},
+        {"_sha", init_sha},
+        {"_sha256", init_sha256},
+        {"_sha512", init_sha512},
         {"strop", initstrop},
         {"struct", initstruct},
         {"time", inittime},

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 3d8aaf24f0c3dd2d5bc7fd15130498c9a8ab385c..652d3123d12b0fa8afbd7b11137626353251612b 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -2763,6 +2763,60 @@
                                        PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
                        </FileConfiguration>
                </File>
+               <File
+                        RelativePath="..\Modules\shamodule256.c">
+                       <FileConfiguration
+                               Name="Release|Win32">
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       Optimization="2"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Debug|Win32">
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       Optimization="0"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="ReleaseItanium|Win32">
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       Optimization="2"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+                       </FileConfiguration>
+               </File>
+               <File
+                        RelativePath="..\Modules\shamodule512.c">
+                       <FileConfiguration
+                               Name="Release|Win32">
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       Optimization="2"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Debug|Win32">
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       Optimization="0"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="ReleaseItanium|Win32">
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       Optimization="2"
+                                       AdditionalIncludeDirectories=""
+                                       PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+                       </FileConfiguration>
+               </File>
                <File
                        RelativePath="..\Modules\signalmodule.c">
                        <FileConfiguration