idk/go-i2p
1
0
Fork 0
mirror of https://github.com/go-i2p/go-i2p.git synced 2025-07-06 14:33:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

more keys and cert testing

Browse Source
This commit is contained in:
Hayden Parker
2016-06-17 00:09:33 -07:00
parent 89b9e418c2
commit e05c0bc9bc
2 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/common/keys_and_cert.go
View File

@ -180,12 +180,17 @@ func ReadKeysAndCert(data []byte) (keys_and_cert KeysAndCert, remainder []byte,
} }
keys_and_cert = KeysAndCert(data[:KEYS_AND_CERT_MIN_SIZE]) keys_and_cert = KeysAndCert(data[:KEYS_AND_CERT_MIN_SIZE])
cert, _ := keys_and_cert.Certificate() cert, _ := keys_and_cert.Certificate()
cert_len, _ := cert.Length() cert_len, cert_len_err := cert.Length()
if cert_len == 0 { if cert_len == 0 {
remainder = data[KEYS_AND_CERT_MIN_SIZE:] remainder = data[KEYS_AND_CERT_MIN_SIZE:]
return return
} }
keys_and_cert = append(keys_and_cert, data[KEYS_AND_CERT_MIN_SIZE:KEYS_AND_CERT_MIN_SIZE+cert_len]...) if data_len < KEYS_AND_CERT_MIN_SIZE+cert_len {
remainder = data[KEYS_AND_CERT_MIN_SIZE+cert_len:] keys_and_cert = append(keys_and_cert, data[KEYS_AND_CERT_MIN_SIZE:]...)
err = cert_len_err
} else {
keys_and_cert = append(keys_and_cert, data[KEYS_AND_CERT_MIN_SIZE:KEYS_AND_CERT_MIN_SIZE+cert_len]...)
remainder = data[KEYS_AND_CERT_MIN_SIZE+cert_len:]
}
return return
} }

58
lib/common/keys_and_cert_test.go
View File

@ -45,6 +45,28 @@ func TestReadKeysAndCertWithMissingData(t *testing.T) {
} }
func TestReadKeysAndCertWithMissingCertData(t *testing.T) { func TestReadKeysAndCertWithMissingCertData(t *testing.T) {
assert := assert.New(t)
cert_data := make([]byte, 128+256)
cert_data = append(cert_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01}...)
keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
assert.Equal(0, len(remainder))
if assert.NotNil(err) {
assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
}
_, err = keys_and_cert.PublicKey()
if assert.NotNil(err) {
assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
}
_, err = keys_and_cert.SigningPublicKey()
if assert.NotNil(err) {
assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
}
_, err = keys_and_cert.Certificate()
if assert.NotNil(err) {
assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
}
} }
func TestReadKeysAndCertWithValidDataWithCertificate(t *testing.T) { func TestReadKeysAndCertWithValidDataWithCertificate(t *testing.T) {
@ -82,11 +104,39 @@ func TestReadKeysAndCertWithValidDataWithoutCertificate(t *testing.T) {
} }
func TestReadKeysAndCertWithValidDataWithCertificateAndRemainder(t *testing.T) { func TestReadKeysAndCertWithValidDataWithCertificateAndRemainder(t *testing.T) {
assert := assert.New(t)
cert_data := make([]byte, 128+256)
cert_data = append(cert_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x41}...)
keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
if assert.Equal(1, len(remainder)) {
assert.Equal("A", string(remainder[0]))
}
assert.Nil(err)
_, err = keys_and_cert.PublicKey()
assert.Nil(err, "keys_and_cert.PublicKey() returned error with valid data containing certificate")
_, err = keys_and_cert.SigningPublicKey()
assert.Nil(err, "keys_and_cert.SigningPublicKey() returned error with valid data containing certificate")
_, err = keys_and_cert.Certificate()
assert.Nil(err, "keys_and_cert.Certificate() returned error with valid data containing certificate")
} }
func TestReadKeysAndCertWithValidDataWithoutCertificateAndRemainder(t *testing.T) { func TestReadKeysAndCertWithValidDataWithoutCertificateAndRemainder(t *testing.T) {
} assert := assert.New(t)
//if assert.NotNil(err) { cert_data := make([]byte, 128+256)
// assert.Equal(err.Error(), "", "correct error message should be returned") cert_data = append(cert_data, []byte{0x00, 0x00, 0x00, 0x41}...)
//} keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
if assert.Equal(1, len(remainder)) {
assert.Equal("A", string(remainder[0]))
}
assert.Nil(err)
_, err = keys_and_cert.PublicKey()
assert.Nil(err, "keys_and_cert.PublicKey() returned error with valid data not containing certificate")
_, err = keys_and_cert.SigningPublicKey()
assert.Nil(err, "keys_and_cert.SigningPublicKey() returned error with valid data not containing certificate")
_, err = keys_and_cert.Certificate()
assert.Nil(err, "keys_and_cert.Certificate() returned error with valid data not containing certificate")
}