From 394941b6b0a30fecf8ae7b6de5880fa553141f93 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Mon, 22 Jul 2013 16:16:31 -0700
Subject: [PATCH] Switch json/payload order

---
 auth/auth.go    | 4 ++--
 utils/tarsum.go | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/auth/auth.go b/auth/auth.go
index e402031ca2..6dd6ceb620 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -16,9 +16,9 @@ import (
 const CONFIGFILE = ".dockercfg"
 
 // Only used for user auth + account creation
-//const INDEXSERVER = "https://index.docker.io/v1/"
+const INDEXSERVER = "https://index.docker.io/v1/"
 
-const INDEXSERVER = "https://indexstaging-docker.dotcloud.com/v1/"
+//const INDEXSERVER = "https://indexstaging-docker.dotcloud.com/v1/"
 
 var (
 	ErrConfigFileMissing = errors.New("The Auth config file is missing")
diff --git a/utils/tarsum.go b/utils/tarsum.go
index 015b9b3076..d3e1db61f1 100644
--- a/utils/tarsum.go
+++ b/utils/tarsum.go
@@ -145,13 +145,13 @@ func (ts *TarSum) Read(buf []byte) (int, error) {
 func (ts *TarSum) Sum(extra []byte) string {
 	sort.Strings(ts.sums)
 	h := sha256.New()
+	if extra != nil {
+		h.Write(extra)
+	}
 	for _, sum := range ts.sums {
 		Debugf("-->%s<--", sum)
 		h.Write([]byte(sum))
 	}
-	if extra != nil {
-		h.Write(extra)
-	}
 	checksum := "tarsum+sha256:" + hex.EncodeToString(h.Sum(nil))
 	Debugf("checksum processed: %s", checksum)
 	return checksum