Make `openssl x509 -noout -modulus' functional also for DSA certificates (in

[openssl.git] / apps / x509.c

diff --git a/apps/x509.c b/apps/x509.c
index c4e4890999c0c6b34176317d76fa0ba5d7b86e9e..c20d213b3d37ec823f04304999923d42dbf4b08d 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -468,7 +468,6 @@ bad:
                                BIO_printf(STDout,"%08lx\n",X509_subject_name_hash(x));
                                }
                        else
-#ifndef NO_RSA
                                if (modulus == i)
                                {
                                EVP_PKEY *pkey;
@@ -481,15 +480,21 @@ bad:
                                        goto end;
                                        }
                                BIO_printf(STDout,"Modulus=");
+#ifndef NO_RSA
                                if (pkey->type == EVP_PKEY_RSA)
                                        BN_print(STDout,pkey->pkey.rsa->n);
                                else
+#endif
+#ifndef NO_DSA
+                               if (pkey->type == EVP_PKEY_DSA)
+                                       BN_print(STDout,pkey->pkey.dsa->pub_key);
+                               else
+#endif
                                        BIO_printf(STDout,"Wrong Algorithm type");
                                BIO_printf(STDout,"\n");
                                EVP_PKEY_free(pkey);
                                }
                        else
-#endif
                                if (C == i)
                                {
                                unsigned char *d;