Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | Upstream-Status: submitted https://github.com/mongodb/mongo/pull/1296 |
| 2 | From 362be06fc16a5ad0f9e9aa90cc763c5242e8e35c Mon Sep 17 00:00:00 2001 |
| 3 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 4 | Date: Sat, 9 Feb 2019 12:41:45 +0100 |
| 5 | Subject: [PATCH] ssl_manager.cpp: fix build with gcc 7 and -fpermissive |
| 6 | |
| 7 | Change prototype of DERToken::parse function from |
| 8 | parse(ConstDataRange cdr, size_t* outLength); |
| 9 | to parse(ConstDataRange cdr, uint64_t* outLength); |
| 10 | |
| 11 | Otherwise, we got the following error: |
| 12 | |
| 13 | 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*)': |
| 14 | src/mongo/util/net/ssl_manager.cpp:575:79: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive] |
| 15 | if (mongoUnsignedAddOverflow64(tagAndLengthByteCount, derLength, outLength) || |
| 16 | |
| 17 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 18 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | --- |
| 20 | src/mongo/util/net/ssl_manager.cpp | 6 +++--- |
| 21 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 22 | |
| 23 | diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 24 | index 455a1662a5..e8497bc0d1 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 25 | --- a/src/mongo/util/net/ssl_manager.cpp |
| 26 | +++ b/src/mongo/util/net/ssl_manager.cpp |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 27 | @@ -810,7 +810,7 @@ public: |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 28 | * |
| 29 | * Returns a DERToken which consists of the (tag, length, value) tuple. |
| 30 | */ |
| 31 | - static StatusWith<DERToken> parse(ConstDataRange cdr, size_t* outLength); |
| 32 | + static StatusWith<DERToken> parse(ConstDataRange cdr, uint64_t* outLength); |
| 33 | |
| 34 | private: |
| 35 | DERType _type{DERType::EndOfContent}; |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 36 | @@ -827,7 +827,7 @@ struct DataType::Handler<DERToken> { |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 37 | size_t length, |
| 38 | size_t* advanced, |
| 39 | std::ptrdiff_t debug_offset) { |
| 40 | - size_t outLength; |
| 41 | + uint64_t outLength; |
| 42 | |
| 43 | auto swPair = DERToken::parse(ConstDataRange(ptr, length), &outLength); |
| 44 | |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 45 | @@ -889,7 +889,7 @@ StatusWith<DERInteger> readDERInt(ConstDataRangeCursor& cdc) { |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 46 | } |
| 47 | |
| 48 | |
| 49 | -StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, size_t* outLength) { |
| 50 | +StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, uint64_t* outLength) { |
| 51 | const size_t kTagLength = 1; |
| 52 | const size_t kTagLengthAndInitialLengthByteLength = kTagLength + 1; |
| 53 | |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 54 | -- |
| 55 | 2.24.0 |
| 56 | |