1651031 - Update RNP to snapshot from 2020-07-07

Status: RESOLVED FIXED

(MailNews Core :: Security: OpenPGP, defect)

Description

[Kai Engert (:KaiE:)]

We need to pick up more RNP fixes.
The new snapshot from 2020-07-06 avoids rejection of some unusual keys.
Also, it allows us to decode minimal OpenPGP messages (encoded, not encrypted) after obtaining results from external GnuPG decryption.

Comment 1

[Kai Engert (:KaiE:)]

Attachment: Bug 1651031 - Update RNP to snapshot from 2020-07-07. r=rjl

Comment 2

[Kai Engert (:KaiE:)]

Attachment: Bug 1651031 - Manual fixes to allow building of RNP snapshot from 2020-07-07. r=rjl

Depends on D82509

Comment 3

[Kai Engert (:KaiE:)]

Explanation of the manual fixes:

File list.cpp and list.h were moved to a different directory.
Include additional was necessary to find list.h

The upstream RNP build process creates a new file rnp_report.h
I don't know how to automatically create that as part of our build process.
I copied it from an upstream build tree.

rnp_file_exists was a new unresolved external, so I've added it to the list of built files

Had to adjust include statements for rnp_export.h to allow loading them from the local source tree.

Comment 4

[Kai Engert (:KaiE:)]

Rob, if you think these should be fixed differently, could you please help?

Comment 5

[Kai Engert (:KaiE:)]

There have been additional interesting RNP commits, that I'd like to pick up. Maybe let's another few days.

Comment 6

[Kai Engert (:KaiE:)]

My manual fixes were insufficient to fix building on MacOS:

https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=309067639&repo=try-comm-central&lineNumber=35490

Comment 7

[Kai Engert (:KaiE:)]

I've updated the snapshot to 07-07. Let's try to get this fixed and landed.

Comment 8

[Rob Lemley [:rjl]]

(In reply to Kai Engert (:KaiE:) from comment #3)

The upstream RNP build process creates a new file rnp_report.h
I don't know how to automatically create that as part of our build process.
I copied it from an upstream build tree.

You mean rnp_export.h? What OS was the build tree from? (Linux?) I suspect that a Windows build tree would be different since the default there is to not export symbols (with MSVC style compilers anyway). But since we're doing symbol export via rnp.symbols it probably won't actually matter. A followup bug may not be a bad idea though.

For the record, this is the CMake code that generates that file:

generate_export_header(librnp
  BASE_NAME rnp/rnp
  EXPORT_MACRO_NAME RNP_API
  STATIC_DEFINE RNP_STATIC
)

https://cmake.org/cmake/help/v3.0/module/GenerateExportHeader.html

Comment 9

[Kai Engert (:KaiE:)]

(In reply to Rob Lemley [:rjl] from comment #8)

(In reply to Kai Engert (:KaiE:) from comment #3)

The upstream RNP build process creates a new file rnp_report.h
I don't know how to automatically create that as part of our build process.
I copied it from an upstream build tree.

You mean rnp_export.h?

yes, sorry

What OS was the build tree from? (Linux?)

yes

Do you understand why macOS doesn't build, and complains about unresolved rnp_file_exists, despite my fixes?
Maybe it has to do with rnp_export.h, too?

Comment 10

[Kai Engert (:KaiE:)]

When using a native build environment on macOS the file rnp_export.h has identical contents as on Linux.

Comment 11

[Kai Engert (:KaiE:)]

I've started a local build of comm-esr78 on my (slow) Mac, in case it isn't obvious how to fix the unresolved external, maybe I can help analyzing with the local build.

Comment 12

[Kai Engert (:KaiE:)]

removing the non-exported symbol rnp_file_exists from rnp.symbols fixes it.

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/7177071c96c7
Update RNP to snapshot from 2020-07-07. r=rjl
https://hg.mozilla.org/comm-central/rev/178be1973377
Manual fixes to allow building of RNP snapshot from 2020-07-07. r=rjl

Comment 14

[Kai Engert (:KaiE:)]

Comment on attachment 9161840 [details]
Bug 1651031 - Update RNP to snapshot from 2020-07-07. r=rjl

Required for OpenPGP correctness and features

Comment 15

[Kai Engert (:KaiE:)]

Comment on attachment 9161841 [details]
Bug 1651031 - Manual fixes to allow building of RNP snapshot from 2020-07-07. r=rjl

Required for OpenPGP correctness and features

Comment 16

[Wayne Mery (:wsmwk)]

Comment on attachment 9161840 [details]
Bug 1651031 - Update RNP to snapshot from 2020-07-07. r=rjl

Approved for 78.0

[Triage Comment]

Comment 17

[Wayne Mery (:wsmwk)]

Comment on attachment 9161841 [details]
Bug 1651031 - Manual fixes to allow building of RNP snapshot from 2020-07-07. r=rjl

Approved for 78.0

Comment 18

[Kai Engert (:KaiE:)]

https://hg.mozilla.org/releases/comm-esr78/rev/2f7557e72662d8e601824ea64028baf5fa550e79
https://hg.mozilla.org/releases/comm-esr78/rev/d29c65bd5b5ee10e8675edebf39d9153dd47c3ad

Comment 19

[Kai Engert (:KaiE:)]

Comment on attachment 9161840 [details]
Bug 1651031 - Update RNP to snapshot from 2020-07-07. r=rjl

OpenPGP - patch already on comm-esr78 - should uplift for consistency

Comment 20

[Kai Engert (:KaiE:)]

Comment on attachment 9161841 [details]
Bug 1651031 - Manual fixes to allow building of RNP snapshot from 2020-07-07. r=rjl

OpenPGP - patch already on comm-esr78 - should uplift for consistency

Comment 21

[Wayne Mery (:wsmwk)]

Comment on attachment 9161841 [details]
Bug 1651031 - Manual fixes to allow building of RNP snapshot from 2020-07-07. r=rjl

Approved for beta
Approved for esr78

Comment 22

[Wayne Mery (:wsmwk)]

Comment on attachment 9161840 [details]
Bug 1651031 - Update RNP to snapshot from 2020-07-07. r=rjl

Approved for beta
Approved for esr78

Comment 23

[Kai Engert (:KaiE:)]

https://hg.mozilla.org/releases/comm-beta/rev/eb9b4b675b7caa7f599a1d7adb479ab6c8251262
https://hg.mozilla.org/releases/comm-beta/rev/eea1d9ce254c0e1e150a5f52faf7a2b5bbdc4a69