*** empty log message ***

8 files changed, 87 insertions, 323 deletions

diff --git a/doc/tex/certificate.tex b/doc/tex/certificate.tex
index 6b955f6e1f..2a18fa5cc2 100644
--- a/doc/tex/certificate.tex
+++ b/doc/tex/certificate.tex
@@ -1,4 +1,5 @@
 \chapter{More on certificate authentication}
+\index{Certificate authentication}
 
 \section{The X.509\index{X.509 certificates} trust model}
 \label{x509:trust}
@@ -33,13 +34,16 @@ more information.
 
 
 \par
-Verifying certificate\index{Verifying certificate paths} paths is also important in X.509 authentication.
-For this purpose you can use the
-\printfunc{gnutls_x509_verify_certificate}{gnutls\_x509\_verify\_certificate}
-function. A more generic one is also provided and can be used with all
+Verifying certificate\index{Verifying certificate paths} paths is important 
+in X.509 authentication. For this purpose you should use functions like
+\printfunc{gnutls_x509_verify_certificate}{gnutls\_x509\_verify\_certificate}.
+A more generic one is also provided and can be used with all
 of the certificate authentication methods, but is limited to a session. See the
 \printfunc{gnutls_certificate_verify_peers}{gnutls\_certificate\_verify\_peers}
