diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-12-02 22:00:31 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-12-02 22:00:31 +0000 |
| commit | e7d5a4ee4a160060dec7fd27aed237da276dfc92 (patch) | |
| tree | e12806c2904586079500c5bda5a57c3b93306e9a | |
| parent | b8393542bb50bb4503f65529a68d551d3e7e4d1b (diff) | |
| download | gnutls-e7d5a4ee4a160060dec7fd27aed237da276dfc92.tar.gz | |
depends on opencdk 0.3.5
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | doc/tex/ex-pgp-keyserver.tex | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 43e408971e..ef9fff0146 100644 --- a/configure.in +++ b/configure.in @@ -293,10 +293,10 @@ AC_ARG_ENABLE( openpgp-authentication, [ --disable-openpgp-authentication disab ) if test x$ac_enable_openpgp != xno; then AC_MSG_RESULT(no) - AM_PATH_LIBOPENCDK( 0.3.2, AC_DEFINE(HAVE_LIBOPENCDK, 1, [have libopencdk]), + AM_PATH_LIBOPENCDK( 0.3.5, AC_DEFINE(HAVE_LIBOPENCDK, 1, [have libopencdk]), AC_MSG_WARN([[ *** -*** libopencdk 0.3.2 was not found. You will not be able to use OpenPGP keys with gnutls. +*** libopencdk 0.3.5 was not found. You will not be able to use OpenPGP keys with gnutls. ]])) else AC_MSG_RESULT(yes) diff --git a/doc/tex/ex-pgp-keyserver.tex b/doc/tex/ex-pgp-keyserver.tex index 6482d81527..c5eaca1ef3 100644 --- a/doc/tex/ex-pgp-keyserver.tex +++ b/doc/tex/ex-pgp-keyserver.tex @@ -39,15 +39,9 @@ recv_openpgp_key(gnutls_session session, const unsigned char *keyfpr, CDK_DBSEARCH_FPR, &knode ); if( !rc ) { - size_t len = 20000; - buf = cdk_calloc( 1, len + 1 ); + size_t len; - if (buf == NULL) { - rc = -1; - goto finish; - } - - cdk_kbnode_write_to_mem( knode, buf, &len); + cdk_kbnode_write_to_mem( knode, NULL, &len); key->data = malloc( len); if (key->data==NULL) { @@ -55,7 +49,7 @@ recv_openpgp_key(gnutls_session session, const unsigned char *keyfpr, goto finish; } - memcpy( key->data, buf, len); + cdk_kbnode_write_to_mem( knode, key->data, &len); rc = 0; /* success */ |