make

[openssl.git] / crypto / asn1 / t_req.c

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 32eef7e78f66788681eb346e09e1e1dae2438667..c779a9bb18050bc5fcfc85d1e0ff8820e9477a42 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -63,8 +63,12 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
+#endif
 
 #ifndef OPENSSL_NO_FP_API
 int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
@@ -166,7 +170,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long
                if (pkey->type == EVP_PKEY_EC)
                {
                        BIO_printf(bp, "%12sEC Public Key: \n","");
-                       EC_KEY_print(bp, pkey->pkey.eckey, 16);
+                       EC_KEY_print(bp, pkey->pkey.ec, 16);
                }
        else
 #endif
@@ -276,7 +280,7 @@ get_next:
 
        return(1);
 err:
-       X509err(X509_F_X509_REQ_PRINT,ERR_R_BUF_LIB);
+       X509err(X509_F_X509_REQ_PRINT_EX,ERR_R_BUF_LIB);
        return(0);
        }