e_os.h removal from other headers and source files.

[openssl.git] / crypto / evp / evp_pkey.c

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 82ab1ef0af71e5043f166f4fef6f5e2ad2cb2008..e61a8761a92d291e18616a8dd3de519c33e0308e 100644 (file)
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -18,10 +18,10 @@
 
 /* Extract a private key from a PKCS8 structure */
 
 
 /* Extract a private key from a PKCS8 structure */
 

-EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8)
+EVP_PKEY *EVP_PKCS82PKEY(const PKCS8_PRIV_KEY_INFO *p8)

 {
     EVP_PKEY *pkey = NULL;
 {
     EVP_PKEY *pkey = NULL;

-    ASN1_OBJECT *algoid;
+    const ASN1_OBJECT *algoid;

     char obj_tmp[80];
 
     if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8))
     char obj_tmp[80];
 
     if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8))


@@ -80,7 +80,6 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
         EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
         goto error;
     }
         EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
         goto error;
     }

-    RAND_add(p8->pkey->data, p8->pkey->length, 0.0);

     return p8;
  error:
     PKCS8_PRIV_KEY_INFO_free(p8);
     return p8;
  error:
     PKCS8_PRIV_KEY_INFO_free(p8);