fixes for 06/09 go weekly

uwedeportivo · Jun 12, 2011 · 78e9b5a · 78e9b5a
1 parent bb23e0e
commit 78e9b5a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/goclient/kindi/bitmap.go b/goclient/kindi/bitmap.go
@@ -70,7 +70,9 @@ func (pi *payloadImage) b(i int) byte {
 }
 
 func (pi *payloadImage) At(x, y int) image.Color {
-	if !pi.bounds.Contains(image.Point{x, y}) {
+	p := image.Point{x, y}
+
+	if !p.In(pi.bounds) {
 		return image.NRGBAColor{}
 	}
 

diff --git a/goclient/kindi/keychain.go b/goclient/kindi/keychain.go
@@ -30,10 +30,12 @@
 package kindi
 
 import (
+	"big"
         "bytes"
         "crypto/rsa"
         "crypto/rand"
         "crypto/x509"
+	"crypto/x509/pkix"
         "encoding/pem"
         "fmt"
 	"io/ioutil"
@@ -198,8 +200,8 @@ func Generate(certoutPath, pngoutPath, keyoutPath string) os.Error {
         now := time.Seconds()
 
         template := x509.Certificate{
-        SerialNumber: []byte{0},
-        Subject: x509.Name{
+        SerialNumber: big.NewInt(0),
+        Subject: pkix.Name{
                 CommonName:   "kindi",
                 Organization: []string{"codemanic.com"},
                 },

diff --git a/goclient/kindi/picasa.go b/goclient/kindi/picasa.go
@@ -64,7 +64,7 @@ func jsonPath(object interface{}, path string) interface{} {
 
 func fetchKindiAlbumId(user string) (string, os.Error) {
 	url := "https://picasaweb.google.com/data/feed/api/user/" + user + "?alt=json"
-	httpResponse, _, err := http.DefaultClient.Get(url)
+	httpResponse, err := http.DefaultClient.Get(url)
 	if err != nil {
 		return "", err
 	}
@@ -129,7 +129,7 @@ func fetchImageURL(user string) (string, os.Error) {
 
 	url := "https://picasaweb.google.com/data/feed/api/user/" + user + "/albumid/" + albumId + "?alt=json"
 
-	httpResponse, _, err := http.DefaultClient.Get(url)
+	httpResponse, err := http.DefaultClient.Get(url)
 	if err != nil {
 		return "", err
 	}
@@ -179,7 +179,7 @@ func fetchCertBytes(user string) ([]byte, os.Error) {
 		return nil, nil
 	}
 
-	httpResponse, _, err := http.DefaultClient.Get(imageURL)
+	httpResponse, err := http.DefaultClient.Get(imageURL)
 	if err != nil {
 		return nil, err
 	}