diff options
| author | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
| commit | 8d77ecefb78a0e7ec702cf614a78dd85de9395ee (patch) | |
| tree | ade84397c16fe1b20cb2a441f603826e49c36cf2 /crypto/openssl/ssl/ssl_asn1.c | |
| parent | 5374819b03f4e6dcb332bf2729f9270e5d10b83a (diff) | |
| parent | afd52a5fc90e70242dbb0e7d29987c976eb993e0 (diff) | |
| download | FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.zip FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.tar.gz | |
Merge OpenSSL 1.0.2e.
Diffstat (limited to 'crypto/openssl/ssl/ssl_asn1.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_asn1.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/ssl_asn1.c b/crypto/openssl/ssl/ssl_asn1.c index 39d48ea..35cc27c 100644 --- a/crypto/openssl/ssl/ssl_asn1.c +++ b/crypto/openssl/ssl/ssl_asn1.c @@ -121,13 +121,16 @@ typedef struct ssl_session_asn1_st { int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) { #define LSIZE2 (sizeof(long)*2) - int v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0, v7 = 0, v8 = 0; + int v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0; unsigned char buf[4], ibuf1[LSIZE2], ibuf2[LSIZE2]; unsigned char ibuf3[LSIZE2], ibuf4[LSIZE2], ibuf5[LSIZE2]; #ifndef OPENSSL_NO_TLSEXT int v6 = 0, v9 = 0, v10 = 0; unsigned char ibuf6[LSIZE2]; #endif +#ifndef OPENSSL_NO_PSK + int v7 = 0, v8 = 0; +#endif #ifndef OPENSSL_NO_COMP unsigned char cbuf; int v11 = 0; |
