Overview
Comment: | Merged in updates from trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | internal_sha1 |
Files: | files | file ages | folders |
SHA1: |
ee9eb7ed98663bc2e73768874fd038e4 |
User & Date: | rkeene on 2014-11-06 00:37:20 |
Other Links: | branch diff | manifest | tags |
Context
2014-11-06
| ||
02:29 | Updated to use C-based implementation of SHA1 Closed-Leaf check-in: 853a9068a7 user: rkeene tags: internal_sha1 | |
00:37 | Merged in updates from trunk check-in: ee9eb7ed98 user: rkeene tags: internal_sha1 | |
2014-11-05
| ||
21:41 | Fixed cleanup issue which was causing excessive lookups check-in: cc5a68a6de user: rkeene tags: trunk | |
2014-11-03
| ||
23:16 | Started work on an internal sha1 implementation check-in: 5ebe069cbf user: rkeene tags: internal_sha1 | |
Changes
Modified Makefile from [fe29eeac49] to [bee1193267].
︙ | ︙ | |||
26 27 28 29 30 31 32 | appfsd: appfsd.o $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o appfsd appfsd.o $(LIBS) appfsd.o: appfsd.c appfsd.tcl.h $(CC) $(CPPFLAGS) $(CFLAGS) -o appfsd.o -c appfsd.c | | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | appfsd: appfsd.o $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o appfsd appfsd.o $(LIBS) appfsd.o: appfsd.c appfsd.tcl.h $(CC) $(CPPFLAGS) $(CFLAGS) -o appfsd.o -c appfsd.c appfsd.tcl.h: appfsd.tcl sha1.tcl sed '/@@SHA1\.TCL@@/ r sha1.tcl' appfsd.tcl | sed '/@@SHA1\.TCL@@/ d' | sed 's@[\\"]@\\&@g;s@^@ "@;s@$$@\\n"@' > appfsd.tcl.h.new mv appfsd.tcl.h.new appfsd.tcl.h install: appfsd if [ ! -d '$(DESTDIR)$(sbindir)' ]; then mkdir -p '$(DESTDIR)$(sbindir)'; chmod 755 '$(DESTDIR)$(sbindir)'; fi cp appfsd '$(DESTDIR)$(sbindir)/' clean: |
︙ | ︙ |
Modified appfsd.c from [e3ba0e89d2] to [72840611b5].
︙ | ︙ | |||
79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | const char *fmt; }; static Tcl_Interp *appfs_create_TclInterp(const char *cachedir) { Tcl_Interp *interp; int tcl_ret; interp = Tcl_CreateInterp(); if (interp == NULL) { fprintf(stderr, "Unable to create Tcl Interpreter. Aborting.\n"); return(NULL); } tcl_ret = Tcl_Init(interp); if (tcl_ret != TCL_OK) { fprintf(stderr, "Unable to initialize Tcl. Aborting.\n"); return(NULL); } tcl_ret = Tcl_Eval(interp, "" #include "appfsd.tcl.h" ""); if (tcl_ret != TCL_OK) { fprintf(stderr, "Unable to initialize Tcl AppFS script. Aborting.\n"); fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(interp)); return(NULL); } if (Tcl_SetVar(interp, "::appfs::cachedir", cachedir, TCL_GLOBAL_ONLY) == NULL) { fprintf(stderr, "Unable to set cache directory. This should never fail.\n"); return(NULL); } tcl_ret = Tcl_Eval(interp, "::appfs::init"); if (tcl_ret != TCL_OK) { fprintf(stderr, "Unable to initialize Tcl AppFS script (::appfs::init). Aborting.\n"); fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(interp)); return(NULL); } return(interp); } static int appfs_Tcl_Eval(Tcl_Interp *interp, int objc, const char *cmd, ...) { Tcl_Obj **objv; const char *arg; va_list argp; | > > > > > > > > > > > > > > > > | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | const char *fmt; }; static Tcl_Interp *appfs_create_TclInterp(const char *cachedir) { Tcl_Interp *interp; int tcl_ret; APPFS_DEBUG("Creating new Tcl interpreter for TID = 0x%llx", (unsigned long long) pthread_self()); interp = Tcl_CreateInterp(); if (interp == NULL) { fprintf(stderr, "Unable to create Tcl Interpreter. Aborting.\n"); return(NULL); } tcl_ret = Tcl_Init(interp); if (tcl_ret != TCL_OK) { fprintf(stderr, "Unable to initialize Tcl. Aborting.\n"); Tcl_DeleteInterp(interp); return(NULL); } tcl_ret = Tcl_Eval(interp, "" #include "appfsd.tcl.h" ""); if (tcl_ret != TCL_OK) { fprintf(stderr, "Unable to initialize Tcl AppFS script. Aborting.\n"); fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(interp)); Tcl_DeleteInterp(interp); return(NULL); } if (Tcl_SetVar(interp, "::appfs::cachedir", cachedir, TCL_GLOBAL_ONLY) == NULL) { fprintf(stderr, "Unable to set cache directory. This should never fail.\n"); Tcl_DeleteInterp(interp); return(NULL); } tcl_ret = Tcl_Eval(interp, "::appfs::init"); if (tcl_ret != TCL_OK) { fprintf(stderr, "Unable to initialize Tcl AppFS script (::appfs::init). Aborting.\n"); fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(interp)); Tcl_DeleteInterp(interp); return(NULL); } Tcl_HideCommand(interp, "glob", "glob"); Tcl_HideCommand(interp, "exec", "exec"); Tcl_HideCommand(interp, "pid", "pid"); Tcl_HideCommand(interp, "auto_load_index", "auto_load_index"); Tcl_HideCommand(interp, "unknown", "unknown"); return(interp); } static int appfs_Tcl_Eval(Tcl_Interp *interp, int objc, const char *cmd, ...) { Tcl_Obj **objv; const char *arg; va_list argp; |
︙ | ︙ |
Modified appfsd.tcl from [a0bff81028] to [86cb2b92c8].
1 2 3 4 5 6 7 8 9 10 11 12 | #! /usr/bin/env tclsh package require http 2.7 package require sqlite3 package require sha1 namespace eval ::appfs { variable cachedir "/tmp/appfs-cache" variable ttl 3600 variable nttl 60 proc _hash_sep {hash {seps 4}} { | > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #! /usr/bin/env tclsh package require http 2.7 package require sqlite3 if {[catch { package require sha1 }]} { @@SHA1.TCL@@ package require sha1 } namespace eval ::appfs { variable cachedir "/tmp/appfs-cache" variable ttl 3600 variable nttl 60 proc _hash_sep {hash {seps 4}} { |
︙ | ︙ | |||
24 25 26 27 28 29 30 | set filekey [_hash_sep $filekey] } set file [file join $::appfs::cachedir $filekey] file mkdir [file dirname $file] | | > > > | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | set filekey [_hash_sep $filekey] } set file [file join $::appfs::cachedir $filekey] file mkdir [file dirname $file] if {[file exists $file]} { return $file } set tmpfile "${file}.[expr {rand()}]" set fd [open $tmpfile "w"] fconfigure $fd -translation binary catch { set token [::http::geturl $url -channel $fd -binary true] } |
︙ | ︙ | |||
54 55 56 57 58 59 60 | } if {$ncode == "200" && $hash == $key} { file rename -force -- $tmpfile $file } else { file delete -force -- $tmpfile } | < | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | } if {$ncode == "200" && $hash == $key} { file rename -force -- $tmpfile $file } else { file delete -force -- $tmpfile } return $file } proc _isHash {value} { set value [string tolower $value] |
︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | switch -- $os { "linux" - "freebsd" - "openbsd" - "netbsd" { return $os } "sunos" { return "solaris" } } return -code error "Unable to normalize OS: $os" } proc _normalizeCPU {cpu} { set cpu [string tolower [string trim $cpu]] switch -glob -- $cpu { "i?86" { return "ix86" } "x86_64" { return $cpu } } return -code error "Unable to normalize CPU: $cpu" } proc init {} { | > > > > > > | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | switch -- $os { "linux" - "freebsd" - "openbsd" - "netbsd" { return $os } "sunos" { return "solaris" } "noarch" - "none" - "any" - "all" { return "noarch" } } return -code error "Unable to normalize OS: $os" } proc _normalizeCPU {cpu} { set cpu [string tolower [string trim $cpu]] switch -glob -- $cpu { "i?86" { return "ix86" } "x86_64" { return $cpu } "noarch" - "none" - "any" - "all" { return "noarch" } } return -code error "Unable to normalize CPU: $cpu" } proc init {} { |
︙ | ︙ | |||
137 138 139 140 141 142 143 | } proc download {hostname hash {method sha1}} { set url "http://$hostname/appfs/$method/$hash" set file [_cachefile $url $hash] if {![file exists $file]} { | | | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | } proc download {hostname hash {method sha1}} { set url "http://$hostname/appfs/$method/$hash" set file [_cachefile $url $hash] if {![file exists $file]} { return -code error "Unable to fetch (file does not exist: $file)" } return $file } proc getindex {hostname} { set now [clock seconds] |
︙ | ︙ | |||
171 172 173 174 175 176 177 | catch { set token [::http::geturl $url] if {[::http::ncode $token] == "200"} { set indexhash_data [::http::data $token] } ::http::reset $token | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | catch { set token [::http::geturl $url] if {[::http::ncode $token] == "200"} { set indexhash_data [::http::data $token] } ::http::reset $token ::http::cleanup $token } if {![info exists indexhash_data]} { # Cache this result for 60 seconds _db eval {INSERT OR REPLACE INTO sites (hostname, lastUpdate, ttl) VALUES ($hostname, $now, $::appfs::nttl);} return -code error "Unable to fetch $url" |
︙ | ︙ | |||
207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | if {$line == ""} { continue } set work [split $line ","] unset -nocomplain pkgInfo set pkgInfo(package) [lindex $work 0] set pkgInfo(version) [lindex $work 1] set pkgInfo(os) [_normalizeOS [lindex $work 2]] set pkgInfo(cpuArch) [_normalizeCPU [lindex $work 3]] set pkgInfo(hash) [string tolower [lindex $work 4]] set pkgInfo(hash_type) "sha1" set pkgInfo(isLatest) [expr {!![lindex $work 5]}] if {![_isHash $pkgInfo(hash)]} { continue } lappend curr_packages $pkgInfo(hash) | > > > > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | if {$line == ""} { continue } set work [split $line ","] unset -nocomplain pkgInfo if {[catch { set pkgInfo(package) [lindex $work 0] set pkgInfo(version) [lindex $work 1] set pkgInfo(os) [_normalizeOS [lindex $work 2]] set pkgInfo(cpuArch) [_normalizeCPU [lindex $work 3]] set pkgInfo(hash) [string tolower [lindex $work 4]] set pkgInfo(hash_type) "sha1" set pkgInfo(isLatest) [expr {!![lindex $work 5]}] }]} { continue } if {![_isHash $pkgInfo(hash)]} { continue } lappend curr_packages $pkgInfo(hash) |
︙ | ︙ |
Added sha1.tcl version [a8b3b2afbe].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 | # sha1.tcl - # @@ Meta Begin # Package sha1 2.0.3 # Meta platform tcl # Meta rsk::build::date 2011-03-30 # Meta description Part of the Tclib sha1 module # Meta require {Tcl 8.2} # @@ Meta End # # Copyright (C) 2001 Don Libes <libes@nist.gov> # Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net> # # SHA1 defined by FIPS 180-1, "The SHA1 Message-Digest Algorithm" # HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication" # # This is an implementation of SHA1 based upon the example code given in # FIPS 180-1 and upon the tcllib MD4 implementation and taking some ideas # and methods from the earlier tcllib sha1 version by Don Libes. # # This implementation permits incremental updating of the hash and # provides support for external compiled implementations either using # critcl (sha1c) or Trf. # # ref: http://www.itl.nist.gov/fipspubs/fip180-1.htm # # ------------------------------------------------------------------------- # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # ------------------------------------------------------------------------- # # $Id: sha1.tcl,v 1.22 2009/05/07 00:35:10 patthoyts Exp $ # @mdgen EXCLUDE: sha1c.tcl package require Tcl 8.2; # tcl minimum version namespace eval ::sha1 { variable version 2.0.3 namespace export sha1 hmac SHA1Init SHA1Update SHA1Final variable uid if {![info exists uid]} { set uid 0 } } proc ::sha1::SHA1Init {} { variable uid set token [namespace current]::[incr uid] upvar #0 $token state # FIPS 180-1: 7 - Initialize the hash state array set state \ [list \ A [expr {int(0x67452301)}] \ B [expr {int(0xEFCDAB89)}] \ C [expr {int(0x98BADCFE)}] \ D [expr {int(0x10325476)}] \ E [expr {int(0xC3D2E1F0)}] \ n 0 i "" ] return $token } # SHA1Update -- # # This is called to add more data into the hash. You may call this # as many times as you require. Note that passing in "ABC" is equivalent # to passing these letters in as separate calls -- hence this proc # permits hashing of chunked data # # If we have a C-based implementation available, then we will use # it here in preference to the pure-Tcl implementation. # proc ::sha1::SHA1Update {token data} { upvar #0 $token state # Update the state values incr state(n) [string length $data] append state(i) $data # Calculate the hash for any complete blocks set len [string length $state(i)] for {set n 0} {($n + 64) <= $len} {} { SHA1Transform $token [string range $state(i) $n [incr n 64]] } # Adjust the state for the blocks completed. set state(i) [string range $state(i) $n end] return } # SHA1Final -- # # This procedure is used to close the current hash and returns the # hash data. Once this procedure has been called the hash context # is freed and cannot be used again. # # Note that the output is 160 bits represented as binary data. # proc ::sha1::SHA1Final {token} { upvar #0 $token state # Padding # set len [string length $state(i)] set pad [expr {56 - ($len % 64)}] if {$len % 64 > 56} { incr pad 64 } if {$pad == 0} { incr pad 64 } append state(i) [binary format a$pad \x80] # Append length in bits as big-endian wide int. set dlen [expr {8 * $state(n)}] append state(i) [binary format II 0 $dlen] # Calculate the hash for the remaining block. set len [string length $state(i)] for {set n 0} {($n + 64) <= $len} {} { SHA1Transform $token [string range $state(i) $n [incr n 64]] } # Output set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)][bytes $state(E)] unset state return $r } # ------------------------------------------------------------------------- # HMAC Hashed Message Authentication (RFC 2104) # # hmac = H(K xor opad, H(K xor ipad, text)) # # HMACInit -- # # This is equivalent to the SHA1Init procedure except that a key is # added into the algorithm # proc ::sha1::HMACInit {K} { # Key K is adjusted to be 64 bytes long. If K is larger, then use # the SHA1 digest of K and pad this instead. set len [string length $K] if {$len > 64} { set tok [SHA1Init] SHA1Update $tok $K set K [SHA1Final $tok] set len [string length $K] } set pad [expr {64 - $len}] append K [string repeat \0 $pad] # Cacluate the padding buffers. set Ki {} set Ko {} binary scan $K i16 Ks foreach k $Ks { append Ki [binary format i [expr {$k ^ 0x36363636}]] append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]] } set tok [SHA1Init] SHA1Update $tok $Ki; # initialize with the inner pad # preserve the Ko value for the final stage. # FRINK: nocheck set [subst $tok](Ko) $Ko return $tok } # HMACUpdate -- # # Identical to calling SHA1Update # proc ::sha1::HMACUpdate {token data} { SHA1Update $token $data return } # HMACFinal -- # # This is equivalent to the SHA1Final procedure. The hash context is # closed and the binary representation of the hash result is returned. # proc ::sha1::HMACFinal {token} { upvar #0 $token state set tok [SHA1Init]; # init the outer hashing function SHA1Update $tok $state(Ko); # prepare with the outer pad. SHA1Update $tok [SHA1Final $token]; # hash the inner result return [SHA1Final $tok] } # ------------------------------------------------------------------------- # Description: # This is the core SHA1 algorithm. It is a lot like the MD4 algorithm but # includes an extra round and a set of constant modifiers throughout. # set ::sha1::SHA1Transform_body { upvar #0 $token state # FIPS 180-1: 7a: Process Message in 16-Word Blocks binary scan $msg I* blocks set blockLen [llength $blocks] for {set i 0} {$i < $blockLen} {incr i 16} { set W [lrange $blocks $i [expr {$i+15}]] # FIPS 180-1: 7b: Expand the input into 80 words # For t = 16 to 79 # let Wt = (Wt-3 ^ Wt-8 ^ Wt-14 ^ Wt-16) <<< 1 set t3 12 set t8 7 set t14 1 set t16 -1 for {set t 16} {$t < 80} {incr t} { set x [expr {[lindex $W [incr t3]] ^ [lindex $W [incr t8]] ^ \ [lindex $W [incr t14]] ^ [lindex $W [incr t16]]}] lappend W [expr {int(($x << 1) | (($x >> 31) & 1))}] } # FIPS 180-1: 7c: Copy hash state. set A $state(A) set B $state(B) set C $state(C) set D $state(D) set E $state(E) # FIPS 180-1: 7d: Do permutation rounds # For t = 0 to 79 do # TEMP = (A<<<5) + ft(B,C,D) + E + Wt + Kt; # E = D; D = C; C = S30(B); B = A; A = TEMP; # Round 1: ft(B,C,D) = (B & C) | (~B & D) ( 0 <= t <= 19) for {set t 0} {$t < 20} {incr t} { set TEMP [F1 $A $B $C $D $E [lindex $W $t]] set E $D set D $C set C [rotl32 $B 30] set B $A set A $TEMP } # Round 2: ft(B,C,D) = (B ^ C ^ D) ( 20 <= t <= 39) for {} {$t < 40} {incr t} { set TEMP [F2 $A $B $C $D $E [lindex $W $t]] set E $D set D $C set C [rotl32 $B 30] set B $A set A $TEMP } # Round 3: ft(B,C,D) = ((B & C) | (B & D) | (C & D)) ( 40 <= t <= 59) for {} {$t < 60} {incr t} { set TEMP [F3 $A $B $C $D $E [lindex $W $t]] set E $D set D $C set C [rotl32 $B 30] set B $A set A $TEMP } # Round 4: ft(B,C,D) = (B ^ C ^ D) ( 60 <= t <= 79) for {} {$t < 80} {incr t} { set TEMP [F4 $A $B $C $D $E [lindex $W $t]] set E $D set D $C set C [rotl32 $B 30] set B $A set A $TEMP } # Then perform the following additions. (That is, increment each # of the four registers by the value it had before this block # was started.) incr state(A) $A incr state(B) $B incr state(C) $C incr state(D) $D incr state(E) $E } return } proc ::sha1::F1 {A B C D E W} { expr {(((($A << 5) & 0xffffffff) | (($A >> 27) & 0x1f)) \ + ($D ^ ($B & ($C ^ $D))) + $E + $W + 0x5a827999) & 0xffffffff} } proc ::sha1::F2 {A B C D E W} { expr {(((($A << 5) & 0xffffffff) | (($A >> 27) & 0x1f)) \ + ($B ^ $C ^ $D) + $E + $W + 0x6ed9eba1) & 0xffffffff} } proc ::sha1::F3 {A B C D E W} { expr {(((($A << 5) & 0xffffffff)| (($A >> 27) & 0x1f)) \ + (($B & $C) | ($D & ($B | $C))) + $E + $W + 0x8f1bbcdc) & 0xffffffff} } proc ::sha1::F4 {A B C D E W} { expr {(((($A << 5) & 0xffffffff)| (($A >> 27) & 0x1f)) \ + ($B ^ $C ^ $D) + $E + $W + 0xca62c1d6) & 0xffffffff} } proc ::sha1::rotl32 {v n} { return [expr {((($v << $n) \ | (($v >> (32 - $n)) \ & (0x7FFFFFFF >> (31 - $n))))) \ & 0xFFFFFFFF}] } # ------------------------------------------------------------------------- # # In order to get this code to go as fast as possible while leaving # the main code readable we can substitute the above function bodies # into the transform procedure. This inlines the code for us an avoids # a procedure call overhead within the loops. # # We can do some minor tweaking to improve speed on Tcl < 8.5 where we # know our arithmetic is limited to 64 bits. On > 8.5 we may have # unconstrained integer arithmetic and must avoid letting it run away. # regsub -all -line \ {\[F1 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body \ {[expr {(rotl32($A,5) + ($D ^ ($B \& ($C ^ $D))) + $E + \1 + 0x5a827999) \& 0xffffffff}]} \ ::sha1::SHA1Transform_body_tmp regsub -all -line \ {\[F2 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body_tmp \ {[expr {(rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0x6ed9eba1) \& 0xffffffff}]} \ ::sha1::SHA1Transform_body_tmp regsub -all -line \ {\[F3 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body_tmp \ {[expr {(rotl32($A,5) + (($B \& $C) | ($D \& ($B | $C))) + $E + \1 + 0x8f1bbcdc) \& 0xffffffff}]} \ ::sha1::SHA1Transform_body_tmp regsub -all -line \ {\[F4 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body_tmp \ {[expr {(rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0xca62c1d6) \& 0xffffffff}]} \ ::sha1::SHA1Transform_body_tmp regsub -all -line \ {rotl32\(\$A,5\)} \ $::sha1::SHA1Transform_body_tmp \ {((($A << 5) \& 0xffffffff) | (($A >> 27) \& 0x1f))} \ ::sha1::SHA1Transform_body_tmp regsub -all -line \ {\[rotl32 \$B 30\]} \ $::sha1::SHA1Transform_body_tmp \ {[expr {int(($B << 30) | (($B >> 2) \& 0x3fffffff))}]} \ ::sha1::SHA1Transform_body_tmp # # Version 2 avoids a few truncations to 32 bits in non-essential places. # regsub -all -line \ {\[F1 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body \ {[expr {rotl32($A,5) + ($D ^ ($B \& ($C ^ $D))) + $E + \1 + 0x5a827999}]} \ ::sha1::SHA1Transform_body_tmp2 regsub -all -line \ {\[F2 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body_tmp2 \ {[expr {rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0x6ed9eba1}]} \ ::sha1::SHA1Transform_body_tmp2 regsub -all -line \ {\[F3 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body_tmp2 \ {[expr {rotl32($A,5) + (($B \& $C) | ($D \& ($B | $C))) + $E + \1 + 0x8f1bbcdc}]} \ ::sha1::SHA1Transform_body_tmp2 regsub -all -line \ {\[F4 \$A \$B \$C \$D \$E (\[.*?\])\]} \ $::sha1::SHA1Transform_body_tmp2 \ {[expr {rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0xca62c1d6}]} \ ::sha1::SHA1Transform_body_tmp2 regsub -all -line \ {rotl32\(\$A,5\)} \ $::sha1::SHA1Transform_body_tmp2 \ {(($A << 5) | (($A >> 27) \& 0x1f))} \ ::sha1::SHA1Transform_body_tmp2 regsub -all -line \ {\[rotl32 \$B 30\]} \ $::sha1::SHA1Transform_body_tmp2 \ {[expr {($B << 30) | (($B >> 2) \& 0x3fffffff)}]} \ ::sha1::SHA1Transform_body_tmp2 if {[package vsatisfies [package provide Tcl] 8.5]} { proc ::sha1::SHA1Transform {token msg} $::sha1::SHA1Transform_body_tmp } else { proc ::sha1::SHA1Transform {token msg} $::sha1::SHA1Transform_body_tmp2 } unset ::sha1::SHA1Transform_body unset ::sha1::SHA1Transform_body_tmp unset ::sha1::SHA1Transform_body_tmp2 # ------------------------------------------------------------------------- proc ::sha1::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}} proc ::sha1::bytes {v} { #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v] format %c%c%c%c \ [expr {((0xFF000000 & $v) >> 24) & 0xFF}] \ [expr {(0xFF0000 & $v) >> 16}] \ [expr {(0xFF00 & $v) >> 8}] \ [expr {0xFF & $v}] } # ------------------------------------------------------------------------- proc ::sha1::Hex {data} { binary scan $data H* result return $result } # ------------------------------------------------------------------------- # Description: # Pop the nth element off a list. Used in options processing. # proc ::sha1::Pop {varname {nth 0}} { upvar $varname args set r [lindex $args $nth] set args [lreplace $args $nth $nth] return $r } # ------------------------------------------------------------------------- # fileevent handler for chunked file hashing. # proc ::sha1::Chunk {token channel {chunksize 4096}} { upvar #0 $token state if {[eof $channel]} { fileevent $channel readable {} set state(reading) 0 } SHA1Update $token [read $channel $chunksize] } # ------------------------------------------------------------------------- proc ::sha1::sha1 {args} { array set opts {-hex 0 -filename {} -channel {} -chunksize 4096} if {[llength $args] == 1} { set opts(-hex) 1 } else { while {[string match -* [set option [lindex $args 0]]]} { switch -glob -- $option { -hex { set opts(-hex) 1 } -bin { set opts(-hex) 0 } -file* { set opts(-filename) [Pop args 1] } -channel { set opts(-channel) [Pop args 1] } -chunksize { set opts(-chunksize) [Pop args 1] } default { if {[llength $args] == 1} { break } if {[string compare $option "--"] == 0} { Pop args; break } set err [join [lsort [concat -bin [array names opts]]] ", "] return -code error "bad option $option:\ must be one of $err" } } Pop args } } if {$opts(-filename) != {}} { set opts(-channel) [open $opts(-filename) r] fconfigure $opts(-channel) -translation binary } if {$opts(-channel) == {}} { if {[llength $args] != 1} { return -code error "wrong # args:\ should be \"sha1 ?-hex? -filename file | string\"" } set tok [SHA1Init] SHA1Update $tok [lindex $args 0] set r [SHA1Final $tok] } else { set tok [SHA1Init] # FRINK: nocheck set [subst $tok](reading) 1 fileevent $opts(-channel) readable \ [list [namespace origin Chunk] \ $tok $opts(-channel) $opts(-chunksize)] # FRINK: nocheck vwait [subst $tok](reading) set r [SHA1Final $tok] # If we opened the channel - we should close it too. if {$opts(-filename) != {}} { close $opts(-channel) } } if {$opts(-hex)} { set r [Hex $r] } return $r } # ------------------------------------------------------------------------- proc ::sha1::hmac {args} { array set opts {-hex 1 -filename {} -channel {} -chunksize 4096} if {[llength $args] != 2} { while {[string match -* [set option [lindex $args 0]]]} { switch -glob -- $option { -key { set opts(-key) [Pop args 1] } -hex { set opts(-hex) 1 } -bin { set opts(-hex) 0 } -file* { set opts(-filename) [Pop args 1] } -channel { set opts(-channel) [Pop args 1] } -chunksize { set opts(-chunksize) [Pop args 1] } default { if {[llength $args] == 1} { break } if {[string compare $option "--"] == 0} { Pop args; break } set err [join [lsort [array names opts]] ", "] return -code error "bad option $option:\ must be one of $err" } } Pop args } } if {[llength $args] == 2} { set opts(-key) [Pop args] } if {![info exists opts(-key)]} { return -code error "wrong # args:\ should be \"hmac ?-hex? -key key -filename file | string\"" } if {$opts(-filename) != {}} { set opts(-channel) [open $opts(-filename) r] fconfigure $opts(-channel) -translation binary } if {$opts(-channel) == {}} { if {[llength $args] != 1} { return -code error "wrong # args:\ should be \"hmac ?-hex? -key key -filename file | string\"" } set tok [HMACInit $opts(-key)] HMACUpdate $tok [lindex $args 0] set r [HMACFinal $tok] } else { set tok [HMACInit $opts(-key)] # FRINK: nocheck set [subst $tok](reading) 1 fileevent $opts(-channel) readable \ [list [namespace origin Chunk] \ $tok $opts(-channel) $opts(-chunksize)] # FRINK: nocheck vwait [subst $tok](reading) set r [HMACFinal $tok] # If we opened the channel - we should close it too. if {$opts(-filename) != {}} { close $opts(-channel) } } if {$opts(-hex)} { set r [Hex $r] } return $r } # ------------------------------------------------------------------------- package provide sha1 $::sha1::version # ------------------------------------------------------------------------- # Local Variables: # mode: tcl # indent-tabs-mode: nil # End: |