| Index: crypto/rsa_private_key_nss.cc
|
| diff --git a/crypto/rsa_private_key_nss.cc b/crypto/rsa_private_key_nss.cc
|
| index c51e308419d5b0b831bdf40fa1f9612980b7b820..45b2be76c2418fac27c78d74d129caa28f72eb17 100644
|
| --- a/crypto/rsa_private_key_nss.cc
|
| +++ b/crypto/rsa_private_key_nss.cc
|
| @@ -38,7 +38,7 @@ static bool ReadAttribute(SECKEYPrivateKey* key,
|
| return true;
|
| }
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| struct PublicKeyInfoDeleter {
|
| inline void operator()(CERTSubjectPublicKeyInfo* spki) {
|
| SECKEY_DestroySubjectPublicKeyInfo(spki);
|
| @@ -67,7 +67,7 @@ crypto::ScopedSECKEYPublicKey GetRSAPublicKey(const std::vector<uint8>& input) {
|
| return crypto::ScopedSECKEYPublicKey();
|
| return result.Pass();
|
| }
|
| -#endif // defined(USE_NSS)
|
| +#endif // defined(USE_NSS_CERTS)
|
|
|
| } // namespace
|
|
|
| @@ -104,7 +104,7 @@ RSAPrivateKey* RSAPrivateKey::CreateFromPrivateKeyInfo(
|
| false /* not sensitive */);
|
| }
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| // static
|
| RSAPrivateKey* RSAPrivateKey::CreateSensitive(PK11SlotInfo* slot,
|
| uint16 num_bits) {
|
| @@ -313,7 +313,7 @@ RSAPrivateKey* RSAPrivateKey::CreateFromPrivateKeyInfoWithParams(
|
| return result.release();
|
| }
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| // static
|
| RSAPrivateKey* RSAPrivateKey::InitPublicPart(const std::vector<uint8>& input) {
|
| EnsureNSSInit();
|
| @@ -327,6 +327,6 @@ RSAPrivateKey* RSAPrivateKey::InitPublicPart(const std::vector<uint8>& input) {
|
|
|
| return result.release();
|
| }
|
| -#endif // defined(USE_NSS)
|
| +#endif // defined(USE_NSS_CERTS)
|
|
|
| } // namespace crypto
|
|
|