You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

30 lines
1018 B

  1. From db7715407efa43cd2a66caed67c02d8f7bb90b35 Mon Sep 17 00:00:00 2001
  2. From: Paul Wouters <pwouters@redhat.com>
  3. Date: Tue, 12 May 2020 12:56:38 -0400
  4. Subject: [PATCH] nss: move NSS_PKCS11_2_0_COMPAT define to
  5. ike_alg_encrypt_nss_gcm_ops.c
  6. It needs to go before any nss includes are done, and those includes are
  7. all over the place. But CK_GCM_PARAMS is only used in one file, so
  8. just define it there instead before the nss includes.
  9. ---
  10. lib/libswan/ike_alg_encrypt_nss_gcm_ops.c | 6 ++++++
  11. 1 files changed, 6 insertions(+), 0 deletions(-)
  12. diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
  13. index 93a027089a..571913cc1e 100644
  14. --- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
  15. +++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
  16. @@ -16,6 +16,12 @@
  17. #include <stdio.h>
  18. #include <stdlib.h>
  19. +/*
  20. + * Special advise from Bob Relyea - needs to go before any nss include
  21. + *
  22. + */
  23. +#define NSS_PKCS11_2_0_COMPAT 1
  24. +
  25. #include "lswlog.h"
  26. #include "lswnss.h"
  27. #include "prmem.h"