From 8242184fe528b19b7ddb10aa1b62d849d2f72490 Mon Sep 17 00:00:00 2001 From: Ismail Khoffi Date: Thu, 13 Jun 2019 14:22:35 +0200 Subject: [PATCH] Update protobuf dependency and regenerate rust code https://github.com/RustSec/advisory-db/blob/master/crates/protobuf/RUSTSEC-2019-0003.toml https://github.com/stepancheg/rust-protobuf/issues/411 --- Cargo.toml | 4 ++-- src/messages/abci.rs | 24 ++++++++++++------------ src/messages/merkle.rs | 6 +++--- src/messages/types.rs | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 10056da..8590e3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ include = ["src/**/*", "Cargo.toml"] [dependencies] bytes = "0.4" -protobuf = "2.2.0" +protobuf = "2.6.2" byteorder = "1.2.7" integer-encoding = "1.0.5" log = "0.4.6" @@ -21,4 +21,4 @@ tokio = "0.1" futures = "0.1" [build-dependencies] -protobuf-codegen-pure = "2.2.0" +protobuf-codegen-pure = "2.6.2" diff --git a/src/messages/abci.rs b/src/messages/abci.rs index 4057f89..7d822ed 100644 --- a/src/messages/abci.rs +++ b/src/messages/abci.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.6.1. Do not edit +// This file is generated by rust-protobuf 2.6.2. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 @@ -11453,19 +11453,19 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x01(\x0cB\0\x12\x1e\n\x05proof\x18\x08\x20\x01(\x0b2\r.merkle.ProofB\0\ \x12\x10\n\x06height\x18\t\x20\x01(\x03B\0\x12\x13\n\tcodespace\x18\n\ \x20\x01(\tB\0:\0\"L\n\x12ResponseBeginBlock\x124\n\x04tags\x18\x01\x20\ - \x03(\x0b2\x0e.common.KVPairB\x16\xea\xde\x1f\x0etags,omitempty\xc8\xde\ - \x1f\0:\0\"\xc7\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\x20\ + \x03(\x0b2\x0e.common.KVPairB\x16\xc8\xde\x1f\0\xea\xde\x1f\x0etags,omit\ + empty:\0\"\xc7\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\x20\ \x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03log\x18\ \x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\x14\n\nga\ s_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\x20\x01(\ - \x03B\0\x124\n\x04tags\x18\x07\x20\x03(\x0b2\x0e.common.KVPairB\x16\xc8\ - \xde\x1f\0\xea\xde\x1f\x0etags,omitempty\x12\x13\n\tcodespace\x18\x08\ + \x03B\0\x124\n\x04tags\x18\x07\x20\x03(\x0b2\x0e.common.KVPairB\x16\xea\ + \xde\x1f\x0etags,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespace\x18\x08\ \x20\x01(\tB\0:\0\"\xc9\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\x18\ \x01\x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03\ log\x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\ \x14\n\ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\ \x20\x01(\x03B\0\x124\n\x04tags\x18\x07\x20\x03(\x0b2\x0e.common.KVPairB\ - \x16\xc8\xde\x1f\0\xea\xde\x1f\x0etags,omitempty\x12\x13\n\tcodespace\ + \x16\xea\xde\x1f\x0etags,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespace\ \x18\x08\x20\x01(\tB\0:\0\"\xbc\x01\n\x10ResponseEndBlock\x126\n\x11vali\ dator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ \xde\x1f\0\x128\n\x17consensus_param_updates\x18\x02\x20\x01(\x0b2\x15.a\ @@ -11484,8 +11484,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12$\n\x07version\x18\x01\x20\x01(\x0b2\r.abci.VersionB\x04\xc8\xde\x1f\ \0\x12\x1d\n\x08chain_id\x18\x02\x20\x01(\tB\x0b\xe2\xde\x1f\x07ChainID\ \x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\x122\n\x04time\x18\x04\x20\ - \x01(\x0b2\x1a.google.protobuf.TimestampB\x08\x90\xdf\x1f\x01\xc8\xde\ - \x1f\0\x12\x11\n\x07num_txs\x18\x05\x20\x01(\x03B\0\x12\x13\n\ttotal_txs\ + \x01(\x0b2\x1a.google.protobuf.TimestampB\x08\xc8\xde\x1f\0\x90\xdf\x1f\ + \x01\x12\x11\n\x07num_txs\x18\x05\x20\x01(\x03B\0\x12\x13\n\ttotal_txs\ \x18\x06\x20\x01(\x03B\0\x12*\n\rlast_block_id\x18\x07\x20\x01(\x0b2\r.a\ bci.BlockIDB\x04\xc8\xde\x1f\0\x12\x1a\n\x10last_commit_hash\x18\x08\x20\ \x01(\x0cB\0\x12\x13\n\tdata_hash\x18\t\x20\x01(\x0cB\0\x12\x19\n\x0fval\ @@ -11509,10 +11509,10 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \0:\0\"\xaa\x01\n\x08Evidence\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\ \x12(\n\tvalidator\x18\x02\x20\x01(\x0b2\x0f.abci.ValidatorB\x04\xc8\xde\ \x1f\0\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\x122\n\x04time\x18\ - \x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\xc8\xde\x1f\0\x90\ - \xdf\x1f\x01\x12\x1c\n\x12total_voting_power\x18\x05\x20\x01(\x03B\0:\0B\ - \x1c\xd0\xe2\x1e\x01\xb8\xe2\x1e\x01\xf8\xe1\x1e\x01\xe0\xe2\x1e\x01\xc8\ - \xe2\x1e\x01\xc0\xe3\x1e\x01\xa8\xe2\x1e\x01b\x06proto3\ + \x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\x90\xdf\x1f\x01\ + \xc8\xde\x1f\0\x12\x1c\n\x12total_voting_power\x18\x05\x20\x01(\x03B\0:\ + \0B\x1c\xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\xb8\xe2\x1e\x01\xf8\xe1\x1e\x01\ + \xc8\xe2\x1e\x01\xc0\xe3\x1e\x01\xa8\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/merkle.rs b/src/messages/merkle.rs index 11a4c70..6ee70b4 100644 --- a/src/messages/merkle.rs +++ b/src/messages/merkle.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.6.1. Do not edit +// This file is generated by rust-protobuf 2.6.2. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 @@ -455,8 +455,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ rkle\":\n\x07ProofOp\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\x12\r\n\x03\ key\x18\x02\x20\x01(\x0cB\0\x12\x0e\n\x04data\x18\x03\x20\x01(\x0cB\0:\0\ \"-\n\x05Proof\x12\"\n\x03ops\x18\x01\x20\x03(\x0b2\x0f.merkle.ProofOpB\ - \x04\xc8\xde\x1f\0:\0B\x14\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\xe2\x1e\ - \x01\xa8\xe2\x1e\x01\xf8\xe1\x1e\x01b\x06proto3\ + \x04\xc8\xde\x1f\0:\0B\x14\xf8\xe1\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\ + \x01\xe0\xe2\x1e\x01\xa8\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/types.rs b/src/messages/types.rs index 6bfaf37..9a228dc 100644 --- a/src/messages/types.rs +++ b/src/messages/types.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.6.1. Do not edit +// This file is generated by rust-protobuf 2.6.2. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 @@ -440,9 +440,9 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \n8github.com/tendermint/tendermint/libs/common/types.proto\x12\x06commo\ n\"*\n\x06KVPair\x12\r\n\x03key\x18\x01\x20\x01(\x0cB\0\x12\x0f\n\x05val\ ue\x18\x02\x20\x01(\x0cB\0:\0\",\n\x08KI64Pair\x12\r\n\x03key\x18\x01\ - \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xb8\ - \xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\ - \x01\xa8\xe2\x1e\x01\xf8\xe1\x1e\x01b\x06proto3\ + \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xe0\ + \xe2\x1e\x01\xb8\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01\xc0\xe3\x1e\ + \x01\xf8\xe1\x1e\x01\xa8\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {