Merge branch 'master' into fix_addkey
Corrected KeyczarTool tests to use the new version for added keys (max key version)
Fix for AttachedSign with empty hidden, issue 120
Merge branch 'fix_addkey'
Merge branch 'master' into keygen_refactor
Updated docs in default key type. Set the default for the rsa tool test to be 1024 bits instead of 512 to remove the ability to encrypt with 512 byte keys
Add freebsd8+9 to platforms.

Signed-off-by: Devin Lundberg <dlundberg@google.com>
Created X509 parse unit test
Fixed bug in x509 parsing presented by hans@at.or.at, issue 89
Moved unpadding to after mac validation

This will prevent padding oracles.
Should use bitlength from generated p value.

Fixes issue 130
Merge branch 'fix_x509_python'
fixed the openssl pem bug that caused several cpp test cases to fail. loaded all algorithms instead of just ciphers.
Merge branch 'freebsd_support'
Updated docs to match openssl code changes
Merge branch 'master' into java/all

Conflicts:
	java/code/testdata
	java/code/tests/org/keyczar/KeyczarToolTest.java