[gentoo-commits] data/glep:master commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     8c0e77f51968a2e6cb1d8e99fddb255b4dd3831e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 10:02:49 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 22:20:26 2017 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=8c0e77f5

glep-0059: Merge the two References sections into one.

Also add a newline and remove indentation in the "Thanks to" section,
so that rst2html.py will render it properly.

Closes: https://bugs.gentoo.org/637668

 glep-0059.rst | 100 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/glep-0059.rst b/glep-0059.rst
index 17b7540..77ea1ab 100644
--- a/glep-0059.rst
+++ b/glep-0059.rst
@@ -6,7 +6,7 @@ Type: Standards Track
 Status: Final
 Version: 1
 Created: 2008-10-22
-Last-Modified: 2017-11-12
+Last-Modified: 2017-11-16
 Post-History: 2009-12-01, 2010-01-31
 Content-Type: text/x-rst
 Requires: 44
@@ -168,65 +168,63 @@ For maximum compatibility, we should only have to include each of the
 old algorithms that we are officially still supporting, as well as the
 new ones that we prefer.
 
-References
-==========
-
-[AHS] NIST (2007). "NIST's Plan for New Cryptographic Hash Functions",
-  (Advanced Hash Standard). http://csrc.nist.gov/pki/HashWorkshop/
-
-[BOBO06] Boneh, D. and Boyen, X. (2006). "On the Impossibility of
-  Efficiently Combining Collision Resistant Hash Functions"; Proceedings
-  of CRYPTO 2006, Dwork, C. (Ed.); Lecture Notes in Computer Science
-  4117, pp. 570-583. Available online from:
-  http://crypto.stanford.edu/~dabo/abstracts/hashing.html
-
-[H04] Hawkes, P. and Paddon, M. and Rose, G. (2004). "On Corrective
-  Patterns for the SHA-2 Family". CRYPTO 2004 Cryptology ePrint Archive,
-  Report 2004/204. Available online from:
-  http://eprint.iacr.org/2004/207.pdf
-
-[J04] Joux, Antoie. (2004).  "Multicollisions in Iterated Hash 
-  Functions - Application to Cascaded Constructions;" Proceedings of
-  CRYPTO 2004, Franklin, M. (Ed); Lecture Notes in Computer Science
-  3152, pp.  306-316. Available online from:
-  http://web.cecs.pdx.edu/~teshrim/spring06/papers/general-attacks/multi-joux.pdf
-
-[K06a] Klima, V. (2006). "Tunnels in Hash Functions: MD5 Collisions
-  Within a Minute". Cryptology ePrint Archive, Report 2006/105.
-  Available online from: http://eprint.iacr.org/2006/105.pdf
-
-[K06b] Klima, V. (2006). "Note and links to high-speed MD5 collision
-  proof of concept tools". Available online from:
-  http://cryptography.hyperlink.cz/2006/trick.txt
-
-[K08] Klima, V. (2008). "On Collisions of Hash Functions Turbo SHA-2".
-  Cryptology ePrint Archive, Report 2008/003. Available online from:
-  http://eprint.iacr.org/2008/003.pdf
-
-[G07] Gligoroski, D. and Knapskog, S.J. (2007). "Turbo SHA-2".
-  Cryptology ePrint Archive, Report 2007/403. Available online from:
-  http://eprint.iacr.org/2007/403.pdf
-
-[W04] Wang, X. et al: "Collisions for Hash Functions MD4, MD5,
-  HAVAL-128 and RIPEMD", rump session, CRYPTO 2004, Cryptology ePrint
-  Archive, Report 2004/199, first version (August 16, 2004), second
-  version (August 17, 2004). Available online from:
-  http://eprint.iacr.org/2004/199.pdf
-
 Thanks to
 =========
 I'd like to thank the following folks, in no specific order:
- - Ciaran McCreesh (ciaranm) - for pointing out the Joux (2004) paper,
-   and also being stubborn enough in not accepting a partial solution.
- - Marius Mauch (genone), Zac Medico (zmedico) and Brian Harring
-   (ferringb): for being knowledgeable about the Portage Manifest2
-   codebase.
+
+- Ciaran McCreesh (ciaranm) - for pointing out the Joux (2004) paper,
+  and also being stubborn enough in not accepting a partial solution.
+- Marius Mauch (genone), Zac Medico (zmedico) and Brian Harring
+  (ferringb): for being knowledgeable about the Portage Manifest2
+  codebase.
 
 References
 ==========
+.. [AHS] NIST (2007). "NIST's Plan for New Cryptographic Hash Functions",
+   (Advanced Hash Standard). http://csrc.nist.gov/pki/HashWorkshop/
+
+.. [BOBO06] Boneh, D. and Boyen, X. (2006). "On the Impossibility of
+   Efficiently Combining Collision Resistant Hash Functions"; Proceedings
+   of CRYPTO 2006, Dwork, C. (Ed.); Lecture Notes in Computer Science
+   4117, pp. 570-583. Available online from:
+   http://crypto.stanford.edu/~dabo/abstracts/hashing.html
+
+.. [G07] Gligoroski, D. and Knapskog, S.J. (2007). "Turbo SHA-2".
+   Cryptology ePrint Archive, Report 2007/403. Available online from:
+   http://eprint.iacr.org/2007/403.pdf
+
 .. [GLEP44] Mauch, M. (2005) GLEP44 - Manifest2 format.
    https://www.gentoo.org/glep/glep-0044.html
 
+.. [H04] Hawkes, P. and Paddon, M. and Rose, G. (2004). "On Corrective
+   Patterns for the SHA-2 Family". CRYPTO 2004 Cryptology ePrint Archive,
+   Report 2004/204. Available online from:
+   http://eprint.iacr.org/2004/207.pdf
+
+.. [J04] Joux, Antoie. (2004).  "Multicollisions in Iterated Hash
+   Functions - Application to Cascaded Constructions;" Proceedings of
+   CRYPTO 2004, Franklin, M. (Ed); Lecture Notes in Computer Science
+   3152, pp.  306-316. Available online from:
+   http://web.cecs.pdx.edu/~teshrim/spring06/papers/general-attacks/multi-joux.pdf
+
+.. [K06a] Klima, V. (2006). "Tunnels in Hash Functions: MD5 Collisions
+   Within a Minute". Cryptology ePrint Archive, Report 2006/105.
+   Available online from: http://eprint.iacr.org/2006/105.pdf
+
+.. [K06b] Klima, V. (2006). "Note and links to high-speed MD5 collision
+   proof of concept tools". Available online from:
+   http://cryptography.hyperlink.cz/2006/trick.txt
+
+.. [K08] Klima, V. (2008). "On Collisions of Hash Functions Turbo SHA-2".
+   Cryptology ePrint Archive, Report 2008/003. Available online from:
+   http://eprint.iacr.org/2008/003.pdf
+
+.. [W04] Wang, X. et al: "Collisions for Hash Functions MD4, MD5,
+   HAVAL-128 and RIPEMD", rump session, CRYPTO 2004, Cryptology ePrint
+   Archive, Report 2004/199, first version (August 16, 2004), second
+   version (August 17, 2004). Available online from:
+   http://eprint.iacr.org/2004/199.pdf
+
 Copyright
 =========
 Copyright (c) 2005-2010 by Robin Hugh Johnson.