mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert SSL_SESSION_ASN1 to use size specific integers

Browse Source 
This increases portability of SSL_SESSION files between architectures
where the size of |long| may vary.  Before this, SSL_SESSION files
produced on a 64-bit long architecture may break on a 32-bit long
architecture.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3088)
This commit is contained in:
Richard Levitte 2017-03-30 13:33:33 +02:00
parent 5c7e65486c
commit 66ecfb5437
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ssl/ssl_asn1.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
* *
* Licensed under the OpenSSL license (the "License"). You may not use * Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy * this file except in compliance with the License. You can obtain a copy
@ -37,25 +37,25 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "ssl_locl.h" #include "ssl_locl.h"
#include <openssl/asn1t.h> #include "internal/asn1t.h"
#include <openssl/x509.h> #include <openssl/x509.h>
typedef struct { typedef struct {
long version; uint32_t version;
long ssl_version; int32_t ssl_version;
ASN1_OCTET_STRING *cipher; ASN1_OCTET_STRING *cipher;
ASN1_OCTET_STRING *comp_id; ASN1_OCTET_STRING *comp_id;
ASN1_OCTET_STRING *master_key; ASN1_OCTET_STRING *master_key;
ASN1_OCTET_STRING *session_id; ASN1_OCTET_STRING *session_id;
ASN1_OCTET_STRING *key_arg; ASN1_OCTET_STRING *key_arg;
long time; int64_t time;
long timeout; int64_t timeout;
X509 *peer; X509 *peer;
ASN1_OCTET_STRING *session_id_context; ASN1_OCTET_STRING *session_id_context;
long verify_result; int32_t verify_result;
ASN1_OCTET_STRING *tlsext_hostname; ASN1_OCTET_STRING *tlsext_hostname;
long tlsext_tick_lifetime_hint; uint64_t tlsext_tick_lifetime_hint;
long tlsext_tick_age_add; uint32_t tlsext_tick_age_add;
ASN1_OCTET_STRING *tlsext_tick; ASN1_OCTET_STRING *tlsext_tick;
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
ASN1_OCTET_STRING *psk_identity_hint; ASN1_OCTET_STRING *psk_identity_hint;
@ -64,37 +64,37 @@ typedef struct {
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
ASN1_OCTET_STRING *srp_username; ASN1_OCTET_STRING *srp_username;
#endif #endif
long flags; uint64_t flags;
uint32_t max_early_data; uint32_t max_early_data;
ASN1_OCTET_STRING *alpn_selected; ASN1_OCTET_STRING *alpn_selected;
} SSL_SESSION_ASN1; } SSL_SESSION_ASN1;
ASN1_SEQUENCE(SSL_SESSION_ASN1) = { ASN1_SEQUENCE(SSL_SESSION_ASN1) = {
ASN1_SIMPLE(SSL_SESSION_ASN1, version, LONG), ASN1_SIMPLE(SSL_SESSION_ASN1, version, UINT32),
ASN1_SIMPLE(SSL_SESSION_ASN1, ssl_version, LONG), ASN1_SIMPLE(SSL_SESSION_ASN1, ssl_version, INT32),
ASN1_SIMPLE(SSL_SESSION_ASN1, cipher, ASN1_OCTET_STRING), ASN1_SIMPLE(SSL_SESSION_ASN1, cipher, ASN1_OCTET_STRING),
ASN1_SIMPLE(SSL_SESSION_ASN1, session_id, ASN1_OCTET_STRING), ASN1_SIMPLE(SSL_SESSION_ASN1, session_id, ASN1_OCTET_STRING),
ASN1_SIMPLE(SSL_SESSION_ASN1, master_key, 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_IMP_OPT(SSL_SESSION_ASN1, key_arg, ASN1_OCTET_STRING, 0),
ASN1_EXP_OPT(SSL_SESSION_ASN1, time, ZLONG, 1), ASN1_EXP_OPT(SSL_SESSION_ASN1, time, ZINT64, 1),
ASN1_EXP_OPT(SSL_SESSION_ASN1, timeout, ZLONG, 2), ASN1_EXP_OPT(SSL_SESSION_ASN1, timeout, ZINT64, 2),
ASN1_EXP_OPT(SSL_SESSION_ASN1, peer, X509, 3), 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, session_id_context, ASN1_OCTET_STRING, 4),
ASN1_EXP_OPT(SSL_SESSION_ASN1, verify_result, ZLONG, 5), ASN1_EXP_OPT(SSL_SESSION_ASN1, verify_result, ZINT32, 5),
ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_hostname, ASN1_OCTET_STRING, 6), ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_hostname, ASN1_OCTET_STRING, 6),
#ifndef OPENSSL_NO_PSK #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_hint, ASN1_OCTET_STRING, 7),
ASN1_EXP_OPT(SSL_SESSION_ASN1, psk_identity, ASN1_OCTET_STRING, 8), ASN1_EXP_OPT(SSL_SESSION_ASN1, psk_identity, ASN1_OCTET_STRING, 8),
#endif #endif
ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_tick_lifetime_hint, ZLONG, 9), ASN1_EXP_OPT(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, tlsext_tick, ASN1_OCTET_STRING, 10),
ASN1_EXP_OPT(SSL_SESSION_ASN1, comp_id, ASN1_OCTET_STRING, 11), ASN1_EXP_OPT(SSL_SESSION_ASN1, comp_id, ASN1_OCTET_STRING, 11),
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
ASN1_EXP_OPT(SSL_SESSION_ASN1, srp_username, ASN1_OCTET_STRING, 12), ASN1_EXP_OPT(SSL_SESSION_ASN1, srp_username, ASN1_OCTET_STRING, 12),
#endif #endif
ASN1_EXP_OPT(SSL_SESSION_ASN1, flags, ZLONG, 13), ASN1_EXP_OPT(SSL_SESSION_ASN1, flags, ZUINT64, 13),
ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_tick_age_add, ZLONG, 14), ASN1_EXP_OPT(SSL_SESSION_ASN1, tlsext_tick_age_add, ZUINT32, 14),
ASN1_EXP_OPT(SSL_SESSION_ASN1, max_early_data, ZLONG, 15), ASN1_EXP_OPT(SSL_SESSION_ASN1, max_early_data, ZUINT32, 15),
ASN1_EXP_OPT(SSL_SESSION_ASN1, alpn_selected, ASN1_OCTET_STRING, 16) ASN1_EXP_OPT(SSL_SESSION_ASN1, alpn_selected, ASN1_OCTET_STRING, 16)
} static_ASN1_SEQUENCE_END(SSL_SESSION_ASN1) } static_ASN1_SEQUENCE_END(SSL_SESSION_ASN1)