Merge lp://staging/~jelle-vdwaa/ecryptfs/ecryptfs into lp://staging/ecryptfs

Proposed by Jelle van der Waa
Status: Merged
Merged at revision: 890
Proposed branch: lp://staging/~jelle-vdwaa/ecryptfs/ecryptfs
Merge into: lp://staging/ecryptfs
Diff against target: 165 lines (+52/-8)
2 files modified
src/key_mod/ecryptfs_key_mod_openssl.c (+25/-4)
src/key_mod/ecryptfs_key_mod_pkcs11_helper.c (+27/-4)
To merge this branch: bzr merge lp://staging/~jelle-vdwaa/ecryptfs/ecryptfs
Reviewer Review Type Date Requested Status
Tyler Hicks Approve
Raphael Groner (community) Approve
Review via email: mp+319746@code.staging.launchpad.net

Description of the change

Make ecryptfs compile with OpenSSL 1.1.x

To post a comment you must log in.
886. By Jason Xing

libecryptfs: Handle '=' characters in mount option string values

Users cannot mount ecryptfs with "-o passphrase_passwd_file=mykey" (<mykey> is
"passwd=123=abc") or "-o passwd=123=abc". Because the passphrase user uses
includes "=" character.

Because in the manner of process_comma_tok() function, ecryptfs will store
"passwd=123" as the @current->name and "abc" as @current->value. That will go
wrong when we go into tf_pass_file() function because it cannot match the name
"passphrase_passwd" or "passwd".

Add two lines in process_comma_tok() to change that case. If we match one "="
character in the string, we don't need to loop and match another "=" again.

887. By Tyler Hicks

Add Jason's mount option parser fix to debian/changelog

888. By Jelle van der Waa

Fix build with OpenSSL 1.1.x

The rsa_st struct has been made opaque in 1.1.x, add forward compatible
code to access the n, e, d members of rsa_struct.

CRYPTO_malloc_init has been removed from OpenSSL 1.1.x since the library
calls this routine by itself.

889. By Jelle van der Waa

Fix build with OpenSSL 1.1.x

The rsa_st struct has been made opaque in 1.1.x, add forward compatible
code to access the n, e, d members of rsa_struct.

EVP_PKEY structure has been made opaque, use EVP_PKEY_base_id
to get the type.

Revision history for this message
Raphael Groner (projects-rg) wrote :

My vote goes to apply this patch. It fixes the issue for me.

review: Approve
Revision history for this message
Tyler Hicks (tyhicks) wrote :

This looks good to me. Thanks for the patches!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches