1 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libcrypto/pem/pem_x509.c b/src/lib/libcrypto/pem/pem_x509.c
index 350c48ba9a..f440a9f0aa 100644
--- a/src/lib/libcrypto/pem/pem_x509.c
+++ b/src/lib/libcrypto/pem/pem_x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_x509.c,v 1.7 2016/09/04 15:53:03 jsing Exp $ */
+/* $OpenBSD: pem_x509.c,v 1.8 2016/09/04 16:10:38 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -66,13 +66,6 @@
 
 
 X509 *
-PEM_read_bio_X509(BIO *bp, X509 **x, pem_password_cb *cb, void *u)
-{
-        return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, PEM_STRING_X509, bp,
-            (void **)x, cb, u);
-}
-
-X509 *
 PEM_read_X509(FILE *fp, X509 **x, pem_password_cb *cb, void *u)
 {
         return PEM_ASN1_read((d2i_of_void *)d2i_X509, PEM_STRING_X509, fp,
@@ -80,15 +73,22 @@ PEM_read_X509(FILE *fp, X509 **x, pem_password_cb *cb, void *u)
 }
 
 int
-PEM_write_bio_X509(BIO *bp, X509 *x)
+PEM_write_X509(FILE *fp, X509 *x)
 {
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509, PEM_STRING_X509, bp,
+        return PEM_ASN1_write((i2d_of_void *)i2d_X509, PEM_STRING_X509, fp,
             x, NULL, NULL, 0, NULL, NULL);
 }
 
+X509 *
+PEM_read_bio_X509(BIO *bp, X509 **x, pem_password_cb *cb, void *u)
+{
+        return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, PEM_STRING_X509, bp,
+            (void **)x, cb, u);
+}
+
 int
-PEM_write_X509(FILE *fp, X509 *x)
+PEM_write_bio_X509(BIO *bp, X509 *x)
 {
-        return PEM_ASN1_write((i2d_of_void *)i2d_X509, PEM_STRING_X509, fp,
+        return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509, PEM_STRING_X509, bp,
             x, NULL, NULL, 0, NULL, NULL);
 }