diff options
author | lloyd <[email protected]> | 2010-09-13 20:53:31 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-09-13 20:53:31 +0000 |
commit | 4fe8a34f1869805d9115f39cad53d1fd7f7eb6c4 (patch) | |
tree | 2ff6c30d1a7d5f2244b6f1b459a5ea10b6d43fe0 /checks/pk.cpp | |
parent | 36bfef27271eadffefbc6891a9d7fa7eed7b1e10 (diff) |
Remove more uses of vector to pointer implicit conversions
Diffstat (limited to 'checks/pk.cpp')
-rw-r--r-- | checks/pk.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/checks/pk.cpp b/checks/pk.cpp index 0d06e0983..eb93cc531 100644 --- a/checks/pk.cpp +++ b/checks/pk.cpp @@ -178,7 +178,7 @@ void validate_signature(PK_Verifier& v, PK_Signer& s, const std::string& algo, SecureVector<byte> expected = hex_decode(exp); - SecureVector<byte> sig = s.sign_message(message, message.size(), rng); + SecureVector<byte> sig = s.sign_message(message, rng); if(sig != expected) { @@ -187,7 +187,7 @@ void validate_signature(PK_Verifier& v, PK_Signer& s, const std::string& algo, failure = true; } - if(!v.verify_message(message, message.size(), sig, sig.size())) + if(!v.verify_message(message, sig)) { std::cout << "FAILED (verify): " << algo << std::endl; failure = true; @@ -196,7 +196,7 @@ void validate_signature(PK_Verifier& v, PK_Signer& s, const std::string& algo, /* This isn't a very thorough testing method, but it will hopefully catch any really horrible errors */ sig[0]++; - if(v.verify_message(message, message.size(), sig, sig.size())) + if(v.verify_message(message, sig)) { std::cout << "FAILED (accepted bad sig): " << algo << std::endl; failure = true; @@ -220,7 +220,7 @@ void validate_kas(PK_Key_Agreement& kas, const std::string& algo, SecureVector<byte> expected = hex_decode(output); SecureVector<byte> got = kas.derive_key(keylen, - pubkey, pubkey.size()).bits_of(); + pubkey).bits_of(); if(got != expected) { @@ -371,7 +371,7 @@ u32bit validate_rsa_ver(const std::string& algo, SecureVector<byte> sig = hex_decode(str[3]); bool passed = true; - passed = v.verify_message(msg, msg.size(), sig, sig.size()); + passed = v.verify_message(msg, sig); return (passed ? 0 : 1); #endif @@ -402,7 +402,7 @@ u32bit validate_rsa_ver_x509(const std::string& algo, SecureVector<byte> msg = hex_decode(str[1]); SecureVector<byte> sig = hex_decode(str[2]); - bool passed = v.verify_message(msg, msg.size(), sig, sig.size()); + bool passed = v.verify_message(msg, sig); return (passed ? 0 : 1); #endif @@ -427,7 +427,7 @@ u32bit validate_rw_ver(const std::string& algo, SecureVector<byte> sig = hex_decode(str[3]); bool passed = true; - passed = v.verify_message(msg, msg.size(), sig, sig.size()); + passed = v.verify_message(msg, sig); return (passed ? 0 : 1); #endif @@ -542,7 +542,7 @@ u32bit validate_gost_ver(const std::string& algo, SecureVector<byte> msg = hex_decode(str[2]); SecureVector<byte> sig = hex_decode(str[3]); - bool passed = v.verify_message(msg, msg.size(), sig, sig.size()); + bool passed = v.verify_message(msg, sig); return (passed ? 0 : 1); #endif @@ -575,7 +575,7 @@ u32bit validate_dsa_ver(const std::string& algo, SecureVector<byte> sig = hex_decode(str[2]); v.set_input_format(DER_SEQUENCE); - bool passed = v.verify_message(msg, msg.size(), sig, sig.size()); + bool passed = v.verify_message(msg, sig); return (passed ? 0 : 1); #endif |