2001-12-19  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/Makefile.am (EXTRA_DIST): Add $(key_id).

New item about make clean.

Change history.

2001-12-18  Marcus Brinkmann  <marcus@g10code.de>

* autogen.sh (libtool_vers): Bump to 1.4.

* configure.ac (LIBGPGME_LT_CURRENT): Increment.
(LIBGPGME_LT_AGE): Likewise.
Improve comment.
Fix wrong comment character.

2001-12-18  Marcus Brinkmann  <marcus@g10code.de>

* keylist.c (gpgme_op_keylist_end): New function.
* gpgme.h (gpgme_op_keylist_end): New prototype.

* engine.h (gpgme_engine_check_version): Move prototype to ...
* gpgme.h (gpgme_engine_check_version): ... here.

* genkey.c (gpgme_op_genkey_start): Remove unused variable.

More about the new version.

2001-12-18  Marcus Brinkmann  <marcus@g10code.de>

* version.c (gpgme_get_engine_info): Reimplemented.
(gpgme_check_engine): Reimplemented.
(_gpgme_compare_versions): Return NULL if MY_VERSION is NULL.

* engine.c: Include `io.h'.
(gpgme_engine_get_info): New function.
* engine.h (gpgme_engine_check_version, _gpgme_engine_get_info):
Add prototype.

corrected specification of Aegypten test key in encrypt() function

2001-12-18  Marcus Brinkmann  <marcus@g10code.de>

* rungpg.c (struct reap_s, reap_list, reap_list_lock): Moved to ...
* engine.c (struct reap_s, reap_list, reap_list_lock): ... here.
Include `time.h', `sys/types.h', `assert.h', and `sema.h'.

* rungpg.c (_gpgme_engine_add_child_to_reap_list): New function.
(do_reaping, _gpgme_gpg_housecleaning): Moved to ...
* engine.c (do_reaping, _gpgme_engine_housecleaning): ... here.
* rungpg.c (_gpgme_gpg_release): Replace code that is now in its
own function by call to _gpgme_engine_add_child_to_reap_list().

* wait.c: Include `engine.h'.
(run_idle): Call _gpgme_engine_housecleaning(), not
_gpgme_gpg_housecleaning().

added debug message to encrypt() function

2001-12-18  Marcus Brinkmann  <marcus@g10code.de>

* key.c (_gpgme_key_append_name): Append, not prepend, the uid.
Initialize the next field of the uid structure.
(gpgme_key_get_as_xml): Do not list last uid first.

* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Fixed for new automake.

2001-12-17  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_set_colon_line_handler): New
function [!ENABLE_GPGSM].

2001-12-16  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/Makefile: Rename `pubcerts.kbx' to `pubring.kbx'.

2001-12-15  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/t-keylist.c (check_two_contexts): Set protocols.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_op_verify): Put TEXT into
message_data, not SIG.
(_gpgme_gpgsm_op_sign): Use `--detached', not `--detach'.

* sign.c (sign_status_handler): Call
_gpgme_passphrase_status_handler early.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

Small code cleanup.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_op_verify): Put TEXT into
message_data, not SIG.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/t-sign.c: New file.
* gpgsm/Makefile.am (TESTS): Add t-sign.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c: Revert last change.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/t-decrypt.c: New file.
* gpgsm/567064FE6D14A17B2D811ABB407728BC558AA455: Likewise.
* gpgsm/Makefile.am (TESTS): Add t-decrypt.
(key_id): New variable.
(all-local): New target ./private-keys-v1.d/$(key_id) added.
(./private-keys-v1.d/$(key_id)): New target.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/t-verify.c: New file.
* gpgsm/Makefile.am (TESTS): Add t-verify.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* configure.ac (GPG): Substitute this variable.
(GPGSM): Likewise.

tests/
CVS2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* gpg/Makefile.am (GPG): Set to @GPG_PATH@.
(./pubring.gpg): Use $(GPG) instead gpg.
(./secring.gpg): Likewise.

