Allow multiple key and cert parameters for RSA+ECDSA setups #1663

Merged
merged 5 commits into from Oct 15, 2016

Conversation

Projects
None yet
2 participants
@typingArtist
Collaborator

typingArtist commented Oct 15, 2016

Allows multiple file locations to specify for key and cert parameters in tls.

This allows multiple different key types to use which is required for RSA+ECDSA setups.

The patch fixes also a small documentation bug about the location of relative files, config/ is automatically prepended.

Checklist:

  • docs updated
  • no test updates required.
@msimerson

This comment has been minimized.

Show comment
Hide comment
@msimerson

msimerson Oct 15, 2016

Member

I think the use of this option is non-obvious. Can you also provide a commented out example of the syntax and it's usage in the tls.ini file?

Member

msimerson commented Oct 15, 2016

I think the use of this option is non-obvious. Can you also provide a commented out example of the syntax and it's usage in the tls.ini file?

docs/plugins/tls.md
### cert
-Specifies an alternative location for the certificate chain file.
+Specifies an alternative location for the certificate chain file. If multiple
+certificate chains are to be used, use cert[]= assignmet for each of them.

This comment has been minimized.

@msimerson

msimerson Oct 15, 2016

Member

typo assignmet -> assignment

@msimerson

msimerson Oct 15, 2016

Member

typo assignmet -> assignment

This comment has been minimized.

@typingArtist

typingArtist Oct 15, 2016

Collaborator

thanks, fixed in latest commit

@typingArtist

typingArtist Oct 15, 2016

Collaborator

thanks, fixed in latest commit

docs/plugins/tls.md
-Specifies an alternative location for the certificate chain file.
+Specifies an alternative location for the certificate chain file. If multiple
+certificate chains are to be used, use cert[]= assignmet for each of them.
+Non-absolute pahts are relative to the config/ directory. See the description of

This comment has been minimized.

@msimerson

msimerson Oct 15, 2016

Member

typo pahts -> paths

@msimerson

msimerson Oct 15, 2016

Member

typo pahts -> paths

This comment has been minimized.

@typingArtist

typingArtist Oct 15, 2016

Collaborator

thanks, fixed in latest commit

@typingArtist

typingArtist Oct 15, 2016

Collaborator

thanks, fixed in latest commit

docs/plugins/tls.md
-certificate chains are to be used, use cert[]= assignmet for each of them.
-Non-absolute pahts are relative to the config/ directory. See the description of
+certificate chains are to be used, use `cert[]=` assignmet for each of them.
+Non-absolute pahts are relative to the `config/` directory. See the description of
the `key` parameter for specific use.

This comment has been minimized.

@msimerson

msimerson Oct 15, 2016

Member

two typos (assignmet & pahts)

@msimerson

msimerson Oct 15, 2016

Member

two typos (assignmet & pahts)

This comment has been minimized.

@typingArtist

typingArtist Oct 15, 2016

Collaborator

Should be fixed by aaa0632 already.

@typingArtist

typingArtist Oct 15, 2016

Collaborator

Should be fixed by aaa0632 already.

@msimerson msimerson merged commit de446d7 into haraka:master Oct 15, 2016

3 checks passed

codecov/patch Coverage not affected when comparing 74c7a25...aaa0632
Details
codecov/project 35.89% (+0.00%) compared to 74c7a25
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@typingArtist typingArtist deleted the typingArtist:tls_multiple_keys branch Oct 15, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment