pgp_..port_key -> pgp_..port_keydata to avoid conflict with netpgp
authorEdouard Tisserant
Fri, 03 Apr 2015 15:33:10 +0200
changeset 170de3f8287972e
parent 169 a0dec157c6c4
child 173 e3d5905cb419
child 179 112fadcf74b9
pgp_..port_key -> pgp_..port_keydata to avoid conflict with netpgp
src/cryptotech.c
src/pgp_gpg.c
src/pgp_gpg.h
     1.1 --- a/src/cryptotech.c	Wed Apr 01 17:27:46 2015 +0200
     1.2 +++ b/src/cryptotech.c	Fri Apr 03 15:33:10 2015 +0200
     1.3 @@ -31,11 +31,11 @@
     1.4          cryptotech[PEP_crypt_OpenPGP].encrypt_and_sign = pgp_encrypt_and_sign;
     1.5          cryptotech[PEP_crypt_OpenPGP].verify_text = pgp_verify_text;
     1.6          cryptotech[PEP_crypt_OpenPGP].delete_keypair = pgp_delete_keypair;
     1.7 -        cryptotech[PEP_crypt_OpenPGP].export_key = pgp_export_key;
     1.8 +        cryptotech[PEP_crypt_OpenPGP].export_key = pgp_export_keydata;
     1.9          cryptotech[PEP_crypt_OpenPGP].find_keys = pgp_find_keys;
    1.10          cryptotech[PEP_crypt_OpenPGP].generate_keypair = pgp_generate_keypair;
    1.11          cryptotech[PEP_crypt_OpenPGP].get_key_rating = pgp_get_key_rating;
    1.12 -        cryptotech[PEP_crypt_OpenPGP].import_key = pgp_import_key;
    1.13 +        cryptotech[PEP_crypt_OpenPGP].import_key = pgp_import_keydata;
    1.14          cryptotech[PEP_crypt_OpenPGP].recv_key = pgp_recv_key;
    1.15          cryptotech[PEP_crypt_OpenPGP].send_key = pgp_send_key;
    1.16      }
     2.1 --- a/src/pgp_gpg.c	Wed Apr 01 17:27:46 2015 +0200
     2.2 +++ b/src/pgp_gpg.c	Fri Apr 03 15:33:10 2015 +0200
     2.3 @@ -903,7 +903,7 @@
     2.4      return PEP_STATUS_OK;
     2.5  }
     2.6  
     2.7 -PEP_STATUS pgp_import_key(PEP_SESSION session, const char *key_data, size_t size)
     2.8 +PEP_STATUS pgp_import_keydata(PEP_SESSION session, const char *key_data, size_t size)
     2.9  {
    2.10      gpgme_error_t gpgme_error;
    2.11      gpgme_data_t dh;
    2.12 @@ -949,7 +949,7 @@
    2.13      return PEP_STATUS_OK;
    2.14  }
    2.15  
    2.16 -PEP_STATUS pgp_export_key(
    2.17 +PEP_STATUS pgp_export_keydata(
    2.18      PEP_SESSION session, const char *fpr, char **key_data, size_t *size
    2.19      )
    2.20  {
     3.1 --- a/src/pgp_gpg.h	Wed Apr 01 17:27:46 2015 +0200
     3.2 +++ b/src/pgp_gpg.h	Fri Apr 03 15:33:10 2015 +0200
     3.3 @@ -22,7 +22,7 @@
     3.4  
     3.5  PEP_STATUS pgp_delete_keypair(PEP_SESSION session, const char *fpr);
     3.6  
     3.7 -PEP_STATUS pgp_export_key(
     3.8 +PEP_STATUS pgp_export_keydata(
     3.9          PEP_SESSION session, const char *fpr, char **key_data, size_t *size
    3.10      );
    3.11  
    3.12 @@ -40,7 +40,7 @@
    3.13          PEP_comm_type *comm_type
    3.14      );
    3.15  
    3.16 -PEP_STATUS pgp_import_key(PEP_SESSION session, const char *key_data,
    3.17 +PEP_STATUS pgp_import_keydata(PEP_SESSION session, const char *key_data,
    3.18          size_t size);
    3.19  
    3.20  PEP_STATUS pgp_recv_key(PEP_SESSION session, const char *pattern);