doc/

2003-08-14  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.texi (Creating a Signature): Change type of member class
	to unsigned int.

gpgme/
2003-08-14  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.h (struct _gpgme_new_signature): Rename member CLASS to
	_OBSOLETE_CLASS, add member CLASS with type unsigned int.
	* sign.c (parse_sig_created): Also set SIG->_unused_class for
	backward compatibility.

tests/
2003-08-14  Marcus Brinkmann  <marcus@g10code.de>

	* gpg/t-sign.c (check_result): Change output format for signature
	class to unsigned int.

diff --git a/NEWS b/NEWS
index bfc4c8b73b61f7f67900eac2a28069c13f641ba2..3e660937eb6cdc771df9279b77e70a4293e359b9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,11 +10,16 @@ Noteworthy changes in version 0.4.3 (unreleased)
  * gpgme_signature_t's status field is now correctly set to an error
    with error code GPG_ERR_NO_PUBKEY if public key is not found.
 
+ * gpgme_new_signature_t's class field is now an unsigned int, rather
+   than an unsigned long (the old class field is preserved for
+   backwards compatibility).
+
  * Interface changes relative to the 0.4.3 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 gpgme_get_key                  CHANGED: Fails correctly if key ID not unique.
 gpgme_key_t                    EXTENDED: New field can_authenticate.
 gpgme_subkey_t                 EXTENDED: New field can_authenticate.
+gpgme_new_signature_t          CHANGED: New type for class field.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 65c5f892d05a7b2037a50d0cc7ac2f7a88f07e84..ac6f9aa4457cb9da8277a47a7a74178815e8dfc3 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-14  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.texi (Creating a Signature): Change type of member class
+       to unsigned int.
+
 2003-08-04  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.texi (Verify): Get error code from SIG->status in the code

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 6376552876c33e347ac093027d31fa8bc0414d7a..7dd261daf7d5376c2ab37279be24487217f328d4 100644 (file)
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -3937,7 +3937,7 @@ The public key algorithm used to create this signature.
 @item gpgme_hash_algo_t
 The hash algorithm used to create this signature.
 
-@item unsigned long class
+@item unsigned int class
 The signature class of this signature.
 
 @item long int timestamp

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 35172ddb5eb848fbe706f5bd60b3123301b82859..a69c048bec0d21c14e095e5a8fd48276c2f03bfb 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-14  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.h (struct _gpgme_new_signature): Rename member CLASS to
+       _OBSOLETE_CLASS, add member CLASS with type unsigned int.
+       * sign.c (parse_sig_created): Also set SIG->_unused_class for
+       backward compatibility.
+
 2003-08-04  Marcus Brinkmann  <marcus@g10code.de>
 
        * verify.c (parse_new_sig): Fix status parsing case.

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 2320f90063d1b4cabbe76a534825ac7642500494..ed1d25bb91f99b8821270ba5f6d598d379c3b099 100644 (file)
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -1045,12 +1045,28 @@ gpgme_error_t gpgme_op_decrypt_verify (gpgme_ctx_t ctx, gpgme_data_t cipher,
 struct _gpgme_new_signature
 {
   struct _gpgme_new_signature *next;
+
+  /* The type of the signature.  */
   gpgme_sig_mode_t type;
+
+  /* The public key algorithm used to create the signature.  */
   gpgme_pubkey_algo_t pubkey_algo;
+
+  /* The hash algorithm used to create the signature.  */
   gpgme_hash_algo_t hash_algo;
-  unsigned long class;
+
+  /* Internal to GPGME, do not use.  Must be set to the same value as
+     CLASS below.  */
+  unsigned long _obsolete_class;
+
+  /* Signature creation time.  */
   long int timestamp;
+
+  /* The fingerprint of the signature.  */
   char *fpr;
+
+  /* Crypto backend specific signature class.  */
+  unsigned int class;
 };
 typedef struct _gpgme_new_signature *gpgme_new_signature_t;
 

diff --git a/gpgme/sign.c b/gpgme/sign.c
index 0f2c4ee371c40ba0e0dc6c41f4b9af0b32b3abcc..089b34c54946fe0ed2ce0c9d389f8d2cda686e55 100644 (file)
--- a/gpgme/sign.c
+++ b/gpgme/sign.c
@@ -144,6 +144,7 @@ parse_sig_created (char *args, gpgme_new_signature_t *sigp)
   args = tail;
 
   sig->class = strtol (args, &tail, 0);
+  sig->_obsolete_class = sig->class;
   if (errno || args == tail || *tail != ' ')
     {
       /* The crypto backend does not behave.  */

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 99a0a45987dab2bafa7be87c3d90a64671149731..2be0e0a14fc3c64c10296bc6a42e72b26d16f891 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-14  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpg/t-sign.c (check_result): Change output format for signature
+       class to unsigned int.
+
 2003-07-31  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpg/t-verify.c (check_result): Change type of SUMMARY to

diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c
index 85b94a7eee84238537d496a832ff9f1141b6762c..78e590b97eee92f507c8f199f191875589324a78 100644 (file)
--- a/tests/gpg/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -61,7 +61,7 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
     }
   if (result->signatures->class != 1)
     {
-      fprintf (stderr, "Wrong signature class reported: %lu\n",
+      fprintf (stderr, "Wrong signature class reported: %u\n",
               result->signatures->class);
       exit (1);
     }