diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-01-16 10:00:59 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-01-16 10:00:59 +0000 |
| commit | 66e1f91025840b3457e8766f89510d75c21954ea (patch) | |
| tree | 634ea7e4e1c8f007e7b9e9f53866e39065c58c92 /libextra/openpgp | |
| parent | 5702d5025f38f760cec7a31ba400d70c54133f9d (diff) | |
| download | gnutls-66e1f91025840b3457e8766f89510d75c21954ea.tar.gz | |
Fix import of ASCII armored OpenPGP keys, patch from ludovic.courtes@laas.fr (Ludovic Courtès).
Diffstat (limited to 'libextra/openpgp')
| -rw-r--r-- | libextra/openpgp/gnutls_openpgp.h | 3 | ||||
| -rw-r--r-- | libextra/openpgp/privkey.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libextra/openpgp/gnutls_openpgp.h b/libextra/openpgp/gnutls_openpgp.h index a84b903981..4385a43fe3 100644 --- a/libextra/openpgp/gnutls_openpgp.h +++ b/libextra/openpgp/gnutls_openpgp.h @@ -66,7 +66,8 @@ int _gnutls_openpgp_raw_key_to_gcert (gnutls_cert * cert, int _gnutls_openpgp_raw_privkey_to_gkey (gnutls_privkey * pkey, - const gnutls_datum_t * raw_key); + const gnutls_datum_t * raw_key, + gnutls_openpgp_key_fmt_t format); int _gnutls_openpgp_request_key (gnutls_session_t, diff --git a/libextra/openpgp/privkey.c b/libextra/openpgp/privkey.c index e9a9f10af3..2ba49df140 100644 --- a/libextra/openpgp/privkey.c +++ b/libextra/openpgp/privkey.c @@ -94,7 +94,8 @@ gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key, { int rc; - rc = _gnutls_openpgp_raw_privkey_to_gkey (&key->pkey, data); + rc = _gnutls_openpgp_raw_privkey_to_gkey (&key->pkey, data, + format); if (rc) { gnutls_assert (); |