diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-09 17:10:28 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-09 17:10:28 +0200 |
| commit | a8bf03083ce7a72f8104c119f30e7862e2596bd1 (patch) | |
| tree | 3e4dd3fc211aca7d59c7f1b2cacfa471c690723f /lib/ssl/doc/src/ssl_protocol.xml | |
| parent | 0b335b4d6cdbb007536614e7e8c73295af3c7ace (diff) | |
| parent | bfaabab8c130a088d7bd703eb5e57c41fcd1f74f (diff) | |
| download | otp-a8bf03083ce7a72f8104c119f30e7862e2596bd1.tar.gz otp-a8bf03083ce7a72f8104c119f30e7862e2596bd1.tar.bz2 otp-a8bf03083ce7a72f8104c119f30e7862e2596bd1.zip | |
Merge branch 'ia/ssl-4.0.1/documentation' into dev
* ia/ssl-4.0.1/documentation:
Updated documentation for ssl-4.0.1
Diffstat (limited to 'lib/ssl/doc/src/ssl_protocol.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl_protocol.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml index 726b9a4eeb..6936408881 100644 --- a/lib/ssl/doc/src/ssl_protocol.xml +++ b/lib/ssl/doc/src/ssl_protocol.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="latin1" ?> +<?xml version="1.0" encoding="iso-8859-1" ?> <!DOCTYPE chapter SYSTEM "chapter.dtd"> <chapter> <header> <copyright> - <year>2003</year><year>2009</year> + <year>2003</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -44,7 +44,7 @@ <section> <title>Security overview</title> - <p>To achive authentication and privacy the client and server will + <p>To achieve authentication and privacy the client and server will perform a TLS Handshake procedure before transmitting or receiving any data. During the handshake they agree on a protocol version and cryptographic algorithms, they generate shared secrets using public @@ -56,7 +56,7 @@ <title>Data Privacy and Integrity</title> <p>A <em>symmetric key</em> algorithm has one key only. The key is - used for both encryption and decryption. These algoritms are fast + used for both encryption and decryption. These algorithms are fast compared to public key algorithms (using two keys, a public and a private one) and are therefore typically used for encrypting bulk data. @@ -66,7 +66,7 @@ for each connection and are based on a secret negotiated in the TLS handshake. </p> - <p>The TLS handsake protocol and data transfer is run on top of + <p>The TLS handshake protocol and data transfer is run on top of the TLS Record Protocol that uses a keyed-hash MAC (Message Authenticity Code), or HMAC, to protect the message's data integrity. From the TLS RFC "A Message Authentication Code is a @@ -85,7 +85,7 @@ with the private key of the issuer of the certificate. A chain of trust is build by having the issuer in its turn being certified by an other certificate and so on until you reach the - so called root certificate that is self signed e.i. issued + so called root certificate that is self signed i.e. issued by itself.</p> <p>Certificates are issued by <em>certification |