Avoid warnings on VC++ 2005.

[openssl.git] / ssl / ssl_asn1.c

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index d0487e5af5c5942e80062ab7fe06b4f9e8f0a698..d129acc329110b90d1704be92dcca629ab1855c6 100644 (file)
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -58,10 +58,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "ssl_locl.h"
 #include <openssl/asn1_mac.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "ssl_locl.h"
 
 typedef struct ssl_session_asn1_st
        {
@@ -146,9 +146,12 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
        a.key_arg.data=in->key_arg;
 
 #ifndef OPENSSL_NO_KRB5
-       a.krb5_princ.length=in->krb5_client_princ_len;
-       a.krb5_princ.type=V_ASN1_OCTET_STRING;
-       a.krb5_princ.data=in->krb5_client_princ;
+       if (in->krb5_client_princ_len)
+               {
+               a.krb5_princ.length=in->krb5_client_princ_len;
+               a.krb5_princ.type=V_ASN1_OCTET_STRING;
+               a.krb5_princ.data=in->krb5_client_princ;
+               }
 #endif /* OPENSSL_NO_KRB5 */
  
        if (in->time != 0L)
@@ -182,7 +185,8 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
        M_ASN1_I2D_len(&(a.session_id),         i2d_ASN1_OCTET_STRING);
        M_ASN1_I2D_len(&(a.master_key),         i2d_ASN1_OCTET_STRING);
 #ifndef OPENSSL_NO_KRB5
-        M_ASN1_I2D_len(&(a.krb5_princ),         i2d_ASN1_OCTET_STRING);
+       if (in->krb5_client_princ_len)
+               M_ASN1_I2D_len(&(a.krb5_princ), i2d_ASN1_OCTET_STRING);
 #endif /* OPENSSL_NO_KRB5 */
        if (in->key_arg_length > 0)
                M_ASN1_I2D_len_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING);
@@ -204,7 +208,8 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
        M_ASN1_I2D_put(&(a.session_id),         i2d_ASN1_OCTET_STRING);
        M_ASN1_I2D_put(&(a.master_key),         i2d_ASN1_OCTET_STRING);
 #ifndef OPENSSL_NO_KRB5
-        M_ASN1_I2D_put(&(a.krb5_princ),         i2d_ASN1_OCTET_STRING);
+       if (in->krb5_client_princ_len)
+               M_ASN1_I2D_put(&(a.krb5_princ), i2d_ASN1_OCTET_STRING);
 #endif /* OPENSSL_NO_KRB5 */
        if (in->key_arg_length > 0)
                M_ASN1_I2D_put_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING,0);
@@ -221,7 +226,7 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
        M_ASN1_I2D_finish();
        }
 
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
+SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
             long length)
        {
        int version,ssl_version=0,i;
@@ -237,18 +242,18 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        M_ASN1_D2I_start_sequence();
 
        ai.data=NULL; ai.length=0;
-       M_ASN1_D2I_get(aip,d2i_ASN1_INTEGER);
+       M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER);
        version=(int)ASN1_INTEGER_get(aip);
        if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; }
 
        /* we don't care about the version right now :-) */
-       M_ASN1_D2I_get(aip,d2i_ASN1_INTEGER);
+       M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER);
        ssl_version=(int)ASN1_INTEGER_get(aip);
        ret->ssl_version=ssl_version;
        if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; }
 
        os.data=NULL; os.length=0;
-       M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
+       M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING);
        if (ssl_version == SSL2_VERSION)
                {
                if (os.length != 3)
@@ -261,7 +266,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
                        ((unsigned long)os.data[1]<< 8L)|
                         (unsigned long)os.data[2];
                }
