summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/src/ssl/ssl_asn1.c3
-rw-r--r--src/lib/libssl/ssl_asn1.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_asn1.c b/src/lib/libssl/src/ssl/ssl_asn1.c
index 33a8edf20a..ff1d7860e1 100644
--- a/src/lib/libssl/src/ssl/ssl_asn1.c
+++ b/src/lib/libssl/src/ssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_asn1.c,v 1.31 2014/07/13 16:30:50 jsing Exp $ */ 1/* $OpenBSD: ssl_asn1.c,v 1.32 2014/07/13 16:39:19 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -95,7 +95,6 @@ typedef struct ssl_session_asn1_st {
95 ASN1_INTEGER version; 95 ASN1_INTEGER version;
96 ASN1_INTEGER ssl_version; 96 ASN1_INTEGER ssl_version;
97 ASN1_OCTET_STRING cipher; 97 ASN1_OCTET_STRING cipher;
98 ASN1_OCTET_STRING comp_id;
99 ASN1_OCTET_STRING master_key; 98 ASN1_OCTET_STRING master_key;
100 ASN1_OCTET_STRING session_id; 99 ASN1_OCTET_STRING session_id;
101 ASN1_OCTET_STRING session_id_context; 100 ASN1_OCTET_STRING session_id_context;
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index 33a8edf20a..ff1d7860e1 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_asn1.c,v 1.31 2014/07/13 16:30:50 jsing Exp $ */ 1/* $OpenBSD: ssl_asn1.c,v 1.32 2014/07/13 16:39:19 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -95,7 +95,6 @@ typedef struct ssl_session_asn1_st {
95 ASN1_INTEGER version; 95 ASN1_INTEGER version;
96 ASN1_INTEGER ssl_version; 96 ASN1_INTEGER ssl_version;
97 ASN1_OCTET_STRING cipher; 97 ASN1_OCTET_STRING cipher;
98 ASN1_OCTET_STRING comp_id;
99 ASN1_OCTET_STRING master_key; 98 ASN1_OCTET_STRING master_key;
100 ASN1_OCTET_STRING session_id; 99 ASN1_OCTET_STRING session_id;
101 ASN1_OCTET_STRING session_id_context; 100 ASN1_OCTET_STRING session_id_context;