Linux: fix compatibility with nss-3.15 .

Linux: fix compatibility with nss-3.15 .

See https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/Jwz20yLB_7E/acOh0BYai30J
for more info.

BUG=none
R=wtc@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=206184

[wtc, 2013-06-13 18:20:31]

Patch set 1 LGTM. Thanks. I suggest a better header to use.

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
File net/third_party/nss/ssl/bodge/secitem_array.c (right):

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:9: #include "nss.h"

Please include "nssutil.h" and use the NSSUTIL_xxx version macros
in that header instead.

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:18: #if NSS_VERSION_NUM < 31500

Optional: You can just test NSSUTIL_VMINOR < 15.

[Paweł Hajdan Jr., 2013-06-13 18:58:32]

Thank you for review.

Could you take a look at my replies below? I'm not very familiar with nss
versioning, and so I'd just like to understand it more before possibly making
changes.

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
File net/third_party/nss/ssl/bodge/secitem_array.c (right):

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:9: #include "nss.h"
On 2013/06/13 18:20:31, wtc wrote:
> 
> Please include "nssutil.h" and use the NSSUTIL_xxx version macros
> in that header instead.

I'm mirroring the solution from net/cert/cert_verify_proc_nss.cc .

I don't see corresponding usage of NSSUTIL_ macros.

Is the goal to include a smaller header? Is nssutil always synchronized with the
nss version?

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:18: #if NSS_VERSION_NUM < 31500
On 2013/06/13 18:20:31, wtc wrote:
> Optional: You can just test NSSUTIL_VMINOR < 15.

I think the current version is more robust, e.g. against nss-4.1 (VMINOR=1). It
also mirrors an existing pattern (see above), which I think is a good thing.

[wtc, 2013-06-13 21:07:33]

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
File net/third_party/nss/ssl/bodge/secitem_array.c (right):

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:9: #include "nss.h"

The NSS libraries can be grouped into three packages so that
the packages can be released independently.

Group 1: libnssutil3.so
Group 2: libfreebl3.so, libsoftokn3.so, libnssdbm3.so
Group 3: libnss3.so, libssl3.so, libsmime3.so

Three header files define the version macros used by the three
groups.

SECItemArray is in Group 1 (libnssutil3.so). This is why it is
more correct to use the version macros defined in nssutil.h.

I think Fedora may be the only Linux distribution that packages
NSS this way. In any case, it is better to use the right version
macros for SECItemArray.

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:18: #if NSS_VERSION_NUM < 31500

Because NSS 3.x is widely used, it is unlikely that we will be
able to release NSS 4.0. The successor of NSS will need to be
renamed to avoid symbol conflicts. But your current code is fine.

[Paweł Hajdan Jr., 2013-06-13 21:29:56]

PTAL

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
File net/third_party/nss/ssl/bodge/secitem_array.c (right):

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:9: #include "nss.h"
On 2013/06/13 21:07:33, wtc wrote:
> I think Fedora may be the only Linux distribution that packages
> NSS this way. In any case, it is better to use the right version
> macros for SECItemArray.

Ah, I see now. Correctness and understanding were my two main concerns here.
Changed to nssutil, and thanks for great explanation.

https://codereview.chromium.org/16982002/diff/1/net/third_party/nss/ssl/bodge...
net/third_party/nss/ssl/bodge/secitem_array.c:18: #if NSS_VERSION_NUM < 31500
On 2013/06/13 21:07:33, wtc wrote:
> Because NSS 3.x is widely used, it is unlikely that we will be
> able to release NSS 4.0. The successor of NSS will need to be
> renamed to avoid symbol conflicts. But your current code is fine.

Preserved current code then.

[wtc, 2013-06-13 21:35:31]

Patch set 2 LGTM.

[Paweł Hajdan Jr., 2013-06-13 22:44:58]

Committed patchset #2 manually as r206184 (presubmit successful).