[git] GCRYPT - branch, OS2-BRANCH, updated. libgcrypt-1.5.0-31-g32dc494

[by KO Myung-Hun]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, OS2-BRANCH has been updated
       via  32dc49474e83140a6717903db3a8885ebaaaf6fb (commit)
       via  edddd7baaa7554b33ad9701078addb5ee05c36af (commit)
      from  ae8d5037644e6f7f51d308f24d1d3839d986bf0f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 32dc49474e83140a6717903db3a8885ebaaaf6fb
Author: KO Myung-Hun <komh at chollian.net>
Date:   Thu May 31 20:39:34 2012 +0900

    Remove a dependency on APIs specific to some OS/2 version
    
    * random/rndos2.c (_gcry_rndos2_gather_random): Use pfnDosQuerySysState()
    not DosQuerySysState()

diff --git a/random/rndos2.c b/random/rndos2.c
index 4d82238..9b0673c 100644
--- a/random/rndos2.c
+++ b/random/rndos2.c
@@ -208,8 +208,8 @@ _gcry_rndos2_gather_random( void ( *add )( const void *, size_t,
             do
             {
                 /* Query all the system information supported by OS */
-                rc = DosQuerySysState( QS_SUPPORTED, 0, 0, 0, ( PCHAR )buf,
-                                       bufSize );
+                rc = pfnDosQuerySysState( QS_SUPPORTED, 0, 0, 0, ( PCHAR )buf,
+                                          bufSize );
                 if( rc == ERROR_BUFFER_OVERFLOW )
                 {
                     bufSize += BUF_SIZE_SYS_STATE_DELTA;

commit edddd7baaa7554b33ad9701078addb5ee05c36af
Author: KO Myung-Hun <komh at chollian.net>
Date:   Fri Mar 9 22:01:37 2012 +0900

    Fix a potential crash
    
    * random/rndos2.c (_gcry_rndos2_gather_random): Initialize a module handle
    if DosLoadModule() fails.

diff --git a/random/rndos2.c b/random/rndos2.c
index a006bd2..4d82238 100644
--- a/random/rndos2.c
+++ b/random/rndos2.c
@@ -85,7 +85,6 @@ _gcry_rndos2_gather_random( void ( *add )( const void *, size_t,
     {
         CHAR szFail[ 260 ];
 
-        hmodTcpIp32 = NULLHANDLE;
         if( !DosLoadModule( szFail, sizeof( szFail ), "tcpip32",
                             &hmodTcpIp32 ))
         {
@@ -107,8 +106,9 @@ _gcry_rndos2_gather_random( void ( *add )( const void *, size_t,
                 hmodTcpIp32 = NULLHANDLE;
             }
         }
+        else
+            hmodTcpIp32 = NULLHANDLE;
 
-        hmodNetApi32 = NULLHANDLE;
         if( !DosLoadModule( szFail, sizeof( szFail ), "netapi32",
                             &hmodNetApi32 ))
         {
@@ -120,6 +120,8 @@ _gcry_rndos2_gather_random( void ( *add )( const void *, size_t,
                 hmodNetApi32 = NULLHANDLE;
             }
         }
+        else
+            hmodNetApi32 = NULLHANDLE;
 
         pfnDosPerfSysCall   = NULL;
         pfnDosQuerySysState = NULL;

-----------------------------------------------------------------------

Summary of changes:
 random/rndos2.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org