anchor.diff:           }
           ],
       [{poly1305,V} | Config];
  -group_config(aes_cbc, Config) ->
  -    Block = aes_cbc(Config),
  -    [{block, Block} | Config];
  -group_config(_, Config) ->
  -    Config.
  +
  +group_config(F, Config) ->
  +    TestVectors = fun() -> ?MODULE:F(Config) end,
  +    [{cipher, TestVectors} | Config].
  +
  +
   
   rsa_sign_verify_tests(Config, Msg, Public, Private, PublicS, PrivateS, OptsToTry) ->
           case ?config(fips, Config) of
  
positive.code:      <<"Now is the time for all ">>
       }].
  
  rc2_cbc() ->
      [{rc2_cbc,
       <<146,210,160,124,215,227,153,239,227,17,222,140,3,93,27,191>>,
        <<72,91,135,182,25,42,35,210>>,
  
negative.code:     MsgPubEnc = <<"7896345786348 Asldi">>,
      PubPrivEnc = [{ecdsa, Public, Private, MsgPubEnc, []}],
      [{sign_verify, SignVerify}, {pub_priv_encrypt, PubPrivEnc} | Config];
  group_config(Type, Config) when Type == ed25519 ; Type == ed448 ->
      TestVectors = eddsa(Type),
      [{sign_verify,TestVectors} | Config]; 
  group_config(srp, Config) ->
      GenerateCompute = [srp3(), srp6(), srp6a(), srp6a_smaller_prime()],
      [{generate_compute, GenerateCompute} | Config];
  
  group_config(ecdh, Config) ->
      Compute = ecdh(),
      Generate = ecc(),
  