* gpgsm/t-import.c (main): Remove third test case.
* gpgsm/Makefile.am (GPGSM): Set to @GPGSM@.
(all-local): New target.
(./pubcerts.kbx): Likewise.
* gpgsm/t-encrypt.c: New file.
* gpgsm/Makefile.am (TESTS): Add t-encrypt.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (gpgsm_status_handler): Freeze the output file
handler when ending this operation, otherwise the wait function
will sit on it.

Add items about all the new software included.

Change history, doubleplusgood.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* assuan-buffer.c (_assuan_read_line): New variable ATTICLEN, use
it to save the number of bytes left over after the complete line.
Rediddle the code a bit to make it more clear what happens.

gpgme/
2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (struct gpgsm_object_s): New member colon.attic.
(_gpgme_gpgsm_new): Initialize some more members.
(_gpgme_gpgsm_release): Free the colon line handler's attic line.
(gpgsm_status_handler): Rework the inline-data processing.

tests/
2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/t-keylist.c: New file.
* gpgsm/Makefile.am (TESTS): Add t-keylist.

Revert last change.

2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

* assuan-defs.h (LINELENGTH): Define as ASSUAN_LINELENGTH.
assuan.h: Define ASSUAN_LINELENGTH.

2001-12-13  Marcus Brinkmann  <marcus@g10code.de>

* rungpg.c (_gpgme_gpg_spawn): Do not add the fds to the child
list that are not dup'ed, for those the close-on-exec flag is set
now.
* version.c (_gpgme_get_program_version): Remove first entry in
CFD, as the close-on-exec flag is now set for this fd.

2001-12-13  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_op_encrypt): Do not add `armor'
option to `ENCRYPT'.
* engine-gpgsm.c (gpgsm_set_recipients): Free LINE when returning
successfully.

2001-12-13  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (close_notify_handler): New function.
(_gpgme_gpgsm_new): Manage the file descriptors a
bit differently.  Do not set close-on-exec flags.
(_gpgme_gpgsm_op_decrypt): Do not set message_fd
to -1, this is done by the close handler.
(_gpgme_gpgsm_op_encrypt): Likewise.
(_gpgme_gpgsm_op_import): Likewise (also for output_fd).
(_gpgme_gpgsm_op_keylist): Likewise (also for input_fd and output_fd).
(_gpgme_gpgsm_op_sign): Likewise.
(_gpgme_gpgsm_op_verify): Likewise, but for output_fd.

* posix-io.c (_gpgme_io_pipe): Set the close-on-exec flag for the
non-inherited file descriptor index of the pipe.

2001-12-13  Marcus Brinkmann  <marcus@g10code.de>

* gpgsm/cert_dfn_pca01.der: New file.
* gpgsm/cert_dfn_pca15.der: Likewise.
* gpgsm/cert_g10code_test1.der: Likewise.
* gpgsm/t-import.c: Likewise.
* gpgsm/Makefile.am (EXTRADIST): Add new files.
(TESTS): Add t-import.

2001-12-13  Marcus Brinkmann  <marcus@gnu.org>

* assuan-connect.c (assuan_pipe_connect): Remove code that closes
all the little file descriptors we set up.

2001-12-13  Marcus Brinkmann  <marcus@gnu.org>

* assuan-buffer.c (assuan_read_line): Fix order of execution to
get correct return values.

* engine-gpgsm.c (_gpgme_gpgsm_set_colon_line_handler): New.
(gpgsm_status_handler): Pass datalines to a colon handler
* engine.c (_gpgme_engine_set_colon_line_handler): Set the colon
handler for gpgsm.

* engine-gpgsm.c (_gpgme_gpgsm_op_keylist): Allow NULL for
pattern.
(gpgsm_assuan_simple_command): Removed underscore from
assuan_write_line.
(_gpgme_gpgsm_start): Ditto.
(gpgsm_assuan_simple_command): Replaced interal Assuan read
function by the new assuan_read_line.  Removed the use of the
internal header.
(gpgsm_status_handler): Ditto. Use the new assuan_pending_line.
(_gpgme_gpgsm_start): Use the documented way to get an fd from
assuan.

* assuan-handler.c (assuan_get_active_fds): Fixed silly bug,
pretty obvious that nobody ever tested this function.

