diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-11-14 16:36:02 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-11-14 16:36:02 +0100 |
| commit | fdfe796245619e9b31c3f429fd14df28918599a0 (patch) | |
| tree | f5c4ea981e98e22be9dc75a3eed70f193a782ce3 | |
| parent | b2b788085f82338401855181fd4ce68529d194cb (diff) | |
| download | gnutls-fdfe796245619e9b31c3f429fd14df28918599a0.tar.gz | |
Use new API.
| -rw-r--r-- | doc/examples/ex-serv-export.c | 2 | ||||
| -rw-r--r-- | lib/auth_cert.h | 4 | ||||
| -rw-r--r-- | libextra/gnutls_openpgp.c | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/doc/examples/ex-serv-export.c b/doc/examples/ex-serv-export.c index e457ecff5d..cbe0b822ae 100644 --- a/doc/examples/ex-serv-export.c +++ b/doc/examples/ex-serv-export.c @@ -96,7 +96,7 @@ static char srp_dh_group2048[] = int generate_dh_params (void) { -gnutls_datum dparams = { srp_dh_group2048, sizeof( srp_dh_group2048) }; +gnutls_datum_t dparams = { srp_dh_group2048, sizeof( srp_dh_group2048) }; /* Here instead of generating Diffie Hellman parameters (for use with DHE * kx algorithms) we import them. */ diff --git a/lib/auth_cert.h b/lib/auth_cert.h index 3d16c43dba..e59e094b9d 100644 --- a/lib/auth_cert.h +++ b/lib/auth_cert.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation + * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation * * Author: Nikos Mavrogiannopoulos * @@ -67,7 +67,7 @@ typedef struct gnutls_certificate_credentials_st #ifndef KEYRING_HACK gnutls_openpgp_keyring_t keyring; #else - gnutls_datum keyring; + gnutls_datum_t keyring; int keyring_format; #endif diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index dd4c1ef543..927275cb48 100644 --- a/libextra/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c @@ -652,12 +652,13 @@ gnutls_openpgp_count_key_names (const gnutls_datum_t * cert) * **/ int - gnutls_certificate_set_openpgp_keyring_file - (gnutls_certificate_credentials_t c, const char *file, gnutls_openpgp_crt_fmt_t format) +gnutls_certificate_set_openpgp_keyring_file (gnutls_certificate_credentials_t c, + const char *file, + gnutls_openpgp_crt_fmt_t format) { -gnutls_datum ring; -size_t size; -int rc; + gnutls_datum_t ring; + size_t size; + int rc; if (!c || !file) { |