diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-12-20 20:22:03 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-12-20 20:22:03 +0000 |
| commit | a9695a236fae0048af2b3f9934251bbed88cc37e (patch) | |
| tree | 805a15570fd3b99e014ccb08936d35839a275114 /libextra/gnutls_extra.c | |
| parent | 8a56fad939f4cdebacc681bf3bc0df23568b4969 (diff) | |
| download | gnutls-a9695a236fae0048af2b3f9934251bbed88cc37e.tar.gz | |
several cleanups.
Diffstat (limited to 'libextra/gnutls_extra.c')
| -rw-r--r-- | libextra/gnutls_extra.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c index 8044b5d7b0..b4a8c78576 100644 --- a/libextra/gnutls_extra.c +++ b/libextra/gnutls_extra.c @@ -152,11 +152,17 @@ int i; extern OPENPGP_KEY_CREATION_TIME_FUNC _E_gnutls_openpgp_extract_key_creation_time; extern OPENPGP_KEY_EXPIRATION_TIME_FUNC _E_gnutls_openpgp_extract_key_expiration_time; extern OPENPGP_VERIFY_KEY_FUNC _E_gnutls_openpgp_verify_key; -extern OPENPGP_CERT2GNUTLS_CERT _E_gnutls_openpgp_cert2gnutls_cert; -extern OPENPGP_KEY2GNUTLS_KEY _E_gnutls_openpgp_key2gnutls_key; extern OPENPGP_FINGERPRINT _E_gnutls_openpgp_fingerprint; extern OPENPGP_KEY_REQUEST _E_gnutls_openpgp_request_key; +extern OPENPGP_RAW_KEY_TO_GCERT _E_gnutls_openpgp_raw_key_to_gcert; +extern OPENPGP_RAW_PRIVKEY_TO_GKEY _E_gnutls_openpgp_raw_privkey_to_gkey; + +extern OPENPGP_KEY_TO_GCERT _E_gnutls_openpgp_key_to_gcert; +extern OPENPGP_PRIVKEY_TO_GKEY _E_gnutls_openpgp_privkey_to_gkey; +extern OPENPGP_KEY_DEINIT _E_gnutls_openpgp_key_deinit; +extern OPENPGP_PRIVKEY_DEINIT _E_gnutls_openpgp_privkey_deinit; + static void _gnutls_add_openpgp_functions(void) { #ifdef HAVE_LIBOPENCDK _E_gnutls_openpgp_verify_key = gnutls_openpgp_verify_key; @@ -164,8 +170,14 @@ static void _gnutls_add_openpgp_functions(void) { _E_gnutls_openpgp_extract_key_creation_time = gnutls_openpgp_extract_key_creation_time; _E_gnutls_openpgp_fingerprint = gnutls_openpgp_fingerprint; _E_gnutls_openpgp_request_key = _gnutls_openpgp_request_key; - _E_gnutls_openpgp_cert2gnutls_cert = _gnutls_openpgp_cert2gnutls_cert; - _E_gnutls_openpgp_key2gnutls_key = _gnutls_openpgp_key2gnutls_key; + + _E_gnutls_openpgp_raw_key_to_gcert = _gnutls_openpgp_raw_key_to_gcert; + _E_gnutls_openpgp_raw_privkey_to_gkey = _gnutls_openpgp_raw_privkey_to_gkey; + + _E_gnutls_openpgp_key_to_gcert = _gnutls_openpgp_key_to_gcert; + _E_gnutls_openpgp_privkey_to_gkey = _gnutls_openpgp_privkey_to_gkey; + _E_gnutls_openpgp_key_deinit = gnutls_openpgp_key_deinit; + _E_gnutls_openpgp_privkey_deinit = gnutls_openpgp_privkey_deinit; #endif } |