New accessor X509_REQ_get_X509_PUBKEY()

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 8ea350d7a30247547e51a3e6ac15189cc5ef4376..1ed404ce62335878fea8fe13c07c24b519683e9f 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -129,11 +129,15 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
             goto err;
     }
     if (!(cflag & X509_FLAG_NO_PUBKEY)) {
             goto err;
     }
     if (!(cflag & X509_FLAG_NO_PUBKEY)) {

+        X509_PUBKEY *xpkey;
+        ASN1_OBJECT *koid;

         if (BIO_write(bp, "        Subject Public Key Info:\n", 33) <= 0)
             goto err;
         if (BIO_printf(bp, "%12sPublic Key Algorithm: ", "") <= 0)
             goto err;
         if (BIO_write(bp, "        Subject Public Key Info:\n", 33) <= 0)
             goto err;
         if (BIO_printf(bp, "%12sPublic Key Algorithm: ", "") <= 0)
             goto err;

-        if (i2a_ASN1_OBJECT(bp, ri->pubkey->algor->algorithm) <= 0)
+        xpkey = X509_REQ_get_X509_PUBKEY(x);
+        X509_PUBKEY_get0_param(&koid, NULL, NULL, NULL, xpkey);
+        if (i2a_ASN1_OBJECT(bp, koid) <= 0)

             goto err;
         if (BIO_puts(bp, "\n") <= 0)
             goto err;
             goto err;
         if (BIO_puts(bp, "\n") <= 0)
             goto err;

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index a8b838cff9811651d406e140c914217c775f70b0..8cc35b3365e7a1a6edbc30bc89ac72eb76578dd0 100644 (file)
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -117,6 +117,11 @@ EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req)
     return (X509_PUBKEY_get(req->req_info.pubkey));
 }
 
     return (X509_PUBKEY_get(req->req_info.pubkey));
 }
 

+X509_PUBKEY *X509_REQ_get_X509_PUBKEY(X509_REQ *req)
+{
+    return req->req_info.pubkey;
+}
+

 int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
 {
     EVP_PKEY *xk = NULL;
 int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
 {
     EVP_PKEY *xk = NULL;

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 9a58dfcba48dd709826a54dd9e2ea3f50d67de84..5d6c0839ef24c82595c5195186f8be55ae8dd79d 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -759,6 +759,7 @@ int X509_REQ_get_signature_nid(const X509_REQ *req);
 int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp);
 int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
 EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req);
 int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp);
 int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
 EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req);

+X509_PUBKEY *X509_REQ_get_X509_PUBKEY(X509_REQ *req);

 int X509_REQ_extension_nid(int nid);
 int *X509_REQ_get_extension_nids(void);
 void X509_REQ_set_extension_nids(int *nids);
 int X509_REQ_extension_nid(int nid);
 int *X509_REQ_get_extension_nids(void);
 void X509_REQ_set_extension_nids(int *nids);