code review 6499103: crypto/tls: allow certificates and key to be in either ...

crypto/tls: allow certificates and key to be in either order.

X509KeyPair wasn't really supposed to allow the certificate and
key to be in the same file, but it did work if you put the key
first. Since some HTTPS servers support loading keys and certs
like this, this change makes it work in either order.

Fixes issue 3986.

[agl1, 2012-09-12 21:58:50]

Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go/

[dave_cheney.net, 2012-09-13 05:45:14]

On 2012/09/12 21:58:50, agl1 wrote:
> Hello mailto:golang-dev@googlegroups.com (cc:
mailto:golang-dev@googlegroups.com),
> 
> I'd like you to review this change to
> https://code.google.com/p/go/

I think if the logic gets more complicated (ie, a third type of PEM entity) then
this method would need an overall, but for now the change and the test LGTM.

[rsc, 2012-09-13 14:32:18]

LGTM

http://codereview.appspot.com/6499103/diff/4001/src/pkg/crypto/tls/tls_test.go
File src/pkg/crypto/tls/tls_test.go (right):

http://codereview.appspot.com/6499103/diff/4001/src/pkg/crypto/tls/tls_test.g...
src/pkg/crypto/tls/tls_test.go:1: package tls
Copyright notice please.

[agl1, 2012-09-13 15:00:35]

*** Submitted as http://code.google.com/p/go/source/detail?r=7de1fa3b234b ***

crypto/tls: allow certificates and key to be in either order.

X509KeyPair wasn't really supposed to allow the certificate and
key to be in the same file, but it did work if you put the key
first. Since some HTTPS servers support loading keys and certs
like this, this change makes it work in either order.

Fixes issue 3986.

R=golang-dev, dave, rsc
CC=golang-dev
http://codereview.appspot.com/6499103

http://codereview.appspot.com/6499103/diff/4001/src/pkg/crypto/tls/tls_test.go
File src/pkg/crypto/tls/tls_test.go (right):

http://codereview.appspot.com/6499103/diff/4001/src/pkg/crypto/tls/tls_test.g...
src/pkg/crypto/tls/tls_test.go:1: package tls
On 2012/09/13 14:32:19, rsc wrote:
> Copyright notice please.

Done.

[bradfitz, 2012-09-13 16:14:49]

thank you!  I've wasted time on several occasions switching these around
until it works.

On Thu, Sep 13, 2012 at 8:00 AM, <agl@golang.org> wrote:

> *** Submitted as
>
http://code.google.com/p/go/**source/detail?r=7de1fa3b234b<http://code.google...
>
>
> crypto/tls: allow certificates and key to be in either order.
>
> X509KeyPair wasn't really supposed to allow the certificate and
> key to be in the same file, but it did work if you put the key
> first. Since some HTTPS servers support loading keys and certs
> like this, this change makes it work in either order.
>
> Fixes issue 3986.
>
> R=golang-dev, dave, rsc
> CC=golang-dev
>
http://codereview.appspot.com/**6499103<http://codereview.appspot.com/6499103>
>
>
>
>
> http://codereview.appspot.com/**6499103/diff/4001/src/pkg/**
>
crypto/tls/tls_test.go<http://codereview.appspot.com/6499103/diff/4001/src/pkg/crypto/tls/tls_test.go>
> File src/pkg/crypto/tls/tls_test.go (right):
>
> http://codereview.appspot.com/**6499103/diff/4001/src/pkg/**
>
crypto/tls/tls_test.go#**newcode1<http://codereview.appspot.com/6499103/diff/4001/src/pkg/crypto/tls/tls_test.go#newcode1>
> src/pkg/crypto/tls/tls_test.**go:1: package tls
> On 2012/09/13 14:32:19, rsc wrote:
>
>> Copyright notice please.
>>
>
> Done.
>
>
http://codereview.appspot.com/**6499103/<http://codereview.appspot.com/6499103/>
>