-function.
+function. The above functions verify if the given certificate path leads
+to a trusted CA certificate. You should also verify if the certificate's
+owner is the one you expect. See \ref{ex:rfc2818} on page \pageref{ex:rfc2818},
+for an example.
 
 \par
 Note that \gnutls{} is not a generic purpose X.509 toolkit\footnote{Aegypten is such a toolkit. See 
diff --git a/doc/tex/ciphers.tex b/doc/tex/ciphers.tex
index 06f0e6b13b..d1ed592256 100644
--- a/doc/tex/ciphers.tex
+++ b/doc/tex/ciphers.tex
@@ -1,14 +1,15 @@
-\section{Symmetric encryption algorithms}
-\par
-Confidentiality is provided by using block encryption algorithms like {\bf 3DES}, 
-{\bf AES\footnote{AES or Advanced Encryption Standard is actually the RIJNDAEL algorithm. This is the
-algorithm that will replace DES.}}, or
+\subsection{Encryption algorithms used in the record layer}
+\index{Symmetric encryption algorithms}
+Confidentiality in the record layer is achieved by using symmetric block 
+encryption algorithms like {\bf 3DES}, {\bf AES\footnote{AES or Advanced 
+Encryption Standard is actually the RIJNDAEL algorithm. This is the
+algorithm that replaced DES.}}, or
 stream algorithms like {\bf ARCFOUR\_128\footnote{ARCFOUR\_128 is a compatible
 algorithm with RSA's RC4 algorithm, which is considered to be a trade secret.}} See \hyperref{fig:ciphers}{figure }{}{fig:ciphers} for a complete list. 
 Ciphers are encryption algorithms that use a single (secret) key
 to encrypt and decrypt data. Block algorithms in TLS also provide protection
 against statistical analysis of the data. \gnutls{} makes use of this property
-thus, if you're operating in \tlsI{} mode, a random number of blocks will be
+thus, if you're using the \tlsI{} protocol, a random number of blocks will be
 appended to the data. This will prevent eavesdroppers from guessing the 
 actual data size.
 
@@ -59,6 +60,7 @@ MAC\_SHA & SHA is a hash algorithm by NSA. Outputs 160 bits of data.
 \hline
 \end{tabular}
 \caption{Supported MAC algorithms}
+\index{MAC algorithms}
 \label{fig:mac}
 \end{figure}
 
diff --git a/doc/tex/ex-rfc2818.tex b/doc/tex/ex-rfc2818.tex
index 8d539abccb..69a9ce0502 100644
--- a/doc/tex/ex-rfc2818.tex
+++ b/doc/tex/ex-rfc2818.tex
@@ -1,3 +1,5 @@
+\index{Verifying certificate paths}
+\label{ex:rfc2818}
 \begin{verbatim}
 
 /* This example was written by Andrew McDonald <andrew@mcdonald.org.uk>
diff --git a/doc/tex/examples.tex b/doc/tex/examples.tex
index 53df12f87b..ad7966b912 100644
--- a/doc/tex/examples.tex
+++ b/doc/tex/examples.tex
@@ -37,8 +37,8 @@ This function should be called right after a successful
 
 \subsection{Client with Resume capability example}
 \label{resume-example}
-This is the same client as above, but here we add support for session
-resumption.
+This is a modification of the simple client above. Here we added support 
+for session resumption.
 \input{ex4}
 
 \subsection{Client with Resume capability example II}
diff --git a/doc/tex/figures/layers.dia b/doc/tex/figures/layers.dia
index f1d11ed4d3..ad1384e35f 100644
--- a/doc/tex/figures/layers.dia
+++ b/doc/tex/figures/layers.dia
diff --git a/doc/tex/layers.eps b/doc/tex/layers.eps
index 9d42acd530..48115d0485 100644
--- a/doc/tex/layers.eps
+++ b/doc/tex/layers.eps
@@ -1,283 +1,14 @@
 %!PS-Adobe-2.0 EPSF-2.0
-%%Title: /usr/home/nmav/layers.dia
-%%Creator: Dia v0.88.1
-%%CreationDate: Mon Jun 10 16:38:14 2002
-%%For: nmav
+%%Title: layers.dia
+%%Creator: Dia v0.90
+%%CreationDate: Fri Sep  6 21:01:53 2002
+%%For: a user
 %%Magnification: 1.0000
 %%Orientation: Portrait
-%%BoundingBox: 0 0 306 470
+%%BoundingBox: 0 0 698 396
 %%Pages: 1
-%%BeginSetup
-%%EndSetup
 %%EndComments
 %%BeginProlog
-[ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
-/two /three /four /five /six /seven /eight /nine /colon /semicolon
-/less /equal /greater /question /at /A /B /C /D /E
-/F /G /H /I /J /K /L /M /N /O
-/P /Q /R /S /T /U /V /W /X /Y
-/Z /bracketleft /backslash /bracketright /asciicircum /underscore /quoteleft /a /b /c
-/d /e /f /g /h /i /j /k /l /m
-/n /o /p /q /r /s /t /u /v /w
-/x /y /z /braceleft /bar /braceright /asciitilde /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclamdown /cent /sterling /currency /yen /brokenbar /section /dieresis /copyright
-/ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron /degree /plusminus /twosuperior /threesuperior
-/acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf
-/threequarters /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde
-/Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex
-/Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring
-/ae /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash /ugrave
-/uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] /isolatin1encoding exch def
-/Times-Roman-latin1
-    /Times-Roman findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Times-Italic-latin1
-    /Times-Italic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Times-Bold-latin1
-    /Times-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Times-BoldItalic-latin1
-    /Times-BoldItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/AvantGarde-Book-latin1
-    /AvantGarde-Book findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/AvantGarde-BookOblique-latin1
-    /AvantGarde-BookOblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/AvantGarde-Demi-latin1
-    /AvantGarde-Demi findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/AvantGarde-DemiOblique-latin1
-    /AvantGarde-DemiOblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Bookman-Light-latin1
-    /Bookman-Light findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Bookman-LightItalic-latin1
-    /Bookman-LightItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Bookman-Demi-latin1
-    /Bookman-Demi findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Bookman-DemiItalic-latin1
-    /Bookman-DemiItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Courier-latin1
-    /Courier findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Courier-Oblique-latin1
-    /Courier-Oblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Courier-Bold-latin1
-    /Courier-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Courier-BoldOblique-latin1
-    /Courier-BoldOblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-latin1
-    /Helvetica findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-Oblique-latin1
-    /Helvetica-Oblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-Bold-latin1
-    /Helvetica-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-BoldOblique-latin1
-    /Helvetica-BoldOblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-Narrow-latin1
-    /Helvetica-Narrow findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-Narrow-Oblique-latin1
-    /Helvetica-Narrow-Oblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-Narrow-Bold-latin1
-    /Helvetica-Narrow-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Helvetica-Narrow-BoldOblique-latin1
-    /Helvetica-Narrow-BoldOblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/NewCenturySchoolbook-Roman-latin1
-    /NewCenturySchoolbook-Roman findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/NewCenturySchoolbook-Italic-latin1
-    /NewCenturySchoolbook-Italic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/NewCenturySchoolbook-Bold-latin1
-    /NewCenturySchoolbook-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/NewCenturySchoolbook-BoldItalic-latin1
-    /NewCenturySchoolbook-BoldItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Palatino-Roman-latin1
-    /Palatino-Roman findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Palatino-Italic-latin1
-    /Palatino-Italic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Palatino-Bold-latin1
-    /Palatino-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Palatino-BoldItalic-latin1
-    /Palatino-BoldItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/Symbol-latin1
-    /Symbol findfont
-definefont pop
-/ZapfChancery-MediumItalic-latin1
-    /ZapfChancery-MediumItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/ZapfDingbats-latin1
-    /ZapfDingbats findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
 /cp {closepath} bind def
 /c {curveto} bind def
 /f {fill} bind def
@@ -341,10 +72,12 @@ dup
 4 2 roll
 putinterval
 } bind def
-28.346000 -28.346000 scale
--2.476000 -17.038214 translate
 %%EndProlog
 
+%%BeginSetup
+%%EndSetup
+28.346000 -28.346000 scale
+-2.853249 -14.882857 translate
 
 0.100000 slw
 [] 0 sd
@@ -355,17 +88,42 @@ putinterval
 0 slj
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 3.000000 13.835702 m 4.946701 13.433926 5.920052 13.300000 7.866753 13.300000 c 9.813455 13.300000 10.786806 13.433926 12.733507 13.835702 c 12.733507 15.978511 l 10.786806 16.380288 9.813455 16.514214 7.866753 16.514214 c 5.920052 16.514214 4.946701 16.380288 3.000000 15.978511 c 3.000000 13.835702 l f
+n 2.925202 11.305475 m 7.825202 10.776368 10.275202 10.599999 15.175202 10.599999 c 20.075202 10.599999 22.525202 10.776368 27.425202 11.305475 c 27.425202 14.127381 l 22.525202 14.656488 20.075202 14.832857 15.175202 14.832857 c 10.275202 14.832857 7.825202 14.656488 2.925202 14.127381 c 2.925202 11.305475 l f
 0.000000 0.000000 0.000000 srgb
-n 3.000000 13.835702 m 4.946701 13.433926 5.920052 13.300000 7.866753 13.300000 c 9.813455 13.300000 10.786806 13.433926 12.733507 13.835702 c 12.733507 15.978511 l 10.786806 16.380288 9.813455 16.514214 7.866753 16.514214 c 5.920052 16.514214 4.946701 16.380288 3.000000 15.978511 c 3.000000 13.835702 l s
+n 2.925202 11.305475 m 7.825202 10.776368 10.275202 10.599999 15.175202 10.599999 c 20.075202 10.599999 22.525202 10.776368 27.425202 11.305475 c 27.425202 14.127381 l 22.525202 14.656488 20.075202 14.832857 15.175202 14.832857 c 10.275202 14.832857 7.825202 14.656488 2.925202 14.127381 c 2.925202 11.305475 l s
 0 slc
 0 slj
 [] 0 sd
-n 3.000000 13.835702 m 4.946701 14.237479 5.920052 14.371405 7.866753 14.371405 c 9.813455 14.371405 10.786806 14.237479 12.733507 13.835702 c s
-/Courier-latin1 ff 0.800000 scf sf
-( Transport Layer  ) dup sw 2 div 7.866753 ex sub 15.392101 m gs 1 -1 sc sh gr
-/Courier-latin1 ff 0.800000 scf sf
-() dup sw 2 div 3.950000 ex sub 1.550000 m gs 1 -1 sc sh gr
+n 2.925202 11.305475 m 7.825202 11.834583 10.275202 12.010952 15.175202 12.010952 c 20.075202 12.010952 22.525202 11.834583 27.425202 11.305475 c s
+ [ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /space /T /r /a /n /s /p /o /xi /xi /t /L /y /e /S /R
+ /c /d /P /l /A /i /H /h /k /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+ /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi /xi
+] /e0 exch def
+/Courier_e0 undefinefont
+/Courier_e0
+  /Courier findfont
+  dup length dict begin
+  {1 index /FID ne {def} {pop pop} ifelse} forall
+  /Encoding e0 def
+  currentdict end
+definefont pop
+/Courier_e0 ff 0.800000 scf sf
+( !"#$%&'"* +#,-"  ) sw
+2 div 15.175202 ex sub 13.286309 m ( !"#$%&'"* +#,-"  )
+ gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 [] 0 sd
@@ -375,16 +133,20 @@ n 3.000000 13.835702 m 4.946701 14.237479 5.920052 14.371405 7.866753 14.371405
 0 slj
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 3.000000 9.802369 m 4.946701 9.200592 5.920052 9.000000 7.866753 9.000000 c 9.813455 9.000000 10.786805 9.200592 12.733507 9.802369 c 12.733507 13.011845 l 10.786805 13.613621 9.813455 13.814214 7.866753 13.814214 c 5.920052 13.814214 4.946701 13.613621 3.000000 13.011845 c 3.000000 9.802369 l f
+n 2.925202 7.452368 m 7.815202 6.850591 10.260202 6.649999 15.150202 6.649999 c 20.040202 6.649999 22.485202 6.850591 27.375202 7.452368 c 27.375202 10.661842 l 22.485202 11.263619 20.040202 11.464211 15.150202 11.464211 c 10.260202 11.464211 7.815202 11.263619 2.925202 10.661842 c 2.925202 7.452368 l f
 0.000000 0.000000 0.000000 srgb
-n 3.000000 9.802369 m 4.946701 9.200592 5.920052 9.000000 7.866753 9.000000 c 9.813455 9.000000 10.786805 9.200592 12.733507 9.802369 c 12.733507 13.011845 l 10.786805 13.613621 9.813455 13.814214 7.866753 13.814214 c 5.920052 13.814214 4.946701 13.613621 3.000000 13.011845 c 3.000000 9.802369 l s
+n 2.925202 7.452368 m 7.815202 6.850591 10.260202 6.649999 15.150202 6.649999 c 20.040202 6.649999 22.485202 6.850591 27.375202 7.452368 c 27.375202 10.661842 l 22.485202 11.263619 20.040202 11.464211 15.150202 11.464211 c 10.260202 11.464211 7.815202 11.263619 2.925202 10.661842 c 2.925202 7.452368 l s
 0 slc
 0 slj
 [] 0 sd
-n 3.000000 9.802369 m 4.946701 10.404146 5.920052 10.604738 7.866753 10.604738 c 9.813455 10.604738 10.786805 10.404146 12.733507 9.802369 c s
-/Courier-latin1 ff 0.800000 scf sf
-(    TLS Record    ) dup sw 2 div 7.866753 ex sub 11.625434 m gs 1 -1 sc sh gr
-(Protocol) dup sw 2 div 7.866753 ex sub 12.425434 m gs 1 -1 sc sh gr
+n 2.925202 7.452368 m 7.815202 8.054144 10.260202 8.254736 15.150202 8.254736 c 20.040202 8.254736 22.485202 8.054144 27.375202 7.452368 c s
+/Courier_e0 ff 0.800000 scf sf
+(    !+. /-0'"1    ) sw
+2 div 15.150202 ex sub 9.275432 m (    !+. /-0'"1    )
+ gs 1 -1 sc sh gr
+(2"'*'0'3) sw
+2 div 15.150202 ex sub 10.075432 m (2"'*'0'3)
+ gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 [] 0 sd
@@ -394,33 +156,28 @@ n 3.000000 9.802369 m 4.946701 10.404146 5.920052 10.604738 7.866753 10.604738 c
 0 slj
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 3.000000 5.802369 m 4.946701 5.200592 5.920052 5.000000 7.866753 5.000000 c 9.813455 5.000000 10.786805 5.200592 12.733507 5.802369 c 12.733507 9.011845 l 10.786805 9.613621 9.813455 9.814214 7.866753 9.814214 c 5.920052 9.814214 4.946701 9.613621 3.000000 9.011845 c 3.000000 5.802369 l f
+n 2.903249 3.602368 m 7.799070 3.000591 10.246981 2.799999 15.142802 2.799999 c 20.038623 2.799999 22.486534 3.000591 27.382355 3.602368 c 27.382355 6.811842 l 22.486534 7.413619 20.038623 7.614211 15.142802 7.614211 c 10.246981 7.614211 7.799070 7.413619 2.903249 6.811842 c 2.903249 3.602368 l f
 0.000000 0.000000 0.000000 srgb
-n 3.000000 5.802369 m 4.946701 5.200592 5.920052 5.000000 7.866753 5.000000 c 9.813455 5.000000 10.786805 5.200592 12.733507 5.802369 c 12.733507 9.011845 l 10.786805 9.613621 9.813455 9.814214 7.866753 9.814214 c 5.920052 9.814214 4.946701 9.613621 3.000000 9.011845 c 3.000000 5.802369 l s
+n 2.903249 3.602368 m 7.799070 3.000591 10.246981 2.799999 15.142802 2.799999 c 20.038623 2.799999 22.486534 3.000591 27.382355 3.602368 c 27.382355 6.811842 l 22.486534 7.413619 20.038623 7.614211 15.142802 7.614211 c 10.246981 7.614211 7.799070 7.413619 2.903249 6.811842 c 2.903249 3.602368 l s
 0 slc
 0 slj
 [] 0 sd
-n 3.000000 5.802369 m 4.946701 6.404146 5.920052 6.604738 7.866753 6.604738 c 9.813455 6.604738 10.786805 6.404146 12.733507 5.802369 c s
-/Courier-latin1 ff 0.800000 scf sf
-(   TLS Handshake  ) dup sw 2 div 7.866753 ex sub 7.625434 m gs 1 -1 sc sh gr
-(Protocol) dup sw 2 div 7.866753 ex sub 8.425434 m gs 1 -1 sc sh gr
+n 2.903249 3.602368 m 7.799070 4.204144 10.246981 4.404736 15.142802 4.404736 c 20.038623 4.404736 22.486534 4.204144 27.382355 3.602368 c s
+/Courier_e0 ff 0.800000 scf sf
+(    4&&350#*5'$   !+. 6#$1%7#8-     !+. 43-"*) sw
+2 div 15.142802 ex sub 5.425432 m (    4&&350#*5'$   !+. 6#$1%7#8-     !+. 43-"*)
+ gs 1 -1 sc sh gr
+(     2"'*'0'3       2"'*'0'3        2"'*'0'3) sw
+2 div 15.142802 ex sub 6.225432 m (     2"'*'0'3       2"'*'0'3        2"'*'0'3)
+ gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 [] 0 sd
 0 slc
-0 slj
-0 slc
-0 slj
+n 20.275302 4.378604 m 20.312578 7.538693 l s
+0.100000 slw
 [] 0 sd
-1.000000 1.000000 1.000000 srgb
-n 3.000000 1.802369 m 4.946701 1.200592 5.920052 1.000000 7.866753 1.000000 c 9.813455 1.000000 10.786805 1.200592 12.733507 1.802369 c 12.733507 5.011845 l 10.786805 5.613621 9.813455 5.814214 7.866753 5.814214 c 5.920052 5.814214 4.946701 5.613621 3.000000 5.011845 c 3.000000 1.802369 l f
-0.000000 0.000000 0.000000 srgb
-n 3.000000 1.802369 m 4.946701 1.200592 5.920052 1.000000 7.866753 1.000000 c 9.813455 1.000000 10.786805 1.200592 12.733507 1.802369 c 12.733507 5.011845 l 10.786805 5.613621 9.813455 5.814214 7.866753 5.814214 c 5.920052 5.814214 4.946701 5.613621 3.000000 5.011845 c 3.000000 1.802369 l s
-0 slc
-0 slj
 [] 0 sd
-n 3.000000 1.802369 m 4.946701 2.404146 5.920052 2.604738 7.866753 2.604738 c 9.813455 2.604738 10.786805 2.404146 12.733507 1.802369 c s
-/Courier-latin1 ff 0.800000 scf sf
-(    Application   ) dup sw 2 div 7.866753 ex sub 3.625434 m gs 1 -1 sc sh gr
-(Protocol) dup sw 2 div 7.866753 ex sub 4.425434 m gs 1 -1 sc sh gr
+0 slc
+n 12.075202 7.582857 m 12.125202 4.382857 l s
 showpage
diff --git a/doc/tex/layers.tex b/doc/tex/layers.tex
index fedae1ae1f..58e03d780b 100644
--- a/doc/tex/layers.tex
+++ b/doc/tex/layers.tex
@@ -24,7 +24,7 @@ protocol layering in TLS.
 See section \ref{handshake} on page \pageref{handshake} for more information.
 
 \begin{figure}[hbtp]
-\includegraphics{layers}
+\includegraphics[height=8cm,width=12cm]{layers}
 \label{fig:layers}
 \caption{Layers in the TLS protocol}
 \end{figure}
diff --git a/doc/tex/memory.tex b/doc/tex/memory.tex
index 1f27bd21ad..6a0240984b 100644
--- a/doc/tex/memory.tex
+++ b/doc/tex/memory.tex
@@ -6,7 +6,6 @@ reasons, the default memory functions do not overwrite sensitive data from
 memory, nor protect such objects from being written to the swap. 
 In order to change the default behaviour the
 \printfunc{gnutls_global_set_mem_functions}{gnutls\_global\_set\_mem\_functions}
-\\
 function is available which can be used to set other memory 
 handlers than the defaults. 
 \par