1271930 - Refactor copying of server certificates

Status: RESOLVED FIXED

(NSS :: Libraries, defect)

Description

[Martin Thomson [:mt:]]

There's a few bits of code in sslsock.c that copy server certs from one socket to another.  That duplicates a lot of code.  Since I only recently added the certificate handling stuff, I figure that we can do better for that at a minimum.  It has the consequence of making things a bit tidier at the same time by reducing cleanup overhead.

Comment 1

[Martin Thomson [:mt:]]

Attachment: bug1271930-1.patch

Comment 2

[Martin Thomson [:mt:]]

Attachment: bug1271930-w.diff

I just realized how hard it is to review this.  Here's a patch with -w.

Comment 3

[Tim Taubert [:ttaubert] (inactive)]

Comment on attachment 8751211 [details] [diff] [review]
bug1271930-1.patch

Review of attachment 8751211 [details] [diff] [review]:
-----------------------------------------------------------------

Great cleanup, didn't find anything wrong with it. And thanks for the -w patch. Sorry it took me so long.

::: lib/ssl/sslcert.c
@@ +80,5 @@
> +
> +    if (oc->serverKeyPair) {
> +        sc->serverKeyPair =  ssl_GetKeyPairRef(oc->serverKeyPair);
> +    if (!sc->serverKeyPair)
> +        goto loser;

Nit: the indentation of the two lines above is a little off. And there's an extra white space in the line above those two.

Comment 4

[Martin Thomson [:mt:]]

https://hg.mozilla.org/projects/nss/rev/eddc89f0b033

Comment 5

[Martin Thomson [:mt:]]

Clang-format is letting me down.  https://hg.mozilla.org/projects/nss/rev/4df730fb1062