reference TPMURI

diff --git a/doc/cha-bib.texi b/doc/cha-bib.texi
index 7da4b457a67fed2f0e5ab6ba4811c1bc49096061..b99afce4efe62e00252052fd9d43a04a6993be81 100644 (file)
--- a/doc/cha-bib.texi
+++ b/doc/cha-bib.texi
@@ -185,8 +185,12 @@ J. Altman, N. Williams, L. Zhu, "Channel Bindings for TLS", July 2010,
 available from @url{http://www.ietf.org/rfc/rfc5929}.
 
 @item @anchor{PKCS11URI}[PKCS11URI]
-J. Pechanec, D. Moffat, "The PKCS#11 URI Scheme", August 2011,
-Work in progress, available from @url{http://tools.ietf.org/html/draft-pechanec-pkcs11uri-05}.
+J. Pechanec, D. Moffat, "The PKCS#11 URI Scheme", January 2013,
+Work in progress, available from @url{http://tools.ietf.org/html/draft-pechanec-pkcs11uri-08}.
+
+@item @anchor{TPMURI}[TPMURI]
+C. Latze, N. Mavrogiannopoulos, "The TPMKEY URI Scheme", January 2013,
+Work in progress, available from @url{http://tools.ietf.org/html/draft-mavrogiannopoulos-tpmuri-01}.
 
 @item @anchor{ANDERSON}[ANDERSON]
 R. J. Anderson, "Security Engineering: A Guide to Building Dependable Distributed Systems", 

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index 84558de1de26c49ceee45709ace06d9e0ef85dd4..dd0de07ec9b948627d7764dad6d70244115be198 100644 (file)
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -386,7 +386,7 @@ In GnuTLS the TPM functionality is available in @code{gnutls/tpm.h}.
 The RSA keys in the TPM module may either be stored in a flash memory
 within TPM or stored in a file in disk. In the former case the key can
 provide operations as with @acronym{PKCS} #11 and is identified by
-a URL. The URL is of the following form.
+a URL. The URL is described in @xcite{TPMURI} and are of the following form.
 @verbatim
 tpmkey:uuid=42309df8-d101-11e1-a89a-97bb33c23ad1;storage=user
 @end verbatim

diff --git a/doc/latex/gnutls.bib b/doc/latex/gnutls.bib
index 40ac460bf67cacc7d2b7b6711189a31958789b41..263fc71d7a031c16ee8e7df0d8e1ae78d947dedb 100644 (file)
--- a/doc/latex/gnutls.bib
+++ b/doc/latex/gnutls.bib
@@ -373,8 +373,17 @@
 @misc{PKCS11URI,
   author="Jan Pechanec and Darren J. Moffat",
   title="{The PKCS 11 URI Scheme}",
-  month="August",
-  year=2011, 
-  note = "Work in progress, available from \url{http://tools.ietf.org/html/draft-pechanec-pkcs11uri-05}",
-  url = "http://tools.ietf.org/html/draft-pechanec-pkcs11uri-05"
+  month="January",
+  year=2013, 
+  note = "Work in progress, available from \url{http://tools.ietf.org/html/draft-pechanec-pkcs11uri-08}",
+  url = "http://tools.ietf.org/html/draft-pechanec-pkcs11uri-08"
+}
+
+@misc{TPMURI,
+  author="Carolin Latze and Nikos Mavrogiannopoulos",
+  title="{The TPMKEY URI Scheme}",
+  month="January",
+  year=2013, 
+  note = "Work in progress, available from \url{http://tools.ietf.org/html/draft-mavrogiannopoulos-tpmuri-01}",
+  url = "http://tools.ietf.org/html/draft-mavrogiannopoulos-tpmuri-01"
 }

diff --git a/lib/tpm.c b/lib/tpm.c
index 703db97836bf3a7ec92a33b7ae6919a3fd22711d..7a06963e49e91044be68c4e6fc45c68e55985d45 100644 (file)
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -71,7 +71,7 @@ static int import_tpm_key (gnutls_privkey_t pkey,
                            const char *key_password);
 static int encode_tpmkey_url(char** url, const TSS_UUID* uuid, TSS_FLAG storage);
 
-/* TPM URL format:
+/* TPM URL format: (draft-mavrogiannopoulos-tpmuri-01)
  *
  * tpmkey:file=/path/to/file
  * tpmkey:uuid=7f468c16-cb7f-11e1-824d-b3a4f4b20343;storage=user