diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 400de3fb30..939ad4cf44 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -471,7 +471,7 @@ int tls_construct_ctos_supported_versions(SSL *s, WPACKET *pkt,
     }
 
     /*
-     * TODO(TLS1.3): There is some discussion on the TLS list as to wheter
+     * TODO(TLS1.3): There is some discussion on the TLS list as to whether
      * we should include versions <TLS1.2. For the moment we do. To be
      * reviewed later.
      */
@@ -745,7 +745,7 @@ int tls_construct_ctos_padding(SSL *s, WPACKET *pkt, unsigned int context,
     }
 
     if (hlen > F5_WORKAROUND_MIN_MSG_LEN && hlen < F5_WORKAROUND_MAX_MSG_LEN) {
-        /* Calculate the amond of padding we need to add */
+        /* Calculate the amount of padding we need to add */
         hlen = F5_WORKAROUND_MAX_MSG_LEN - hlen;
 
         /*
@@ -804,7 +804,7 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, unsigned int context, X509 *x,
 
     md = ssl_md(s->session->cipher->algorithm2);
     if (md == NULL) {
-        /* Don't recognise this cipher so we can't use the session. Ignore it */
+        /* Don't recognize this cipher so we can't use the session. Ignore it */
         return 1;
     }
 
@@ -1051,7 +1051,7 @@ int tls_parse_stoc_status_request(SSL *s, PACKET *pkt, unsigned int context,
 
     if (SSL_IS_TLS13(s)) {
         /* We only know how to handle this if it's for the first Certificate in
-         * the chain. We ignore any other repsonses.
+         * the chain. We ignore any other responses.
          */
         if (chainidx != 0)
             return 1;
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 1342272a78..c6b164147b 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2978,7 +2978,7 @@ static int tls_construct_cke_gost(SSL *s, WPACKET *pkt, int *al)
         dgst_nid = NID_id_GostR3411_2012_256;
 
     /*
-     * Get server sertificate PKEY and create ctx from it
+     * Get server certificate PKEY and create ctx from it
      */
     peer_cert = s->session->peer;
     if (!peer_cert) {
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index bf1a5b20e0..19d4b4631e 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1603,7 +1603,7 @@ int ssl_choose_server_version(SSL *s, CLIENTHELLO_MSG *hello, DOWNGRADE *dgrd)
                 candidate_vers = TLS1_3_VERSION;
             /*
              * TODO(TLS1.3): There is some discussion on the TLS list about
-             * wheter to ignore versions <TLS1.2 in supported_versions. At the
+             * whether to ignore versions <TLS1.2 in supported_versions. At the
              * moment we honour them if present. To be reviewed later
              */
             if (version_cmp(s, candidate_vers, best_vers) <= 0)