Rename 'peer' to 'peer_cert' in SSL_SESSION.

The 'peer' member of SSL_SESSION is the leaf/end-entity certificate
provided by our peer. Rename it since 'peer' on its own is unhelpful.

ok inoguchi@ tb@

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index 2af6834d88..70a50acc5c 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_asn1.c,v 1.60 2021/10/23 08:13:02 jsing Exp $ */
+/* $OpenBSD: ssl_asn1.c,v 1.61 2022/01/11 18:39:28 jsing Exp $ */
 /*
  * Copyright (c) 2016 Joel Sing <jsing@openbsd.org>
  *
@@ -113,8 +113,8 @@ SSL_SESSION_encode(SSL_SESSION *s, unsigned char **out, size_t *out_len,
         }
 
         /* Peer certificate [3]. */
-        if (s->peer != NULL) {
-                if ((len = i2d_X509(s->peer, &peer_cert_bytes)) <= 0)
+        if (s->peer_cert != NULL) {
+                if ((len = i2d_X509(s->peer_cert, &peer_cert_bytes)) <= 0)
                         goto err;
                 if (!CBB_add_asn1(&session, &peer_cert, SSLASN1_PEER_CERT_TAG))
                         goto err;
@@ -332,8 +332,8 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length)
                 s->timeout = (long)timeout;
 
         /* Peer certificate [3]. */
-        X509_free(s->peer);
-        s->peer = NULL;
+        X509_free(s->peer_cert);
+        s->peer_cert = NULL;
         if (!CBS_get_optional_asn1(&session, &peer_cert, &present,
             SSLASN1_PEER_CERT_TAG))
                 goto err;
@@ -342,7 +342,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length)
                 if (data_len > LONG_MAX)
                         goto err;
                 peer_cert_bytes = CBS_data(&peer_cert);
-                if (d2i_X509(&s->peer, &peer_cert_bytes,
+                if (d2i_X509(&s->peer_cert, &peer_cert_bytes,
                     (long)data_len) == NULL)
                         goto err;
         }