Add support for shared libraries with OS/2.

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

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 5e875b2f87439f03a4a3eb2d0215d789fe44f739..bfa58cc967135f9c1edc766758bfdf4148d609a9 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -64,7 +64,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
         {
         BIO *b;
@@ -117,7 +117,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
        if (BIO_puts(bp,str) <= 0) goto err;
 
        pkey=X509_REQ_get_pubkey(x);
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
        if (pkey != NULL && pkey->type == EVP_PKEY_RSA)
                {
                BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
@@ -126,7 +126,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
                }
        else 
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                if (pkey != NULL && pkey->type == EVP_PKEY_DSA)
                {
                BIO_printf(bp,"%12sDSA Public Key:\n","");
@@ -134,6 +134,15 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
                }
        else
 #endif
+#ifndef OPENSSL_NO_ECDSA
+               if (pkey != NULL && pkey->type == EVP_PKEY_ECDSA)
+               {
+                       BIO_printf(bp, "%12sECDSA Public Key: \n","");
+                       ECDSA_print(bp, pkey->pkey.ecdsa, 16);
+               }
+       else
+#endif
+
                BIO_printf(bp,"%12sUnknown Public Key:\n","");
 
        if (pkey != NULL)