[96130] trunk/base/src/pextlib1.0

[afb at macports.org]

Revision: 96130
          https://trac.macports.org/changeset/96130
Author:   afb at macports.org
Date:     2012-08-01 11:50:15 -0700 (Wed, 01 Aug 2012)
Log Message:
-----------
change from base32hex encoding, to base32

Modified Paths:
--------------
    trunk/base/src/pextlib1.0/base32cmd.c
    trunk/base/src/pextlib1.0/tests/base32.tcl

Modified: trunk/base/src/pextlib1.0/base32cmd.c
===================================================================
--- trunk/base/src/pextlib1.0/base32cmd.c	2012-08-01 18:16:15 UTC (rev 96129)
+++ trunk/base/src/pextlib1.0/base32cmd.c	2012-08-01 18:50:15 UTC (rev 96130)
@@ -42,11 +42,11 @@
 #include "base32cmd.h"
 
 /* This package provides commands for encoding and decoding of hexstrings
-   into and out of the extended hex base32 encoding as specified in RFC 3548.
+   into and out of the standard base32 encoding as specified in RFC 4648.
 
    Based on public domain base32 code from tcllib, by Andreas Kupries */
 
-#define BASE32HEX 1
+#undef BASE32HEX
 
 static __inline__ int hex2dec(int data)
 {

Modified: trunk/base/src/pextlib1.0/tests/base32.tcl
===================================================================
--- trunk/base/src/pextlib1.0/tests/base32.tcl	2012-08-01 18:16:15 UTC (rev 96129)
+++ trunk/base/src/pextlib1.0/tests/base32.tcl	2012-08-01 18:50:15 UTC (rev 96130)
@@ -5,13 +5,13 @@
 proc main {pextlibname} {
 	load $pextlibname
 	
-	if {[base32encode "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"] != "SEOC8GKOVGE196NRUJ49IRTP4GJQSGF4CIDP6J54IMCHMU2IN1AG===="} {
-		puts {[base32encode "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"] != "SEOC8GKOVGE196NRUJ49IRTP4GJQSGF4CIDP6J54IMCHMU2IN1AG===="}
+	if {[base32encode "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"] != "4OYMIQUY7QOBJGX36TEJS35ZEQT24QPEMSNZGTFESWMRW6CSXBKQ===="} {
+		puts {[base32encode "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"] != "4OYMIQUY7QOBJGX36TEJS35ZEQT24QPEMSNZGTFESWMRW6CSXBKQ===="}
 		exit 1
 	}
 
-	if {[base32decode "SEOC8GKOVGE196NRUJ49IRTP4GJQSGF4CIDP6J54IMCHMU2IN1AG===="] != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"} {
-		puts {[base32decode "SEOC8GKOVGE196NRUJ49IRTP4GJQSGF4CIDP6J54IMCHMU2IN1AG===="] != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
+	if {[base32decode "4OYMIQUY7QOBJGX36TEJS35ZEQT24QPEMSNZGTFESWMRW6CSXBKQ===="] != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"} {
+		puts {[base32decode "4OYMIQUY7QOBJGX36TEJS35ZEQT24QPEMSNZGTFESWMRW6CSXBKQ===="] != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
 		exit 1
 	}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120801/c16ff4b7/attachment.html>