From 776188f249fa2360bafcc3083119efc9d82446b7 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 6 Aug 2010 21:49:52 +0300 Subject: modified: commonheaders.h modified: init.cpp deleted: lib/gpgme.exp deleted: lib/gpgme.lib renamed: lib/libgcrypt.def -> lib/libgcrypt-11.def renamed: lib/libgcrypt.exp -> lib/libgcrypt-11.exp new file: lib/libgcrypt-11.lib deleted: lib/libgcrypt.lib renamed: lib/gpgme.def -> lib/libgpgme-11.def new file: lib/libgpgme-11.exp modified: lib/libgpgme-11.lib renamed: lib/libksba.def -> lib/libksba-8.def renamed: lib/libksba.exp -> lib/libksba-8.exp new file: lib/libksba-8.lib deleted: lib/libksba.lib modified: main.cpp modified: new_gpg.rc modified: new_gpg.vcproj modified: new_gpg.vcproj.EVIL2.sss.user modified: options.cpp modified: resource.h modified: utilities.cpp modified: utilities.h --- commonheaders.h | 2 + init.cpp | 2 + lib/gpgme.def | 203 ------------------------------------ lib/gpgme.exp | Bin 21999 -> 0 bytes lib/gpgme.lib | Bin 36792 -> 0 bytes lib/libgcrypt-11.def | 237 ++++++++++++++++++++++++++++++++++++++++++ lib/libgcrypt-11.exp | Bin 0 -> 25231 bytes lib/libgcrypt-11.lib | Bin 0 -> 43498 bytes lib/libgcrypt.def | 237 ------------------------------------------ lib/libgcrypt.exp | Bin 25211 -> 0 bytes lib/libgcrypt.lib | Bin 42814 -> 0 bytes lib/libgpgme-11.def | 203 ++++++++++++++++++++++++++++++++++++ lib/libgpgme-11.exp | Bin 0 -> 22028 bytes lib/libgpgme-11.lib | Bin 1572 -> 37776 bytes lib/libksba-8.def | 178 +++++++++++++++++++++++++++++++ lib/libksba-8.exp | Bin 0 -> 20921 bytes lib/libksba-8.lib | Bin 0 -> 35626 bytes lib/libksba.def | 178 ------------------------------- lib/libksba.exp | Bin 20908 -> 0 bytes lib/libksba.lib | Bin 35314 -> 0 bytes main.cpp | 13 +++ new_gpg.rc | 20 ++++ new_gpg.vcproj | 10 +- new_gpg.vcproj.EVIL2.sss.user | 2 +- options.cpp | 61 +++++++++++ resource.h | 8 +- utilities.cpp | 25 +++++ utilities.h | 1 + 28 files changed, 757 insertions(+), 623 deletions(-) delete mode 100644 lib/gpgme.def delete mode 100644 lib/gpgme.exp delete mode 100644 lib/gpgme.lib create mode 100644 lib/libgcrypt-11.def create mode 100644 lib/libgcrypt-11.exp create mode 100644 lib/libgcrypt-11.lib delete mode 100644 lib/libgcrypt.def delete mode 100644 lib/libgcrypt.exp delete mode 100644 lib/libgcrypt.lib create mode 100644 lib/libgpgme-11.def create mode 100644 lib/libgpgme-11.exp create mode 100644 lib/libksba-8.def create mode 100644 lib/libksba-8.exp create mode 100644 lib/libksba-8.lib delete mode 100644 lib/libksba.def delete mode 100644 lib/libksba.exp delete mode 100644 lib/libksba.lib diff --git a/commonheaders.h b/commonheaders.h index ec7221b..6986e13 100644 --- a/commonheaders.h +++ b/commonheaders.h @@ -16,6 +16,7 @@ #ifndef COMMONHEADERS_H #define COMMONHEADERS_H #include +#include #define MIRANDA_VER 0x0801 @@ -25,6 +26,7 @@ #include #include "resource.h" +#include "gpgme.h" #include "constants.h" #include "utilities.h" #include "globals.h" diff --git a/init.cpp b/init.cpp index 2f03d0c..e64ce15 100644 --- a/init.cpp +++ b/init.cpp @@ -77,10 +77,12 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) } int GpgOptInit(WPARAM wParam,LPARAM lParam); +int gpg_init(); static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) { HookEvent(ME_OPT_INITIALISE, GpgOptInit); + gpg_init(); return 0; } diff --git a/lib/gpgme.def b/lib/gpgme.def deleted file mode 100644 index 1a685ff..0000000 --- a/lib/gpgme.def +++ /dev/null @@ -1,203 +0,0 @@ -; gpgme.def - List of symbols to export. -; Copyright (C) 2005 g10 Code GmbH -; -; This file is part of GPGME. -; -; GPGME is free software; you can redistribute it and/or modify -; it under the terms of the GNU Lesser general Public License as -; published by the Free Software Foundation; either version 2.1 of -; the License, or (at your option) any later version. -; -; GPGME is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Lesser General Public License for more details. -; -; You should have received a copy of the GNU Lesser General Public -; License along with this program; if not, write to the Free Software -; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - - -EXPORTS - gpgme_check_version @1 - gpgme_get_engine_info @2 - gpgme_engine_check_version @3 - - gpgme_err_code_from_errno @4 - gpgme_err_code_to_errno @5 - gpgme_err_make_from_errno @6 - gpgme_error_from_errno @7 - gpgme_strerror @8 - gpgme_strerror_r @9 - gpgme_strsource @10 - - gpgme_data_get_encoding @11 - gpgme_data_new @12 - gpgme_data_new_from_cbs @13 - gpgme_data_new_from_fd @14 - gpgme_data_new_from_file @15 - gpgme_data_new_from_filepart @16 - gpgme_data_new_from_mem @17 - gpgme_data_new_from_stream @18 - gpgme_data_read @19 - gpgme_data_release @20 - gpgme_data_release_and_get_mem @21 - gpgme_data_seek @22 - gpgme_data_set_encoding @23 - gpgme_data_write @24 - - gpgme_get_protocol_name @25 - gpgme_hash_algo_name @26 - gpgme_pubkey_algo_name @27 - - gpgme_new @28 - gpgme_get_armor @29 - gpgme_get_include_certs @30 - gpgme_get_io_cbs @31 - gpgme_get_keylist_mode @32 - gpgme_get_passphrase_cb @33 - gpgme_get_progress_cb @34 - gpgme_get_protocol @35 - gpgme_get_textmode @36 - gpgme_release @37 - gpgme_set_armor @38 - gpgme_set_include_certs @39 - gpgme_set_io_cbs @40 - gpgme_set_keylist_mode @41 - gpgme_set_locale @42 - gpgme_set_passphrase_cb @43 - gpgme_set_progress_cb @44 - gpgme_set_protocol @45 - gpgme_set_textmode @46 - gpgme_signers_add @47 - gpgme_signers_clear @48 - gpgme_signers_enum @49 - - gpgme_key_ref @50 - gpgme_key_unref @51 - gpgme_key_release @52 - - gpgme_trust_item_ref @53 - gpgme_trust_item_unref @54 - - gpgme_cancel @55 - gpgme_op_card_edit @56 - gpgme_op_card_edit_start @57 - gpgme_op_decrypt @58 - gpgme_op_decrypt_result @59 - gpgme_op_decrypt_start @60 - gpgme_op_decrypt_verify @61 - gpgme_op_decrypt_verify_start @62 - gpgme_op_delete @63 - gpgme_op_delete_start @64 - gpgme_op_edit @65 - gpgme_op_edit_start @66 - gpgme_op_encrypt @67 - gpgme_op_encrypt_result @68 - gpgme_op_encrypt_sign @69 - gpgme_op_encrypt_sign_start @70 - gpgme_op_encrypt_start @71 - gpgme_op_export @72 - gpgme_op_export_ext @73 - gpgme_op_export_ext_start @74 - gpgme_op_export_start @75 - gpgme_op_genkey @76 - gpgme_op_genkey_result @77 - gpgme_op_genkey_start @78 - gpgme_get_key @79 - gpgme_op_import @80 - gpgme_op_import_result @81 - gpgme_op_import_start @82 - gpgme_op_keylist_end @83 - gpgme_op_keylist_ext_start @84 - gpgme_op_keylist_next @85 - gpgme_op_keylist_result @86 - gpgme_op_keylist_start @87 - gpgme_op_sign @88 - gpgme_op_sign_result @89 - gpgme_op_sign_start @90 - gpgme_op_trustlist_end @91 - gpgme_op_trustlist_next @92 - gpgme_op_trustlist_start @93 - gpgme_op_verify @94 - gpgme_op_verify_result @95 - gpgme_op_verify_start @96 - gpgme_wait @97 - - gpgme_data_new_with_read_cb @98 - gpgme_data_rewind @99 - gpgme_get_sig_status @100 - gpgme_get_sig_string_attr @101 - gpgme_get_sig_ulong_attr @102 - gpgme_get_sig_key @103 - gpgme_key_get_string_attr @104 - gpgme_key_get_ulong_attr @105 - gpgme_key_sig_get_string_attr @106 - gpgme_key_sig_get_ulong_attr @107 - gpgme_op_import_ext @108 - gpgme_trust_item_get_int_attr @109 - gpgme_trust_item_get_string_attr @110 - gpgme_trust_item_release @111 - - gpgme_set_engine_info @112 - - gpgme_ctx_get_engine_info @113 - gpgme_ctx_set_engine_info @114 - - gpgme_data_set_file_name @115 - gpgme_data_get_file_name @116 - - gpgme_sig_notation_clear @117 - gpgme_sig_notation_add @118 - gpgme_sig_notation_get @119 - - gpgme_free @120 - - gpgme_get_giochannel @121 - gpgme_get_fdptr @122 - - gpgme_op_getauditlog_start @123 - gpgme_op_getauditlog @124 - - gpgme_conf_release @125 - gpgme_conf_arg_new @126 - gpgme_conf_arg_release @127 - gpgme_conf_opt_change @128 - gpgme_op_conf_load @129 - gpgme_op_conf_save @130 - - gpgme_cancel_async @131 - - gpgme_op_assuan_result @132 - gpgme_op_assuan_transact_start @133 - gpgme_op_assuan_transact @134 - - gpgme_check_version_internal @135 - - gpgme_io_read @136 - gpgme_io_write @137 - - gpgme_result_ref @138 - gpgme_result_unref @139 - - gpgme_op_import_keys @140 - gpgme_op_import_keys_start @141 - gpgme_op_export_keys @142 - gpgme_op_export_keys_start @143 - - gpgme_op_assuan_transact_ext @144 - - gpgme_wait_ext @145 - gpgme_op_vfs_mount_result @146 - gpgme_op_vfs_mount @147 - gpgme_op_vfs_create @148 - - gpgme_key_from_uid @149 - gpgme_set_sub_protocol @150 - gpgme_get_sub_protocol @151 - - gpgme_op_passwd_start @152 - gpgme_op_passwd @153 - -; END - diff --git a/lib/gpgme.exp b/lib/gpgme.exp deleted file mode 100644 index 07b103b..0000000 Binary files a/lib/gpgme.exp and /dev/null differ diff --git a/lib/gpgme.lib b/lib/gpgme.lib deleted file mode 100644 index 2f833c0..0000000 Binary files a/lib/gpgme.lib and /dev/null differ diff --git a/lib/libgcrypt-11.def b/lib/libgcrypt-11.def new file mode 100644 index 0000000..8fc4d32 --- /dev/null +++ b/lib/libgcrypt-11.def @@ -0,0 +1,237 @@ +;; libgcrypt.defs - Exported symbols for W32 +;; Copyright (C) 2003, 2007 Free Software Foundation, Inc. +;; +;; This file is part of Libgcrypt. +;; +;; Libgcrypt is free software; you can redistribute it and/or modify +;; it under the terms of the GNU Lesser General Public License as +;; published by the Free Software Foundation; either version 2.1 of +;; the License, or (at your option) any later version. +;; +;; Libgcrypt is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Lesser General Public License for more details. +;; +;; You should have received a copy of the GNU Lesser General Public +;; License along with this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +;; + +;; Note: This file should be updated manually and the ordinals shall +;; never be changed. Also check libgcrypt.vers and visibility.h. + + +EXPORTS + gcry_check_version @1 + gcry_control @2 + + gcry_malloc @3 + gcry_calloc @4 + gcry_malloc_secure @5 + gcry_calloc_secure @6 + gcry_realloc @7 + gcry_strdup @8 + gcry_xmalloc @9 + gcry_xcalloc @10 + gcry_xmalloc_secure @11 + gcry_xcalloc_secure @12 + gcry_xrealloc @13 + gcry_xstrdup @14 + gcry_is_secure @15 + gcry_free @16 + + gcry_set_progress_handler @17 + gcry_set_allocation_handler @18 + gcry_set_outofcore_handler @19 + gcry_set_fatalerror_handler @20 + gcry_set_log_handler @21 + gcry_set_gettext_handler @22 + + gcry_strerror @23 + gcry_strsource @24 + gcry_err_code_from_errno @25 + gcry_err_code_to_errno @26 + gcry_err_make_from_errno @27 + gcry_error_from_errno @28 + + gcry_sexp_new @29 + gcry_sexp_create @30 + gcry_sexp_sscan @31 + gcry_sexp_build @32 + gcry_sexp_build_array @33 + gcry_sexp_release @34 + gcry_sexp_canon_len @35 + gcry_sexp_sprint @36 + gcry_sexp_dump @37 + gcry_sexp_cons @38 + gcry_sexp_alist @39 + gcry_sexp_vlist @40 + gcry_sexp_append @41 + gcry_sexp_prepend @42 + gcry_sexp_find_token @43 + gcry_sexp_length @44 + gcry_sexp_nth @45 + gcry_sexp_car @46 + gcry_sexp_cdr @47 + gcry_sexp_cadr @48 + gcry_sexp_nth_data @49 + gcry_sexp_nth_mpi @50 + + gcry_mpi_new @51 + gcry_mpi_snew @52 + gcry_mpi_release @53 + gcry_mpi_copy @54 + gcry_mpi_set @55 + gcry_mpi_set_ui @56 + gcry_mpi_swap @57 + gcry_mpi_cmp @58 + gcry_mpi_cmp_ui @59 + gcry_mpi_scan @60 + gcry_mpi_print @61 + gcry_mpi_aprint @62 + gcry_mpi_dump @63 + gcry_mpi_add @64 + gcry_mpi_add_ui @65 + gcry_mpi_addm @66 + gcry_mpi_sub @67 + gcry_mpi_sub_ui @68 + gcry_mpi_subm @69 + gcry_mpi_mul @70 + gcry_mpi_mul_ui @71 + gcry_mpi_mulm @72 + gcry_mpi_mul_2exp @73 + gcry_mpi_div @74 + gcry_mpi_mod @75 + gcry_mpi_powm @76 + gcry_mpi_gcd @77 + gcry_mpi_invm @78 + gcry_mpi_get_nbits @79 + gcry_mpi_test_bit @80 + gcry_mpi_set_bit @81 + gcry_mpi_clear_bit @82 + gcry_mpi_set_highbit @83 + gcry_mpi_clear_highbit @84 + gcry_mpi_rshift @85 + gcry_mpi_set_opaque @86 + gcry_mpi_get_opaque @87 + gcry_mpi_set_flag @88 + gcry_mpi_clear_flag @89 + gcry_mpi_get_flag @90 + + + gcry_cipher_open @92 + gcry_cipher_close @93 + gcry_cipher_ctl @94 + gcry_cipher_info @95 + gcry_cipher_algo_info @96 + gcry_cipher_algo_name @97 + gcry_cipher_map_name @98 + gcry_cipher_mode_from_oid @99 + gcry_cipher_encrypt @100 + gcry_cipher_decrypt @101 + gcry_cipher_get_algo_keylen @102 + gcry_cipher_get_algo_blklen @103 + gcry_cipher_list @104 + + gcry_pk_encrypt @105 + gcry_pk_decrypt @106 + gcry_pk_sign @107 + gcry_pk_verify @108 + gcry_pk_testkey @109 + gcry_pk_genkey @110 + gcry_pk_ctl @111 + gcry_pk_algo_info @112 + gcry_pk_algo_name @113 + gcry_pk_map_name @114 + gcry_pk_get_nbits @115 + gcry_pk_get_keygrip @116 + gcry_pk_list @117 + + gcry_ac_data_new @118 + gcry_ac_data_destroy @119 + gcry_ac_data_set @120 + gcry_ac_data_copy @121 + gcry_ac_data_length @122 + gcry_ac_data_get_name @123 + gcry_ac_data_get_index @124 + gcry_ac_data_clear @125 + gcry_ac_open @126 + gcry_ac_close @127 + gcry_ac_key_init @128 + gcry_ac_key_pair_generate @129 + gcry_ac_key_pair_extract @130 + gcry_ac_key_data_get @131 + gcry_ac_key_test @132 + gcry_ac_key_get_nbits @133 + gcry_ac_key_get_grip @134 + gcry_ac_key_destroy @135 + gcry_ac_key_pair_destroy @136 + gcry_ac_data_encrypt @137 + gcry_ac_data_decrypt @138 + gcry_ac_data_sign @139 + gcry_ac_data_verify @140 + gcry_ac_id_to_name @141 + gcry_ac_name_to_id @142 + + gcry_md_open @143 + gcry_md_close @144 + gcry_md_enable @145 + gcry_md_copy @146 + gcry_md_reset @147 + gcry_md_ctl @148 + gcry_md_write @149 + gcry_md_read @150 + gcry_md_hash_buffer @151 + gcry_md_get_algo @152 + gcry_md_get_algo_dlen @153 + gcry_md_is_enabled @154 + gcry_md_is_secure @155 + gcry_md_info @156 + gcry_md_algo_info @157 + gcry_md_algo_name @158 + gcry_md_map_name @159 + gcry_md_setkey @160 + gcry_md_list @161 + + gcry_randomize @162 + gcry_random_add_bytes @163 + gcry_random_bytes @164 + gcry_random_bytes_secure @165 + gcry_mpi_randomize @166 + + gcry_prime_generate @167 + gcry_prime_group_generator @168 + gcry_prime_release_factors @169 + gcry_prime_check @170 + + gcry_create_nonce @171 + + gcry_md_debug @172 + + gcry_cipher_register @173 + gcry_cipher_unregister @174 + gcry_md_register @175 + gcry_md_unregister @176 + gcry_pk_register @177 + gcry_pk_unregister @178 + + gcry_ac_data_from_sexp @179 + gcry_ac_data_to_sexp @180 + gcry_ac_io_init @181 + gcry_ac_io_init_va @182 + gcry_ac_data_encrypt_scheme @183 + gcry_ac_data_decrypt_scheme @184 + gcry_ac_data_sign_scheme @185 + gcry_ac_data_verify_scheme @186 + + gcry_sexp_nth_string @187 + + gcry_cipher_setkey @188 + gcry_cipher_setiv @189 + gcry_cipher_setctr @190 + + gcry_mpi_lshift @191 + + + diff --git a/lib/libgcrypt-11.exp b/lib/libgcrypt-11.exp new file mode 100644 index 0000000..8fcfc83 Binary files /dev/null and b/lib/libgcrypt-11.exp differ diff --git a/lib/libgcrypt-11.lib b/lib/libgcrypt-11.lib new file mode 100644 index 0000000..d527033 Binary files /dev/null and b/lib/libgcrypt-11.lib differ diff --git a/lib/libgcrypt.def b/lib/libgcrypt.def deleted file mode 100644 index 8fc4d32..0000000 --- a/lib/libgcrypt.def +++ /dev/null @@ -1,237 +0,0 @@ -;; libgcrypt.defs - Exported symbols for W32 -;; Copyright (C) 2003, 2007 Free Software Foundation, Inc. -;; -;; This file is part of Libgcrypt. -;; -;; Libgcrypt is free software; you can redistribute it and/or modify -;; it under the terms of the GNU Lesser General Public License as -;; published by the Free Software Foundation; either version 2.1 of -;; the License, or (at your option) any later version. -;; -;; Libgcrypt is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU Lesser General Public License for more details. -;; -;; You should have received a copy of the GNU Lesser General Public -;; License along with this program; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -;; - -;; Note: This file should be updated manually and the ordinals shall -;; never be changed. Also check libgcrypt.vers and visibility.h. - - -EXPORTS - gcry_check_version @1 - gcry_control @2 - - gcry_malloc @3 - gcry_calloc @4 - gcry_malloc_secure @5 - gcry_calloc_secure @6 - gcry_realloc @7 - gcry_strdup @8 - gcry_xmalloc @9 - gcry_xcalloc @10 - gcry_xmalloc_secure @11 - gcry_xcalloc_secure @12 - gcry_xrealloc @13 - gcry_xstrdup @14 - gcry_is_secure @15 - gcry_free @16 - - gcry_set_progress_handler @17 - gcry_set_allocation_handler @18 - gcry_set_outofcore_handler @19 - gcry_set_fatalerror_handler @20 - gcry_set_log_handler @21 - gcry_set_gettext_handler @22 - - gcry_strerror @23 - gcry_strsource @24 - gcry_err_code_from_errno @25 - gcry_err_code_to_errno @26 - gcry_err_make_from_errno @27 - gcry_error_from_errno @28 - - gcry_sexp_new @29 - gcry_sexp_create @30 - gcry_sexp_sscan @31 - gcry_sexp_build @32 - gcry_sexp_build_array @33 - gcry_sexp_release @34 - gcry_sexp_canon_len @35 - gcry_sexp_sprint @36 - gcry_sexp_dump @37 - gcry_sexp_cons @38 - gcry_sexp_alist @39 - gcry_sexp_vlist @40 - gcry_sexp_append @41 - gcry_sexp_prepend @42 - gcry_sexp_find_token @43 - gcry_sexp_length @44 - gcry_sexp_nth @45 - gcry_sexp_car @46 - gcry_sexp_cdr @47 - gcry_sexp_cadr @48 - gcry_sexp_nth_data @49 - gcry_sexp_nth_mpi @50 - - gcry_mpi_new @51 - gcry_mpi_snew @52 - gcry_mpi_release @53 - gcry_mpi_copy @54 - gcry_mpi_set @55 - gcry_mpi_set_ui @56 - gcry_mpi_swap @57 - gcry_mpi_cmp @58 - gcry_mpi_cmp_ui @59 - gcry_mpi_scan @60 - gcry_mpi_print @61 - gcry_mpi_aprint @62 - gcry_mpi_dump @63 - gcry_mpi_add @64 - gcry_mpi_add_ui @65 - gcry_mpi_addm @66 - gcry_mpi_sub @67 - gcry_mpi_sub_ui @68 - gcry_mpi_subm @69 - gcry_mpi_mul @70 - gcry_mpi_mul_ui @71 - gcry_mpi_mulm @72 - gcry_mpi_mul_2exp @73 - gcry_mpi_div @74 - gcry_mpi_mod @75 - gcry_mpi_powm @76 - gcry_mpi_gcd @77 - gcry_mpi_invm @78 - gcry_mpi_get_nbits @79 - gcry_mpi_test_bit @80 - gcry_mpi_set_bit @81 - gcry_mpi_clear_bit @82 - gcry_mpi_set_highbit @83 - gcry_mpi_clear_highbit @84 - gcry_mpi_rshift @85 - gcry_mpi_set_opaque @86 - gcry_mpi_get_opaque @87 - gcry_mpi_set_flag @88 - gcry_mpi_clear_flag @89 - gcry_mpi_get_flag @90 - - - gcry_cipher_open @92 - gcry_cipher_close @93 - gcry_cipher_ctl @94 - gcry_cipher_info @95 - gcry_cipher_algo_info @96 - gcry_cipher_algo_name @97 - gcry_cipher_map_name @98 - gcry_cipher_mode_from_oid @99 - gcry_cipher_encrypt @100 - gcry_cipher_decrypt @101 - gcry_cipher_get_algo_keylen @102 - gcry_cipher_get_algo_blklen @103 - gcry_cipher_list @104 - - gcry_pk_encrypt @105 - gcry_pk_decrypt @106 - gcry_pk_sign @107 - gcry_pk_verify @108 - gcry_pk_testkey @109 - gcry_pk_genkey @110 - gcry_pk_ctl @111 - gcry_pk_algo_info @112 - gcry_pk_algo_name @113 - gcry_pk_map_name @114 - gcry_pk_get_nbits @115 - gcry_pk_get_keygrip @116 - gcry_pk_list @117 - - gcry_ac_data_new @118 - gcry_ac_data_destroy @119 - gcry_ac_data_set @120 - gcry_ac_data_copy @121 - gcry_ac_data_length @122 - gcry_ac_data_get_name @123 - gcry_ac_data_get_index @124 - gcry_ac_data_clear @125 - gcry_ac_open @126 - gcry_ac_close @127 - gcry_ac_key_init @128 - gcry_ac_key_pair_generate @129 - gcry_ac_key_pair_extract @130 - gcry_ac_key_data_get @131 - gcry_ac_key_test @132 - gcry_ac_key_get_nbits @133 - gcry_ac_key_get_grip @134 - gcry_ac_key_destroy @135 - gcry_ac_key_pair_destroy @136 - gcry_ac_data_encrypt @137 - gcry_ac_data_decrypt @138 - gcry_ac_data_sign @139 - gcry_ac_data_verify @140 - gcry_ac_id_to_name @141 - gcry_ac_name_to_id @142 - - gcry_md_open @143 - gcry_md_close @144 - gcry_md_enable @145 - gcry_md_copy @146 - gcry_md_reset @147 - gcry_md_ctl @148 - gcry_md_write @149 - gcry_md_read @150 - gcry_md_hash_buffer @151 - gcry_md_get_algo @152 - gcry_md_get_algo_dlen @153 - gcry_md_is_enabled @154 - gcry_md_is_secure @155 - gcry_md_info @156 - gcry_md_algo_info @157 - gcry_md_algo_name @158 - gcry_md_map_name @159 - gcry_md_setkey @160 - gcry_md_list @161 - - gcry_randomize @162 - gcry_random_add_bytes @163 - gcry_random_bytes @164 - gcry_random_bytes_secure @165 - gcry_mpi_randomize @166 - - gcry_prime_generate @167 - gcry_prime_group_generator @168 - gcry_prime_release_factors @169 - gcry_prime_check @170 - - gcry_create_nonce @171 - - gcry_md_debug @172 - - gcry_cipher_register @173 - gcry_cipher_unregister @174 - gcry_md_register @175 - gcry_md_unregister @176 - gcry_pk_register @177 - gcry_pk_unregister @178 - - gcry_ac_data_from_sexp @179 - gcry_ac_data_to_sexp @180 - gcry_ac_io_init @181 - gcry_ac_io_init_va @182 - gcry_ac_data_encrypt_scheme @183 - gcry_ac_data_decrypt_scheme @184 - gcry_ac_data_sign_scheme @185 - gcry_ac_data_verify_scheme @186 - - gcry_sexp_nth_string @187 - - gcry_cipher_setkey @188 - gcry_cipher_setiv @189 - gcry_cipher_setctr @190 - - gcry_mpi_lshift @191 - - - diff --git a/lib/libgcrypt.exp b/lib/libgcrypt.exp deleted file mode 100644 index a74710b..0000000 Binary files a/lib/libgcrypt.exp and /dev/null differ diff --git a/lib/libgcrypt.lib b/lib/libgcrypt.lib deleted file mode 100644 index 3cd34a9..0000000 Binary files a/lib/libgcrypt.lib and /dev/null differ diff --git a/lib/libgpgme-11.def b/lib/libgpgme-11.def new file mode 100644 index 0000000..1a685ff --- /dev/null +++ b/lib/libgpgme-11.def @@ -0,0 +1,203 @@ +; gpgme.def - List of symbols to export. +; Copyright (C) 2005 g10 Code GmbH +; +; This file is part of GPGME. +; +; GPGME is free software; you can redistribute it and/or modify +; it under the terms of the GNU Lesser general Public License as +; published by the Free Software Foundation; either version 2.1 of +; the License, or (at your option) any later version. +; +; GPGME is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; GNU Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this program; if not, write to the Free Software +; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + + +EXPORTS + gpgme_check_version @1 + gpgme_get_engine_info @2 + gpgme_engine_check_version @3 + + gpgme_err_code_from_errno @4 + gpgme_err_code_to_errno @5 + gpgme_err_make_from_errno @6 + gpgme_error_from_errno @7 + gpgme_strerror @8 + gpgme_strerror_r @9 + gpgme_strsource @10 + + gpgme_data_get_encoding @11 + gpgme_data_new @12 + gpgme_data_new_from_cbs @13 + gpgme_data_new_from_fd @14 + gpgme_data_new_from_file @15 + gpgme_data_new_from_filepart @16 + gpgme_data_new_from_mem @17 + gpgme_data_new_from_stream @18 + gpgme_data_read @19 + gpgme_data_release @20 + gpgme_data_release_and_get_mem @21 + gpgme_data_seek @22 + gpgme_data_set_encoding @23 + gpgme_data_write @24 + + gpgme_get_protocol_name @25 + gpgme_hash_algo_name @26 + gpgme_pubkey_algo_name @27 + + gpgme_new @28 + gpgme_get_armor @29 + gpgme_get_include_certs @30 + gpgme_get_io_cbs @31 + gpgme_get_keylist_mode @32 + gpgme_get_passphrase_cb @33 + gpgme_get_progress_cb @34 + gpgme_get_protocol @35 + gpgme_get_textmode @36 + gpgme_release @37 + gpgme_set_armor @38 + gpgme_set_include_certs @39 + gpgme_set_io_cbs @40 + gpgme_set_keylist_mode @41 + gpgme_set_locale @42 + gpgme_set_passphrase_cb @43 + gpgme_set_progress_cb @44 + gpgme_set_protocol @45 + gpgme_set_textmode @46 + gpgme_signers_add @47 + gpgme_signers_clear @48 + gpgme_signers_enum @49 + + gpgme_key_ref @50 + gpgme_key_unref @51 + gpgme_key_release @52 + + gpgme_trust_item_ref @53 + gpgme_trust_item_unref @54 + + gpgme_cancel @55 + gpgme_op_card_edit @56 + gpgme_op_card_edit_start @57 + gpgme_op_decrypt @58 + gpgme_op_decrypt_result @59 + gpgme_op_decrypt_start @60 + gpgme_op_decrypt_verify @61 + gpgme_op_decrypt_verify_start @62 + gpgme_op_delete @63 + gpgme_op_delete_start @64 + gpgme_op_edit @65 + gpgme_op_edit_start @66 + gpgme_op_encrypt @67 + gpgme_op_encrypt_result @68 + gpgme_op_encrypt_sign @69 + gpgme_op_encrypt_sign_start @70 + gpgme_op_encrypt_start @71 + gpgme_op_export @72 + gpgme_op_export_ext @73 + gpgme_op_export_ext_start @74 + gpgme_op_export_start @75 + gpgme_op_genkey @76 + gpgme_op_genkey_result @77 + gpgme_op_genkey_start @78 + gpgme_get_key @79 + gpgme_op_import @80 + gpgme_op_import_result @81 + gpgme_op_import_start @82 + gpgme_op_keylist_end @83 + gpgme_op_keylist_ext_start @84 + gpgme_op_keylist_next @85 + gpgme_op_keylist_result @86 + gpgme_op_keylist_start @87 + gpgme_op_sign @88 + gpgme_op_sign_result @89 + gpgme_op_sign_start @90 + gpgme_op_trustlist_end @91 + gpgme_op_trustlist_next @92 + gpgme_op_trustlist_start @93 + gpgme_op_verify @94 + gpgme_op_verify_result @95 + gpgme_op_verify_start @96 + gpgme_wait @97 + + gpgme_data_new_with_read_cb @98 + gpgme_data_rewind @99 + gpgme_get_sig_status @100 + gpgme_get_sig_string_attr @101 + gpgme_get_sig_ulong_attr @102 + gpgme_get_sig_key @103 + gpgme_key_get_string_attr @104 + gpgme_key_get_ulong_attr @105 + gpgme_key_sig_get_string_attr @106 + gpgme_key_sig_get_ulong_attr @107 + gpgme_op_import_ext @108 + gpgme_trust_item_get_int_attr @109 + gpgme_trust_item_get_string_attr @110 + gpgme_trust_item_release @111 + + gpgme_set_engine_info @112 + + gpgme_ctx_get_engine_info @113 + gpgme_ctx_set_engine_info @114 + + gpgme_data_set_file_name @115 + gpgme_data_get_file_name @116 + + gpgme_sig_notation_clear @117 + gpgme_sig_notation_add @118 + gpgme_sig_notation_get @119 + + gpgme_free @120 + + gpgme_get_giochannel @121 + gpgme_get_fdptr @122 + + gpgme_op_getauditlog_start @123 + gpgme_op_getauditlog @124 + + gpgme_conf_release @125 + gpgme_conf_arg_new @126 + gpgme_conf_arg_release @127 + gpgme_conf_opt_change @128 + gpgme_op_conf_load @129 + gpgme_op_conf_save @130 + + gpgme_cancel_async @131 + + gpgme_op_assuan_result @132 + gpgme_op_assuan_transact_start @133 + gpgme_op_assuan_transact @134 + + gpgme_check_version_internal @135 + + gpgme_io_read @136 + gpgme_io_write @137 + + gpgme_result_ref @138 + gpgme_result_unref @139 + + gpgme_op_import_keys @140 + gpgme_op_import_keys_start @141 + gpgme_op_export_keys @142 + gpgme_op_export_keys_start @143 + + gpgme_op_assuan_transact_ext @144 + + gpgme_wait_ext @145 + gpgme_op_vfs_mount_result @146 + gpgme_op_vfs_mount @147 + gpgme_op_vfs_create @148 + + gpgme_key_from_uid @149 + gpgme_set_sub_protocol @150 + gpgme_get_sub_protocol @151 + + gpgme_op_passwd_start @152 + gpgme_op_passwd @153 + +; END + diff --git a/lib/libgpgme-11.exp b/lib/libgpgme-11.exp new file mode 100644 index 0000000..0ed3fd2 Binary files /dev/null and b/lib/libgpgme-11.exp differ diff --git a/lib/libgpgme-11.lib b/lib/libgpgme-11.lib index 8ec4a86..cfd1c15 100644 Binary files a/lib/libgpgme-11.lib and b/lib/libgpgme-11.lib differ diff --git a/lib/libksba-8.def b/lib/libksba-8.def new file mode 100644 index 0000000..5cb20f3 --- /dev/null +++ b/lib/libksba-8.def @@ -0,0 +1,178 @@ +;; libksba.def - Exported symbols for W32 +;; Copyright (C) 2007 g10 Code GmbH +;; +;; This file is part of KSBA. +;; +;; KSBA is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. +;; +;; KSBA is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, see . + + +EXPORTS + ksba_check_version @1 + + ksba_set_hash_buffer_function @2 + ksba_set_malloc_hooks @3 + ksba_free @4 + ksba_malloc @5 + ksba_calloc @6 + ksba_realloc @7 + ksba_strdup @8 + + ksba_asn_create_tree @9 + ksba_asn_delete_structure @10 + ksba_asn_parse_file @11 + ksba_asn_tree_dump @12 + ksba_asn_tree_release @13 + + ksba_cert_get_auth_key_id @14 + ksba_cert_get_cert_policies @15 + ksba_cert_get_crl_dist_point @16 + ksba_cert_get_digest_algo @17 + ksba_cert_get_ext_key_usages @18 + ksba_cert_get_extension @19 + ksba_cert_get_image @20 + ksba_cert_get_issuer @21 + ksba_cert_get_key_usage @22 + ksba_cert_get_public_key @23 + ksba_cert_get_serial @24 + ksba_cert_get_sig_val @25 + ksba_cert_get_subject @26 + ksba_cert_get_validity @27 + ksba_cert_hash @28 + ksba_cert_init_from_mem @29 + ksba_cert_is_ca @30 + ksba_cert_new @31 + ksba_cert_read_der @32 + ksba_cert_ref @33 + ksba_cert_release @34 + ksba_cert_get_authority_info_access @35 + ksba_cert_get_subject_info_access @36 + ksba_cert_get_subj_key_id @37 + ksba_cert_set_user_data @38 + ksba_cert_get_user_data @39 + + ksba_certreq_add_subject @40 + ksba_certreq_build @41 + ksba_certreq_new @42 + ksba_certreq_release @43 + ksba_certreq_set_hash_function @44 + ksba_certreq_set_public_key @45 + ksba_certreq_set_sig_val @46 + ksba_certreq_set_writer @47 + ksba_certreq_add_extension @48 + + ksba_cms_add_cert @49 + ksba_cms_add_digest_algo @50 + ksba_cms_add_recipient @51 + ksba_cms_add_signer @52 + ksba_cms_build @53 + ksba_cms_get_cert @54 + ksba_cms_get_content_enc_iv @55 + ksba_cms_get_content_oid @56 + ksba_cms_get_content_type @57 + ksba_cms_get_digest_algo @58 + ksba_cms_get_digest_algo_list @59 + ksba_cms_get_enc_val @60 + ksba_cms_get_issuer_serial @61 + ksba_cms_get_message_digest @62 + ksba_cms_get_sig_val @63 + ksba_cms_get_sigattr_oids @64 + ksba_cms_get_signing_time @65 + ksba_cms_hash_signed_attrs @66 + ksba_cms_identify @67 + ksba_cms_new @68 + ksba_cms_parse @69 + ksba_cms_release @70 + ksba_cms_set_content_enc_algo @71 + ksba_cms_set_content_type @72 + ksba_cms_set_enc_val @73 + ksba_cms_set_hash_function @74 + ksba_cms_set_message_digest @75 + ksba_cms_set_reader_writer @76 + ksba_cms_set_sig_val @77 + ksba_cms_set_signing_time @78 + ksba_cms_add_smime_capability @79 + + ksba_crl_get_digest_algo @80 + ksba_crl_get_issuer @81 + ksba_crl_get_item @82 + ksba_crl_get_sig_val @83 + ksba_crl_get_update_times @84 + ksba_crl_new @85 + ksba_crl_parse @86 + ksba_crl_release @87 + ksba_crl_set_hash_function @88 + ksba_crl_set_reader @89 + ksba_crl_get_extension @90 + ksba_crl_get_auth_key_id @91 + ksba_crl_get_crl_number @92 + + ksba_name_enum @93 + ksba_name_get_uri @94 + ksba_name_new @95 + ksba_name_ref @96 + ksba_name_release @97 + + ksba_ocsp_add_cert @98 + ksba_ocsp_add_target @99 + ksba_ocsp_build_request @100 + ksba_ocsp_get_cert @101 + ksba_ocsp_get_digest_algo @102 + ksba_ocsp_get_responder_id @103 + ksba_ocsp_get_sig_val @104 + ksba_ocsp_get_status @105 + ksba_ocsp_hash_request @106 + ksba_ocsp_hash_response @107 + ksba_ocsp_new @108 + ksba_ocsp_parse_response @109 + ksba_ocsp_prepare_request @110 + ksba_ocsp_release @111 + ksba_ocsp_set_digest_algo @112 + ksba_ocsp_set_nonce @113 + ksba_ocsp_set_requestor @114 + ksba_ocsp_set_sig_val @115 + ksba_ocsp_get_extension @116 + + ksba_oid_from_str @117 + ksba_oid_to_str @118 + + ksba_dn_der2str @119 + ksba_dn_str2der @120 + ksba_dn_teststr @121 + + ksba_reader_clear @122 + ksba_reader_error @123 + ksba_reader_new @124 + ksba_reader_read @125 + ksba_reader_release @126 + ksba_reader_set_cb @127 + ksba_reader_set_fd @128 + ksba_reader_set_file @129 + ksba_reader_set_mem @130 + ksba_reader_tell @131 + ksba_reader_unread @132 + + ksba_writer_error @133 + ksba_writer_get_mem @134 + ksba_writer_new @135 + ksba_writer_release @136 + ksba_writer_set_cb @137 + ksba_writer_set_fd @138 + ksba_writer_set_file @139 + ksba_writer_set_filter @140 + ksba_writer_set_mem @141 + ksba_writer_snatch_mem @142 + ksba_writer_tell @143 + ksba_writer_write @144 + ksba_writer_write_octet_string @145 + diff --git a/lib/libksba-8.exp b/lib/libksba-8.exp new file mode 100644 index 0000000..b1e2925 Binary files /dev/null and b/lib/libksba-8.exp differ diff --git a/lib/libksba-8.lib b/lib/libksba-8.lib new file mode 100644 index 0000000..f9a74a5 Binary files /dev/null and b/lib/libksba-8.lib differ diff --git a/lib/libksba.def b/lib/libksba.def deleted file mode 100644 index 5cb20f3..0000000 --- a/lib/libksba.def +++ /dev/null @@ -1,178 +0,0 @@ -;; libksba.def - Exported symbols for W32 -;; Copyright (C) 2007 g10 Code GmbH -;; -;; This file is part of KSBA. -;; -;; KSBA is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3 of the License, or -;; (at your option) any later version. -;; -;; KSBA is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, see . - - -EXPORTS - ksba_check_version @1 - - ksba_set_hash_buffer_function @2 - ksba_set_malloc_hooks @3 - ksba_free @4 - ksba_malloc @5 - ksba_calloc @6 - ksba_realloc @7 - ksba_strdup @8 - - ksba_asn_create_tree @9 - ksba_asn_delete_structure @10 - ksba_asn_parse_file @11 - ksba_asn_tree_dump @12 - ksba_asn_tree_release @13 - - ksba_cert_get_auth_key_id @14 - ksba_cert_get_cert_policies @15 - ksba_cert_get_crl_dist_point @16 - ksba_cert_get_digest_algo @17 - ksba_cert_get_ext_key_usages @18 - ksba_cert_get_extension @19 - ksba_cert_get_image @20 - ksba_cert_get_issuer @21 - ksba_cert_get_key_usage @22 - ksba_cert_get_public_key @23 - ksba_cert_get_serial @24 - ksba_cert_get_sig_val @25 - ksba_cert_get_subject @26 - ksba_cert_get_validity @27 - ksba_cert_hash @28 - ksba_cert_init_from_mem @29 - ksba_cert_is_ca @30 - ksba_cert_new @31 - ksba_cert_read_der @32 - ksba_cert_ref @33 - ksba_cert_release @34 - ksba_cert_get_authority_info_access @35 - ksba_cert_get_subject_info_access @36 - ksba_cert_get_subj_key_id @37 - ksba_cert_set_user_data @38 - ksba_cert_get_user_data @39 - - ksba_certreq_add_subject @40 - ksba_certreq_build @41 - ksba_certreq_new @42 - ksba_certreq_release @43 - ksba_certreq_set_hash_function @44 - ksba_certreq_set_public_key @45 - ksba_certreq_set_sig_val @46 - ksba_certreq_set_writer @47 - ksba_certreq_add_extension @48 - - ksba_cms_add_cert @49 - ksba_cms_add_digest_algo @50 - ksba_cms_add_recipient @51 - ksba_cms_add_signer @52 - ksba_cms_build @53 - ksba_cms_get_cert @54 - ksba_cms_get_content_enc_iv @55 - ksba_cms_get_content_oid @56 - ksba_cms_get_content_type @57 - ksba_cms_get_digest_algo @58 - ksba_cms_get_digest_algo_list @59 - ksba_cms_get_enc_val @60 - ksba_cms_get_issuer_serial @61 - ksba_cms_get_message_digest @62 - ksba_cms_get_sig_val @63 - ksba_cms_get_sigattr_oids @64 - ksba_cms_get_signing_time @65 - ksba_cms_hash_signed_attrs @66 - ksba_cms_identify @67 - ksba_cms_new @68 - ksba_cms_parse @69 - ksba_cms_release @70 - ksba_cms_set_content_enc_algo @71 - ksba_cms_set_content_type @72 - ksba_cms_set_enc_val @73 - ksba_cms_set_hash_function @74 - ksba_cms_set_message_digest @75 - ksba_cms_set_reader_writer @76 - ksba_cms_set_sig_val @77 - ksba_cms_set_signing_time @78 - ksba_cms_add_smime_capability @79 - - ksba_crl_get_digest_algo @80 - ksba_crl_get_issuer @81 - ksba_crl_get_item @82 - ksba_crl_get_sig_val @83 - ksba_crl_get_update_times @84 - ksba_crl_new @85 - ksba_crl_parse @86 - ksba_crl_release @87 - ksba_crl_set_hash_function @88 - ksba_crl_set_reader @89 - ksba_crl_get_extension @90 - ksba_crl_get_auth_key_id @91 - ksba_crl_get_crl_number @92 - - ksba_name_enum @93 - ksba_name_get_uri @94 - ksba_name_new @95 - ksba_name_ref @96 - ksba_name_release @97 - - ksba_ocsp_add_cert @98 - ksba_ocsp_add_target @99 - ksba_ocsp_build_request @100 - ksba_ocsp_get_cert @101 - ksba_ocsp_get_digest_algo @102 - ksba_ocsp_get_responder_id @103 - ksba_ocsp_get_sig_val @104 - ksba_ocsp_get_status @105 - ksba_ocsp_hash_request @106 - ksba_ocsp_hash_response @107 - ksba_ocsp_new @108 - ksba_ocsp_parse_response @109 - ksba_ocsp_prepare_request @110 - ksba_ocsp_release @111 - ksba_ocsp_set_digest_algo @112 - ksba_ocsp_set_nonce @113 - ksba_ocsp_set_requestor @114 - ksba_ocsp_set_sig_val @115 - ksba_ocsp_get_extension @116 - - ksba_oid_from_str @117 - ksba_oid_to_str @118 - - ksba_dn_der2str @119 - ksba_dn_str2der @120 - ksba_dn_teststr @121 - - ksba_reader_clear @122 - ksba_reader_error @123 - ksba_reader_new @124 - ksba_reader_read @125 - ksba_reader_release @126 - ksba_reader_set_cb @127 - ksba_reader_set_fd @128 - ksba_reader_set_file @129 - ksba_reader_set_mem @130 - ksba_reader_tell @131 - ksba_reader_unread @132 - - ksba_writer_error @133 - ksba_writer_get_mem @134 - ksba_writer_new @135 - ksba_writer_release @136 - ksba_writer_set_cb @137 - ksba_writer_set_fd @138 - ksba_writer_set_file @139 - ksba_writer_set_filter @140 - ksba_writer_set_mem @141 - ksba_writer_snatch_mem @142 - ksba_writer_tell @143 - ksba_writer_write @144 - ksba_writer_write_octet_string @145 - diff --git a/lib/libksba.exp b/lib/libksba.exp deleted file mode 100644 index bb332a6..0000000 Binary files a/lib/libksba.exp and /dev/null differ diff --git a/lib/libksba.lib b/lib/libksba.lib deleted file mode 100644 index f1eedca..0000000 Binary files a/lib/libksba.lib and /dev/null differ diff --git a/main.cpp b/main.cpp index 986f3ae..63735bf 100644 --- a/main.cpp +++ b/main.cpp @@ -19,3 +19,16 @@ #include "commonheaders.h" +int gpg_init() +{ + setlocale (LC_ALL, ""); + gpgme_check_version (NULL); + gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); +#ifdef LC_MESSAGES + gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL)); +#endif + gpgme_protocol_t proto = GPGME_PROTOCOL_UNKNOWN; + gpgme_ctx_t ctx; + gpgme_new(&ctx); + return 0; +} diff --git a/new_gpg.rc b/new_gpg.rc index 38aeab6..989b5eb 100644 --- a/new_gpg.rc +++ b/new_gpg.rc @@ -70,6 +70,18 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN END +IDD_OPT_GPG_BIN DIALOGEX 0, 0, 268, 214 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + PUSHBUTTON "Browse",IDC_SET_BIN_PATH,116,18,38,14 + PUSHBUTTON "Browse",IDC_SET_HOME_DIR,116,44,38,14 + EDITTEXT IDC_BIN_PATH,7,17,95,14,ES_AUTOHSCROLL + EDITTEXT IDC_HOME_DIR,7,44,95,14,ES_AUTOHSCROLL + LTEXT "GnuPG2 binary:",IDC_STATIC,10,7,147,8 + LTEXT "Home directory:",IDC_STATIC,9,34,144,8 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -86,6 +98,14 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 207 END + + IDD_OPT_GPG_BIN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 261 + TOPMARGIN, 7 + BOTTOMMARGIN, 207 + END END #endif // APSTUDIO_INVOKED diff --git a/new_gpg.vcproj b/new_gpg.vcproj index dbaf111..740f92f 100644 --- a/new_gpg.vcproj +++ b/new_gpg.vcproj @@ -53,7 +53,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories=""X:\install\git\miranda\miranda-im\miranda\include";../../include" + AdditionalIncludeDirectories="X:\install\git\miranda\mim_plugs;"X:\install\git\miranda\miranda-im\miranda\include";../../include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE" StringPooling="true" RuntimeLibrary="2" @@ -80,8 +80,10 @@ /> code) + { + + case PSN_APPLY: + { + TCHAR tmp[512]; + GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512); + DBWriteContactSettingTString(NULL, szModuleName, "szGpgBinPath", tmp); + return TRUE; + } + } + } + break; + } + + return FALSE; +} diff --git a/resource.h b/resource.h index 89d6198..ac3997d 100644 --- a/resource.h +++ b/resource.h @@ -3,6 +3,12 @@ // Used by new_gpg.rc // #define IDD_OPT_GPG 104 +#define IDD_OPT_GPG_BIN 105 +#define IDC_SET_BIN_PATH 1016 +#define IDC_BUTTON2 1017 +#define IDC_SET_HOME_DIR 1017 +#define IDC_BIN_PATH 1018 +#define IDC_HOME_DIR 1019 // Next default values for new objects // @@ -10,7 +16,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1016 +#define _APS_NEXT_CONTROL_VALUE 1020 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/utilities.cpp b/utilities.cpp index 5b4ac3a..f8ea696 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -76,3 +76,28 @@ char *date() d[9]=tmp[5]; return d; } + +void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc) +{ + TCHAR str[MAX_PATH+2] = {0}; + OPENFILENAME ofn={0}; + TCHAR filter[512], *pfilter; + ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName); + ofn.Flags=OFN_EXPLORER; + ofn.lpstrTitle=TranslateW(WindowTittle); + _tcscpy(filter,TranslateW(szExtDesc)); + pfilter=filter+_tcslen(filter)+1; + _tcscpy(pfilter, szExt); + pfilter[_tcslen(pfilter)+1] = '\0'; + pfilter[_tcslen(pfilter)+2] = '\0'; + ofn.lpstrFilter=filter; + _tcscpy(str, UniGetContactSettingUtf(0, szModuleName, szSetting, _T(""))); + if(_tcslen(str)< 2) + str[0] = '\0'; + ofn.lpstrFile=str; + ofn.nMaxFile=_MAX_PATH; + ofn.nMaxFileTitle=MAX_PATH; + if(!GetOpenFileName(&ofn)) + return; + DBWriteContactSettingTString(0, szModuleName, szSetting, str); +} diff --git a/utilities.h b/utilities.h index 923803f..e3622dd 100644 --- a/utilities.h +++ b/utilities.h @@ -17,5 +17,6 @@ #ifndef UTILITIES_H #define UTILITIES_H TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef); +void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc); #endif -- cgit v1.2.3