Better fixes from openssl cvs; from markus@

2 files changed, 8 insertions, 6 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index 46731b2438..f210be9559 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <limits.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
@@ -140,7 +141,7 @@ err:
 static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
         {
         unsigned char *p= *pp;
-        long ret=0;
+        unsigned long ret=0;
         int i;
 
         if (max-- < 1) return(0);
@@ -169,10 +170,10 @@ static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
                 else
                         ret=i;
                 }
-        if (ret < 0)
+        if (ret > LONG_MAX)
                 return 0;
         *pp=p;
-        *rl=ret;
+        *rl=(long)ret;
         return(1);
         }
 
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_lib.c b/src/lib/libssl/src/crypto/asn1/asn1_lib.c
index 46731b2438..f210be9559 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_lib.c
+++ b/src/lib/libssl/src/crypto/asn1/asn1_lib.c
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <limits.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
@@ -140,7 +141,7 @@ err:
 static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
         {
         unsigned char *p= *pp;
-        long ret=0;
+        unsigned long ret=0;
         int i;
 
         if (max-- < 1) return(0);
@@ -169,10 +170,10 @@ static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
                 else
                         ret=i;
                 }
-        if (ret < 0)
+        if (ret > LONG_MAX)
                 return 0;
         *pp=p;
-        *rl=ret;
+        *rl=(long)ret;
         return(1);
         }