sha1 / sha256 - Ticket [8f0ff73083] - Search order tweak.

Search for sha256c package first, then tcllibc.
Ordering issues around the stubs table exported by sha256c makes that a better choice.
Bumped to version 1.0.6

Author: andreas-kupries

embedded/md/tcllib/files/modules/sha1/sha256.md

@@ -2,7 +2,7 @@
 [//000000001]: # (sha256 \- SHA\-x Message\-Digest Algorithm)
 [//000000002]: # (Generated from file 'sha256\.man' by tcllib/doctools with format 'markdown')
 [//000000003]: # (Copyright &copy; 2008, Andreas Kupries <andreas\_kupries@users\.sourceforge\.net>)
-[//000000004]: # (sha256\(n\) 1\.0\.5 tcllib "SHA\-x Message\-Digest Algorithm")
+[//000000004]: # (sha256\(n\) 1\.0\.6 tcllib "SHA\-x Message\-Digest Algorithm")
 
 <hr> [ <a href="../../../../toc.md">Main Table Of Contents</a> &#124; <a
 href="../../../toc.md">Table Of Contents</a> &#124; <a
@@ -44,7 +44,7 @@ sha256 \- SHA256 Message\-Digest Algorithm
 # <a name='synopsis'></a>SYNOPSIS
 
 package require Tcl 8\.5 9  
-package require sha256 ?1\.0\.5?  
+package require sha256 ?1\.0\.6?  
 
 [__::sha2::sha256__ ?__\-hex&#124;\-bin__? \[ __\-channel channel__ &#124; __\-file filename__ &#124; ?__\-\-__? *string* \]](#1)  
 [__::sha2::sha224__ ?__\-hex&#124;\-bin__? \[ __\-channel channel__ &#124; __\-file filename__ &#124; ?__\-\-__? *string* \]](#2)  

idoc/man/files/modules/sha1/sha256.n

@@ -2,7 +2,7 @@
 '\" Generated from file 'sha256\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2008, Andreas Kupries <andreas_kupries@users\&.sourceforge\&.net>
 '\"
-.TH "sha256" n 1\&.0\&.5 tcllib "SHA-x Message-Digest Algorithm"
+.TH "sha256" n 1\&.0\&.6 tcllib "SHA-x Message-Digest Algorithm"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -276,7 +276,7 @@ sha256 \- SHA256 Message-Digest Algorithm
 .SH SYNOPSIS
 package require \fBTcl 8\&.5 9\fR
 .sp
-package require \fBsha256 ?1\&.0\&.5?\fR
+package require \fBsha256 ?1\&.0\&.6?\fR
 .sp
 \fB::sha2::sha256\fR ?\fB-hex|-bin\fR? [ \fB-channel channel\fR | \fB-file filename\fR | ?\fB--\fR? \fIstring\fR ]
 .sp

idoc/www/tcllib/files/modules/sha1/sha256.html

@@ -109,7 +109,7 @@
 &#124; <a href="../../../../toc2.html">Applications</a>
  ] <hr>
 <div class="doctools">
-<h1 class="doctools_title">sha256(n) 1.0.5 tcllib &quot;SHA-x Message-Digest Algorithm&quot;</h1>
+<h1 class="doctools_title">sha256(n) 1.0.6 tcllib &quot;SHA-x Message-Digest Algorithm&quot;</h1>
 <div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
 <p>sha256 - SHA256 Message-Digest Algorithm</p>
 </div>
@@ -133,7 +133,7 @@ <h1 class="doctools_title">sha256(n) 1.0.5 tcllib &quot;SHA-x Message-Digest Alg
 <div class="doctools_synopsis">
 <ul class="doctools_requirements">
 <li>package require <b class="pkgname">Tcl 8.5 9</b></li>
-<li>package require <b class="pkgname">sha256 <span class="opt">?1.0.5?</span></b></li>
+<li>package require <b class="pkgname">sha256 <span class="opt">?1.0.6?</span></b></li>
 </ul>
 <ul class="doctools_syntax">
 <li><a href="#1"><b class="cmd">::sha2::sha256</b> <span class="opt">?<b class="option">-hex|-bin</b>?</span> [ <b class="option">-channel channel</b> | <b class="option">-file filename</b> | <span class="opt">?<b class="option">--</b>?</span> <i class="arg">string</i> ]</a></li>

modules/sha1/pkgIndex.tcl

@@ -1,15 +1,5 @@
-# Tcl package index file, version 1.1
-# This file is generated by the "pkg_mkIndex" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
 if {![package vsatisfies [package provide Tcl] 8.5 9]} {return}
-package ifneeded sha256 1.0.5 [list source [file join $dir sha256.tcl]]
+package ifneeded sha256  1.0.6 [list source [file join $dir sha256.tcl]]
 package ifneeded sha256c 1.0.5 [list source [file join $dir sha256c.tcl]]
-package ifneeded sha1   2.0.5 [list source [file join $dir sha1.tcl]]
-package ifneeded sha1   1.1.2 [list source [file join $dir sha1v1.tcl]]
+package ifneeded sha1    2.0.5 [list source [file join $dir sha1.tcl]]
+package ifneeded sha1    1.1.2 [list source [file join $dir sha1v1.tcl]]

modules/sha1/sha256.man

@@ -1,4 +1,4 @@
-[vset VERSION 1.0.5]
+[vset VERSION 1.0.6]
 [manpage_begin sha256 n [vset VERSION]]
 [see_also md4]
 [see_also md5]

modules/sha1/sha256.tcl

@@ -83,8 +83,8 @@ proc ::sha2::LoadAccelerator {name} {
             set r 1
         }
         critcl {
-            if {![catch {package require tcllibc}]
-                || ![catch {package require sha256c}]} {
+            if {![catch {package require sha256c}] ||
+                ![catch {package require tcllibc}]} {
                 set r [expr {[info commands ::sha2::sha256c_update] != {}}]
             }
         }
@@ -824,7 +824,7 @@ namespace eval ::sha2 {
     unset e
 }
 
-package provide sha256 1.0.5
+package provide sha256 1.0.6
 
 # -------------------------------------------------------------------------
 # Local Variables:

modules/sha1/sha256c.tcl

@@ -4,8 +4,6 @@
 #   (Rewriting the sha1c wrapper to 256).
 #
 # Wrapper for the Secure Hashing Algorithm (SHA256)
-#
-# $Id: sha256c.tcl,v 1.5 2009/05/07 00:35:10 patthoyts Exp $
 
 package require critcl;        # needs critcl
 # @sak notprovided sha256c
@@ -179,7 +177,6 @@ critcl::api header sha256.h
 ::critcl::api function void SHA256Init {
 	SHA256Context *sc
 }
-
 ::critcl::api function void SHA256Update {
 	SHA256Context *sc
 	{const void} *data