summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo Raisr <ivo.raisr@oracle.com>2015-09-11 17:24:33 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-09-16 18:12:31 +0100
commitdf32994cf0dbaefef8187b60785eb615735d7be1 (patch)
tree79b66ce1bae5225a1eca691af187157150568093
parent01d8ae61f236d24a5a04992866d94ec10f7d69a2 (diff)
Make no-psk compile without warnings.
PR#4035 Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Stephen Henson <steve@openssl.org> (cherry picked from commit 929f6d6f55275b17cfdd5c405ef403bce87c9aef)
-rw-r--r--ssl/ssl_asn1.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index aad07e6cf0..8629916a07 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -118,13 +118,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;