12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455 |
- From 362be06fc16a5ad0f9e9aa90cc763c5242e8e35c Mon Sep 17 00:00:00 2001
- From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Date: Sat, 9 Feb 2019 12:41:45 +0100
- Subject: [PATCH] ssl_manager.cpp: fix build with gcc 7 and -fpermissive
- Change prototype of DERToken::parse function from
- parse(ConstDataRange cdr, size_t* outLength);
- to parse(ConstDataRange cdr, uint64_t* outLength);
- Otherwise, we got the following error:
- src/mongo/util/net/ssl_manager.cpp: In static member function 'static mongo::StatusWith<mongo::{anonymous}::DERToken> mongo::{anonymous}::DERToken::parse(mongo::ConstDataRange, size_t*)':
- src/mongo/util/net/ssl_manager.cpp:575:79: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive]
- if (mongoUnsignedAddOverflow64(tagAndLengthByteCount, derLength, outLength) ||
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- [Upstream status: https://github.com/mongodb/mongo/pull/1296]
- ---
- src/mongo/util/net/ssl_manager.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
- index b93ebe84a4..3511eb5d99 100644
- --- a/src/mongo/util/net/ssl_manager.cpp
- +++ b/src/mongo/util/net/ssl_manager.cpp
- @@ -782,7 +782,7 @@ public:
- *
- * Returns a DERToken which consists of the (tag, length, value) tuple.
- */
- - static StatusWith<DERToken> parse(ConstDataRange cdr, size_t* outLength);
- + static StatusWith<DERToken> parse(ConstDataRange cdr, uint64_t* outLength);
-
- private:
- DERType _type{DERType::EndOfContent};
- @@ -799,7 +799,7 @@ struct DataType::Handler<DERToken> {
- size_t length,
- size_t* advanced,
- std::ptrdiff_t debug_offset) {
- - size_t outLength;
- + uint64_t outLength;
-
- auto swPair = DERToken::parse(ConstDataRange(ptr, length), &outLength);
-
- @@ -844,7 +844,7 @@ StatusWith<std::string> readDERString(ConstDataRangeCursor& cdc) {
- }
-
-
- -StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, size_t* outLength) {
- +StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, uint64_t* outLength) {
- const size_t kTagLength = 1;
- const size_t kTagLengthAndInitialLengthByteLength = kTagLength + 1;
-
- --
- 2.14.1
|