commit 2bc937068d26312b5a334d635dd45209c9328a5a
author David Benjamin <davidben@google.com> Wed Dec 06 11:06:48 2017 -0500
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Dec 06 17:49:04 2017 +0000
tree 1a83b0f921492744ea2b8a89d9fa87a27c15630c
parent d8dbde79f9803c4cfce11eadfd49ca1284b49734

Add X509_NAME_get0_der from OpenSSL 1.1.0.

Change-Id: Iaa616a09f944ce720c11236b031d0fa9deb47db3
Reviewed-on: https://boringssl-review.googlesource.com/23864
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/x509/x_name.c

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index f132e6b..7824100 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -539,3 +539,16 @@
 {
     return ne->set;
 }
+
+int X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder,
+                       size_t *pderlen)
+{
+    /* Make sure encoding is valid */
+    if (i2d_X509_NAME(nm, NULL) <= 0)
+        return 0;
+    if (pder != NULL)
+        *pder = (unsigned char *)nm->bytes->data;
+    if (pderlen != NULL)
+        *pderlen = nm->bytes->length;
+    return 1;
+}

include/openssl/x509.h

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 430ffc0..9cc497a 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -690,6 +690,9 @@
 OPENSSL_EXPORT X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
 OPENSSL_EXPORT int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne);
 
+OPENSSL_EXPORT int X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder,
+                                      size_t *pderlen);
+
 OPENSSL_EXPORT int		X509_cmp_time(const ASN1_TIME *s, time_t *t);
 OPENSSL_EXPORT int		X509_cmp_current_time(const ASN1_TIME *s);
 OPENSSL_EXPORT ASN1_TIME *	X509_time_adj(ASN1_TIME *s, long adj, time_t *t);