Commit 3b842275 authored by Richard Levitte's avatar Richard Levitte
Browse files

ASN.1: adapt SSL_SESSION_ASN1 by explicitely embedding INTxx et al 



Fixes #3191

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3200)
parent b0a05a39

ssl/ssl_asn1.c

+7 −7
Original line number Diff line number Diff line
@@ -67,29 +67,29 @@ typedef struct { 
} SSL_SESSION_ASN1;



ASN1_SEQUENCE(SSL_SESSION_ASN1) = {

    ASN1_SIMPLE(SSL_SESSION_ASN1, version, UINT32),

    ASN1_SIMPLE(SSL_SESSION_ASN1, ssl_version, INT32),

    ASN1_EMBED(SSL_SESSION_ASN1, version, UINT32),

    ASN1_EMBED(SSL_SESSION_ASN1, ssl_version, INT32),

    ASN1_SIMPLE(SSL_SESSION_ASN1, cipher, ASN1_OCTET_STRING),

    ASN1_SIMPLE(SSL_SESSION_ASN1, session_id, ASN1_OCTET_STRING),

    ASN1_SIMPLE(SSL_SESSION_ASN1, master_key, ASN1_OCTET_STRING),

    ASN1_IMP_OPT(SSL_SESSION_ASN1, key_arg, ASN1_OCTET_STRING, 0),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, time, ZINT64, 1),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, timeout, ZINT64, 2),

    ASN1_EXP_OPT_EMBED(SSL_SESSION_ASN1, time, ZINT64, 1),

    ASN1_EXP_OPT_EMBED(SSL_SESSION_ASN1, timeout, ZINT64, 2),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, peer, X509, 3),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, session_id_context, ASN1_OCTET_STRING, 4),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, verify_result, ZINT32, 5),

    ASN1_EXP_OPT_EMBED(SSL_SESSION_ASN1, verify_result, ZINT32, 5),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_hostname, ASN1_OCTET_STRING, 6),

#ifndef OPENSSL_NO_PSK

    ASN1_EXP_OPT(SSL_SESSION_ASN1, psk_identity_hint, ASN1_OCTET_STRING, 7),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, psk_identity, ASN1_OCTET_STRING, 8),

#endif

    ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_tick_lifetime_hint, ZUINT64, 9),

    ASN1_EXP_OPT_EMBED(SSL_SESSION_ASN1, tlsext_tick_lifetime_hint, ZUINT64, 9),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_tick, ASN1_OCTET_STRING, 10),

    ASN1_EXP_OPT(SSL_SESSION_ASN1, comp_id, ASN1_OCTET_STRING, 11),

#ifndef OPENSSL_NO_SRP

    ASN1_EXP_OPT(SSL_SESSION_ASN1, srp_username, ASN1_OCTET_STRING, 12),

#endif

    ASN1_EXP_OPT(SSL_SESSION_ASN1, flags, ZUINT64, 13)

    ASN1_EXP_OPT_EMBED(SSL_SESSION_ASN1, flags, ZUINT64, 13)

} static_ASN1_SEQUENCE_END(SSL_SESSION_ASN1)



IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(SSL_SESSION_ASN1)