Commit 3aeb9348 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make EVP_PKEY opaque 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent a8eda431

apps/req.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ int req_main(int argc, char **argv) 
        fprintf(stdout, "Modulus=");

#ifndef OPENSSL_NO_RSA

        if (EVP_PKEY_base_id(tpubkey) == EVP_PKEY_RSA)

            BN_print(out, tpubkey->pkey.rsa->n);

            BN_print(out, EVP_PKEY_get0_RSA(tpubkey)->n);

        else

#endif

            fprintf(stdout, "Wrong Algorithm type");

apps/x509.c

+4 −4
Original line number Diff line number Diff line
@@ -731,13 +731,13 @@ int x509_main(int argc, char **argv) 
                }

                BIO_printf(out, "Modulus=");

#ifndef OPENSSL_NO_RSA

                if (pkey->type == EVP_PKEY_RSA)

                    BN_print(out, pkey->pkey.rsa->n);

                if (EVP_PKEY_id(pkey) == EVP_PKEY_RSA)

                    BN_print(out, EVP_PKEY_get0_RSA(pkey)->n);

                else

#endif

#ifndef OPENSSL_NO_DSA

                if (pkey->type == EVP_PKEY_DSA)

                    BN_print(out, pkey->pkey.dsa->pub_key);

                if (EVP_PKEY_id(pkey) == EVP_PKEY_DSA)

                    BN_print(out, EVP_PKEY_get0_DSA(pkey)->pub_key);

                else

#endif

                    BIO_printf(out, "Wrong Algorithm type");

crypto/asn1/a_verify.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#include <openssl/buffer.h>

#include <openssl/evp.h>

#include "internal/asn1_int.h"

#include "internal/evp_int.h"



#ifndef NO_ASN1_OLD

crypto/asn1/ameth_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
# include <openssl/engine.h>

#endif

#include "internal/asn1_int.h"

#include "internal/evp_int.h"



/* Keep this sorted in type order !! */

static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {

crypto/asn1/d2i_pr.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <openssl/x509.h>

#include <openssl/asn1.h>

#include "internal/asn1_int.h"

#include "internal/evp_int.h"



EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,

                         long length)