Skip to content
This repository has been archived by the owner on May 16, 2020. It is now read-only.

Commit

Permalink
Merge pull request #21 from vladimiroff/uncamelize
Browse files Browse the repository at this point in the history 
Don't use camelCase on the keyczar name
  • Loading branch information
@dgryski
dgryski committed Feb 15, 2016
2 parents 97c9c77 + 8ad3ef6 commit 05c8ea3
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions TODO
View file
@@ -1,9 +1,9 @@
- Make all encrypt/decrypt/sign/verify calls expose same api, if possible
-- If you want an attached signature, created an AttachedSigner
-- If you want an attached signature, created an AttachedSigner
- improve external docs (README, examples, ...)
- improve tests -- not enough failure cases are checked
- key.Type() => ktFOO constant
- some of the keyman routines poke into keyCzar internals
- some of the keyman routines poke into keyczar internals
- some of the ImportFOOForBar would be easier if we exported the KeyPurpose enum
- fix keymeta.Versions so Versions[versionNumber] is correct (placeholder? nil?)
- write functions to abstract byte-stream format
Expand Down
38 changes: 19 additions & 19 deletions keyczar.go
View file
Expand Up @@ -42,7 +42,7 @@ const (
)

// Our main base type. We only expose this through one of the interfaces.
type keyCzar struct {
type keyczar struct {
keymeta keyMeta // metadata for this key
keys map[int]keydata // maps versions to keys
idkeys map[uint32][]keydata // maps keyids to keys
Expand Down Expand Up @@ -233,21 +233,21 @@ func (cc *compressionController) decompress(data []byte) ([]byte, error) {
}

type keyCrypter struct {
kz *keyCzar
kz *keyczar
encodingController
compressionController
}

type keySignedEncypter struct {
kz *keyCzar
kz *keyczar
encodingController
compressionController
nonce []byte
signer Signer
}

type keySignedDecrypter struct {
kz *keyCzar
kz *keyczar
encodingController
compressionController
nonce []byte
Expand Down Expand Up @@ -348,7 +348,7 @@ func (kc *keySignedDecrypter) Decrypt(signedCiphertext string) ([]uint8, error)
type currentTime func() int64

type keySigner struct {
kz *keyCzar
kz *keyczar
currentTime
encodingController
}
Expand Down Expand Up @@ -635,7 +635,7 @@ func (ks *keySigner) TimeoutVerify(message []byte, signature string) (bool, erro
func NewCrypter(r KeyReader) (Crypter, error) {
k := new(keyCrypter)
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)

if err != nil {
return nil, err
Expand All @@ -656,7 +656,7 @@ func NewCrypter(r KeyReader) (Crypter, error) {
func NewSignedEncrypter(r KeyReader, signer Signer, nonce []byte) (SignedEncrypter, error) {
k := new(keySignedEncypter)
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)
k.nonce = nonce
k.signer = signer

Expand All @@ -679,7 +679,7 @@ func NewSignedEncrypter(r KeyReader, signer Signer, nonce []byte) (SignedEncrypt
func NewSignedDecrypter(r KeyReader, verifier Verifier, nonce []byte) (SignedDecrypter, error) {
k := new(keySignedDecrypter)
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)
k.nonce = nonce
k.verifier = verifier

Expand All @@ -703,7 +703,7 @@ func NewSignedDecrypter(r KeyReader, verifier Verifier, nonce []byte) (SignedDec
func NewEncrypter(r KeyReader) (Encrypter, error) {
k := new(keyCrypter)
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)

if err != nil {
return nil, err
Expand All @@ -728,7 +728,7 @@ func NewVerifier(r KeyReader) (Verifier, error) {
return time.Now().UnixNano() / int64(time.Millisecond)
}
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)

if err != nil {
return nil, err
Expand All @@ -746,7 +746,7 @@ func NewVerifierTimeProvider(r KeyReader, t currentTime) (Verifier, error) {
k := new(keySigner)
k.currentTime = t
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)

if err != nil {
return nil, err
Expand All @@ -763,7 +763,7 @@ func NewVerifierTimeProvider(r KeyReader, t currentTime) (Verifier, error) {
func NewSigner(r KeyReader) (Signer, error) {
k := new(keySigner)
var err error
k.kz, err = newKeyCzar(r)
k.kz, err = newKeyczar(r)

if err != nil {
return nil, err
Expand Down Expand Up @@ -853,7 +853,7 @@ func NewSignedSessionDecrypter(crypter Crypter, verifier Verifier, sessionKeys s
return NewSignedDecrypter(r, verifier, sm.nonce)
}

func (kz *keyCzar) loadPrimaryKey() error {
func (kz *keyczar) loadPrimaryKey() error {

// search for the primary key
kz.primary = -1
Expand All @@ -876,22 +876,22 @@ func (kz *keyCzar) loadPrimaryKey() error {

}

func (kz *keyCzar) getPrimaryKey() keydata {
func (kz *keyczar) getPrimaryKey() keydata {
if kz.primary == -1 {
return nil
}
return kz.keys[kz.primary]
}

func (kz *keyCzar) isAcceptablePurpose(purpose keyPurpose) bool {
func (kz *keyczar) isAcceptablePurpose(purpose keyPurpose) bool {
return kz.keymeta.Purpose.isAcceptablePurpose(purpose)
}

type lookupKeyIDer interface {
getKeyForID(id []byte) ([]keydata, error)
}

func (kz *keyCzar) getKeyForID(id []byte) ([]keydata, error) {
func (kz *keyczar) getKeyForID(id []byte) ([]keydata, error) {

kl, ok := kz.idkeys[binary.BigEndian.Uint32(id)]

Expand All @@ -902,7 +902,7 @@ func (kz *keyCzar) getKeyForID(id []byte) ([]keydata, error) {
return kl, nil
}

func newKeysFromReader(r KeyReader, kz *keyCzar, keyFromJSON func([]byte) (keydata, error)) (map[int]keydata, map[uint32][]keydata, error) {
func newKeysFromReader(r KeyReader, kz *keyczar, keyFromJSON func([]byte) (keydata, error)) (map[int]keydata, map[uint32][]keydata, error) {

keys := make(map[int]keydata)
idkeys := make(map[uint32][]keydata)
Expand Down Expand Up @@ -932,9 +932,9 @@ func newKeysFromReader(r KeyReader, kz *keyCzar, keyFromJSON func([]byte) (keyda
}

// construct a keyczar object from a reader for a given purpose
func newKeyCzar(r KeyReader) (*keyCzar, error) {
func newKeyczar(r KeyReader) (*keyczar, error) {

kz := new(keyCzar)
kz := new(keyczar)

kz.primary = -1

Expand Down
8 changes: 4 additions & 4 deletions keyman.go
View file
Expand Up @@ -18,7 +18,7 @@ type KeyManager interface {
}

type keyManager struct {
kz *keyCzar
kz *keyczar
}

// NewKeyManager returns a new KeyManager
Expand All @@ -28,13 +28,13 @@ func NewKeyManager() KeyManager {

func (m *keyManager) Load(reader KeyReader) error {
var err error
m.kz, err = newKeyCzar(reader)
m.kz, err = newKeyczar(reader)
return err
}

func (m *keyManager) Create(name string, purpose keyPurpose, ktype keyType) error {

m.kz = &keyCzar{
m.kz = &keyczar{
keymeta: keyMeta{name, ktype, purpose, false, nil},
keys: make(map[int]keydata),
idkeys: make(map[uint32][]keydata),
Expand Down Expand Up @@ -177,7 +177,7 @@ func (m *keyManager) PubKeys() KeyManager {
return nil // unknown types
}

km.kz = &keyCzar{keyMeta{m.kz.keymeta.Name, kt, kp, false, nil}, nil, nil, -1}
km.kz = &keyczar{keyMeta{m.kz.keymeta.Name, kt, kp, false, nil}, nil, nil, -1}

km.kz.keymeta.Versions = make([]keyVersion, len(m.kz.keymeta.Versions))

Expand Down

0 comments on commit 05c8ea3

Please sign in to comment.