-       else if ((ssl_version>>8) == 3)
+       else if ((ssl_version>>8) == SSL3_VERSION_MAJOR)
                {
                if (os.length != 2)
                        {
@@ -281,19 +286,22 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        ret->cipher=NULL;
        ret->cipher_id=id;
 
-       M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
-       if ((ssl_version>>8) == SSL3_VERSION)
+       M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING);
+       if ((ssl_version>>8) == SSL3_VERSION_MAJOR)
                i=SSL3_MAX_SSL_SESSION_ID_LENGTH;
-       else /* if (ssl_version == SSL2_VERSION) */
+       else /* if (ssl_version>>8 == SSL2_VERSION_MAJOR) */
                i=SSL2_MAX_SSL_SESSION_ID_LENGTH;
 
        if (os.length > i)
-               os.length=i;
+               os.length = i;
+       if (os.length > (int)sizeof(ret->session_id)) /* can't happen */
+               os.length = sizeof(ret->session_id);
 
        ret->session_id_length=os.length;
+       OPENSSL_assert(os.length <= (int)sizeof(ret->session_id));
        memcpy(ret->session_id,os.data,os.length);
 
-       M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
+       M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING);
        if (ret->master_key_length > SSL_MAX_MASTER_KEY_LENGTH)
                ret->master_key_length=SSL_MAX_MASTER_KEY_LENGTH;
        else
@@ -301,6 +309,25 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        memcpy(ret->master_key,os.data,ret->master_key_length);
 
        os.length=0;
+
+#ifndef OPENSSL_NO_KRB5
+       os.length=0;
+       M_ASN1_D2I_get_opt(osp,d2i_ASN1_OCTET_STRING,V_ASN1_OCTET_STRING);
+       if (os.data)
+               {
+               if (os.length > SSL_MAX_KRB5_PRINCIPAL_LENGTH)
+                       ret->krb5_client_princ_len=0;
+               else
+                       ret->krb5_client_princ_len=os.length;
+               memcpy(ret->krb5_client_princ,os.data,ret->krb5_client_princ_len);
+               OPENSSL_free(os.data);
+               os.data = NULL;
+               os.length = 0;
+               }
+       else
+               ret->krb5_client_princ_len=0;
+#endif /* OPENSSL_NO_KRB5 */
+
        M_ASN1_D2I_get_IMP_opt(osp,d2i_ASN1_OCTET_STRING,0,V_ASN1_OCTET_STRING);
        if (os.length > SSL_MAX_KEY_ARG_LENGTH)
                ret->key_arg_length=SSL_MAX_KEY_ARG_LENGTH;
@@ -309,17 +336,6 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        memcpy(ret->key_arg,os.data,ret->key_arg_length);
        if (os.data != NULL) OPENSSL_free(os.data);
 
-#ifndef OPENSSL_NO_KRB5
-        os.length=0;
-        M_ASN1_D2I_get_IMP_opt(osp,d2i_ASN1_OCTET_STRING,0,V_ASN1_OCTET_STRING);
-        if (os.length > SSL_MAX_KRB5_PRINCIPAL_LENGTH)
-            ret->krb5_client_princ_len=0;
-       else
-            ret->krb5_client_princ_len=os.length;
-       memcpy(ret->krb5_client_princ,os.data,ret->krb5_client_princ_len);
-       if (os.data != NULL) OPENSSL_free(os.data);
-#endif /* OPENSSL_NO_KRB5 */
-
        ai.length=0;
        M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,1);
        if (ai.data != NULL)
@@ -328,7 +344,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
                OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
                }
        else
-               ret->time=time(NULL);
+               ret->time=(unsigned long)time(NULL);
 
        ai.length=0;
        M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,2);
@@ -354,9 +370,15 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        if(os.data != NULL)
            {
            if (os.length > SSL_MAX_SID_CTX_LENGTH)
+               {
+               ret->sid_ctx_length=os.length;
                SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
-           ret->sid_ctx_length=os.length;
-           memcpy(ret->sid_ctx,os.data,os.length);
+               }
+           else
+               {
+               ret->sid_ctx_length=os.length;
+               memcpy(ret->sid_ctx,os.data,os.length);
+               }
            OPENSSL_free(os.data); os.data=NULL; os.length=0;
            }
        else