Spelling

6 files changed, 17 insertions, 18 deletions

diff --git a/src/tls/msg_client_hello.cpp b/src/tls/msg_client_hello.cpp
index 440389ea1..d6512dccb 100644
--- a/src/tls/msg_client_hello.cpp
+++ b/src/tls/msg_client_hello.cpp
@@ -190,7 +190,7 @@ std::vector<byte> Client_Hello::serialize() const
    Extensions extensions;
 
    if(m_secure_renegotiation)
-      extensions.add(new Renegotation_Extension(m_renegotiation_info));
+      extensions.add(new Renegotiation_Extension(m_renegotiation_info));
 
    extensions.add(new Session_Ticket(m_session_ticket));
 
@@ -304,7 +304,7 @@ void Client_Hello::deserialize(const std::vector<byte>& buf)
       m_fragment_size = frag->fragment_size();
       }
 
-   if(Renegotation_Extension* reneg = extensions.get<Renegotation_Extension>())
+   if(Renegotiation_Extension* reneg = extensions.get<Renegotiation_Extension>())
       {
       // checked by Client / Server as they know the handshake state
       m_secure_renegotiation = true;
diff --git a/src/tls/msg_next_protocol.cpp b/src/tls/msg_next_protocol.cpp
index 71bb0eb9e..a09fd02d1 100644
--- a/src/tls/msg_next_protocol.cpp
+++ b/src/tls/msg_next_protocol.cpp
@@ -1,5 +1,5 @@
 /*
-* Next Protocol Negotation
+* Next Protocol Negotiation
 * (C) 2012 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/tls/msg_server_hello.cpp b/src/tls/msg_server_hello.cpp
index 941fee8e4..277e6e94d 100644
--- a/src/tls/msg_server_hello.cpp
+++ b/src/tls/msg_server_hello.cpp
@@ -75,7 +75,7 @@ Server_Hello::Server_Hello(const std::vector<byte>& buf)
 
    Extensions extensions(reader);
 
-   if(Renegotation_Extension* reneg = extensions.get<Renegotation_Extension>())
+   if(Renegotiation_Extension* reneg = extensions.get<Renegotiation_Extension>())
       {
       // checked by Client / Server as they know the handshake state
       m_secure_renegotiation = true;
@@ -126,7 +126,7 @@ std::vector<byte> Server_Hello::serialize() const
       extensions.add(new Heartbeat_Support_Indicator(m_peer_can_send_heartbeats));
 
    if(m_secure_renegotiation)
-      extensions.add(new Renegotation_Extension(m_renegotiation_info));
+      extensions.add(new Renegotiation_Extension(m_renegotiation_info));
 
    if(m_fragment_size != 0)
       extensions.add(new Maximum_Fragment_Length(m_fragment_size));
diff --git a/src/tls/tls_extensions.cpp b/src/tls/tls_extensions.cpp
index 46c8dc5be..602a30c8f 100644
--- a/src/tls/tls_extensions.cpp
+++ b/src/tls/tls_extensions.cpp
@@ -34,7 +34,7 @@ Extension* make_extension(TLS_Data_Reader& reader,
          return new Supported_Elliptic_Curves(reader, size);
 
       case TLSEXT_SAFE_RENEGOTIATION:
-         return new Renegotation_Extension(reader, size);
+         return new Renegotiation_Extension(reader, size);
 
       case TLSEXT_SIGNATURE_ALGORITHMS:
          return new Signature_Algorithms(reader, size);
@@ -188,7 +188,7 @@ std::vector<byte> SRP_Identifier::serialize() const
    return buf;
    }
 
-Renegotation_Extension::Renegotation_Extension(TLS_Data_Reader& reader,
+Renegotiation_Extension::Renegotiation_Extension(TLS_Data_Reader& reader,
                                                u16bit extension_size)
    {
    reneg_data = reader.get_range<byte>(1, 0, 255);
@@ -197,7 +197,7 @@ Renegotation_Extension::Renegotation_Extension(TLS_Data_Reader& reader,
       throw Decoding_Error("Bad encoding for secure renegotiation extn");
    }
 
-std::vector<byte> Renegotation_Extension::serialize() const
+std::vector<byte> Renegotiation_Extension::serialize() const
    {
    std::vector<byte> buf;
    append_tls_length_value(buf, reneg_data, 1);
diff --git a/src/tls/tls_extensions.h b/src/tls/tls_extensions.h
index 6b1652deb..a2d10fd13 100644
--- a/src/tls/tls_extensions.h
+++ b/src/tls/tls_extensions.h
@@ -121,7 +121,7 @@ class SRP_Identifier : public Extension
 /**
 * Renegotiation Indication Extension (RFC 5746)
 */
-class Renegotation_Extension : public Extension
+class Renegotiation_Extension : public Extension
    {
    public:
       static Handshake_Extension_Type static_type()
@@ -129,12 +129,12 @@ class Renegotation_Extension : public Extension
 
       Handshake_Extension_Type type() const { return static_type(); }
 
-      Renegotation_Extension() {}
+      Renegotiation_Extension() {}
 
-      Renegotation_Extension(const std::vector<byte>& bits) :
+      Renegotiation_Extension(const std::vector<byte>& bits) :
          reneg_data(bits) {}
 
-      Renegotation_Extension(TLS_Data_Reader& reader,
+      Renegotiation_Extension(TLS_Data_Reader& reader,
                              u16bit extension_size);
 
       const std::vector<byte>& renegotiation_info() const
diff --git a/src/tls/tls_server.cpp b/src/tls/tls_server.cpp
index 761be08ca..a8e433514 100644
--- a/src/tls/tls_server.cpp
+++ b/src/tls/tls_server.cpp
@@ -309,12 +309,11 @@ void Server::process_handshake_msg(const Handshake_State* active_state,
       else if(!initial_handshake && (client_version != active_state->version()))
          {
          /*
-         * If this is a renegotation, and the client has offered a
-         * later version than what it initially negotiated,
-         * negotiate the old version. This matches OpenSSL's
-         * behavior. If the client is offering a version earlier
-         * than what it initially negotiated, reject as a probable
-         * attack.
+         * If this is a renegotiation, and the client has offered a
+         * later version than what it initially negotiated, negotiate
+         * the old version. This matches OpenSSL's behavior. If the
+         * client is offering a version earlier than what it initially
+         * negotiated, reject as a probable attack.
          */
          if(active_state->version() > client_version)
             {