Linux: fix compatibility with nss-3.15 .

net/third_party/nss/ssl/bodge/secitem_array.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * Support routines for SECItemArray data structure.
  */
 
+#include "nss.h"

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

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

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

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?

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

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.

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

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

 #include "seccomon.h"
 #include "secitem.h"
 #include "secerr.h"
 #include "secport.h"
 
 typedef struct SECItemArrayStr SECItemArray;
 
+#define NSS_VERSION_NUM (NSS_VMAJOR * 10000 + NSS_VMINOR * 100 + NSS_VPATCH)
+#if NSS_VERSION_NUM < 31500

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

Optional: You can just test NSSUTIL_VMINOR < 15.

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

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]

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]

Preserved current code then.

+// Added in NSS 3.15.
 struct SECItemArrayStr {
     SECItem *items;
     unsigned int len;
 };
+#endif
 
 SECItemArray *
 SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
 {
     SECItemArray *result = NULL;
     void *mark = NULL;
 
     if (arena != NULL) {
         mark = PORT_ArenaMark(arena);
     }
@@ skipping 106 matching lines @@
         SECStatus rv = SECITEM_CopyItem(arena,
                                         &result->items[i], &from->items[i]);
         if (rv != SECSuccess) {
             SECITEM_ZfreeArray(result, PR_TRUE);
             return NULL;
         }
     }
 
     return result;
 }