state: add CACert to Info.

environs/config/authkeys.go

 package config
 
 import (
         "bytes"
         "crypto/tls"
         "crypto/x509"
         "encoding/pem"
         "fmt"
         "io/ioutil"
         "os"
@@ skipping 46 matching lines @@
                         firstError = fmt.Errorf("no public ssh keys found")
                 }
                 return "", firstError
         }
         return string(keyData), nil
 }
 
 // verifyKeyPair verifies that the certificate and key parse correctly.
 // The key is optional - if it is provided, we also check that the key
 // matches the certificate.
-func verifyKeyPair(certPEM, keyPEM []byte) error {
-        if keyPEM != nil {
-                _, err := tls.X509KeyPair(certPEM, keyPEM)
+func verifyKeyPair(cert, key []byte) error {
+        if key != nil {
+                _, err := tls.X509KeyPair(cert, key)
                 return err
         }
-        for len(certPEM) > 0 {
+        for len(cert) > 0 {
                 var certBlock *pem.Block
-                certBlock, certPEM = pem.Decode(certPEM)
+                certBlock, cert = pem.Decode(cert)
                 if certBlock == nil {
                         break
                 }
                 if certBlock.Type == "CERTIFICATE" {
                         _, err := x509.ParseCertificate(certBlock.Bytes)
                         return err
                 }
         }
         return fmt.Errorf("no certificates found")
 }