aboutsummaryrefslogtreecommitdiffstats
path: root/src/pubkey
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-09-14 02:05:05 +0000
committerlloyd <[email protected]>2010-09-14 02:05:05 +0000
commit77a33b0c16880884cc0326e92c0c30d0e8444a91 (patch)
treedf2d917b312abb79c8654558399521366dbb2d14 /src/pubkey
parent59a9b0ef260b010606edc3384035b6aa12dd6415 (diff)
More changes to avoid vector to pointer implicit conversions
Diffstat (limited to 'src/pubkey')
-rw-r--r--src/pubkey/nr/nr.cpp4
-rw-r--r--src/pubkey/pkcs8.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pubkey/nr/nr.cpp b/src/pubkey/nr/nr.cpp
index 3c5b71ad2..244a397ee 100644
--- a/src/pubkey/nr/nr.cpp
+++ b/src/pubkey/nr/nr.cpp
@@ -104,8 +104,8 @@ NR_Signature_Operation::sign(const byte msg[], u32bit msg_len,
}
SecureVector<byte> output(2*q.bytes());
- c.binary_encode(output + (output.size() / 2 - c.bytes()));
- d.binary_encode(output + (output.size() - d.bytes()));
+ c.binary_encode(&output[output.size() / 2 - c.bytes()]);
+ d.binary_encode(&output[output.size() - d.bytes()]);
return output;
}
diff --git a/src/pubkey/pkcs8.cpp b/src/pubkey/pkcs8.cpp
index 5eed776be..415aed790 100644
--- a/src/pubkey/pkcs8.cpp
+++ b/src/pubkey/pkcs8.cpp
@@ -101,7 +101,7 @@ SecureVector<byte> PKCS8_decode(DataSource& source, const User_Interface& ui,
pbe->set_key(passphrase);
Pipe decryptor(pbe.release());
- decryptor.process_msg(key_data, key_data.size());
+ decryptor.process_msg(key_data);
key = decryptor.read_all();
}