[openssl] OpenSSL_1_1_1-stable update

[kaduk at mit.edu]

The branch OpenSSL_1_1_1-stable has been updated
       via  ee833fe9c325ecacc15b1f4e6c931f69aac0664e (commit)
      from  b5aff22ac90623afeb0c74b36096f85eff5bc2b9 (commit)


- Log -----------------------------------------------------------------
commit ee833fe9c325ecacc15b1f4e6c931f69aac0664e
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Jan 27 12:19:08 2021 -0800

    Remove unused 'peer_type' from SSL_SESSION
    
    This field has not been used since #3858 was merged in 2017 when we
    moved to a table-based lookup for certificate type properties instead of
    an index-based one.
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/13991)
    
    (cherry picked from commit 3bc0b621a7baf1a11bc5cad69a287ad093674d68)

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_local.h          | 1 -
 ssl/statem/statem_clnt.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 8ddbde7729..3f02751dde 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -537,7 +537,6 @@ struct ssl_session_st {
     int not_resumable;
     /* This is the cert and type for the other end. */
     X509 *peer;
-    int peer_type;
     /* Certificate chain peer sent. */
     STACK_OF(X509) *peer_chain;
     /*
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 3420ce65c7..d68cd1f9d7 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1960,7 +1960,6 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL *s, PACKET *pkt)
             goto err;
         }
     }
-    s->session->peer_type = certidx;
 
     X509_free(s->session->peer);
     X509_up_ref(x);