diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-10-31 09:41:08 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-10-31 09:41:08 +0000 |
| commit | e414b565f85e31b7d0e276f68958297841ea9572 (patch) | |
| tree | 212d97f1d4d22ad5cdab243787ed07312f24e52f /lib/gnutls_x509.c | |
| parent | 2b082d3bc8c134d58cdc4467125795319f04462c (diff) | |
| download | gnutls-e414b565f85e31b7d0e276f68958297841ea9572.tar.gz | |
some openpgp related changes.
Diffstat (limited to 'lib/gnutls_x509.c')
| -rw-r--r-- | lib/gnutls_x509.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c index af0e47b436..3481c63091 100644 --- a/lib/gnutls_x509.c +++ b/lib/gnutls_x509.c @@ -619,13 +619,9 @@ static int read_key_mem(gnutls_certificate_credentials res, const char *key, int # include <sys/mman.h> #endif -typedef struct { - opaque * data; - size_t size; - int mmaped; -} strfile; +#include <strfile.h> -inline static void _strfile_free( strfile *x) +void _gnutls_strfile_free( strfile *x) { #ifdef HAVE_MMAP if (x->mmaped) { @@ -725,7 +721,7 @@ static int read_cert_file(gnutls_certificate_credentials res, const char *certfi } ret = read_cert_mem( res, x.data, x.size, type); - _strfile_free(&x); + _gnutls_strfile_free(&x); return ret; @@ -749,7 +745,7 @@ static int read_key_file(gnutls_certificate_credentials res, const char *keyfile } ret = read_key_mem( res, x.data, x.size, type); - _strfile_free(&x); + _gnutls_strfile_free(&x); return ret; } @@ -1256,7 +1252,7 @@ int gnutls_certificate_set_x509_trust_file(gnutls_certificate_credentials res, ret = parse_pem_ca_mem( &res->x509_ca_list, &res->x509_ncas, x.data, x.size); - _strfile_free(&x); + _gnutls_strfile_free(&x); if (ret < 0) { gnutls_assert(); @@ -1509,7 +1505,7 @@ int gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials res, ret = parse_pem_crl_mem( &res->x509_crl_list, &res->x509_ncrls, x.data, x.size); - _strfile_free(&x); + _gnutls_strfile_free(&x); if (ret < 0) { gnutls_assert(); |