| Index: nss_util.cc
|
| diff --git a/nss_util.cc b/nss_util.cc
|
| index 2ef55f0b138ce13854ce2127e1a40d92f7d192db..1f2f963f9ebd36e560c795881e6d1f9e087ed3ab 100644
|
| --- a/nss_util.cc
|
| +++ b/nss_util.cc
|
| @@ -13,7 +13,6 @@
|
| #include <base/nss_util.h>
|
| #include <base/scoped_ptr.h>
|
| #include <cros/chromeos_login.h>
|
| -#include <glib/garray.h>
|
|
|
| namespace login_manager {
|
| ///////////////////////////////////////////////////////////////////////////
|
| @@ -67,11 +66,11 @@ NssUtil* NssUtil::Create() {
|
| }
|
|
|
| // static
|
| -void NssUtil::KeyFromBuffer(const GArray* buf, std::vector<uint8>* out) {
|
| - out->resize(buf->len);
|
| - if (buf->len == 0)
|
| +void NssUtil::KeyFromBuffer(const std::string& buf, std::vector<uint8>* out) {
|
| + out->resize(buf.length());
|
| + if (out->size() == 0)
|
| return;
|
| - memcpy(&(out->at(0)), buf->data, buf->len);
|
| + memcpy(&(out->at(0)), buf.c_str(), out->size());
|
| }
|
|
|
| // We're generating and using 2048-bit RSA keys.
|
|
|