improce memory handling

.cvsigore updated - I still not tyhing they should go innto the cvs

Set protocol to CMS to test gpgsm

* engine-gpgsm.c (_gpgme_gpgsm_op_keylist): Allow NULL for
pattern.
(gpgsm_assuan_simple_command): Removed underscore from
assuan_write_line.
(_gpgme_gpgsm_start): Ditto.
* keylist.c (keylist_colon_handler): Handle "crt" records
* key.h (gpgme_key_s): Add an x509 flag.
* key.c (parse_x509_user_id): New.
(_gpgme_key_append_name): Handle x.509 names.

However, it does not yet work.

Updated Assuan to the current version

*** empty log message ***

Corrected (for a second time) code status error from previous wrong CVS comits

Corrected code status error from previous wrong CVS comits

2001-12-05  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (gpgsm_status_handler): Make it work with current
version of assuan.

2001-12-05  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (gpgsm_set_fd): Accept one more argument OPT.
(_gpgme_gpgsm_op_encrypt): Pass armor argument to gpgsm_set_fd for
output descriptor.
(_gpgme_gpgsm_op_sign): Likewise.

Add .cvsignore files.  Suggested by Jan-Oliver Wagner <jan@intevation.de>.

2001-12-05  Marcus Brinkmann  <marcus@g10code.de>

* keylist.c (gpgme_op_keylist_next): Set pending to 0 if EOF
occurs.

2001-11-29  Marcus Brinkmann  <marcus@g10code.de>

* gpgmeplug.c (checkMessageSignature): Add call to gpgme_set_protocol.

added error detection to signing and encrypting methodes: this has to be improved furtheron

Check for out-of-memory in signature verification

enabled fetching meta data after checking of signature(s)

2001-11-26  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Fix stupid typo.
2001-11-23  Marcus Brinkmann  <marcus@g10code.de>

