| Index: crypto/rsa_private_key.h
|
| diff --git a/crypto/rsa_private_key.h b/crypto/rsa_private_key.h
|
| index 221e341a6fe8da40b9753dc58df91598a53fd61a..8e1389439347eadb6510cf670fa089d14acc95fa 100644
|
| --- a/crypto/rsa_private_key.h
|
| +++ b/crypto/rsa_private_key.h
|
| @@ -180,7 +180,12 @@ class CRYPTO_EXPORT RSAPrivateKey {
|
| static RSAPrivateKey* CreateFromPrivateKeyInfo(
|
| const std::vector<uint8>& input);
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_OPENSSL)
|
| + // Create a new instance from an existing EVP_PKEY, taking a
|
| + // reference to it. |key| must be an RSA key. Returns NULL on
|
| + // failure.
|
| + static RSAPrivateKey* CreateFromKey(EVP_PKEY* key);
|
| +#elif defined(USE_NSS)
|
| // Create a new random instance in |slot|. Can return NULL if initialization
|
| // fails. The created key is permanent and is not exportable in plaintext
|
| // form.
|
| @@ -216,12 +221,6 @@ class CRYPTO_EXPORT RSAPrivateKey {
|
| static RSAPrivateKey* FindFromPublicKeyInfoInSlot(
|
| const std::vector<uint8>& input,
|
| PK11SlotInfo* slot);
|
| -#elif defined(USE_OPENSSL)
|
| - // Create a new instance from an existing EVP_PKEY, taking a
|
| - // reference to it. |key| must be an RSA key. Returns NULL on
|
| - // failure.
|
| - static RSAPrivateKey* CreateFromKey(EVP_PKEY* key);
|
| -
|
| #endif
|
|
|
| #if defined(USE_OPENSSL)
|
|
|