X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fx509%2Fx509.h;h=7808b6a1120c02951cc80538b5057d33672306eb;hp=ef7213541410c616a6fbc1ebece39ac4f5756292;hb=bd08a2bd0c1078e396c02a1ba11205a0d0a3a2a7;hpb=a657546f9c376f4b7ba4dce14649598fb1a38de5

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index ef72135414..7808b6a112 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -338,10 +338,10 @@ DECLARE_STACK_OF(X509_TRUST)
 
 #define XN_FLAG_FN_MASK		(0x3 << 21)
 
-#define XN_FLAG_FN_NONE		0		/* No field names */
-#define XN_FLAG_FN_SN		(1 << 21)	/* Object short name */
-#define XN_FLAG_FN_LN		(2 << 21)	/* Object long name */
-#define XN_FLAG_FN_OID		(3 << 21)	/* Always use OIDs */
+#define XN_FLAG_FN_SN		0		/* Object short name */
+#define XN_FLAG_FN_LN		(1 << 21)	/* Object long name */
+#define XN_FLAG_FN_OID		(2 << 21)	/* Always use OIDs */
+#define XN_FLAG_FN_NONE		(3 << 21)	/* No field names */
 
 #define XN_FLAG_SPC_EQ		(1 << 23)	/* Put spaces round '=' */
 
@@ -744,6 +744,8 @@ int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,PKCS8_PRIV_KEY_INFO *p8inf);
 int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key);
 int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
 EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
+int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
+EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
 #endif
 
 #ifndef NO_BIO
@@ -775,6 +777,8 @@ int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,PKCS8_PRIV_KEY_INFO *p8inf);
 int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key);
 int i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey);
 EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
+int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey);
+EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
 #endif
 
 X509 *X509_dup(X509 *x509);