removed the openpgp key retrieval example.

4 files changed, 2 insertions, 77 deletions

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index d8e6e4b297..d452274129 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = ex-alert.c ex-client-resume.c ex-client-srp.c \
 	ex-client2.c ex-x509-info.c ex-rfc2818.c ex-serv-export.c ex-serv-pgp.c \
-	ex-serv-srp.c ex-serv1.c ex-pgp-keyserver.c ex-cert-select.c \
+	ex-serv-srp.c ex-serv1.c ex-cert-select.c \
 	ex-crq.c ex-session-info.c ex-pkcs12.c
diff --git a/doc/tex/Makefile.am b/doc/tex/Makefile.am
index 7227d8a12c..53c37c1a90 100644
--- a/doc/tex/Makefile.am
+++ b/doc/tex/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = gnutls.tex gnutls.ps \
 EXAMPLE_OBJECTS = ex-alert.tex ex-client-srp.tex ex-serv-export.tex \
 	ex-client2.tex ex-x509-info.tex ex-rfc2818.tex \
 	ex-serv1.tex ex-client-resume.tex ex-serv-srp.tex \
-	ex-serv-pgp.tex ex-pgp-keyserver.tex ex-cert-select.tex \
+	ex-serv-pgp.tex ex-cert-select.tex \
 	ex-crq.tex ex-session-info.tex ex-pkcs12.tex
 
 TEX_OBJECTS = gnutls.tex ../../lib/gnutls-api.tex fdl.tex ../../lib/x509/x509-api.tex \
diff --git a/doc/tex/ex-pgp-keyserver.tex b/doc/tex/ex-pgp-keyserver.tex
deleted file mode 100644
index fe64022075..0000000000
--- a/doc/tex/ex-pgp-keyserver.tex
+++ /dev/null
@@ -1,68 +0,0 @@
-\begin {verbatim}
-
-/* This file is actually an example of using the OpenCDK library
- * to retrieve an OpenPGP key from a key server.
- */
-
-#include <stdlib.h>
-#include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
-#include <opencdk.h>
-
-/* A callback function that tries to connect
- * to a public keyserver to get the specified key.
- * The callback should be set as:
- *
- * gnutls_openpgp_set_recv_key_function( session, recv_openpgp_key);
- *
- * in the initialization of a gnutls session.
- */
-
-static const char *hostname = "hkp://wwwkeys.pgp.net";
-static const short port = 11371;
-
-int
-recv_openpgp_key(gnutls_session session, const unsigned char *keyfpr, 
-       unsigned int keyfpr_length, gnutls_datum * key)
-{
-   int rc;
-   cdk_kbnode_t knode = NULL;
-
-   /* The key fingerprint should be 20 bytes
-    * in v4 keys.
-    */
-   if (keyfpr_length != 20)
-      return -1;
-
-   rc = cdk_keyserver_recv_key( hostname, port, keyfpr, 
-      CDK_DBSEARCH_FPR, &knode );
-
-   if( !rc ) {
-       size_t len;
-
-       cdk_kbnode_write_to_mem( knode, NULL, &len);
-
-       key->data = gnutls_malloc( len);
-       if (key->data==NULL) {
-          rc = -1;
-          goto finish;
-       }
-
-       key->size = len;
-       cdk_kbnode_write_to_mem( knode, key->data, &len);
-
-       rc = 0; /* success */
-
-   } else {
-       rc = -1;
-   }
-
-   finish:
-
-   cdk_kbnode_release( knode );
-   return rc;
-
-}
-
-
-\end{verbatim}
diff --git a/doc/tex/examples.tex b/doc/tex/examples.tex
index 544b502616..940b2b66b7 100644
--- a/doc/tex/examples.tex
+++ b/doc/tex/examples.tex
@@ -90,13 +90,6 @@ is separate for simplicity.
 
 \section{Miscellaneous examples}
 
-\subsection{A callback which\index{OpenPGP!Key retrieval} retrieves OpenPGP keys}
-The following example is a callback function which retrieves {\bf OpenPGP} keys from
-a public key server. This is useful when a client connected to an OpenPGP \tls{} server
-and sent its key fingerprint instead of the whole key. With this callback the \tls{}
-server can retrieve the key from a public key server.
-\input{ex-pgp-keyserver}
-
 \subsection{Checking for an alert}
 This is a function that checks if an alert has been received
 in the current session.