[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_0-118-gee1a192
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_0-118-gee1a192 |
|
Date: |
Sat, 27 Aug 2011 22:27:31 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=ee1a19267a3a3a7c42f9171e85d94f6ba48d125f
The branch, master has been updated
via ee1a19267a3a3a7c42f9171e85d94f6ba48d125f (commit)
via 85a60552eaa46954502292d2d8012915c241e4c1 (commit)
via d10658c0cd9bd6d9eb98ce1e92e6347491077ebe (commit)
from b544992357edd9e4128e065d710a82e9e4e4af24 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ee1a19267a3a3a7c42f9171e85d94f6ba48d125f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Aug 28 00:26:46 2011 +0200
Benchmark applications were incorporated to gnutls-cli
commit 85a60552eaa46954502292d2d8012915c241e4c1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Aug 28 00:26:04 2011 +0200
Corrected DH-ANON ciphersuite names.
commit d10658c0cd9bd6d9eb98ce1e92e6347491077ebe
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Aug 27 23:02:13 2011 +0200
updated figures.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 +
doc/cha-cert-auth.texi | 4 +-
doc/gnutls-pgp.dia | Bin 1845 -> 1872 bytes
doc/gnutls-pgp.eps | 1900 +++++++----------------------------------
doc/gnutls-pgp.pdf | Bin 31116 -> 8006 bytes
doc/gnutls-pgp.png | Bin 21873 -> 19611 bytes
doc/gnutls-x509.dia | Bin 1638 -> 1821 bytes
doc/gnutls-x509.eps | 450 ++++++++---
doc/gnutls-x509.pdf | Bin 17321 -> 7416 bytes
doc/gnutls-x509.png | Bin 21902 -> 18942 bytes
lib/algorithms/ciphersuites.c | 34 +-
src/Makefile.am | 11 +-
src/benchmark-cipher.c | 10 +-
src/benchmark-tls.c | 407 ++++-----
src/benchmark.h | 3 +
src/cli-gaa.c | 213 +++--
src/cli-gaa.h | 60 +-
src/cli.gaa | 4 +
18 files changed, 1030 insertions(+), 2069 deletions(-)
diff --git a/NEWS b/NEWS
index 2e934cc..a184ec9 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
* Version 3.0.2 (unreleased)
+** gnutls-cli: Benchmark applications were incorporated
+with it.
+
** libgnutls: Corrected parsing of XMPP subject
alternative names.
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index aeef061..db53858 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -22,7 +22,7 @@ certificates as well, following a hierarchical model.
@float Figure,fig:x509
@image{gnutls-x509,7cm}
address@hidden X.509 hierarchical trust model.}
address@hidden example of the X.509 hierarchical trust model.}
@end float
One needs to trust one or more CAs for his secure communications. In
@@ -368,7 +368,7 @@ signed Bob's key thus Dave trusts Bob's key to be the real
one.
@float Figure,fig:openpgp
@image{gnutls-pgp,8cm}
address@hidden OpenPGP trust model.}
address@hidden example of the OpenPGP trust model.}
@end float
There are some key points that are important in that model. In the
diff --git a/doc/gnutls-pgp.dia b/doc/gnutls-pgp.dia
index 74cfa70..d53584c 100644
Binary files a/doc/gnutls-pgp.dia and b/doc/gnutls-pgp.dia differ
diff --git a/doc/gnutls-pgp.eps b/doc/gnutls-pgp.eps
index c953101..13a8859 100644
--- a/doc/gnutls-pgp.eps
+++ b/doc/gnutls-pgp.eps
@@ -1,11 +1,11 @@
%!PS-Adobe-2.0 EPSF-2.0
-%%Title: /home/nmav/cvs/gnutls/doc/pgp1.dia
-%%Creator: Dia v0.94
-%%CreationDate: Sat Aug 20 13:30:47 2005
+%%Title: /home/nmav/cvs/gnutls/doc/gnutls-pgp.dia
+%%Creator: Dia v0.97.1
+%%CreationDate: Sat Aug 27 23:00:38 2011
%%For: nmav
%%Orientation: Portrait
%%Magnification: 1.0000
-%%BoundingBox: 0 0 444 424
+%%BoundingBox: 0 0 444 362
%%BeginSetup
%%EndSetup
%%EndComments
@@ -99,223 +99,281 @@ dup
4 2 roll
putinterval
} bind def
-/dpi_x 300 def
-/dpi_y 300 def
-/conicto {
- /to_y exch def
- /to_x exch def
- /conic_cntrl_y exch def
- /conic_cntrl_x exch def
- currentpoint
- /p0_y exch def
- /p0_x exch def
- /p1_x p0_x conic_cntrl_x p0_x sub 2 3 div mul add def
- /p1_y p0_y conic_cntrl_y p0_y sub 2 3 div mul add def
- /p2_x p1_x to_x p0_x sub 1 3 div mul add def
- /p2_y p1_y to_y p0_y sub 1 3 div mul add def
- p1_x p1_y p2_x p2_y to_x to_y curveto
-} bind def
-/start_ol { gsave 1.1 dpi_x div dup scale} bind def
-/end_ol { closepath fill grestore } bind 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-Gothic-latin1
+ /AvantGarde-Gothic 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
+/NewCenturySchlbk-Roman-latin1
+ /NewCenturySchlbk-Roman findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Italic-latin1
+ /NewCenturySchlbk-Italic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Bold-latin1
+ /NewCenturySchlbk-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-BoldItalic-latin1
+ /NewCenturySchlbk-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
28.346000 -28.346000 scale
--0.450000 -15.800000 translate
+-0.450000 -13.600000 translate
%%EndProlog
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 3.850000 2.750000 1.750000 1.000000 0 360 ellipse f
+n 4.025000 2.750000 1.925000 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 3.850000 2.750000 1.750000 1.000000 0 360 ellipse cp s
-gsave 2.952533 2.950000 translate 0.035278 -0.035278 scale
-start_ol
-1375 2740 moveto
-1062 1408 lineto
-1690 1408 lineto
-1375 2740 lineto
-970 3328 moveto
-1782 3328 lineto
-2688 0 lineto
-2025 0 lineto
-1818 896 lineto
-930 896 lineto
-727 0 lineto
-64 0 lineto
-970 3328 lineto
-end_ol grestore
-gsave 3.316600 2.950000 translate 0.035278 -0.035278 scale
-start_ol
-896 1059 moveto
-896 3008 lineto
-256 3008 lineto
-256 3520 lineto
-1536 3520 lineto
-1536 1059 lineto
-1536 761 1631 636 conicto
-1726 512 1953 512 conicto
-2496 512 lineto
-2496 0 lineto
-1764 0 lineto
-1299 0 1097 245 conicto
-896 490 896 1059 conicto
-end_ol grestore
-gsave 3.680667 2.950000 translate 0.035278 -0.035278 scale
-start_ol
-512 2496 moveto
-1792 2496 lineto
-1792 512 lineto
-2624 512 lineto
-2624 0 lineto
-320 0 lineto
-320 512 lineto
-1152 512 lineto
-1152 1984 lineto
-512 1984 lineto
-512 2496 lineto
-1152 3776 moveto
-1792 3776 lineto
-1792 3008 lineto
-1152 3008 lineto
-1152 3776 lineto
-end_ol grestore
-gsave 4.044733 2.950000 translate 0.035278 -0.035278 scale
-start_ol
-2368 128 moveto
-2204 32 2015 -16 conicto
-1826 -64 1609 -64 conicto
-1033 -64 708 283 conicto
-384 631 384 1246 conicto
-384 1863 711 2211 conicto
-1038 2560 1613 2560 conicto
-1813 2560 1998 2513 conicto
-2184 2466 2368 2368 conicto
-2368 1792 lineto
-2224 1916 2051 1982 conicto
-1879 2048 1694 2048 conicto
-1372 2048 1198 1839 conicto
-1024 1631 1024 1246 conicto
-1024 861 1198 654 conicto
-1372 448 1694 448 conicto
-1886 448 2053 511 conicto
-2220 575 2368 704 conicto
-2368 128 lineto
-end_ol grestore
-gsave 4.408800 2.950000 translate 0.035278 -0.035278 scale
-start_ol
-2432 128 moveto
-2205 31 1970 -16 conicto
-1735 -64 1474 -64 conicto
-850 -64 521 271 conicto
-192 607 192 1239 conicto
-192 1850 512 2205 conicto
-833 2560 1386 2560 conicto
-1945 2560 2252 2230 conicto
-2560 1900 2560 1301 conicto
-2560 1024 lineto
-832 1024 lineto
-834 734 1007 591 conicto
-1180 448 1524 448 conicto
-1751 448 1971 509 conicto
-2191 570 2432 704 conicto
-2432 128 lineto
-1920 1536 moveto
-1915 1789 1779 1918 conicto
-1643 2048 1379 2048 conicto
-1141 2048 999 1914 conicto
-858 1780 832 1534 conicto
-1920 1536 lineto
-end_ol grestore
+n 4.025000 2.750000 1.925000 1.000000 0 360 ellipse cp s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Alice) dup sw 2 div 4.025000 ex sub 2.682500 m
+ gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
n 2.575000 11.000000 1.625000 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
n 2.575000 11.000000 1.625000 1.000000 0 360 ellipse cp s
-gsave 2.041600 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-896 1536 moveto
-896 512 lineto
-1363 512 lineto
-1708 512 1846 623 conicto
-1984 734 1984 1010 conicto
-1984 1290 1840 1413 conicto
-1696 1536 1363 1536 conicto
-896 1536 lineto
-896 2816 moveto
-896 2048 lineto
-1363 2048 lineto
-1630 2048 1743 2136 conicto
-1856 2225 1856 2429 conicto
-1856 2632 1740 2724 conicto
-1625 2816 1363 2816 conicto
-896 2816 lineto
-256 3328 moveto
-1363 3328 lineto
-1927 3328 2211 3120 conicto
-2496 2913 2496 2501 conicto
-2496 2184 2335 2006 conicto
-2174 1828 1862 1800 conicto
-2241 1762 2432 1541 conicto
-2624 1320 2624 924 conicto
-2624 437 2327 218 conicto
-2031 0 1363 0 conicto
-256 0 lineto
-256 3328 lineto
-end_ol grestore
-gsave 2.405667 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-1342 2048 moveto
-1104 2048 968 1836 conicto
-832 1625 832 1249 conicto
-832 872 968 660 conicto
-1104 448 1342 448 conicto
-1584 448 1720 660 conicto
-1856 872 1856 1249 conicto
-1856 1625 1720 1836 conicto
-1584 2048 1342 2048 conicto
-192 1248 moveto
-192 1853 504 2206 conicto
-816 2560 1343 2560 conicto
-1872 2560 2184 2206 conicto
-2496 1853 2496 1248 conicto
-2496 643 2184 289 conicto
-1872 -64 1343 -64 conicto
-816 -64 504 289 conicto
-192 643 192 1248 conicto
-end_ol grestore
-gsave 2.769733 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-1920 1247 moveto
-1920 1623 1793 1835 conicto
-1666 2048 1442 2048 conicto
-1218 2048 1089 1835 conicto
-960 1623 960 1247 conicto
-960 873 1089 660 conicto
-1218 448 1442 448 conicto
-1666 448 1793 660 conicto
-1920 873 1920 1247 conicto
-960 2169 moveto
-1083 2365 1246 2462 conicto
-1409 2560 1614 2560 conicto
-2069 2560 2314 2221 conicto
-2560 1882 2560 1248 conicto
-2560 623 2318 279 conicto
-2076 -64 1638 -64 conicto
-1407 -64 1236 40 conicto
-1065 145 960 353 conicto
-960 0 lineto
-320 0 lineto
-320 3520 lineto
-960 3520 lineto
-960 2169 lineto
-end_ol grestore
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Bob) dup sw 2 div 2.575000 ex sub 10.932500 m
+ gs 1 -1 sc sh gr
0.100000 slw
0 slc
[] 0 sd
-n 2.611503 4.307106 m 2.604400 10.000000 l s
+n 2.611500 4.307109 m 2.604400 10.000000 l s
0 slj
-n 2.861502 4.307418 m 2.612501 3.507107 l 2.361503 4.306794 l ef
+n 2.861500 4.307421 m 2.612498 3.507110 l 2.361500 4.306798 l ef
+0.100000 slw
+[] 0 sd
+0 slj
+n 2.861500 4.307421 m 2.612498 3.507110 l 2.361500 4.306798 l cp s
+/Helvetica-latin1 ff 0.560000 scf sf
0.100000 slw
0 slc
[] 0 sd
@@ -324,103 +382,23 @@ n 3.784081 9.442957 m 3.850000 3.750000 l s
n 3.534098 9.440062 m 3.774819 10.242903 l 4.034065 9.445852 l ef
0.100000 slw
[] 0 sd
+0 slj
+n 3.534098 9.440062 m 3.774819 10.242903 l 4.034065 9.445852 l cp s
+0.100000 slw
+[] 0 sd
1.000000 1.000000 1.000000 srgb
n 8.075000 7.050000 1.625000 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
n 8.075000 7.050000 1.625000 1.000000 0 360 ellipse cp s
-gsave 7.359567 7.250000 translate 0.035278 -0.035278 scale
-start_ol
-960 2752 moveto
-960 576 lineto
-1164 576 lineto
-1607 576 1795 823 conicto
-1984 1071 1984 1667 conicto
-1984 2258 1795 2505 conicto
-1607 2752 1164 2752 conicto
-960 2752 lineto
-320 3328 moveto
-1013 3328 lineto
-1905 3328 2296 2939 conicto
-2688 2550 2688 1667 conicto
-2688 783 2296 391 conicto
-1905 0 1013 0 conicto
-320 0 lineto
-320 3328 lineto
-end_ol grestore
-gsave 7.723633 7.250000 translate 0.035278 -0.035278 scale
-start_ol
-1565 1216 moveto
-1156 1216 994 1116 conicto
-832 1017 832 776 conicto
-832 596 944 490 conicto
-1056 384 1248 384 conicto
-1537 384 1696 590 conicto
-1856 797 1856 1169 conicto
-1856 1216 lineto
-1565 1216 lineto
-2496 1456 moveto
-2496 0 lineto
-1856 0 lineto
-1856 275 lineto
-1734 112 1543 24 conicto
-1353 -64 1122 -64 conicto
-682 -64 437 163 conicto
-192 391 192 801 conicto
-192 1243 475 1453 conicto
-758 1664 1351 1664 conicto
-1856 1664 lineto
-1856 1779 lineto
-1856 1942 1728 2027 conicto
-1600 2112 1351 2112 conicto
-1119 2112 901 2050 conicto
-684 1989 448 1856 conicto
-448 2368 lineto
-663 2466 883 2513 conicto
-1104 2560 1351 2560 conicto
-1984 2560 2240 2318 conicto
-2496 2077 2496 1456 conicto
-end_ol grestore
-gsave 8.087700 7.250000 translate 0.035278 -0.035278 scale
-start_ol
-2624 2496 moveto
-1817 0 lineto
-999 0 lineto
-192 2496 lineto
-865 2496 lineto
-1407 549 lineto
-1951 2496 lineto
-2624 2496 lineto
-end_ol grestore
-gsave 8.451767 7.250000 translate 0.035278 -0.035278 scale
-start_ol
-2432 128 moveto
-2205 31 1970 -16 conicto
-1735 -64 1474 -64 conicto
-850 -64 521 271 conicto
-192 607 192 1239 conicto
-192 1850 512 2205 conicto
-833 2560 1386 2560 conicto
-1945 2560 2252 2230 conicto
-2560 1900 2560 1301 conicto
-2560 1024 lineto
-832 1024 lineto
-834 734 1007 591 conicto
-1180 448 1524 448 conicto
-1751 448 1971 509 conicto
-2191 570 2432 704 conicto
-2432 128 lineto
-1920 1536 moveto
-1915 1789 1779 1918 conicto
-1643 2048 1379 2048 conicto
-1141 2048 999 1914 conicto
-858 1780 832 1534 conicto
-1920 1536 lineto
-end_ol grestore
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Dave) dup sw 2 div 8.075000 ex sub 6.982500 m
+ gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
[] 0 sd
0 slc
0 slj
+0.100000 slw
0 slc
0 slj
[] 0 sd
@@ -437,1337 +415,91 @@ n 0.500000 0.900000 m 0.500000 13.550000 l s
0 slj
[] 0 sd
n 16.050000 0.900000 m 16.050000 13.550000 l s
-gsave 5.122367 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-1375 2929 moveto
-893 1216 lineto
-1857 1216 lineto
-1375 2929 lineto
-1099 3328 moveto
-1654 3328 lineto
-2688 0 lineto
-2215 0 lineto
-1966 832 lineto
-782 832 lineto
-538 0 lineto
-64 0 lineto
-1099 3328 lineto
-end_ol grestore
-gsave 5.486433 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2368 1575 moveto
-2368 0 lineto
-1984 0 lineto
-1984 1575 lineto
-1984 1917 1858 2078 conicto
-1733 2240 1466 2240 conicto
-1161 2240 996 2032 conicto
-832 1824 832 1436 conicto
-832 0 lineto
-448 0 lineto
-448 2496 lineto
-832 2496 lineto
-832 2160 lineto
-944 2357 1136 2458 conicto
-1328 2560 1591 2560 conicto
-1982 2560 2175 2315 conicto
-2368 2071 2368 1575 conicto
-end_ol grestore
-gsave 5.850500 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 6.214567 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
-end_ol grestore
-gsave 6.578633 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2560 2496 moveto
-1638 1301 lineto
-2624 0 lineto
-2145 0 lineto
-1406 1000 lineto
-671 0 lineto
-192 0 lineto
-1177 1301 lineto
-256 2496 lineto
-724 2496 lineto
-1406 1594 lineto
-2084 2496 lineto
-2560 2496 lineto
-end_ol grestore
-gsave 6.942700 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-1633 1280 moveto
-1485 1280 lineto
-1097 1280 900 1148 conicto
-704 1016 704 754 conicto
-704 518 851 387 conicto
-999 256 1259 256 conicto
-1626 256 1835 502 conicto
-2045 749 2048 1184 conicto
-2048 1280 lineto
-1633 1280 lineto
-2432 1449 moveto
-2432 0 lineto
-2048 0 lineto
-2048 353 lineto
-1910 139 1701 37 conicto
-1493 -64 1194 -64 conicto
-796 -64 558 154 conicto
-320 372 320 739 conicto
-320 1161 607 1380 conicto
-895 1600 1452 1600 conicto
-2048 1600 lineto
-2048 1662 lineto
-2045 1966 1889 2103 conicto
-1733 2240 1390 2240 conicto
-1172 2240 948 2174 conicto
-724 2109 512 1984 conicto
-512 2368 lineto
-744 2464 956 2512 conicto
-1169 2560 1369 2560 conicto
-1686 2560 1910 2470 conicto
-2134 2380 2272 2201 conicto
-2359 2091 2395 1931 conicto
-2432 1771 2432 1449 conicto
-end_ol grestore
-gsave 7.306767 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-1534 2267 moveto
-1610 2417 1727 2488 conicto
-1845 2560 2010 2560 conicto
-2312 2560 2436 2330 conicto
-2560 2100 2560 1464 conicto
-2560 0 lineto
-2176 0 lineto
-2176 1446 lineto
-2176 1981 2118 2110 conicto
-2060 2240 1906 2240 conicto
-1730 2240 1665 2101 conicto
-1600 1963 1600 1446 conicto
-1600 0 lineto
-1216 0 lineto
-1216 1446 lineto
-1216 1987 1153 2113 conicto
-1090 2240 928 2240 conicto
-766 2240 703 2101 conicto
-640 1963 640 1446 conicto
-640 0 lineto
-256 0 lineto
-256 2496 lineto
-640 2496 lineto
-640 2303 lineto
-714 2428 824 2494 conicto
-935 2560 1076 2560 conicto
-1246 2560 1358 2487 conicto
-1471 2414 1534 2267 conicto
-end_ol grestore
-gsave 7.670833 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-832 288 moveto
-832 -960 lineto
-448 -960 lineto
-448 2496 lineto
-832 2496 lineto
-832 2207 lineto
-944 2379 1131 2469 conicto
-1319 2560 1563 2560 conicto
-2059 2560 2341 2209 conicto
-2624 1859 2624 1239 conicto
-2624 630 2340 283 conicto
-2057 -64 1563 -64 conicto
-1313 -64 1126 26 conicto
-940 117 832 288 conicto
-2176 1248 moveto
-2176 1739 2008 1989 conicto
-1840 2240 1509 2240 conicto
-1175 2240 1003 1988 conicto
-832 1737 832 1248 conicto
-832 761 1003 508 conicto
-1175 256 1509 256 conicto
-1840 256 2008 506 conicto
-2176 756 2176 1248 conicto
-end_ol grestore
-gsave 8.034900 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-1408 889 moveto
-1408 607 1511 463 conicto
-1615 320 1816 320 conicto
-2304 320 lineto
-2304 0 lineto
-1775 0 lineto
-1417 0 1220 232 conicto
-1024 464 1024 889 conicto
-1024 3200 lineto
-192 3200 lineto
-192 3520 lineto
-1408 3520 lineto
-1408 889 lineto
-end_ol grestore
-gsave 8.398967 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
-end_ol grestore
-gsave 8.763033 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 9.127100 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-1407 2240 moveto
-1092 2240 930 1989 conicto
-768 1739 768 1248 conicto
-768 759 930 507 conicto
-1092 256 1407 256 conicto
-1724 256 1886 507 conicto
-2048 759 2048 1248 conicto
-2048 1739 1886 1989 conicto
-1724 2240 1407 2240 conicto
-1407 2560 moveto
-1935 2560 2215 2223 conicto
-2496 1886 2496 1248 conicto
-2496 607 2217 271 conicto
-1938 -64 1407 -64 conicto
-879 -64 599 271 conicto
-320 607 320 1248 conicto
-320 1886 599 2223 conicto
-879 2560 1407 2560 conicto
-end_ol grestore
-gsave 9.491167 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2368 3520 moveto
-2368 3200 lineto
-1882 3200 lineto
-1651 3200 1561 3099 conicto
-1472 2999 1472 2742 conicto
-1472 2496 lineto
-2368 2496 lineto
-2368 2176 lineto
-1472 2176 lineto
-1472 0 lineto
-1088 0 lineto
-1088 2176 lineto
-384 2176 lineto
-384 2496 lineto
-1088 2496 lineto
-1088 2691 lineto
-1088 3117 1274 3318 conicto
-1460 3520 1854 3520 conicto
-2368 3520 lineto
-end_ol grestore
-gsave 9.855233 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 10.219300 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-1344 3200 moveto
-1344 2496 lineto
-2304 2496 lineto
-2304 2176 lineto
-1344 2176 lineto
-1344 816 lineto
-1344 539 1451 429 conicto
-1559 320 1828 320 conicto
-2304 320 lineto
-2304 0 lineto
-1787 0 lineto
-1333 0 1146 184 conicto
-960 368 960 816 conicto
-960 2176 lineto
-256 2176 lineto
-256 2496 lineto
-960 2496 lineto
-960 3200 lineto
-1344 3200 lineto
-end_ol grestore
-gsave 10.583367 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2368 1575 moveto
-2368 0 lineto
-1984 0 lineto
-1984 1575 lineto
-1984 1917 1858 2078 conicto
-1733 2240 1466 2240 conicto
-1161 2240 996 2032 conicto
-832 1824 832 1436 conicto
-832 0 lineto
-448 0 lineto
-448 3520 lineto
-832 3520 lineto
-832 2160 lineto
-944 2357 1136 2458 conicto
-1328 2560 1591 2560 conicto
-1982 2560 2175 2315 conicto
-2368 2071 2368 1575 conicto
-end_ol grestore
-gsave 10.947433 14.650000 translate 0.035278 -0.035278 scale
-start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
-end_ol grestore
-gsave 4.771000 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 5.135067 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-0 2496 moveto
-407 2496 lineto
-841 469 lineto
-1198 1728 lineto
-1550 1728 lineto
-1911 469 lineto
-2346 2496 lineto
-2752 2496 lineto
-2168 0 lineto
-1775 0 lineto
-1375 1339 lineto
-978 0 lineto
-585 0 lineto
-0 2496 lineto
-end_ol grestore
-gsave 5.499133 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
-end_ol grestore
-gsave 5.863200 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2176 1248 moveto
-2176 1739 2007 1989 conicto
-1838 2240 1507 2240 conicto
-1175 2240 1003 1988 conicto
-832 1737 832 1248 conicto
-832 761 1003 508 conicto
-1175 256 1507 256 conicto
-1838 256 2007 506 conicto
-2176 756 2176 1248 conicto
-832 2207 moveto
-939 2378 1128 2469 conicto
-1317 2560 1567 2560 conicto
-2058 2560 2341 2213 conicto
-2624 1866 2624 1257 conicto
-2624 639 2340 287 conicto
-2056 -64 1561 -64 conicto
-1317 -64 1131 26 conicto
-945 117 832 288 conicto
-832 0 lineto
-448 0 lineto
-448 3520 lineto
-832 3520 lineto
-832 2207 lineto
-end_ol grestore
-gsave 6.227267 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 6.591333 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-1407 2240 moveto
-1092 2240 930 1989 conicto
-768 1739 768 1248 conicto
-768 759 930 507 conicto
-1092 256 1407 256 conicto
-1724 256 1886 507 conicto
-2048 759 2048 1248 conicto
-2048 1739 1886 1989 conicto
-1724 2240 1407 2240 conicto
-1407 2560 moveto
-1935 2560 2215 2223 conicto
-2496 1886 2496 1248 conicto
-2496 607 2217 271 conicto
-1938 -64 1407 -64 conicto
-879 -64 599 271 conicto
-320 607 320 1248 conicto
-320 1886 599 2223 conicto
-879 2560 1407 2560 conicto
-end_ol grestore
-gsave 6.955400 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2368 3520 moveto
-2368 3200 lineto
-1882 3200 lineto
-1651 3200 1561 3099 conicto
-1472 2999 1472 2742 conicto
-1472 2496 lineto
-2368 2496 lineto
-2368 2176 lineto
-1472 2176 lineto
-1472 0 lineto
-1088 0 lineto
-1088 2176 lineto
-384 2176 lineto
-384 2496 lineto
-1088 2496 lineto
-1088 2691 lineto
-1088 3117 1274 3318 conicto
-1460 3520 1854 3520 conicto
-2368 3520 lineto
-end_ol grestore
-gsave 7.319467 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 7.683533 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-1344 3200 moveto
-1344 2496 lineto
-2304 2496 lineto
-2304 2176 lineto
-1344 2176 lineto
-1344 816 lineto
-1344 539 1451 429 conicto
-1559 320 1828 320 conicto
-2304 320 lineto
-2304 0 lineto
-1787 0 lineto
-1333 0 1146 184 conicto
-960 368 960 816 conicto
-960 2176 lineto
-256 2176 lineto
-256 2496 lineto
-960 2496 lineto
-960 3200 lineto
-1344 3200 lineto
-end_ol grestore
-gsave 8.047600 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2624 1984 moveto
-2487 2085 2346 2130 conicto
-2205 2176 2035 2176 conicto
-1637 2176 1426 1936 conicto
-1216 1696 1216 1243 conicto
-1216 0 lineto
-832 0 lineto
-832 2496 lineto
-1216 2496 lineto
-1216 2010 lineto
-1322 2276 1543 2418 conicto
-1765 2560 2068 2560 conicto
-2226 2560 2362 2529 conicto
-2498 2498 2624 2432 conicto
-2624 1984 lineto
-end_ol grestore
-gsave 8.411667 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-448 921 moveto
-448 2496 lineto
-832 2496 lineto
-832 921 lineto
-832 578 958 417 conicto
-1085 256 1350 256 conicto
-1657 256 1820 464 conicto
-1984 672 1984 1059 conicto
-1984 2496 lineto
-2368 2496 lineto
-2368 0 lineto
-1984 0 lineto
-1984 340 lineto
-1871 141 1678 38 conicto
-1485 -64 1226 -64 conicto
-833 -64 640 180 conicto
-448 425 448 921 conicto
-end_ol grestore
-gsave 8.775733 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2240 2432 moveto
-2240 2048 lineto
-2054 2144 1865 2192 conicto
-1677 2240 1481 2240 conicto
-1186 2240 1041 2149 conicto
-896 2059 896 1873 conicto
-896 1706 1009 1623 conicto
-1123 1540 1575 1461 conicto
-1757 1429 lineto
-2058 1370 2213 1193 conicto
-2368 1017 2368 734 conicto
-2368 359 2100 147 conicto
-1832 -64 1355 -64 conicto
-1166 -64 959 -32 conicto
-753 0 512 64 conicto
-512 512 lineto
-752 385 971 320 conicto
-1191 256 1387 256 conicto
-1672 256 1828 371 conicto
-1984 487 1984 693 conicto
-1984 991 1380 1106 conicto
-1360 1110 lineto
-1190 1143 lineto
-837 1211 674 1373 conicto
-512 1536 512 1817 conicto
-512 2173 761 2366 conicto
-1011 2560 1472 2560 conicto
-1678 2560 1867 2528 conicto
-2057 2496 2240 2432 conicto
-end_ol grestore
-gsave 9.139800 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-1344 3200 moveto
-1344 2496 lineto
-2304 2496 lineto
-2304 2176 lineto
-1344 2176 lineto
-1344 816 lineto
-1344 539 1451 429 conicto
-1559 320 1828 320 conicto
-2304 320 lineto
-2304 0 lineto
-1787 0 lineto
-1333 0 1146 184 conicto
-960 368 960 816 conicto
-960 2176 lineto
-256 2176 lineto
-256 2496 lineto
-960 2496 lineto
-960 3200 lineto
-1344 3200 lineto
-end_ol grestore
-gsave 9.503867 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-end_ol grestore
-gsave 9.867933 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-1534 2267 moveto
-1610 2417 1727 2488 conicto
-1845 2560 2010 2560 conicto
-2312 2560 2436 2330 conicto
-2560 2100 2560 1464 conicto
-2560 0 lineto
-2176 0 lineto
-2176 1446 lineto
-2176 1981 2118 2110 conicto
-2060 2240 1906 2240 conicto
-1730 2240 1665 2101 conicto
-1600 1963 1600 1446 conicto
-1600 0 lineto
-1216 0 lineto
-1216 1446 lineto
-1216 1987 1153 2113 conicto
-1090 2240 928 2240 conicto
-766 2240 703 2101 conicto
-640 1963 640 1446 conicto
-640 0 lineto
-256 0 lineto
-256 2496 lineto
-640 2496 lineto
-640 2303 lineto
-714 2428 824 2494 conicto
-935 2560 1076 2560 conicto
-1246 2560 1358 2487 conicto
-1471 2414 1534 2267 conicto
-end_ol grestore
-gsave 10.232000 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-1407 2240 moveto
-1092 2240 930 1989 conicto
-768 1739 768 1248 conicto
-768 759 930 507 conicto
-1092 256 1407 256 conicto
-1724 256 1886 507 conicto
-2048 759 2048 1248 conicto
-2048 1739 1886 1989 conicto
-1724 2240 1407 2240 conicto
-1407 2560 moveto
-1935 2560 2215 2223 conicto
-2496 1886 2496 1248 conicto
-2496 607 2217 271 conicto
-1938 -64 1407 -64 conicto
-879 -64 599 271 conicto
-320 607 320 1248 conicto
-320 1886 599 2223 conicto
-879 2560 1407 2560 conicto
-end_ol grestore
-gsave 10.596067 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2048 2207 moveto
-2048 3520 lineto
-2432 3520 lineto
-2432 0 lineto
-2048 0 lineto
-2048 288 lineto
-1935 117 1749 26 conicto
-1563 -64 1319 -64 conicto
-824 -64 540 287 conicto
-256 639 256 1257 conicto
-256 1866 541 2213 conicto
-826 2560 1319 2560 conicto
-1565 2560 1753 2469 conicto
-1941 2379 2048 2207 conicto
-704 1248 moveto
-704 756 873 506 conicto
-1042 256 1373 256 conicto
-1703 256 1875 508 conicto
-2048 761 2048 1248 conicto
-2048 1737 1875 1988 conicto
-1703 2240 1373 2240 conicto
-1042 2240 873 1989 conicto
-704 1739 704 1248 conicto
-end_ol grestore
-gsave 10.960133 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
-end_ol grestore
-gsave 11.324200 15.450000 translate 0.035278 -0.035278 scale
-start_ol
-1408 889 moveto
-1408 607 1511 463 conicto
-1615 320 1816 320 conicto
-2304 320 lineto
-2304 0 lineto
-1775 0 lineto
-1417 0 1220 232 conicto
-1024 464 1024 889 conicto
-1024 3200 lineto
-192 3200 lineto
-192 3520 lineto
-1408 3520 lineto
-1408 889 lineto
-end_ol grestore
0.100000 slw
0 slc
[] 0 sd
-n 5.569834 4.156959 m 7.076560 6.342890 l s
+n 5.467027 4.447835 m 7.076560 6.342890 l s
+0 slj
+n 5.657574 4.285996 m 4.949144 3.838082 l 5.276479 4.609673 l ef
+0.100000 slw
+[] 0 sd
0 slj
-n 5.775673 4.015078 m 5.115813 3.498275 l 5.363995 4.298841 l ef
+n 5.657574 4.285996 m 4.949144 3.838082 l 5.276479 4.609673 l cp s
+/Helvetica-latin1 ff 0.560000 scf sf
0.100000 slw
[] 0 sd
[0.400000] 0 sd
0 slc
-n 8.589200 6.050000 m 5.825075 2.998477 l s
+n 8.589200 6.050000 m 5.745285 3.993798 l s
0.100000 slw
[] 0 sd
0 slj
0 slc
-n 6.434899 3.299320 m 5.712538 2.874239 l 6.064326 3.634992 l s
-gsave 7.094600 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-2240 -384 moveto
-2240 -704 lineto
-2101 -704 lineto
-1574 -704 1395 -541 conicto
-1216 -378 1216 109 conicto
-1216 616 lineto
-1216 955 1094 1085 conicto
-972 1216 654 1216 conicto
-512 1216 lineto
-512 1536 lineto
-654 1536 lineto
-974 1536 1095 1666 conicto
-1216 1797 1216 2139 conicto
-1216 2687 lineto
-1216 3187 1395 3353 conicto
-1574 3520 2101 3520 conicto
-2240 3520 lineto
-2240 3200 lineto
-2089 3200 lineto
-1785 3200 1692 3101 conicto
-1600 3002 1600 2677 conicto
-1600 2111 lineto
-1600 1755 1506 1593 conicto
-1412 1432 1184 1375 conicto
-1414 1315 1507 1159 conicto
-1600 1004 1600 661 conicto
-1600 118 lineto
-1600 -195 1692 -289 conicto
-1785 -384 2089 -384 conicto
-2240 -384 lineto
-end_ol grestore
-gsave 7.458667 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-128 3328 moveto
-2624 3328 lineto
-2624 2944 lineto
-1600 2944 lineto
-1600 0 lineto
-1152 0 lineto
-1152 2944 lineto
-128 2944 lineto
-128 3328 lineto
-end_ol grestore
-gsave 7.822733 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-2624 1984 moveto
-2487 2085 2346 2130 conicto
-2205 2176 2035 2176 conicto
-1637 2176 1426 1936 conicto
-1216 1696 1216 1243 conicto
-1216 0 lineto
-832 0 lineto
-832 2496 lineto
-1216 2496 lineto
-1216 2010 lineto
-1322 2276 1543 2418 conicto
-1765 2560 2068 2560 conicto
-2226 2560 2362 2529 conicto
-2498 2498 2624 2432 conicto
-2624 1984 lineto
-end_ol grestore
-gsave 8.186800 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-448 921 moveto
-448 2496 lineto
-832 2496 lineto
-832 921 lineto
-832 578 958 417 conicto
-1085 256 1350 256 conicto
-1657 256 1820 464 conicto
-1984 672 1984 1059 conicto
-1984 2496 lineto
-2368 2496 lineto
-2368 0 lineto
-1984 0 lineto
-1984 340 lineto
-1871 141 1678 38 conicto
-1485 -64 1226 -64 conicto
-833 -64 640 180 conicto
-448 425 448 921 conicto
-end_ol grestore
-gsave 8.550867 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-2240 2432 moveto
-2240 2048 lineto
-2054 2144 1865 2192 conicto
-1677 2240 1481 2240 conicto
-1186 2240 1041 2149 conicto
-896 2059 896 1873 conicto
-896 1706 1009 1623 conicto
-1123 1540 1575 1461 conicto
-1757 1429 lineto
-2058 1370 2213 1193 conicto
-2368 1017 2368 734 conicto
-2368 359 2100 147 conicto
-1832 -64 1355 -64 conicto
-1166 -64 959 -32 conicto
-753 0 512 64 conicto
-512 512 lineto
-752 385 971 320 conicto
-1191 256 1387 256 conicto
-1672 256 1828 371 conicto
-1984 487 1984 693 conicto
-1984 991 1380 1106 conicto
-1360 1110 lineto
-1190 1143 lineto
-837 1211 674 1373 conicto
-512 1536 512 1817 conicto
-512 2173 761 2366 conicto
-1011 2560 1472 2560 conicto
-1678 2560 1867 2528 conicto
-2057 2496 2240 2432 conicto
-end_ol grestore
-gsave 8.914933 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-1344 3200 moveto
-1344 2496 lineto
-2304 2496 lineto
-2304 2176 lineto
-1344 2176 lineto
-1344 816 lineto
-1344 539 1451 429 conicto
-1559 320 1828 320 conicto
-2304 320 lineto
-2304 0 lineto
-1787 0 lineto
-1333 0 1146 184 conicto
-960 368 960 816 conicto
-960 2176 lineto
-256 2176 lineto
-256 2496 lineto
-960 2496 lineto
-960 3200 lineto
-1344 3200 lineto
-end_ol grestore
-gsave 9.279000 4.400000 translate 0.035278 -0.035278 scale
-start_ol
-512 -384 moveto
-659 -384 lineto
-966 -384 1059 -287 conicto
-1152 -191 1152 118 conicto
-1152 661 lineto
-1152 1004 1247 1159 conicto
-1342 1315 1574 1375 conicto
-1343 1432 1247 1593 conicto
-1152 1755 1152 2111 conicto
-1152 2677 lineto
-1152 2999 1059 3099 conicto
-966 3200 659 3200 conicto
-512 3200 lineto
-512 3520 lineto
-647 3520 lineto
-1178 3520 1357 3353 conicto
-1536 3187 1536 2687 conicto
-1536 2139 lineto
-1536 1797 1657 1666 conicto
-1778 1536 2096 1536 conicto
-2240 1536 lineto
-2240 1216 lineto
-2096 1216 lineto
-1778 1216 1657 1085 conicto
-1536 955 1536 616 conicto
-1536 109 lineto
-1536 -378 1357 -541 conicto
-1178 -704 647 -704 conicto
-512 -704 lineto
-512 -384 lineto
-end_ol grestore
+n 6.404219 4.161719 m 5.609442 3.895580 l 6.111262 4.566905 l s
+/Courier-latin1 ff 0.560000 scf sf
+({Trust}) 7.031400 4.773680 m
+ gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 11.425000 11.000000 2.425000 1.000000 0 360 ellipse f
+n 12.797500 10.950000 2.547500 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 11.425000 11.000000 2.425000 1.000000 0 360 ellipse cp s
-gsave 10.163467 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-2432 128 moveto
-2273 32 2098 -16 conicto
-1923 -64 1730 -64 conicto
-1044 -64 682 380 conicto
-320 824 320 1663 conicto
-320 2504 682 2948 conicto
-1044 3392 1730 3392 conicto
-1923 3392 2100 3344 conicto
-2277 3296 2432 3200 conicto
-2432 2432 lineto
-2260 2632 2098 2724 conicto
-1937 2816 1765 2816 conicto
-1397 2816 1210 2525 conicto
-1024 2235 1024 1662 conicto
-1024 1093 1210 802 conicto
-1397 512 1765 512 conicto
-1937 512 2098 604 conicto
-2260 696 2432 896 conicto
-2432 128 lineto
-end_ol grestore
-gsave 10.527533 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-2432 1642 moveto
-2432 0 lineto
-1792 0 lineto
-1792 1540 lineto
-1792 1813 1708 1930 conicto
-1625 2048 1435 2048 conicto
-1242 2048 1133 1889 conicto
-1024 1730 1024 1447 conicto
-1024 0 lineto
-384 0 lineto
-384 3520 lineto
-1024 3520 lineto
-1024 2144 lineto
-1096 2342 1269 2451 conicto
-1443 2560 1689 2560 conicto
-2056 2560 2244 2329 conicto
-2432 2099 2432 1642 conicto
-end_ol grestore
-gsave 10.891600 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-1565 1216 moveto
-1156 1216 994 1116 conicto
-832 1017 832 776 conicto
-832 596 944 490 conicto
-1056 384 1248 384 conicto
-1537 384 1696 590 conicto
-1856 797 1856 1169 conicto
-1856 1216 lineto
-1565 1216 lineto
-2496 1456 moveto
-2496 0 lineto
-1856 0 lineto
-1856 275 lineto
-1734 112 1543 24 conicto
-1353 -64 1122 -64 conicto
-682 -64 437 163 conicto
-192 391 192 801 conicto
-192 1243 475 1453 conicto
-758 1664 1351 1664 conicto
-1856 1664 lineto
-1856 1779 lineto
-1856 1942 1728 2027 conicto
-1600 2112 1351 2112 conicto
-1119 2112 901 2050 conicto
-684 1989 448 1856 conicto
-448 2368 lineto
-663 2466 883 2513 conicto
-1104 2560 1351 2560 conicto
-1984 2560 2240 2318 conicto
-2496 2077 2496 1456 conicto
-end_ol grestore
-gsave 11.255667 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-2560 1792 moveto
-2452 1920 2306 1984 conicto
-2161 2048 1986 2048 conicto
-1777 2048 1620 1971 conicto
-1463 1894 1377 1747 conicto
-1323 1657 1301 1529 conicto
-1280 1401 1280 1140 conicto
-1280 0 lineto
-640 0 lineto
-640 2496 lineto
-1280 2496 lineto
-1280 2143 lineto
-1377 2342 1578 2451 conicto
-1779 2560 2047 2560 conicto
-2183 2560 2313 2527 conicto
-2443 2495 2560 2432 conicto
-2560 1792 lineto
-end_ol grestore
-gsave 11.619733 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-896 1059 moveto
-896 3008 lineto
-256 3008 lineto
-256 3520 lineto
-1536 3520 lineto
-1536 1059 lineto
-1536 761 1631 636 conicto
-1726 512 1953 512 conicto
-2496 512 lineto
-2496 0 lineto
-1764 0 lineto
-1299 0 1097 245 conicto
-896 490 896 1059 conicto
-end_ol grestore
-gsave 11.983800 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-512 2496 moveto
-1792 2496 lineto
-1792 512 lineto
-2624 512 lineto
-2624 0 lineto
-320 0 lineto
-320 512 lineto
-1152 512 lineto
-1152 1984 lineto
-512 1984 lineto
-512 2496 lineto
-1152 3776 moveto
-1792 3776 lineto
-1792 3008 lineto
-1152 3008 lineto
-1152 3776 lineto
-end_ol grestore
-gsave 12.347867 11.200000 translate 0.035278 -0.035278 scale
-start_ol
-2432 128 moveto
-2205 31 1970 -16 conicto
-1735 -64 1474 -64 conicto
-850 -64 521 271 conicto
-192 607 192 1239 conicto
-192 1850 512 2205 conicto
-833 2560 1386 2560 conicto
-1945 2560 2252 2230 conicto
-2560 1900 2560 1301 conicto
-2560 1024 lineto
-832 1024 lineto
-834 734 1007 591 conicto
-1180 448 1524 448 conicto
-1751 448 1971 509 conicto
-2191 570 2432 704 conicto
-2432 128 lineto
-1920 1536 moveto
-1915 1789 1779 1918 conicto
-1643 2048 1379 2048 conicto
-1141 2048 999 1914 conicto
-858 1780 832 1534 conicto
-1920 1536 lineto
-end_ol grestore
+n 12.797500 10.950000 2.547500 1.000000 0 360 ellipse cp s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Charlie) dup sw 2 div 12.797500 ex sub 10.882500 m
+ gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 13.150000 2.950000 1.750000 1.000000 0 360 ellipse f
+n 13.325000 2.950000 1.925000 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 13.150000 2.950000 1.750000 1.000000 0 360 ellipse cp s
-gsave 12.261000 3.150000 translate 0.035278 -0.035278 scale
-start_ol
-256 3328 moveto
-896 3328 lineto
-896 2013 lineto
-1936 3328 lineto
-2687 3328 lineto
-1627 2017 lineto
-2725 0 lineto
-1987 0 lineto
-1191 1498 lineto
-896 1128 lineto
-896 0 lineto
-256 0 lineto
-256 3328 lineto
-end_ol grestore
-gsave 12.625067 3.150000 translate 0.035278 -0.035278 scale
-start_ol
-2432 128 moveto
-2205 31 1970 -16 conicto
-1735 -64 1474 -64 conicto
-850 -64 521 271 conicto
-192 607 192 1239 conicto
-192 1850 512 2205 conicto
-833 2560 1386 2560 conicto
-1945 2560 2252 2230 conicto
-2560 1900 2560 1301 conicto
-2560 1024 lineto
-832 1024 lineto
-834 734 1007 591 conicto
-1180 448 1524 448 conicto
-1751 448 1971 509 conicto
-2191 570 2432 704 conicto
-2432 128 lineto
-1920 1536 moveto
-1915 1789 1779 1918 conicto
-1643 2048 1379 2048 conicto
-1141 2048 999 1914 conicto
-858 1780 832 1534 conicto
-1920 1536 lineto
-end_ol grestore
-gsave 12.989133 3.150000 translate 0.035278 -0.035278 scale
-start_ol
-2624 2496 moveto
-1817 0 lineto
-999 0 lineto
-192 2496 lineto
-865 2496 lineto
-1407 549 lineto
-1951 2496 lineto
-2624 2496 lineto
-end_ol grestore
-gsave 13.353200 3.150000 translate 0.035278 -0.035278 scale
-start_ol
-512 2496 moveto
-1792 2496 lineto
-1792 512 lineto
-2624 512 lineto
-2624 0 lineto
-320 0 lineto
-320 512 lineto
-1152 512 lineto
-1152 1984 lineto
-512 1984 lineto
-512 2496 lineto
-1152 3776 moveto
-1792 3776 lineto
-1792 3008 lineto
-1152 3008 lineto
-1152 3776 lineto
-end_ol grestore
-gsave 13.717267 3.150000 translate 0.035278 -0.035278 scale
-start_ol
-2432 1638 moveto
-2432 0 lineto
-1792 0 lineto
-1792 1537 lineto
-1792 1812 1708 1930 conicto
-1625 2048 1435 2048 conicto
-1245 2048 1134 1888 conicto
-1024 1728 1024 1444 conicto
-1024 0 lineto
-384 0 lineto
-384 2496 lineto
-1024 2496 lineto
-1024 2139 lineto
-1096 2339 1269 2449 conicto
-1443 2560 1689 2560 conicto
-2056 2560 2244 2328 conicto
-2432 2097 2432 1638 conicto
-end_ol grestore
+n 13.325000 2.950000 1.925000 1.000000 0 360 ellipse cp s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Kevin) dup sw 2 div 13.325000 ex sub 2.882500 m
+ gs 1 -1 sc sh gr
0.100000 slw
0 slc
[] 0 sd
-n 9.949856 5.900509 m 13.150000 3.950000 l s
+n 9.949857 5.900506 m 13.150000 3.950000 l s
0 slj
-n 9.819743 5.687036 m 9.266743 6.316871 l 10.079969 6.113982 l ef
+n 9.819744 5.687033 m 9.266745 6.316867 l 10.079970 6.113979 l ef
+0.100000 slw
+[] 0 sd
+0 slj
+n 9.819744 5.687033 m 9.266745 6.316867 l 10.079970 6.113979 l cp s
+/Helvetica-latin1 ff 0.560000 scf sf
0.100000 slw
[] 0 sd
[0.400000] 0 sd
0 slc
-n 11.425000 10.000000 m 14.245565 3.960870 l s
+n 12.797500 9.950000 m 13.220701 4.334057 l s
0.100000 slw
[] 0 sd
0 slj
0 slc
-n 14.204478 4.639621 m 14.316501 3.808989 l 13.751453 4.428037 l s
-gsave 12.906168 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-2240 -384 moveto
-2240 -704 lineto
-2101 -704 lineto
-1574 -704 1395 -541 conicto
-1216 -378 1216 109 conicto
-1216 616 lineto
-1216 955 1094 1085 conicto
-972 1216 654 1216 conicto
-512 1216 lineto
-512 1536 lineto
-654 1536 lineto
-974 1536 1095 1666 conicto
-1216 1797 1216 2139 conicto
-1216 2687 lineto
-1216 3187 1395 3353 conicto
-1574 3520 2101 3520 conicto
-2240 3520 lineto
-2240 3200 lineto
-2089 3200 lineto
-1785 3200 1692 3101 conicto
-1600 3002 1600 2677 conicto
-1600 2111 lineto
-1600 1755 1506 1593 conicto
-1412 1432 1184 1375 conicto
-1414 1315 1507 1159 conicto
-1600 1004 1600 661 conicto
-1600 118 lineto
-1600 -195 1692 -289 conicto
-1785 -384 2089 -384 conicto
-2240 -384 lineto
-end_ol grestore
-gsave 13.270235 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-128 3328 moveto
-2624 3328 lineto
-2624 2944 lineto
-1600 2944 lineto
-1600 0 lineto
-1152 0 lineto
-1152 2944 lineto
-128 2944 lineto
-128 3328 lineto
-end_ol grestore
-gsave 13.634302 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-2624 1984 moveto
-2487 2085 2346 2130 conicto
-2205 2176 2035 2176 conicto
-1637 2176 1426 1936 conicto
-1216 1696 1216 1243 conicto
-1216 0 lineto
-832 0 lineto
-832 2496 lineto
-1216 2496 lineto
-1216 2010 lineto
-1322 2276 1543 2418 conicto
-1765 2560 2068 2560 conicto
-2226 2560 2362 2529 conicto
-2498 2498 2624 2432 conicto
-2624 1984 lineto
-end_ol grestore
-gsave 13.998368 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-448 921 moveto
-448 2496 lineto
-832 2496 lineto
-832 921 lineto
-832 578 958 417 conicto
-1085 256 1350 256 conicto
-1657 256 1820 464 conicto
-1984 672 1984 1059 conicto
-1984 2496 lineto
-2368 2496 lineto
-2368 0 lineto
-1984 0 lineto
-1984 340 lineto
-1871 141 1678 38 conicto
-1485 -64 1226 -64 conicto
-833 -64 640 180 conicto
-448 425 448 921 conicto
-end_ol grestore
-gsave 14.362435 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-2240 2432 moveto
-2240 2048 lineto
-2054 2144 1865 2192 conicto
-1677 2240 1481 2240 conicto
-1186 2240 1041 2149 conicto
-896 2059 896 1873 conicto
-896 1706 1009 1623 conicto
-1123 1540 1575 1461 conicto
-1757 1429 lineto
-2058 1370 2213 1193 conicto
-2368 1017 2368 734 conicto
-2368 359 2100 147 conicto
-1832 -64 1355 -64 conicto
-1166 -64 959 -32 conicto
-753 0 512 64 conicto
-512 512 lineto
-752 385 971 320 conicto
-1191 256 1387 256 conicto
-1672 256 1828 371 conicto
-1984 487 1984 693 conicto
-1984 991 1380 1106 conicto
-1360 1110 lineto
-1190 1143 lineto
-837 1211 674 1373 conicto
-512 1536 512 1817 conicto
-512 2173 761 2366 conicto
-1011 2560 1472 2560 conicto
-1678 2560 1867 2528 conicto
-2057 2496 2240 2432 conicto
-end_ol grestore
-gsave 14.726502 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-1344 3200 moveto
-1344 2496 lineto
-2304 2496 lineto
-2304 2176 lineto
-1344 2176 lineto
-1344 816 lineto
-1344 539 1451 429 conicto
-1559 320 1828 320 conicto
-2304 320 lineto
-2304 0 lineto
-1787 0 lineto
-1333 0 1146 184 conicto
-960 368 960 816 conicto
-960 2176 lineto
-256 2176 lineto
-256 2496 lineto
-960 2496 lineto
-960 3200 lineto
-1344 3200 lineto
-end_ol grestore
-gsave 15.090568 6.828548 translate 0.035278 -0.035278 scale
-start_ol
-512 -384 moveto
-659 -384 lineto
-966 -384 1059 -287 conicto
-1152 -191 1152 118 conicto
-1152 661 lineto
-1152 1004 1247 1159 conicto
-1342 1315 1574 1375 conicto
-1343 1432 1247 1593 conicto
-1152 1755 1152 2111 conicto
-1152 2677 lineto
-1152 2999 1059 3099 conicto
-966 3200 659 3200 conicto
-512 3200 lineto
-512 3520 lineto
-647 3520 lineto
-1178 3520 1357 3353 conicto
-1536 3187 1536 2687 conicto
-1536 2139 lineto
-1536 1797 1657 1666 conicto
-1778 1536 2096 1536 conicto
-2240 1536 lineto
-2240 1216 lineto
-2096 1216 lineto
-1778 1216 1657 1085 conicto
-1536 955 1536 616 conicto
-1536 109 lineto
-1536 -378 1357 -541 conicto
-1178 -704 647 -704 conicto
-512 -704 lineto
-512 -384 lineto
-end_ol grestore
+n 13.422476 4.983424 m 13.233298 4.166900 l 12.923889 4.945852 l s
+/Courier-latin1 ff 0.560000 scf sf
+({Trust}) 11.600000 8.600000 m
+ gs 1 -1 sc sh gr
0.100000 slw
0 slc
[] 0 sd
-n 5.108800 11.000000 m 9.000000 11.000000 l s
+n 5.108770 10.992907 m 10.250000 10.950000 l s
+0 slj
+n 5.106684 10.742915 m 4.308798 10.999583 l 5.110857 11.242898 l ef
+0.100000 slw
+[] 0 sd
0 slj
-n 5.108800 10.750000 m 4.308800 11.000000 l 5.108800 11.250000 l ef
+n 5.106684 10.742915 m 4.308798 10.999583 l 5.110857 11.242898 l cp s
+/Helvetica-latin1 ff 0.560000 scf sf
0.100000 slw
0 slc
[] 0 sd
-n 14.230367 4.492468 m 13.139734 10.292893 l s
+n 13.654446 4.836032 m 14.598900 10.242900 l s
+0 slj
+n 13.900717 4.793014 m 13.516789 4.047965 l 13.408175 4.879050 l ef
+0.100000 slw
+[] 0 sd
0 slj
-n 14.476061 4.538665 m 14.378197 3.706246 l 13.984672 4.446271 l ef
+n 13.900717 4.793014 m 13.516789 4.047965 l 13.408175 4.879050 l cp s
showpage
diff --git a/doc/gnutls-pgp.pdf b/doc/gnutls-pgp.pdf
index 978e790..50b23cc 100644
Binary files a/doc/gnutls-pgp.pdf and b/doc/gnutls-pgp.pdf differ
diff --git a/doc/gnutls-pgp.png b/doc/gnutls-pgp.png
index 5b899f3..fd53b2e 100644
Binary files a/doc/gnutls-pgp.png and b/doc/gnutls-pgp.png differ
diff --git a/doc/gnutls-x509.dia b/doc/gnutls-x509.dia
index 0742bb3..9f9960e 100644
Binary files a/doc/gnutls-x509.dia and b/doc/gnutls-x509.dia differ
diff --git a/doc/gnutls-x509.eps b/doc/gnutls-x509.eps
index 5129adb..c63df95 100644
--- a/doc/gnutls-x509.eps
+++ b/doc/gnutls-x509.eps
@@ -1,14 +1,41 @@
%!PS-Adobe-2.0 EPSF-2.0
-%%Title: tree1
-%%Creator: Dia v0.90
-%%CreationDate: Thu Sep 5 21:44:57 2002
-%%For: a user
-%%Magnification: 1.0000
+%%Title: /home/nmav/cvs/gnutls/doc/gnutls-x509.dia
+%%Creator: Dia v0.97.1
+%%CreationDate: Sat Aug 27 23:00:31 2011
+%%For: nmav
%%Orientation: Portrait
-%%BoundingBox: 0 0 470 617
-%%Pages: 1
+%%Magnification: 1.0000
+%%BoundingBox: 0 0 470 569
+%%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
/cp {closepath} bind def
/c {curveto} bind def
/f {fill} bind def
@@ -72,121 +99,322 @@ dup
4 2 roll
putinterval
} bind 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-Gothic-latin1
+ /AvantGarde-Gothic 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
+/NewCenturySchlbk-Roman-latin1
+ /NewCenturySchlbk-Roman findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Italic-latin1
+ /NewCenturySchlbk-Italic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Bold-latin1
+ /NewCenturySchlbk-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-BoldItalic-latin1
+ /NewCenturySchlbk-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
+28.346000 -28.346000 scale
+-0.000000 -20.000000 translate
%%EndProlog
-%%BeginSetup
-%%EndSetup
-28.346000 -28.346000 scale
--0.000000 -21.685957 translate
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 2.600000 13.250000 0.300000 0.300000 0 360 ellipse f
+n 3.000000 13.450000 0.300000 0.300000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 2.600000 13.250000 0.300000 0.300000 0 360 ellipse cp s
-n 1.400000 13.850000 m 3.800000 13.850000 l s
-n 2.600000 13.550000 m 2.600000 15.050000 l s
-n 2.600000 15.050000 m 1.400000 16.350000 l s
-n 2.600000 15.050000 m 3.800000 16.350000 l 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
- /A /l /i /c /e /B /o /b /xi /xi /R /t /space /C /I /W
- /S /r /v /T /w /y /p /a /X /period /five /zero /nine /f /n /h
- /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 /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-Bold_e0 undefinefont
-/Courier-Bold_e0
- /Courier-Bold findfont
- dup length dict begin
- {1 index /FID ne {def} {pop pop} ifelse} forall
- /Encoding e0 def
- currentdict end
-definefont pop
-/Courier-Bold_e0 ff 0.800000 scf sf
-( !"#$) sw
-2 div 2.600000 ex sub 17.555217 m ( !"#$)
+n 3.000000 13.450000 0.300000 0.300000 0 360 ellipse cp s
+n 1.800000 14.050000 m 4.200000 14.050000 l s
+n 3.000000 13.750000 m 3.000000 15.250000 l s
+n 3.000000 15.250000 m 1.800000 16.550000 l s
+n 3.000000 15.250000 m 4.200000 16.550000 l s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Alice) dup sw 2 div 3.000000 ex sub 17.585000 m
gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 7.200000 13.450000 0.300000 0.300000 0 360 ellipse f
+n 8.150000 13.450000 0.300000 0.300000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 7.200000 13.450000 0.300000 0.300000 0 360 ellipse cp s
-n 6.000000 14.050000 m 8.400000 14.050000 l s
-n 7.200000 13.750000 m 7.200000 15.250000 l s
-n 7.200000 15.250000 m 6.000000 16.550000 l s
-n 7.200000 15.250000 m 8.400000 16.550000 l s
-/Courier-Bold_e0 ff 0.800000 scf sf
-(%&') sw
-2 div 7.200000 ex sub 17.755217 m (%&')
+n 8.150000 13.450000 0.300000 0.300000 0 360 ellipse cp s
+n 6.950000 14.050000 m 9.350000 14.050000 l s
+n 8.150000 13.750000 m 8.150000 15.250000 l s
+n 8.150000 15.250000 m 6.950000 16.550000 l s
+n 8.150000 15.250000 m 9.350000 16.550000 l s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Bob) dup sw 2 div 8.150000 ex sub 17.585000 m
gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 6.952400 3.067467 3.052400 1.017467 0 360 ellipse f
+n 6.447500 3.050000 2.547500 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 6.952400 3.067467 3.052400 1.017467 0 360 ellipse cp s
-/Courier-Bold_e0 ff 0.800000 scf sf
-(*&&+,- ) sw
-2 div 6.952400 ex sub 3.272684 m (*&&+,- )
+n 6.447500 3.050000 2.547500 1.000000 0 360 ellipse cp s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(Root CA) dup sw 2 div 6.447500 ex sub 3.085000 m
gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 3.365200 8.200000 2.015200 1.000000 0 360 ellipse f
+n 2.975000 8.200000 1.625000 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 3.365200 8.200000 2.015200 1.000000 0 360 ellipse cp s
-/Courier-Bold_e0 ff 0.800000 scf sf
-(- ,.) sw
-2 div 3.365200 ex sub 8.405217 m (- ,.)
+n 2.975000 8.200000 1.625000 1.000000 0 360 ellipse cp s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(CA I) dup sw 2 div 2.975000 ex sub 8.235000 m
gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 11.671600 8.100000 2.471600 1.000000 0 360 ellipse f
+n 11.125000 8.100000 1.925000 1.000000 0 360 ellipse f
0.000000 0.000000 0.000000 srgb
-n 11.671600 8.100000 2.471600 1.000000 0 360 ellipse cp s
-/Courier-Bold_e0 ff 0.800000 scf sf
-(- ,..) sw
-2 div 11.671600 ex sub 8.305217 m (- ,..)
+n 11.125000 8.100000 1.925000 1.000000 0 360 ellipse cp s
+/Courier-Bold-latin1 ff 0.560000 scf sf
+(CA II) dup sw 2 div 11.125000 ex sub 8.135000 m
gs 1 -1 sc sh gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 10.400000 11.650000 m 10.400000 13.450000 l 16.037600 13.450000 l 16.037600
11.650000 l f
+n 10.950000 14.350000 m 10.950000 16.150000 l 15.652500 16.150000 l 15.652500
14.350000 l f
0.000000 0.000000 0.000000 srgb
-n 10.400000 11.650000 m 10.400000 13.450000 l 16.037600 13.450000 l 16.037600
11.650000 l cp s
-/Helvetica_e0 undefinefont
-/Helvetica_e0
- /Helvetica findfont
- dup length dict begin
- {1 index /FID ne {def} {pop pop} ifelse} forall
- /Encoding e0 def
- currentdict end
-definefont pop
-/Helvetica_e0 ff 0.800000 scf sf
-(/$',0$12$1) sw
-2 div 13.218800 ex sub 12.762903 m (/$',0$12$1)
+n 10.950000 14.350000 m 10.950000 16.150000 l 15.652500 16.150000 l 15.652500
14.350000 l cp s
+/Helvetica-latin1 ff 0.560000 scf sf
+(Web Server) dup sw 2 div 13.301250 ex sub 15.285000 m
gs 1 -1 sc sh gr
0.050000 slw
-n 10.900000 12.950000 m 15.537600 12.950000 l s
+n 11.450000 15.595000 m 15.152500 15.595000 l s
0.100000 slw
[] 0 sd
[] 0 sd
0 slc
0 slj
+0.100000 slw
0 slc
0 slj
[] 0 sd
@@ -206,46 +434,52 @@ n 16.500000 0.000000 m 16.500000 19.950000 l s
0.100000 slw
0 slc
[] 0 sd
-n 3.489200 7.200000 m 6.896800 4.050000 l s
+n 3.982591 6.507855 m 5.698897 4.100165 l s
+0 slj
+n 3.779019 6.362740 m 3.518223 7.159286 l 4.186163 6.652970 l ef
+0.100000 slw
+[] 0 sd
0 slj
-n 3.906952 6.473376 m 3.489200 7.200000 l 4.246356 6.840534 l f
+n 3.779019 6.362740 m 3.518223 7.159286 l 4.186163 6.652970 l cp s
+/Helvetica-latin1 ff 0.560000 scf sf
0.100000 slw
0 slc
[] 0 sd
-n 11.712000 7.100000 m 6.896800 4.050000 l s
+n 9.576726 6.428427 m 7.418173 4.097974 l s
+0 slj
+n 9.393314 6.598309 m 10.120351 7.015344 l 9.760138 6.258544 l ef
+0.100000 slw
+[] 0 sd
0 slj
-n 10.902394 6.883118 m 11.712000 7.100000 l 11.169943 6.460724 l f
+n 9.393314 6.598309 m 10.120351 7.015344 l 9.760138 6.258544 l cp s
0.100000 slw
0 slc
[] 0 sd
-n 2.600000 12.350000 m 3.489200 9.200000 l s
+n 2.995115 11.700014 m 2.981033 9.249799 l s
0 slj
-n 2.576738 11.512170 m 2.600000 12.350000 l 3.057933 11.648005 l f
+n 2.745119 11.701451 m 2.999713 12.500001 l 3.245111 11.698577 l ef
+0.100000 slw
+[] 0 sd
+0 slj
+n 2.745119 11.701451 m 2.999713 12.500001 l 3.245111 11.698577 l cp s
0.100000 slw
0 slc
[] 0 sd
-n 13.141200 11.650000 m 11.712000 9.100000 l s
+n 13.021784 13.547273 m 11.490683 9.150186 l s
0 slj
-n 12.531985 11.074364 m 13.141200 11.650000 l 12.968150 10.829906 l f
+n 12.785688 13.629483 m 13.284858 14.302781 l 13.257880 13.465062 l ef
+0.100000 slw
+[] 0 sd
+0 slj
+n 12.785688 13.629483 m 13.284858 14.302781 l 13.257880 13.465062 l cp s
0.100000 slw
0 slc
[] 0 sd
-n 7.200000 12.550000 m 11.712000 9.100000 l s
+n 8.622411 11.843369 m 10.423013 9.150031 l s
0 slj
-n 7.683658 11.865474 m 7.200000 12.550000 l 7.987363 12.262668 l f
-/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
-(34&,+56"#7!,89:;<,-$1+"="#7+"&>) sw
-2 div 8.307760 ex sub 20.703100 m (34&,+56"#7!,89:;<,-$1+"="#7+"&>)
- gs 1 -1 sc sh gr
-(67+?@) sw
-2 div 8.307760 ex sub 21.503100 m (67+?@)
- gs 1 -1 sc sh gr
+n 8.414578 11.704424 m 8.177789 12.508433 l 8.830244 11.982313 l ef
+0.100000 slw
+[] 0 sd
+0 slj
+n 8.414578 11.704424 m 8.177789 12.508433 l 8.830244 11.982313 l cp s
showpage
diff --git a/doc/gnutls-x509.pdf b/doc/gnutls-x509.pdf
index 050df14..a81f944 100644
Binary files a/doc/gnutls-x509.pdf and b/doc/gnutls-x509.pdf differ
diff --git a/doc/gnutls-x509.png b/doc/gnutls-x509.png
index 39fa640..0e21a19 100644
Binary files a/doc/gnutls-x509.png and b/doc/gnutls-x509.png differ
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 252af26..94ceb70 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -64,19 +64,19 @@ typedef struct
/* ANONymous cipher suites.
*/
-#define GNUTLS_ANON_DH_3DES_EDE_CBC_SHA1 { 0x00, 0x1B }
-#define GNUTLS_ANON_DH_ARCFOUR_MD5 { 0x00, 0x18 }
+#define GNUTLS_DH_ANON_3DES_EDE_CBC_SHA1 { 0x00, 0x1B }
+#define GNUTLS_DH_ANON_ARCFOUR_MD5 { 0x00, 0x18 }
/* rfc3268: */
-#define GNUTLS_ANON_DH_AES_128_CBC_SHA1 { 0x00, 0x34 }
-#define GNUTLS_ANON_DH_AES_256_CBC_SHA1 { 0x00, 0x3A }
+#define GNUTLS_DH_ANON_AES_128_CBC_SHA1 { 0x00, 0x34 }
+#define GNUTLS_DH_ANON_AES_256_CBC_SHA1 { 0x00, 0x3A }
/* rfc4132 */
-#define GNUTLS_ANON_DH_CAMELLIA_128_CBC_SHA1 { 0x00,0x46 }
-#define GNUTLS_ANON_DH_CAMELLIA_256_CBC_SHA1 { 0x00,0x89 }
+#define GNUTLS_DH_ANON_CAMELLIA_128_CBC_SHA1 { 0x00,0x46 }
+#define GNUTLS_DH_ANON_CAMELLIA_256_CBC_SHA1 { 0x00,0x89 }
-#define GNUTLS_ANON_DH_AES_128_CBC_SHA256 { 0x00, 0x6C }
-#define GNUTLS_ANON_DH_AES_256_CBC_SHA256 { 0x00, 0x6D }
+#define GNUTLS_DH_ANON_AES_128_CBC_SHA256 { 0x00, 0x6C }
+#define GNUTLS_DH_ANON_AES_256_CBC_SHA256 { 0x00, 0x6D }
/* PSK (not in TLS 1.0)
* draft-ietf-tls-psk:
@@ -227,38 +227,38 @@ typedef struct
#define CIPHER_SUITES_COUNT
(sizeof(cs_algorithms)/sizeof(gnutls_cipher_suite_entry)-1)
static const gnutls_cipher_suite_entry cs_algorithms[] = {
- /* ANON_DH */
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_ARCFOUR_MD5,
+ /* DH_ANON */
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_ARCFOUR_MD5,
GNUTLS_CIPHER_ARCFOUR_128,
GNUTLS_KX_ANON_DH, GNUTLS_MAC_MD5,
GNUTLS_SSL3, GNUTLS_VERSION_MAX, 0),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_3DES_EDE_CBC_SHA1,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_3DES_EDE_CBC_SHA1,
GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_AES_128_CBC_SHA1,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_AES_128_CBC_SHA1,
GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_AES_256_CBC_SHA1,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_AES_256_CBC_SHA1,
GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_CAMELLIA_128_CBC_SHA1,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_CAMELLIA_128_CBC_SHA1,
GNUTLS_CIPHER_CAMELLIA_128_CBC,
GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
GNUTLS_VERSION_MAX, 1),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_CAMELLIA_256_CBC_SHA1,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_CAMELLIA_256_CBC_SHA1,
GNUTLS_CIPHER_CAMELLIA_256_CBC,
GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
GNUTLS_VERSION_MAX, 1),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_AES_128_CBC_SHA256,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_AES_128_CBC_SHA256,
GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
GNUTLS_VERSION_MAX, 1),
- GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_AES_256_CBC_SHA256,
+ GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DH_ANON_AES_256_CBC_SHA256,
GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
GNUTLS_VERSION_MAX, 1),
diff --git a/src/Makefile.am b/src/Makefile.am
index 10813cf..9e6a0dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/../libextra/includes \
-I$(srcdir)/cfg
-noinst_PROGRAMS = benchmark-cipher benchmark-tls
bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
if ENABLE_PKI
bin_PROGRAMS += certtool
@@ -77,16 +76,12 @@ noinst_LTLIBRARIES += libcmd-psk.la
libcmd_psk_la_CFLAGS =
libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
-benchmark_cipher_SOURCES = benchmark-cipher.c benchmark.c benchmark.h
-benchmark_cipher_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
$(LIB_CLOCK_GETTIME)
+BENCHMARK_SRCS = benchmark-cipher.c benchmark.c benchmark.h benchmark-tls.c
-benchmark_tls_SOURCES = benchmark-tls.c benchmark.c benchmark.h
-benchmark_tls_LDADD = ../lib/libgnutls.la ../gl/libgnu.la $(LIB_CLOCK_GETTIME)
-
-gnutls_cli_SOURCES = cli.c common.h common.c $(PKCS11_SRCS)
+gnutls_cli_SOURCES = cli.c common.h common.c $(PKCS11_SRCS) $(BENCHMARK_SRCS)
gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la
-gnutls_cli_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
+gnutls_cli_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
$(LIB_CLOCK_GETTIME)
noinst_LTLIBRARIES += libcmd-cli.la
libcmd_cli_la_CFLAGS =
libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c
diff --git a/src/benchmark-cipher.c b/src/benchmark-cipher.c
index f23c899..d43bc0c 100644
--- a/src/benchmark-cipher.c
+++ b/src/benchmark-cipher.c
@@ -202,14 +202,8 @@ mac_bench (int algo, int size)
free (_key);
}
-int
-main (int argc, char **argv)
+void benchmark_cipher (int debug_level)
{
- int debug_level = 0;
-
- if (argc > 1)
- debug_level = 2;
-
gnutls_global_set_log_function (tls_log_func);
gnutls_global_set_log_level (debug_level);
gnutls_global_init ();
@@ -230,5 +224,5 @@ main (int argc, char **argv)
cipher_bench (GNUTLS_CIPHER_ARCFOUR, 16, 0);
- return 0;
+ gnutls_global_deinit();
}
diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c
index 91117b2..81b236b 100644
--- a/src/benchmark-tls.c
+++ b/src/benchmark-tls.c
@@ -51,265 +51,238 @@
/* DH of 2432 bits that is pretty equivalent to 224 bits of ECDH.
*/
const char *pkcs3 =
-"-----BEGIN DH PARAMETERS-----\n"
-"MIICagKCATEBWS7COZB/f58zwMlPUWBEoRwPjS8W0vMl2bGvnbCBYuUkgk0T5uUz\n"
-"bLOV6vMNWxkO/jNLyR06T3nHiqr0j+pYkpGv3PXy0IcIG4CsXySicqCAn/9zmiVO\n"
-"GTkqAZfMskByWZRkSRU9lW8ca7po+PpJ9id2I0SlhDwgcpjw4f47ajXOBeil0uXs\n"
-"NWtQZlcd1NFjTDaToAnmN6x+pS6BXZ2It0/sPPGNdTsvF7Ym0fWWMV6JbZlXDODL\n"
-"kaT81cCdygUvaPEOUAcm/TXcelaTiBMlU2uBtfFjuI45+kzEWkNCNENvULyCoqZ+\n"
-"AH/dqer/DqnliJX7tnnlQLsuT7EIIyXtfM0F7XMLGU3WlKxpgWmWDdhpGHcM5xfv\n"
-"trUZWr/DWfeWyhwDDYashpYXcrYHf7iP3wKCATEA4nwYa0AFL3i1+4DNvZr0O47x\n"
-"pRf7dMK29Nh/WDdhIvl51c532I/2vBSUH4Mjd+Ao+rBxYAutRcz3kF+YhQjcdCMf\n"
-"/aKnbtepJ9Lz5xOKfqZdFfR2ANw7I+rNNd0LKHnzpm12xTZcAX7IT4eoIxrB2FYw\n"
-"vcQ6K2Soaan0clq8iCPuPx1HBPDNpFvQ7H+kF7o9Z0+7W7jFLpsdc2+x1mlo5/iT\n"
-"hw0yjuqm4rNX7VU/Vw1H1m/OIXarzURSE2C70uXBQaaDbOTDb+LZOExR1tGS16ZM\n"
-"PreiK1pH8v64OAbihB+OYd/QLU2y6YBjGPHxJQ/bAYFCnsEslkkgOot6bv81iktB\n"
-"mPny0He9Qafb1DaNMcXBBG9tZVMJD7HwobjciAQJx+bz9Ckb0EvkyD5N2t5ovw==\n"
-"-----END DH PARAMETERS-----\n"
-"\n";
+ "-----BEGIN DH PARAMETERS-----\n"
+ "MIICagKCATEBWS7COZB/f58zwMlPUWBEoRwPjS8W0vMl2bGvnbCBYuUkgk0T5uUz\n"
+ "bLOV6vMNWxkO/jNLyR06T3nHiqr0j+pYkpGv3PXy0IcIG4CsXySicqCAn/9zmiVO\n"
+ "GTkqAZfMskByWZRkSRU9lW8ca7po+PpJ9id2I0SlhDwgcpjw4f47ajXOBeil0uXs\n"
+ "NWtQZlcd1NFjTDaToAnmN6x+pS6BXZ2It0/sPPGNdTsvF7Ym0fWWMV6JbZlXDODL\n"
+ "kaT81cCdygUvaPEOUAcm/TXcelaTiBMlU2uBtfFjuI45+kzEWkNCNENvULyCoqZ+\n"
+ "AH/dqer/DqnliJX7tnnlQLsuT7EIIyXtfM0F7XMLGU3WlKxpgWmWDdhpGHcM5xfv\n"
+ "trUZWr/DWfeWyhwDDYashpYXcrYHf7iP3wKCATEA4nwYa0AFL3i1+4DNvZr0O47x\n"
+ "pRf7dMK29Nh/WDdhIvl51c532I/2vBSUH4Mjd+Ao+rBxYAutRcz3kF+YhQjcdCMf\n"
+ "/aKnbtepJ9Lz5xOKfqZdFfR2ANw7I+rNNd0LKHnzpm12xTZcAX7IT4eoIxrB2FYw\n"
+ "vcQ6K2Soaan0clq8iCPuPx1HBPDNpFvQ7H+kF7o9Z0+7W7jFLpsdc2+x1mlo5/iT\n"
+ "hw0yjuqm4rNX7VU/Vw1H1m/OIXarzURSE2C70uXBQaaDbOTDb+LZOExR1tGS16ZM\n"
+ "PreiK1pH8v64OAbihB+OYd/QLU2y6YBjGPHxJQ/bAYFCnsEslkkgOot6bv81iktB\n"
+ "mPny0He9Qafb1DaNMcXBBG9tZVMJD7HwobjciAQJx+bz9Ckb0EvkyD5N2t5ovw==\n"
+ "-----END DH PARAMETERS-----\n" "\n";
char buffer[64 * 1024];
-static void
-tls_log_func (int level, const char *str)
+static void tls_log_func(int level, const char *str)
{
- fprintf (stderr, "|<%d>| %s", level, str);
+ fprintf(stderr, "|<%d>| %s", level, str);
}
-static void
-test_ciphersuite (const char* cipher_prio, int size)
+static void test_ciphersuite(const char *cipher_prio, int size)
{
- /* Server stuff. */
- gnutls_anon_server_credentials_t s_anoncred;
- const gnutls_datum_t p3 = { (char *) pkcs3, strlen (pkcs3) };
- static gnutls_dh_params_t dh_params;
- gnutls_session_t server;
- int sret, cret;
- const char *str;
- /* Client stuff. */
- gnutls_anon_client_credentials_t c_anoncred;
- gnutls_session_t client;
- /* Need to enable anonymous KX specifically. */
- int ret;
- struct benchmark_st st;
-
- /* Init server */
- gnutls_anon_allocate_server_credentials (&s_anoncred);
- gnutls_dh_params_init (&dh_params);
- gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
- gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
- gnutls_init (&server, GNUTLS_SERVER);
- ret = gnutls_priority_set_direct (server, cipher_prio, &str);
- if (ret < 0)
- {
- fprintf (stderr, "Error in %s\n", str);
- exit (1);
+ /* Server stuff. */
+ gnutls_anon_server_credentials_t s_anoncred;
+ const gnutls_datum_t p3 = { (char *) pkcs3, strlen(pkcs3) };
+ static gnutls_dh_params_t dh_params;
+ gnutls_session_t server;
+ int sret, cret;
+ const char *str;
+ /* Client stuff. */
+ gnutls_anon_client_credentials_t c_anoncred;
+ gnutls_session_t client;
+ /* Need to enable anonymous KX specifically. */
+ int ret;
+ struct benchmark_st st;
+
+ /* Init server */
+ gnutls_anon_allocate_server_credentials(&s_anoncred);
+ gnutls_dh_params_init(&dh_params);
+ gnutls_dh_params_import_pkcs3(dh_params, &p3, GNUTLS_X509_FMT_PEM);
+ gnutls_anon_set_server_dh_params(s_anoncred, dh_params);
+ gnutls_init(&server, GNUTLS_SERVER);
+ ret = gnutls_priority_set_direct(server, cipher_prio, &str);
+ if (ret < 0) {
+ fprintf(stderr, "Error in %s\n", str);
+ exit(1);
}
- gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
- gnutls_dh_set_prime_bits (server, 1024);
- gnutls_transport_set_push_function (server, server_push);
- gnutls_transport_set_pull_function (server, server_pull);
- gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t) server);
- reset_buffers();
-
- /* Init client */
- gnutls_anon_allocate_client_credentials (&c_anoncred);
- gnutls_init (&client, GNUTLS_CLIENT);
-
- ret = gnutls_priority_set_direct (client, cipher_prio, &str);
- if (ret < 0)
- {
- fprintf (stderr, "Error in %s\n", str);
- exit (1);
+ gnutls_credentials_set(server, GNUTLS_CRD_ANON, s_anoncred);
+ gnutls_dh_set_prime_bits(server, 1024);
+ gnutls_transport_set_push_function(server, server_push);
+ gnutls_transport_set_pull_function(server, server_pull);
+ gnutls_transport_set_ptr(server, (gnutls_transport_ptr_t) server);
+ reset_buffers();
+
+ /* Init client */
+ gnutls_anon_allocate_client_credentials(&c_anoncred);
+ gnutls_init(&client, GNUTLS_CLIENT);
+
+ ret = gnutls_priority_set_direct(client, cipher_prio, &str);
+ if (ret < 0) {
+ fprintf(stderr, "Error in %s\n", str);
+ exit(1);
}
- gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
- gnutls_transport_set_push_function (client, client_push);
- gnutls_transport_set_pull_function (client, client_pull);
- gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t) client);
+ gnutls_credentials_set(client, GNUTLS_CRD_ANON, c_anoncred);
+ gnutls_transport_set_push_function(client, client_push);
+ gnutls_transport_set_pull_function(client, client_pull);
+ gnutls_transport_set_ptr(client, (gnutls_transport_ptr_t) client);
- HANDSHAKE (client, server);
+ HANDSHAKE(client, server);
- fprintf (stdout, "Testing %s with %d packet size: ",
- gnutls_cipher_suite_get_name(gnutls_kx_get(server),
- gnutls_cipher_get(server), gnutls_mac_get(server)), size);
- fflush (stdout);
+ fprintf(stdout, "Testing %s with %d packet size: ",
+ gnutls_cipher_suite_get_name(gnutls_kx_get(server),
+ gnutls_cipher_get(server),
+ gnutls_mac_get(server)), size);
+ fflush(stdout);
- gnutls_rnd (GNUTLS_RND_NONCE, buffer, sizeof (buffer));
+ gnutls_rnd(GNUTLS_RND_NONCE, buffer, sizeof(buffer));
- start_benchmark (&st);
+ start_benchmark(&st);
- do
- {
- do
- {
- ret = gnutls_record_send (client, buffer, size);
+ do {
+ do {
+ ret = gnutls_record_send(client, buffer, size);
}
- while (ret == GNUTLS_E_AGAIN);
+ while (ret == GNUTLS_E_AGAIN);
- if (ret < 0)
- {
- fprintf (stderr, "Failed sending to server\n");
- exit (1);
+ if (ret < 0) {
+ fprintf(stderr, "Failed sending to server\n");
+ exit(1);
}
- do
- {
- ret = gnutls_record_recv (server, buffer, sizeof (buffer));
+ do {
+ ret = gnutls_record_recv(server, buffer, sizeof(buffer));
}
- while (ret == GNUTLS_E_AGAIN);
+ while (ret == GNUTLS_E_AGAIN);
- if (ret < 0)
- {
- fprintf (stderr, "Failed receiving from client\n");
- exit (1);
+ if (ret < 0) {
+ fprintf(stderr, "Failed receiving from client\n");
+ exit(1);
}
- st.size += size;
+ st.size += size;
}
- while (benchmark_must_finish == 0);
+ while (benchmark_must_finish == 0);
- stop_benchmark (&st, NULL);
+ stop_benchmark(&st, NULL);
- gnutls_bye (client, GNUTLS_SHUT_WR);
- gnutls_bye (server, GNUTLS_SHUT_WR);
+ gnutls_bye(client, GNUTLS_SHUT_WR);
+ gnutls_bye(server, GNUTLS_SHUT_WR);
- gnutls_deinit (client);
- gnutls_deinit (server);
+ gnutls_deinit(client);
+ gnutls_deinit(server);
- gnutls_anon_free_client_credentials (c_anoncred);
- gnutls_anon_free_server_credentials (s_anoncred);
+ gnutls_anon_free_client_credentials(c_anoncred);
+ gnutls_anon_free_server_credentials(s_anoncred);
- gnutls_dh_params_deinit (dh_params);
+ gnutls_dh_params_deinit(dh_params);
}
-static void
-test_ciphersuite_kx (const char* cipher_prio)
+static void test_ciphersuite_kx(const char *cipher_prio)
{
- /* Server stuff. */
- gnutls_anon_server_credentials_t s_anoncred;
- const gnutls_datum_t p3 = { (char *) pkcs3, strlen (pkcs3) };
- static gnutls_dh_params_t dh_params;
- gnutls_session_t server;
- int sret, cret;
- const char *str;
- const char* suite=NULL;
- /* Client stuff. */
- gnutls_anon_client_credentials_t c_anoncred;
- gnutls_session_t client;
- /* Need to enable anonymous KX specifically. */
- int ret;
- struct benchmark_st st;
-
- /* Init server */
- gnutls_anon_allocate_server_credentials (&s_anoncred);
- gnutls_dh_params_init (&dh_params);
- gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
- gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
-
- start_benchmark (&st);
-
- do
- {
- gnutls_init (&server, GNUTLS_SERVER);
- ret = gnutls_priority_set_direct (server, cipher_prio, &str);
- if (ret < 0)
- {
- fprintf (stderr, "Error in %s\n", str);
- exit (1);
- }
- gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
- gnutls_transport_set_push_function (server, server_push);
- gnutls_transport_set_pull_function (server, server_pull);
- gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t) server);
- reset_buffers();
-
- /* Init client */
- gnutls_anon_allocate_client_credentials (&c_anoncred);
- gnutls_init (&client, GNUTLS_CLIENT);
-
- ret = gnutls_priority_set_direct (client, cipher_prio, &str);
- if (ret < 0)
- {
- fprintf (stderr, "Error in %s\n", str);
- exit (1);
- }
- gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
- gnutls_transport_set_push_function (client, client_push);
- gnutls_transport_set_pull_function (client, client_pull);
- gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t) client);
+ /* Server stuff. */
+ gnutls_anon_server_credentials_t s_anoncred;
+ const gnutls_datum_t p3 = { (char *) pkcs3, strlen(pkcs3) };
+ static gnutls_dh_params_t dh_params;
+ gnutls_session_t server;
+ int sret, cret;
+ const char *str;
+ const char *suite = NULL;
+ /* Client stuff. */
+ gnutls_anon_client_credentials_t c_anoncred;
+ gnutls_session_t client;
+ /* Need to enable anonymous KX specifically. */
+ int ret;
+ struct benchmark_st st;
+
+ /* Init server */
+ gnutls_anon_allocate_server_credentials(&s_anoncred);
+ gnutls_dh_params_init(&dh_params);
+ gnutls_dh_params_import_pkcs3(dh_params, &p3, GNUTLS_X509_FMT_PEM);
+ gnutls_anon_set_server_dh_params(s_anoncred, dh_params);
+
+ start_benchmark(&st);
+
+ do {
+ gnutls_init(&server, GNUTLS_SERVER);
+ ret = gnutls_priority_set_direct(server, cipher_prio, &str);
+ if (ret < 0) {
+ fprintf(stderr, "Error in %s\n", str);
+ exit(1);
+ }
+ gnutls_credentials_set(server, GNUTLS_CRD_ANON, s_anoncred);
+ gnutls_transport_set_push_function(server, server_push);
+ gnutls_transport_set_pull_function(server, server_pull);
+ gnutls_transport_set_ptr(server, (gnutls_transport_ptr_t) server);
+ reset_buffers();
+
+ /* Init client */
+ gnutls_anon_allocate_client_credentials(&c_anoncred);
+ gnutls_init(&client, GNUTLS_CLIENT);
+
+ ret = gnutls_priority_set_direct(client, cipher_prio, &str);
+ if (ret < 0) {
+ fprintf(stderr, "Error in %s\n", str);
+ exit(1);
+ }
+ gnutls_credentials_set(client, GNUTLS_CRD_ANON, c_anoncred);
+ gnutls_transport_set_push_function(client, client_push);
+ gnutls_transport_set_pull_function(client, client_pull);
+ gnutls_transport_set_ptr(client, (gnutls_transport_ptr_t) client);
- HANDSHAKE (client, server);
+ HANDSHAKE(client, server);
- if (suite==NULL)
- suite = gnutls_cipher_suite_get_name(gnutls_kx_get(server),
- gnutls_cipher_get(server), gnutls_mac_get(server));
+ if (suite == NULL)
+ suite = gnutls_cipher_suite_get_name(gnutls_kx_get(server),
+ gnutls_cipher_get(server),
+ gnutls_mac_get(server));
- gnutls_deinit (client);
- gnutls_deinit (server);
+ gnutls_deinit(client);
+ gnutls_deinit(server);
- st.size += 1;
+ st.size += 1;
}
- while (benchmark_must_finish == 0);
+ while (benchmark_must_finish == 0);
- fprintf (stdout, "Tested %s: ", suite);
- stop_benchmark (&st, "transactions");
+ fprintf(stdout, "Tested %s: ", suite);
+ stop_benchmark(&st, "transactions");
- gnutls_anon_free_client_credentials (c_anoncred);
- gnutls_anon_free_server_credentials (s_anoncred);
+ gnutls_anon_free_client_credentials(c_anoncred);
+ gnutls_anon_free_server_credentials(s_anoncred);
- gnutls_dh_params_deinit (dh_params);
+ gnutls_dh_params_deinit(dh_params);
}
-int
-main (int argc, char **argv)
+void benchmark_tls(int debug_level)
{
-int ciphers = 1;
-
- if (argc > 1)
- {
- if (strcmp(argv[1], "--kx")==0)
- {
- ciphers = 0;
- }
- else if (strcmp(argv[1], "-v")==0)
- {
- gnutls_global_set_log_function (tls_log_func);
- gnutls_global_set_log_level (2);
- }
- }
- gnutls_global_init ();
-
- if (ciphers != 0)
- {
- printf("Testing throughput in cipher/MAC combinations:\n");
- test_ciphersuite (PRIO_ARCFOUR_128_MD5, 1024);
- test_ciphersuite (PRIO_ARCFOUR_128_MD5, 4096);
- test_ciphersuite (PRIO_ARCFOUR_128_MD5, 8*1024);
- test_ciphersuite (PRIO_ARCFOUR_128_MD5, 15*1024);
-
- test_ciphersuite (PRIO_AES_GCM, 1024);
- test_ciphersuite (PRIO_AES_GCM, 4096);
- test_ciphersuite (PRIO_AES_GCM, 8*1024);
- test_ciphersuite (PRIO_AES_GCM, 15*1024);
-
- test_ciphersuite (PRIO_AES_CBC_SHA1, 1024);
- test_ciphersuite (PRIO_AES_CBC_SHA1, 4096);
- test_ciphersuite (PRIO_AES_CBC_SHA1, 8*1024);
- test_ciphersuite (PRIO_AES_CBC_SHA1, 15*1024);
-
- test_ciphersuite (PRIO_CAMELLIA_CBC_SHA1, 1024);
- test_ciphersuite (PRIO_CAMELLIA_CBC_SHA1, 4096);
- test_ciphersuite (PRIO_CAMELLIA_CBC_SHA1, 8*1024);
- test_ciphersuite (PRIO_CAMELLIA_CBC_SHA1, 15*1024);
- printf("\n");
- }
-
- printf("Testing key exchanges:\n");
- test_ciphersuite_kx (PRIO_DH);
- test_ciphersuite_kx (PRIO_ECDH);
-
-
- gnutls_global_deinit ();
+ gnutls_global_set_log_function(tls_log_func);
+ gnutls_global_set_log_level(debug_level);
+ gnutls_global_init();
+
+ printf("Testing throughput in cipher/MAC combinations:\n");
+ test_ciphersuite(PRIO_ARCFOUR_128_MD5, 1024);
+ test_ciphersuite(PRIO_ARCFOUR_128_MD5, 4096);
+ test_ciphersuite(PRIO_ARCFOUR_128_MD5, 8 * 1024);
+ test_ciphersuite(PRIO_ARCFOUR_128_MD5, 15 * 1024);
+
+ test_ciphersuite(PRIO_AES_GCM, 1024);
+ test_ciphersuite(PRIO_AES_GCM, 4096);
+ test_ciphersuite(PRIO_AES_GCM, 8 * 1024);
+ test_ciphersuite(PRIO_AES_GCM, 15 * 1024);
+
+ test_ciphersuite(PRIO_AES_CBC_SHA1, 1024);
+ test_ciphersuite(PRIO_AES_CBC_SHA1, 4096);
+ test_ciphersuite(PRIO_AES_CBC_SHA1, 8 * 1024);
+ test_ciphersuite(PRIO_AES_CBC_SHA1, 15 * 1024);
+
+ test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 1024);
+ test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 4096);
+ test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 8 * 1024);
+ test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 15 * 1024);
+ printf("\n");
+
+ printf("Testing key exchanges:\n");
+ test_ciphersuite_kx(PRIO_DH);
+ test_ciphersuite_kx(PRIO_ECDH);
+
+
+ gnutls_global_deinit();
+
}
diff --git a/src/benchmark.h b/src/benchmark.h
index b5a7f86..1485a03 100644
--- a/src/benchmark.h
+++ b/src/benchmark.h
@@ -5,6 +5,9 @@
typedef void (*sighandler_t)(int);
+void benchmark_cipher (int debug_level);
+void benchmark_tls (int debug_level);
+
struct benchmark_st
{
struct timespec start;
diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index fc0f53f..7c86e2b 100644
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -8,6 +8,7 @@
#include <config.h>
#include <common.h>
+#include <benchmark.h>
void cli_version(void);
@@ -156,6 +157,8 @@ void gaa_help(void)
__gaa_helpsingle(0, "pskkey", "KEY ", "PSK key (in hex) to use.");
__gaa_helpsingle('p', "port", "PORT ", "The port to connect to.");
__gaa_helpsingle(0, "insecure", "", "Don't abort program if server
certificate can't be validated.");
+ __gaa_helpsingle(0, "benchmark-ciphers", "", "Benchmark individual
ciphers.");
+ __gaa_helpsingle(0, "benchmark-tls", "", "Benchmark ciphers and key
exchange methods in TLS.");
__gaa_helpsingle('l', "list", "", "Print a list of the supported
algorithms and modes.");
__gaa_helpsingle('h', "help", "", "prints this help");
__gaa_helpsingle('v', "version", "", "prints the program's version
number");
@@ -173,65 +176,65 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 106 "cli.gaa"
+#line 110 "cli.gaa"
char *rest_args;
-#line 98 "cli.gaa"
+#line 99 "cli.gaa"
int insecure;
-#line 95 "cli.gaa"
+#line 96 "cli.gaa"
char *port;
-#line 92 "cli.gaa"
+#line 93 "cli.gaa"
char *psk_key;
-#line 89 "cli.gaa"
+#line 90 "cli.gaa"
char *psk_username;
-#line 86 "cli.gaa"
+#line 87 "cli.gaa"
char *srp_passwd;
-#line 83 "cli.gaa"
+#line 84 "cli.gaa"
char *srp_username;
-#line 80 "cli.gaa"
+#line 81 "cli.gaa"
char *x509_certfile;
-#line 77 "cli.gaa"
+#line 78 "cli.gaa"
char *x509_keyfile;
-#line 74 "cli.gaa"
+#line 75 "cli.gaa"
char *pgp_subkey;
-#line 71 "cli.gaa"
+#line 72 "cli.gaa"
char *pgp_certfile;
-#line 68 "cli.gaa"
+#line 69 "cli.gaa"
char *pgp_keyring;
-#line 65 "cli.gaa"
+#line 66 "cli.gaa"
char *pgp_keyfile;
-#line 62 "cli.gaa"
+#line 63 "cli.gaa"
char *x509_crlfile;
-#line 59 "cli.gaa"
+#line 60 "cli.gaa"
char *x509_cafile;
-#line 56 "cli.gaa"
+#line 57 "cli.gaa"
char *priorities;
-#line 53 "cli.gaa"
+#line 54 "cli.gaa"
int verbose;
-#line 50 "cli.gaa"
+#line 51 "cli.gaa"
int record_size;
-#line 47 "cli.gaa"
+#line 48 "cli.gaa"
int print_cert;
-#line 44 "cli.gaa"
+#line 45 "cli.gaa"
int disable_extensions;
-#line 41 "cli.gaa"
+#line 42 "cli.gaa"
int fingerprint;
-#line 38 "cli.gaa"
+#line 39 "cli.gaa"
int fmtder;
-#line 35 "cli.gaa"
+#line 36 "cli.gaa"
int crlf;
-#line 32 "cli.gaa"
+#line 33 "cli.gaa"
int mtu;
-#line 29 "cli.gaa"
+#line 30 "cli.gaa"
int udp;
-#line 26 "cli.gaa"
+#line 27 "cli.gaa"
int starttls;
-#line 23 "cli.gaa"
+#line 24 "cli.gaa"
int noticket;
-#line 20 "cli.gaa"
+#line 21 "cli.gaa"
int rehandshake;
-#line 17 "cli.gaa"
+#line 18 "cli.gaa"
int resume;
-#line 14 "cli.gaa"
+#line 15 "cli.gaa"
int debug;
#line 114 "gaa.skel"
@@ -287,39 +290,41 @@ static int gaa_error = 0;
#define GAA_MULTIPLE_OPTION 3
#define GAA_REST 0
-#define GAA_NB_OPTION 32
+#define GAA_NB_OPTION 34
#define GAAOPTID_version 1
#define GAAOPTID_help 2
#define GAAOPTID_list 3
-#define GAAOPTID_insecure 4
-#define GAAOPTID_port 5
-#define GAAOPTID_pskkey 6
-#define GAAOPTID_pskusername 7
-#define GAAOPTID_srppasswd 8
-#define GAAOPTID_srpusername 9
-#define GAAOPTID_x509certfile 10
-#define GAAOPTID_x509keyfile 11
-#define GAAOPTID_pgpsubkey 12
-#define GAAOPTID_pgpcertfile 13
-#define GAAOPTID_pgpkeyring 14
-#define GAAOPTID_pgpkeyfile 15
-#define GAAOPTID_x509crlfile 16
-#define GAAOPTID_x509cafile 17
-#define GAAOPTID_priority 18
-#define GAAOPTID_verbose 19
-#define GAAOPTID_recordsize 20
-#define GAAOPTID_print_cert 21
-#define GAAOPTID_disable_extensions 22
-#define GAAOPTID_fingerprint 23
-#define GAAOPTID_x509fmtder 24
-#define GAAOPTID_crlf 25
-#define GAAOPTID_mtu 26
-#define GAAOPTID_udp 27
-#define GAAOPTID_starttls 28
-#define GAAOPTID_noticket 29
-#define GAAOPTID_rehandshake 30
-#define GAAOPTID_resume 31
-#define GAAOPTID_debug 32
+#define GAAOPTID_benchmark_tls 4
+#define GAAOPTID_benchmark_ciphers 5
+#define GAAOPTID_insecure 6
+#define GAAOPTID_port 7
+#define GAAOPTID_pskkey 8
+#define GAAOPTID_pskusername 9
+#define GAAOPTID_srppasswd 10
+#define GAAOPTID_srpusername 11
+#define GAAOPTID_x509certfile 12
+#define GAAOPTID_x509keyfile 13
+#define GAAOPTID_pgpsubkey 14
+#define GAAOPTID_pgpcertfile 15
+#define GAAOPTID_pgpkeyring 16
+#define GAAOPTID_pgpkeyfile 17
+#define GAAOPTID_x509crlfile 18
+#define GAAOPTID_x509cafile 19
+#define GAAOPTID_priority 20
+#define GAAOPTID_verbose 21
+#define GAAOPTID_recordsize 22
+#define GAAOPTID_print_cert 23
+#define GAAOPTID_disable_extensions 24
+#define GAAOPTID_fingerprint 25
+#define GAAOPTID_x509fmtder 26
+#define GAAOPTID_crlf 27
+#define GAAOPTID_mtu 28
+#define GAAOPTID_udp 29
+#define GAAOPTID_starttls 30
+#define GAAOPTID_noticket 31
+#define GAAOPTID_rehandshake 32
+#define GAAOPTID_resume 33
+#define GAAOPTID_debug 34
#line 168 "gaa.skel"
@@ -666,6 +671,8 @@ static int gaa_get_option_num(char *str, int status)
GAA_CHECK1STR("v", GAAOPTID_version);
GAA_CHECK1STR("h", GAAOPTID_help);
GAA_CHECK1STR("l", GAAOPTID_list);
+ GAA_CHECK1STR("", GAAOPTID_benchmark_tls);
+ GAA_CHECK1STR("", GAAOPTID_benchmark_ciphers);
GAA_CHECK1STR("", GAAOPTID_insecure);
GAA_CHECK1STR("V", GAAOPTID_verbose);
GAA_CHECK1STR("", GAAOPTID_print_cert);
@@ -685,6 +692,8 @@ static int gaa_get_option_num(char *str, int status)
GAA_CHECKSTR("version", GAAOPTID_version);
GAA_CHECKSTR("help", GAAOPTID_help);
GAA_CHECKSTR("list", GAAOPTID_list);
+ GAA_CHECKSTR("benchmark-tls", GAAOPTID_benchmark_tls);
+ GAA_CHECKSTR("benchmark-ciphers",
GAAOPTID_benchmark_ciphers);
GAA_CHECKSTR("insecure", GAAOPTID_insecure);
GAA_CHECKSTR("port", GAAOPTID_port);
GAA_CHECKSTR("pskkey", GAAOPTID_pskkey);
@@ -765,28 +774,42 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
{
case GAAOPTID_version:
OK = 0;
-#line 104 "cli.gaa"
+#line 108 "cli.gaa"
{ cli_version(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_help:
OK = 0;
-#line 102 "cli.gaa"
+#line 106 "cli.gaa"
{ gaa_help(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_list:
OK = 0;
-#line 101 "cli.gaa"
+#line 105 "cli.gaa"
{ print_list(gaaval->verbose); exit(0); ;};
return GAA_OK;
break;
+ case GAAOPTID_benchmark_tls:
+ OK = 0;
+#line 103 "cli.gaa"
+{ benchmark_tls(gaaval->debug); exit(0) ;};
+
+ return GAA_OK;
+ break;
+ case GAAOPTID_benchmark_ciphers:
+ OK = 0;
+#line 102 "cli.gaa"
+{ benchmark_cipher(gaaval->debug); exit(0) ;};
+
+ return GAA_OK;
+ break;
case GAAOPTID_insecure:
OK = 0;
-#line 99 "cli.gaa"
+#line 100 "cli.gaa"
{ gaaval->insecure = 1 ;};
return GAA_OK;
@@ -796,7 +819,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_port.arg1, gaa_getstr, GAATMP_port.size1);
gaa_index++;
-#line 96 "cli.gaa"
+#line 97 "cli.gaa"
{ gaaval->port = GAATMP_port.arg1 ;};
return GAA_OK;
@@ -806,7 +829,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_pskkey.arg1, gaa_getstr, GAATMP_pskkey.size1);
gaa_index++;
-#line 93 "cli.gaa"
+#line 94 "cli.gaa"
{ gaaval->psk_key = GAATMP_pskkey.arg1 ;};
return GAA_OK;
@@ -816,7 +839,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_pskusername.arg1, gaa_getstr,
GAATMP_pskusername.size1);
gaa_index++;
-#line 90 "cli.gaa"
+#line 91 "cli.gaa"
{ gaaval->psk_username = GAATMP_pskusername.arg1 ;};
return GAA_OK;
@@ -826,7 +849,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr,
GAATMP_srppasswd.size1);
gaa_index++;
-#line 87 "cli.gaa"
+#line 88 "cli.gaa"
{ gaaval->srp_passwd = GAATMP_srppasswd.arg1 ;};
return GAA_OK;
@@ -836,7 +859,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_srpusername.arg1, gaa_getstr,
GAATMP_srpusername.size1);
gaa_index++;
-#line 84 "cli.gaa"
+#line 85 "cli.gaa"
{ gaaval->srp_username = GAATMP_srpusername.arg1 ;};
return GAA_OK;
@@ -846,7 +869,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_x509certfile.arg1, gaa_getstr,
GAATMP_x509certfile.size1);
gaa_index++;
-#line 81 "cli.gaa"
+#line 82 "cli.gaa"
{ gaaval->x509_certfile = GAATMP_x509certfile.arg1 ;};
return GAA_OK;
@@ -856,7 +879,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_x509keyfile.arg1, gaa_getstr,
GAATMP_x509keyfile.size1);
gaa_index++;
-#line 78 "cli.gaa"
+#line 79 "cli.gaa"
{ gaaval->x509_keyfile = GAATMP_x509keyfile.arg1 ;};
return GAA_OK;
@@ -866,7 +889,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_pgpsubkey.arg1, gaa_getstr,
GAATMP_pgpsubkey.size1);
gaa_index++;
-#line 75 "cli.gaa"
+#line 76 "cli.gaa"
{ gaaval->pgp_subkey = GAATMP_pgpsubkey.arg1 ;};
return GAA_OK;
@@ -876,7 +899,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_pgpcertfile.arg1, gaa_getstr,
GAATMP_pgpcertfile.size1);
gaa_index++;
-#line 72 "cli.gaa"
+#line 73 "cli.gaa"
{ gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1 ;};
return GAA_OK;
@@ -886,7 +909,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_pgpkeyring.arg1, gaa_getstr,
GAATMP_pgpkeyring.size1);
gaa_index++;
-#line 69 "cli.gaa"
+#line 70 "cli.gaa"
{ gaaval->pgp_keyring = GAATMP_pgpkeyring.arg1 ;};
return GAA_OK;
@@ -896,7 +919,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_pgpkeyfile.arg1, gaa_getstr,
GAATMP_pgpkeyfile.size1);
gaa_index++;
-#line 66 "cli.gaa"
+#line 67 "cli.gaa"
{ gaaval->pgp_keyfile = GAATMP_pgpkeyfile.arg1 ;};
return GAA_OK;
@@ -906,7 +929,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_x509crlfile.arg1, gaa_getstr,
GAATMP_x509crlfile.size1);
gaa_index++;
-#line 63 "cli.gaa"
+#line 64 "cli.gaa"
{ gaaval->x509_crlfile = GAATMP_x509crlfile.arg1 ;};
return GAA_OK;
@@ -916,7 +939,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_x509cafile.arg1, gaa_getstr,
GAATMP_x509cafile.size1);
gaa_index++;
-#line 60 "cli.gaa"
+#line 61 "cli.gaa"
{ gaaval->x509_cafile = GAATMP_x509cafile.arg1 ;};
return GAA_OK;
@@ -926,14 +949,14 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_priority.arg1, gaa_getstr,
GAATMP_priority.size1);
gaa_index++;
-#line 57 "cli.gaa"
+#line 58 "cli.gaa"
{ gaaval->priorities = GAATMP_priority.arg1 ;};
return GAA_OK;
break;
case GAAOPTID_verbose:
OK = 0;
-#line 54 "cli.gaa"
+#line 55 "cli.gaa"
{ gaaval->verbose = 1 ;};
return GAA_OK;
@@ -943,42 +966,42 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_recordsize.arg1, gaa_getint,
GAATMP_recordsize.size1);
gaa_index++;
-#line 51 "cli.gaa"
+#line 52 "cli.gaa"
{ gaaval->record_size = GAATMP_recordsize.arg1 ;};
return GAA_OK;
break;
case GAAOPTID_print_cert:
OK = 0;
-#line 48 "cli.gaa"
+#line 49 "cli.gaa"
{ gaaval->print_cert = 1 ;};
return GAA_OK;
break;
case GAAOPTID_disable_extensions:
OK = 0;
-#line 45 "cli.gaa"
+#line 46 "cli.gaa"
{ gaaval->disable_extensions = 1 ;};
return GAA_OK;
break;
case GAAOPTID_fingerprint:
OK = 0;
-#line 42 "cli.gaa"
+#line 43 "cli.gaa"
{ gaaval->fingerprint = 1 ;};
return GAA_OK;
break;
case GAAOPTID_x509fmtder:
OK = 0;
-#line 39 "cli.gaa"
+#line 40 "cli.gaa"
{ gaaval->fmtder = 1 ;};
return GAA_OK;
break;
case GAAOPTID_crlf:
OK = 0;
-#line 36 "cli.gaa"
+#line 37 "cli.gaa"
{ gaaval->crlf = 1 ;};
return GAA_OK;
@@ -988,42 +1011,42 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_mtu.arg1, gaa_getint, GAATMP_mtu.size1);
gaa_index++;
-#line 33 "cli.gaa"
+#line 34 "cli.gaa"
{ gaaval->mtu = GAATMP_mtu.arg1 ;};
return GAA_OK;
break;
case GAAOPTID_udp:
OK = 0;
-#line 30 "cli.gaa"
+#line 31 "cli.gaa"
{ gaaval->udp = 1 ;};
return GAA_OK;
break;
case GAAOPTID_starttls:
OK = 0;
-#line 27 "cli.gaa"
+#line 28 "cli.gaa"
{ gaaval->starttls = 1 ;};
return GAA_OK;
break;
case GAAOPTID_noticket:
OK = 0;
-#line 24 "cli.gaa"
+#line 25 "cli.gaa"
{ gaaval->noticket = 1 ;};
return GAA_OK;
break;
case GAAOPTID_rehandshake:
OK = 0;
-#line 21 "cli.gaa"
+#line 22 "cli.gaa"
{ gaaval->rehandshake = 1 ;};
return GAA_OK;
break;
case GAAOPTID_resume:
OK = 0;
-#line 18 "cli.gaa"
+#line 19 "cli.gaa"
{ gaaval->resume = 1 ;};
return GAA_OK;
@@ -1033,7 +1056,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1);
gaa_index++;
-#line 15 "cli.gaa"
+#line 16 "cli.gaa"
{ gaaval->debug = GAATMP_debug.arg1 ;};
return GAA_OK;
@@ -1042,7 +1065,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAAREST_tmp.arg1, gaa_getstr, GAAREST_tmp.size1);
gaa_index++;
-#line 107 "cli.gaa"
+#line 111 "cli.gaa"
{ gaaval->rest_args = GAAREST_tmp.arg1; ;};
return GAA_OK;
@@ -1071,7 +1094,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
if(inited == 0)
{
-#line 109 "cli.gaa"
+#line 113 "cli.gaa"
{ gaaval->resume=0; gaaval->noticket=0; gaaval->port="443";
gaaval->rest_args=NULL;
gaaval->record_size=0;
gaaval->fingerprint=0; gaaval->pgp_keyring=NULL; gaaval->x509_crlfile =
NULL;
@@ -1228,7 +1251,7 @@ static int gaa_internal_get_next_str(FILE *file,
gaa_str_node *tmp_str, int argc
len++;
a = fgetc( file);
- if(a==EOF) return 0; //a = ' ';
+ if(a==EOF) return 0;
}
len += 1;
diff --git a/src/cli-gaa.h b/src/cli-gaa.h
index bebca5f..d4a5188 100644
--- a/src/cli-gaa.h
+++ b/src/cli-gaa.h
@@ -8,65 +8,65 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 106 "cli.gaa"
+#line 110 "cli.gaa"
char *rest_args;
-#line 98 "cli.gaa"
+#line 99 "cli.gaa"
int insecure;
-#line 95 "cli.gaa"
+#line 96 "cli.gaa"
char *port;
-#line 92 "cli.gaa"
+#line 93 "cli.gaa"
char *psk_key;
-#line 89 "cli.gaa"
+#line 90 "cli.gaa"
char *psk_username;
-#line 86 "cli.gaa"
+#line 87 "cli.gaa"
char *srp_passwd;
-#line 83 "cli.gaa"
+#line 84 "cli.gaa"
char *srp_username;
-#line 80 "cli.gaa"
+#line 81 "cli.gaa"
char *x509_certfile;
-#line 77 "cli.gaa"
+#line 78 "cli.gaa"
char *x509_keyfile;
-#line 74 "cli.gaa"
+#line 75 "cli.gaa"
char *pgp_subkey;
-#line 71 "cli.gaa"
+#line 72 "cli.gaa"
char *pgp_certfile;
-#line 68 "cli.gaa"
+#line 69 "cli.gaa"
char *pgp_keyring;
-#line 65 "cli.gaa"
+#line 66 "cli.gaa"
char *pgp_keyfile;
-#line 62 "cli.gaa"
+#line 63 "cli.gaa"
char *x509_crlfile;
-#line 59 "cli.gaa"
+#line 60 "cli.gaa"
char *x509_cafile;
-#line 56 "cli.gaa"
+#line 57 "cli.gaa"
char *priorities;
-#line 53 "cli.gaa"
+#line 54 "cli.gaa"
int verbose;
-#line 50 "cli.gaa"
+#line 51 "cli.gaa"
int record_size;
-#line 47 "cli.gaa"
+#line 48 "cli.gaa"
int print_cert;
-#line 44 "cli.gaa"
+#line 45 "cli.gaa"
int disable_extensions;
-#line 41 "cli.gaa"
+#line 42 "cli.gaa"
int fingerprint;
-#line 38 "cli.gaa"
+#line 39 "cli.gaa"
int fmtder;
-#line 35 "cli.gaa"
+#line 36 "cli.gaa"
int crlf;
-#line 32 "cli.gaa"
+#line 33 "cli.gaa"
int mtu;
-#line 29 "cli.gaa"
+#line 30 "cli.gaa"
int udp;
-#line 26 "cli.gaa"
+#line 27 "cli.gaa"
int starttls;
-#line 23 "cli.gaa"
+#line 24 "cli.gaa"
int noticket;
-#line 20 "cli.gaa"
+#line 21 "cli.gaa"
int rehandshake;
-#line 17 "cli.gaa"
+#line 18 "cli.gaa"
int resume;
-#line 14 "cli.gaa"
+#line 15 "cli.gaa"
int debug;
#line 114 "gaa.skel"
diff --git a/src/cli.gaa b/src/cli.gaa
index 0576d5f..1d1c74f 100644
--- a/src/cli.gaa
+++ b/src/cli.gaa
@@ -4,6 +4,7 @@
#include <config.h>
#include <common.h>
+#include <benchmark.h>
void cli_version(void);
@@ -98,6 +99,9 @@ option (p, port) STR "PORT" { $port = $1 } "The port to
connect to."
#int insecure;
option (insecure) { $insecure = 1 } "Don't abort program if server certificate
can't be validated."
+option ( benchmark-ciphers) { benchmark_cipher($debug); exit(0) } "Benchmark
individual ciphers."
+option ( benchmark-tls) { benchmark_tls($debug); exit(0) } "Benchmark ciphers
and key exchange methods in TLS."
+
option (l, list) { print_list($verbose); exit(0); } "Print a list of the
supported algorithms and modes."
option (h, help) { gaa_help(); exit(0); } "prints this help"
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_0-118-gee1a192,
Nikos Mavrogiannopoulos <=