Fix ASN1 additions for KRB5
[openssl.git] / ssl / ssl_asn1.c
index e77cddd..c5eeeb6 100644 (file)
@@ -72,6 +72,9 @@ typedef struct ssl_session_asn1_st
        ASN1_OCTET_STRING session_id;
        ASN1_OCTET_STRING session_id_context;
        ASN1_OCTET_STRING key_arg;
+#ifndef OPENSSL_NO_KRB5
+        ASN1_OCTET_STRING krb5_princ;
+#endif /* OPENSSL_NO_KRB5 */
        ASN1_INTEGER time;
        ASN1_INTEGER timeout;
        ASN1_INTEGER verify_result;
@@ -92,7 +95,7 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
 
        /* Note that I cheat in the following 2 assignments.  I know
         * that if the ASN1_INTEGER passed to ASN1_INTEGER_set
-        * is > sizeof(long)+1, the buffer will not be re-Malloc()ed.
+        * is > sizeof(long)+1, the buffer will not be re-OPENSSL_malloc()ed.
         * This is a bit evil but makes things simple, no dynamic allocation
         * to clean up :-) */
        a.version.length=LSIZE2;
@@ -142,6 +145,15 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
        a.key_arg.type=V_ASN1_OCTET_STRING;
        a.key_arg.data=in->key_arg;
 
+#ifndef OPENSSL_NO_KRB5
+       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)
                {
                a.time.length=LSIZE2;
@@ -166,11 +178,16 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                ASN1_INTEGER_set(&a.verify_result,in->verify_result);
                }
 
+
        M_ASN1_I2D_len(&(a.version),            i2d_ASN1_INTEGER);
        M_ASN1_I2D_len(&(a.ssl_version),        i2d_ASN1_INTEGER);
        M_ASN1_I2D_len(&(a.cipher),             i2d_ASN1_OCTET_STRING);
        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
+       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);
        if (in->time != 0L)
@@ -190,6 +207,10 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
        M_ASN1_I2D_put(&(a.cipher),             i2d_ASN1_OCTET_STRING);
        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
+       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);
        if (in->time != 0L)
@@ -223,13 +244,13 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        ai.data=NULL; ai.length=0;
        M_ASN1_D2I_get(aip,d2i_ASN1_INTEGER);
        version=(int)ASN1_INTEGER_get(aip);
-       if (ai.data != NULL) { Free(ai.data); ai.data=NULL; ai.length=0; }
+       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);
        ssl_version=(int)ASN1_INTEGER_get(aip);
        ret->ssl_version=ssl_version;
-       if (ai.data != NULL) { Free(ai.data); ai.data=NULL; ai.length=0; }
+       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);
@@ -285,20 +306,39 @@ 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;
        else
                ret->key_arg_length=os.length;
        memcpy(ret->key_arg,os.data,ret->key_arg_length);
-       if (os.data != NULL) Free(os.data);
+       if (os.data != NULL) OPENSSL_free(os.data);
 
        ai.length=0;
        M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,1);
        if (ai.data != NULL)
                {
                ret->time=ASN1_INTEGER_get(aip);
-               Free(ai.data); ai.data=NULL; ai.length=0;
+               OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
                }
        else
                ret->time=time(NULL);
@@ -308,7 +348,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        if (ai.data != NULL)
                {
                ret->timeout=ASN1_INTEGER_get(aip);
-               Free(ai.data); ai.data=NULL; ai.length=0;
+               OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
                }
        else
                ret->timeout=3;
@@ -330,7 +370,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
                SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
            ret->sid_ctx_length=os.length;
            memcpy(ret->sid_ctx,os.data,os.length);
-           Free(os.data); os.data=NULL; os.length=0;
+           OPENSSL_free(os.data); os.data=NULL; os.length=0;
            }
        else
            ret->sid_ctx_length=0;
@@ -340,7 +380,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
        if (ai.data != NULL)
                {
                ret->verify_result=ASN1_INTEGER_get(aip);
-               Free(ai.data); ai.data=NULL; ai.length=0;
+               OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
                }
        else
                ret->verify_result=X509_V_OK;