| Index: ipc/brokerable_attachment.cc
|
| diff --git a/ipc/brokerable_attachment.cc b/ipc/brokerable_attachment.cc
|
| index 70bd0b2cd306da18930c5c4a260530a8d2e6902d..681e2ba0b5626d39130626d7f2b6563dbf32b5f5 100644
|
| --- a/ipc/brokerable_attachment.cc
|
| +++ b/ipc/brokerable_attachment.cc
|
| @@ -6,44 +6,8 @@
|
|
|
| #include "ipc/attachment_broker.h"
|
|
|
| -#if USE_ATTACHMENT_BROKER
|
| -#include "crypto/random.h"
|
| -#endif
|
| -
|
| namespace IPC {
|
|
|
| -
|
| -#if USE_ATTACHMENT_BROKER
|
| -BrokerableAttachment::AttachmentId::AttachmentId() {
|
| -// In order to prevent mutually untrusted processes from stealing resources from
|
| -// one another, the nonce must be secret. This generates a 128-bit,
|
| -// cryptographicaly-strong random number.
|
| - crypto::RandBytes(nonce, BrokerableAttachment::kNonceSize);
|
| -}
|
| -#else
|
| -BrokerableAttachment::AttachmentId::AttachmentId() {
|
| - CHECK(false) << "Not allowed to construct an attachment id if the platform "
|
| - "does not support attachment brokering.";
|
| -}
|
| -#endif
|
| -
|
| -BrokerableAttachment::AttachmentId::AttachmentId(const char* start_address,
|
| - size_t size) {
|
| - DCHECK(size == BrokerableAttachment::kNonceSize);
|
| - for (size_t i = 0; i < BrokerableAttachment::kNonceSize; ++i)
|
| - nonce[i] = start_address[i];
|
| -}
|
| -
|
| -void BrokerableAttachment::AttachmentId::SerializeToBuffer(char* start_address,
|
| - size_t size) {
|
| - DCHECK(size == BrokerableAttachment::kNonceSize);
|
| - for (size_t i = 0; i < BrokerableAttachment::kNonceSize; ++i)
|
| - start_address[i] = nonce[i];
|
| -}
|
| -
|
| -BrokerableAttachment::BrokerableAttachment()
|
| - : needs_brokering_(false) {}
|
| -
|
| BrokerableAttachment::BrokerableAttachment(const AttachmentId& id,
|
| bool needs_brokering)
|
| : id_(id), needs_brokering_(needs_brokering) {}
|
|
|