[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  533bf1df55057eb2bb3dc3306d34153414a4dc4d (commit)
      from  90d28f0519427ffc293f880c423d9c4395a6fcd4 (commit)


- Log -----------------------------------------------------------------
commit 533bf1df55057eb2bb3dc3306d34153414a4dc4d
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Fri Jul 1 13:40:33 2016 +0200

    ssl.h: spelling in comment
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1275)

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

Summary of changes:
 include/openssl/ssl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index cc66dd8..d2736e2 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1277,7 +1277,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 # define SSL_need_tmp_RSA(ssl)                    0
 # define SSL_set_tmp_rsa(ssl,rsa)                 1
 /*
- * We "preted" to call the callback to avoid warnings about unused static
+ * We "pretend" to call the callback to avoid warnings about unused static
  * functions.
  */
 # define SSL_CTX_set_tmp_rsa_callback(ctx, cb)    while(0) (cb)(NULL, 0, 0)