Commit 6eabcc83 authored Aug 15, 2016 by Matt Caswell Committed by Dr. Stephen Henson Aug 17, 2016

Make X509_NAME_get0_der() conform to OpenSSL style



Put the main object first in the params list.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>

parent a0754084

crypto/x509/x_name.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -550,8 +550,8 @@ int X509_NAME_print(BIO bp, X509_NAME name, int obase)
		return 0;
		}

		int X509_NAME_get0_der(const unsigned char *pder, size_t pderlen,
		X509_NAME *nm)
		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)

doc/crypto/X509_NAME_get0_der.pod

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@ X509_NAME_get0_der - get X509_NAME DER encoding

		#include <openssl/x509.h>

		int X509_NAME_get0_der(const unsigned char *pder, size_t pderlen,
		X509_NAME *nm)
		int X509_NAME_get0_der(X509_NAME nm, const unsigned char *pder,
		size_t *pderlen)


		=head1 DESCRIPTION

include/openssl/x509.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -798,8 +798,8 @@ ASN1_OBJECT X509_NAME_ENTRY_get_object(X509_NAME_ENTRY ne);
		ASN1_STRING X509_NAME_ENTRY_get_data(X509_NAME_ENTRY ne);
		int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne);

		int X509_NAME_get0_der(const unsigned char *pder, size_t pderlen,
		X509_NAME *nm);
		int X509_NAME_get0_der(X509_NAME nm, const unsigned char *pder,
		size_t *pderlen);

		int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
		int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,