Solved cvs conflict

2 files changed, 30 insertions, 1 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0ddf6c9bc..28ffff595 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-31  Werner Koch  <[email protected]>
+
+	* DETAILS: Add a note about the date format for X.509.
+
 2003-11-21  David Shaw  <[email protected]>
 
 	* gpg.sgml: Note the new combinations with --symmetric and
diff --git a/doc/DETAILS b/doc/DETAILS
index 0010f549c..0ef922c00 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -65,7 +65,11 @@ record.
 	    (for other id's see include/cipher.h)
  5. Field:  KeyID
  6. Field:  Creation Date (in UTC).  For UID and UAT records, this is the
-            self-signature date.
+            self-signature date.  Note that the dae is usally printed
+            in seconds since epoch, however, we are migrating to an ISO
+            8601 format (e.g. "19660205T091500").  This is currently
+            only relevant for X.509, A simple way to detect the format
+            is be scannning for the 'T'.
  7. Field:  Key or user ID/user attribute expiration date or empty if none.
  8. Field:  Used for serial number in crt records (used to be the Local-ID).
             For UID and UAT records, this is a hash of the user ID contents
@@ -194,6 +198,10 @@ more arguments in future versions.
 	public key. The other fields give more information about
 	this signature.  sig_class is a 2 byte hex-value.
 
+        Note, that TIMESTAMP may either be a number with seconds since
+        epoch or an ISO 8601 string which can be detected by the
+        presence of the letter 'T' inside.
+
     VALIDSIG	<fingerprint in hex> <sig_creation_date> <sig-timestamp>
 		<expire-timestamp> <sig-version> <reserved> <pubkey-algo>
 		<hash-algo> <sig-class> <primary-key-fpr>
@@ -211,6 +219,10 @@ more arguments in future versions.
 	useful to get back to the primary key without running gpg
 	again for this purpose.
 
+        Note, that *-TIMESTAMP may either be a number with seconds
+        since epoch or an ISO 8601 string which can be detected by the
+        presence of the letter 'T' inside.
+
     SIG_ID  <radix64_string>  <sig_creation_date>  <sig-timestamp>
 	This is emitted only for signatures of class 0 or 1 which
 	have been verified okay.  The string is a signature id
@@ -219,6 +231,11 @@ more arguments in future versions.
 	unique ids - others may yield duplicated ones when they
 	have been created in the same second.
 
+        Note, that SIG-TIMESTAMP may either be a number with seconds
+        since epoch or an ISO 8601 string which can be detected by the
+        presence of the letter 'T' inside.
+
+
     ENC_TO  <long keyid>  <keytype>  <keylength>
 	The message is encrypted to this keyid.
 	keytype is the numerical value of the public key algorithm,
@@ -253,6 +270,10 @@ more arguments in future versions.
 	The key has expired.  expire-timestamp is the expiration time
 	in seconds after the epoch.
 
+        Note, that TIMESTAMP may either be a number with seconds since
+        epoch or an ISO 8601 string which can be detected by the
+        presence of the letter 'T' inside.
+
     KEYREVOKED
 	The used key has been revoked by its owner.  No arguments yet.
 
@@ -383,6 +404,10 @@ more arguments in future versions.
 		   'S' = standard
 		   (only the first character should be checked)
 	    class: 2 hex digits with the signature class
+
+        Note, that TIMESTAMP may either be a number with seconds since
+        epoch or an ISO 8601 string which can be detected by the
+        presence of the letter 'T' inside.
         
     KEY_CREATED <type> <fingerprint>
         A key has been created