common: fix building against libcryptopp

libnspr is only needed for libnss, move it to if defined(USE_NSS)
section.

ceph::crypto::shutdown's params should be same with declaration.

Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>

diff --git a/src/common/ceph_crypto.cc b/src/common/ceph_crypto.cc
index e8e6bc670ee7edcff79f6bcf983ead4828550a70..67db503149bbc972a6c4ee7688efd839d6493182 100644 (file)
--- a/src/common/ceph_crypto.cc
+++ b/src/common/ceph_crypto.cc
@@ -18,7 +18,6 @@
 #include "ceph_crypto.h"
 #include "auth/Crypto.h"
 
-#include <nspr.h>
 #include <pthread.h>
 #include <stdlib.h>
 
@@ -28,7 +27,7 @@ void ceph::crypto::init(CephContext *cct)
 {
 }
 
-void ceph::crypto::shutdown()
+void ceph::crypto::shutdown(bool)
 {
 }
 
@@ -45,6 +44,7 @@ ceph::crypto::HMACSHA256::~HMACSHA256()
 
 // for SECMOD_RestartModules()
 #include <secmod.h>
+#include <nspr.h>
 
 static pthread_mutex_t crypto_init_mutex = PTHREAD_MUTEX_INITIALIZER;
 static uint32_t crypto_refs = 0;