Filling the SignatureMetaData struct (the crucial code is #ifdef'd out for safety's sake)
Changes to SignatureMetaData
Added SignatureMetaDataExtendedInfo

changed specification of SignatureMetaData struct

[Kalle] signature verification and decoding of encrypted mails

Now gpgmeplug.c can also create encrypted and signed+encrypted S/MIME mails.

adjusted 'encryptMessage' parameters: now also the addressee is given

Guess what.

Updated from canonical source location in GnuPG.

2001-11-24  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (gpgsm_status_handler): Don't break if bsearch fails.
Deal with assuan read line returning more than one line (for now).

2001-11-24  Marcus Brinkmann  <marcus@g10code.de>

* Makefile.am (libgpgsmplug_la_SOURCES): Fix source file.

signing now returns only the SIGNATURE - not the original text - since building of the S/MIME object is done in the calling program (the MUA...)

2001-11-23  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Implement it according to
the current protocol definition.

signing of mail bodies is working now - buuuuut: I changed the behaviour of the 'signMessage()' function, it now returns *only* the signature part (with a trailing zero).  This is neccessary to avoid confugion at the KMail side: otherwise KMail might try to convert the whole MIME block into quoted printable - of course this is only allowed for the body part but not for the signature part.

Explain more of the build system.

2001-11-23  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for parent
ends of the pipe.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c: Include stdlib.h and string.h.  Also include,
for now, rungpg.h and status-table.h.
(gpgsm_status_handler): Implement more of the status handler.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* engine.c (_gpgme_engine_op_decrypt): Implement CMS case.
(_gpgme_engine_op_delete): Likewise.
(_gpgme_engine_op_encrypt): Likewise.
(_gpgme_engine_op_export): Likewise.
(_gpgme_engine_op_genkey): Likewise.
(_gpgme_engine_op_keylist): Likewise.
(_gpgme_engine_op_sign): Likewise.
(_gpgme_engine_op_trustlist): Likewise.

* engine-gpgsm.c (_gpgme_gpgsm_op_encrypt): New function.
(gpgsm_assuan_simple_command): Likewise.
(gpgsm_set_recipients): Likewise.
(gpgsm_set_fd): Reimplement using gpgsm_assuan_simple_command.
(_gpgme_gpgsm_op_delete): New function.
(_gpgme_gpgsm_op_export): Likewise.
(_gpgme_gpgsm_op_genkey): Likewise.
(_gpgme_gpgsm_op_sign): Likewise.
(_gpgme_gpgsm_op_keylist): Likewise.
(_gpgme_gpgsm_op_trustlist): Likewise.
(_gpgme_gpgsm_release): Release command.
(_gpgme_gpgsm_op_decrypt): Allocate command.
(_gpgme_gpgsm_op_import): Likewise.
(gpgsm_status_handler): Also treat `ERR' strings as EOF.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* gpgme.h (gpgme_set_protocol): New prototype.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* Makefile.am (libgpgsmplug_la_LIBADD): New variable.
(libgpgsmplug_la_LDFLAGS): Likewise.
(libgpgsmplug_la_SOURCES): Likewise.
(lib_LTLIBRARIES): Add libgpgsmplug.la.
(INCLUDES): Include the local gpgme.h.

* gpgmeplug.c (signMessage): Set protocol.
(GPGMEPLUG_PROTOCOL) [!GPGMEPLUG_PROTOCOL]: Set
GPGMEPLUG_PROTOCOL.
* gpgsmplug.c: New file.

removed stupid C bug (malloc of strlen(..) instead of 1+strlen)

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* engine-gpgsm.c (_gpgme_gpgsm_op_decrypt): New function.
(_gpgme_gpgsm_op_import): Likewise.

2001-11-22  Marcus Brinkmann  <marcus@gnu.org>

* engine-gpgsm.c: Shuffle around header inclusion a bit, to still
keep them seperate.
(_gpgme_set_status_handler) [!ENABLE_GPGSM]: New function.

* engine-gpgsm.c: Include more headers so that NULL and mk_error
is defined even with an undefined GPGSM_PATH.

Now send the signature back to the calling function (instead of just printing it to stdout)

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* rungpg.c (gpg_inbound_handler, write_mem_data, write_cb_data,
gpg_outbound_handler): Moved to ...
* data.c (_gpgme_data_inbound_handler, write_mem_data,
write_cb_data, _gpgme_data_outbound_handler): ... here.  Make the
_gpgme_* ones non-static.
* data.c: Include io.h.

* ops.h (_gpgme_data_inbound_handler): New prototype.
(_gpgme_data_outbound_handler): Likewise.
(_gpgme_gpg_spawn): Use these new functions.

* engine-gpgsm.h (_gpgme_gpgsm_op_decrypt, _gpgme_gpgsm_op_delete,
_gpgme_gpgsm_op_encrypt, _gpgme_gpgsm_op_export,
_gpgme_gpgsm_op_genkey, _gpgme_gpgsm_op_import,
_gpgme_gpgsm_op_keylist, _gpgme_gpgsm_op_sign,
_gpgme_gpgsm_op_trustlist, _gpgme_gpgsm_op_verify,
_gpgme_gpgsm_start, _gpgme_gpgsm_set_status_handler): New prototype.
Include <rungpg.h> for status handler function.

* engine-gpgsm.c (struct gpgsm_object_s): New members input_fd,
input_data, output_fd, output_data, message_fd, message_data, command
and status.
(_gpgme_gpgsm_new): Open input, output and message pipes before
connecting to the client.  Close server's ends afterwards.
(_gpgme_gpgsm_release): Close open file descriptors.  Remove
server process from wait queue.
(_gpgme_gpgsm_op_verify, _gpgme_gpgsm_start,
_gpgme_gpgsm_set_status_handler, gpgms_status_handler): New function.

* engine.c (_gpgme_engine_start): Implement for GPGME_PROTOCOL_CMS.
(_gpgme_engine_set_status_handler): Likewise.
(_gpgme_engine_op_verify): Likewise.

* assuan-connect.c (assuan_get_pid): New function.
* assuan.h: Prototype.  Include sys/types.h for pid_t,
and stdio.h for FILE *.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* configure.ac (AC_CONFIG_FILES): Add tests/gpg/Makefile and
tests/gpgsm/Makefile.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

* gpg/: New directory.
* Makefile.am, t-verify.c, t-encrypt.c, t-signers.c, t-trustlist.c,
t-sign.c, t-keylist.c, t-import.c, t-genkey.c, t-export.c,
t-decrypt-verify.c, t-decrypt.c, t-version.c, t-data.c, mkdemodirs.
cipher-1.asc, cipher-2.asc, geheim.txt, pubdemo.asc, pubkey-1.asc,
secdemo.asc, seckey-1.asc): Move to sub directory gpg/.

* gpg/Makefile.am (INCLUDES): Include gpgme/, not include/ and
intl/.
(LDD): Correct relative path to gpgme library.
(TESTS): Remove t-version and t-data.
* gpg/t-verify.c, gpg/t-encrypt.c, gpg/t-signers.c, gpg/t-trustlist.c,
gpg/t-sign.c, gpg/t-keylist.c, gpg/t-import.c, gpg/t-genkey.c,
gpg/t-export.c, gpg/t-decrypt-verify.c, gpg/t-decrypt.c,
t-version.c, t-data.c): Include gpgme.h, not "../gpgme/gpgme.h".

* Makefile.am: New file.
* gpgsm/: New directory.
* gpgsm/Makefile.am: New file.

corrected includes

create signature (and write it to stdout for testing)

change Makefile to create shared lib

cosmetic change

2001-11-21  Marcus Brinkmann  <marcus@g10code.de>

* Makefile.am (gpgmeplug): New variable, set to gpgmeplug if
[BUILD_GPGMEPLUG].
* configure.ac (AC_CONFIG_FILES): Add gpgmeplug/Makefile.
Support --enable-gpgmeplug.

.

2001-11-21  Marcus Brinkmann  <marcus@g10code.de>

* gpgmeplug.c: Include config.h only if [HAVE_CONFIG_H].  Do not
include util.h.
(deinitialize): Use free, not _gpgme_free.
(setDirectoryServers): Use calloc, not xtrycalloc.  Use free, not
_gpgme_free.  Use malloc instead xtrymalloc.
(appendDirectoryServer): Use realloc, not xtryrealloc.

2001-11-21  Marcus Brinkmann  <marcus@g10code.de>

* autogen.sh: Tighten version dependencies.

finished implementation of DirectoryServices storing/retrieving

(security checkin) currently working on signing messages

configure struct updated according to modified cryptplug.h

GPGME Plug-In initial checkin.  Saving/restoring of configuration is working.

Added gpgmeplug/ for experiments

correct history, har har

add some more items

2001-11-21  Marcus Brinkmann  <marcus@g10code.de>

* context.h: Do not include rungpg.h, but engine.h.
(struct gpgme_context_s): Replace member gpg with engine.
* gpgme.c (gpgme_release): Release engine, not gpg.

* recipient.c (_gpgme_append_gpg_args_from_recifgpients): Function
moved ...
* rungpg.c (_gpgme_append_gpg_args_from_recipients): ... here.
Make static, change order of arguments, and return an error value.
* ops.h (_gpgme_append_gpg_args_from_recipients): Removed prototype.

* rungpg.h (_gpgme_gpg_op_verify): Add prototype.
(_gpgme_gpg_op_encrypt): Likewise.
(_gpgme_gpg_op_decrypt): Likewise.
(_gpgme_gpg_op_delete): Likewise.
(_gpgme_gpg_op_export): Likewise.
(_gpgme_gpg_op_genkey): Likewise.
(_gpgme_gpg_op_import): Likewise.
(_gpgme_gpg_op_keylist): Likewise.
(_gpgme_gpg_op_sign): Likewise.
(_gpgme_gpg_op_trustlist): Likewise.
* rungpg.c (_gpgme_gpg_op_verify): New function.
(_gpgme_gpg_op_encrypt): Likewise.
(_gpgme_gpg_op_decrypt): Likewise.
(_gpgme_gpg_op_delete): Likewise.
(_gpgme_gpg_op_export): Likewise.
(_gpgme_gpg_op_genkey): Likewise.
(_gpgme_gpg_op_import): Likewise.
(_gpgme_gpg_op_keylist): Likewise.
(_gpgme_gpg_op_sign): Likewise.
(_gpgme_gpg_op_trustlist): Likewise.

* engine.h (_gpgme_engine_set_status_handler): Add prototype.
(_gpgme_engine_set_command_handler): Likewise.
(_gpgme_engine_set_colon_line_handler): Likewise.
(_gpgme_engine_op_decrypt): Likewise.
(_gpgme_engine_op_delete): Likewise.
(_gpgme_engine_op_encrypt): Likewise.
(_gpgme_engine_op_export): Likewise.
(_gpgme_engine_op_genkey): Likewise.
(_gpgme_engine_op_import): Likewise.
(_gpgme_engine_op_keylist): Likewise.
(_gpgme_engine_op_sign): Likewise.
(_gpgme_engine_op_trustlist): Likewise.
(_gpgme_engine_op_verify): Likewise.
(_gpgme_engine_start): Likewise.
* engine.c (_gpgme_engine_set_status_handler): New function.
(_gpgme_engine_set_command_handler): Likewise.
(_gpgme_engine_set_colon_line_handler): Likewise.
(_gpgme_engine_op_decrypt): Likewise.
(_gpgme_engine_op_delete): Likewise.
(_gpgme_engine_op_encrypt): Likewise.
(_gpgme_engine_op_export): Likewise.
(_gpgme_engine_op_genkey): Likewise.
(_gpgme_engine_op_import): Likewise.
(_gpgme_engine_op_keylist): Likewise.
(_gpgme_engine_op_sign): Likewise.
(_gpgme_engine_op_trustlist): Likewise.
(_gpgme_engine_op_verify): Likewise.
(_gpgme_engine_start): Likewise.

* verify.c (gpgme_op_verify_start): Reimplement in terms of above
functions.
* encrypt.c (gpgme_op_encrypt_start): Likewise.
* decrypt.c (_gpgme_decrypt_start): Likewise.
* passphrase.c (_gpgme_passphrase_start): Likewise.
* keylist.c (gpgme_op_keylist_start): Likewise.

2001-11-20  Marcus Brinkmann  <marcus@g10code.de>

* types.h: Add types EngineObject and GpgsmObject.

* Makefile.am (libgpgme_la_SOURCES): Add engine-gpgsm.h,
engine-gpgsm.c, engine.h and engine.c.
* engine.h: New file.
* engine.c: Likewise.
* engine-gpgsm.h: Likewise.
* engine-gpgsm.c: Likewise.

* rungpg.c (_gpgme_gpg_get_version): New function.
(_gpgme_gpg_check_version): Likewise.
* rungpg.h: Add prototypes for _gpgme_gpg_get_version and
_gpgme_gpg_check_version.

* version.c (compare_versions): Rename to ...
(_gpgme_compare_versions): ... this.  Make non-static.
(gpgme_check_version): Use _gpgme_compare_versions rather than
compare_versions.
(gpgme_check_engine): Likewise.
* ops.h (_gpgme_get_program_version): Add prototype.

remove some CVS conflict cruft

2001-11-20  Marcus Brinkmann  <marcus@g10code.de>

* types.h: Add types EngineObject and GpgsmObject.

* Makefile.am (libgpgme_la_SOURCES): Add engine-gpgsm.h,
engine-gpgsm.c, engine.h and engine.c.
* engine.h: New file.
* engine.c: Likewise.
* engine-gpgsm.h: Likewise.
* engine-gpgsm.c: Likewise.

* rungpg.c (_gpgme_gpg_get_version): New function.
(_gpgme_gpg_check_version): Likewise.
* rungpg.h: Add prototypes for _gpgme_gpg_get_version and
_gpgme_gpg_check_version.

* version.c (compare_versions): Rename to ...
(_gpgme_compare_versions): ... this.  Make non-static.
(gpgme_check_version): Use _gpgme_compare_versions rather than
compare_versions.
(gpgme_check_engine): Likewise.
* ops.h (_gpgme_get_program_version): Add prototype.