Fixed failing RSA unit tests.

Author: mitchell-as

internal/keypairs/rsa_keypair_test.go

@@ -31,11 +31,11 @@ func (suite *RSAKeypairTestSuite) TestGenerateRSA_UsesMinimumBitLength() {
 func (suite *RSAKeypairTestSuite) TestGenerateRSA_GeneratesRSAKeypair() {
 	kp, err := keypairs.GenerateRSA(keypairs.MinimumRSABitLength)
 	suite.Require().Nil(err)
-	suite.Regexp(`^-{5}BEGIN RSA PRIVATE KEY-{5}\s[[:alnum:]/+=]{44}\s-{5}END RSA PRIVATE KEY-{5}\s`, kp.EncodePrivateKey())
+	suite.Regexp(`^-{5}BEGIN RSA PRIVATE KEY-{5}\s[[:alnum:]/+=\s]+?\s-{5}END RSA PRIVATE KEY-{5}`, kp.EncodePrivateKey())
 
 	encPubKey, err := kp.EncodePublicKey()
 	suite.Require().Nil(err)
-	suite.Regexp(`^-{5}BEGIN RSA PUBLIC KEY-{5}\s[[:alnum:]/+=]{44}\s-{5}END RSA PUBLIC KEY-{5}\s`, encPubKey)
+	suite.Regexp(`^-{5}BEGIN RSA PUBLIC KEY-{5}\s[[:alnum:]/+=\s]+\s-{5}END RSA PUBLIC KEY-{5}`, encPubKey)
 }
 
 func (suite *RSAKeypairTestSuite) TestRSAKeypair_EncryptAndEncodePrivateKey() {
@@ -51,18 +51,8 @@ func (suite *RSAKeypairTestSuite) TestRSAKeypair_EncryptAndEncodePrivateKey() {
 	suite.Regexp(`-{5}END RSA PRIVATE KEY-{5}\s`, keyPEM)
 }
 
-func (suite *RSAKeypairTestSuite) TestRSAKeypair_MessageTooLongForKeySize() {
-	kp, err := keypairs.GenerateRSA(keypairs.MinimumRSABitLength)
-	suite.Require().Nil(err)
-
-	encMsg, err := kp.Encrypt([]byte("howdy doody"))
-	suite.Nil(encMsg)
-	suite.Require().Error(err)
-	suite.Contains(err.Error(), "EncryptOAEP failed")
-}
-
 func (suite *RSAKeypairTestSuite) TestRSAKeypair_EncryptsAndDecrypts() {
-	kp, err := keypairs.GenerateRSA(1024)
+	kp, err := keypairs.GenerateRSA(keypairs.MinimumRSABitLength)
 	suite.Require().Nil(err)
 
 	encryptedMsg, err := kp.Encrypt([]byte("howdy doody"))
@@ -75,7 +65,7 @@ func (suite *RSAKeypairTestSuite) TestRSAKeypair_EncryptsAndDecrypts() {
 }
 
 func (suite *RSAKeypairTestSuite) TestRSAKeypair_EncodesAndDeccodesEncryptedValues() {
-	kp, err := keypairs.GenerateRSA(1024)
+	kp, err := keypairs.GenerateRSA(keypairs.MinimumRSABitLength)
 	suite.Require().Nil(err)
 
 	encryptedMsg, err := kp.EncryptAndEncode([]byte("howdy doody"))

internal/secrets/share_test.go

@@ -52,25 +52,6 @@ func (suite *SecretsSharingTestSuite) TestFailure_FirstShareHasBadlyEncryptedVal
 	suite.Require().Error(err)
 }
 
-func (suite *SecretsSharingTestSuite) TestFailure_FailedToEncryptForTargetUser() {
-	shortKeypair, err := keypairs.GenerateRSA(keypairs.MinimumRSABitLength)
-	suite.Require().NoError(err)
-
-	// this is a valid public key, but will be too short for encrypting with
-	shortPubKey, err := shortKeypair.EncodePublicKey()
-	suite.Require().NoError(err)
-
-	encrValue, err := suite.sourceKeypair.EncryptAndEncode([]byte("luv 2 encrypt data"))
-	suite.Require().NoError(err)
-
-	newShares, err := secrets.ShareFromDiff(suite.sourceKeypair, &secrets_models.UserSecretDiff{
-		PublicKey: &shortPubKey,
-		Shares:    []*secrets_models.UserSecretShare{newUserSecretShare("", "FOO", encrValue)},
-	})
-	suite.Nil(newShares)
-	suite.Require().Error(err)
-}
-
 func (suite *SecretsSharingTestSuite) TestSuccess_ReceivedEmptySharesList() {
 	newShares, err := secrets.ShareFromDiff(suite.sourceKeypair, &secrets_models.UserSecretDiff{
 		PublicKey: &suite.targetPubKey,