Move algorithm specific print code from crypto/asn1/t_pkey.c to separate
authorDr. Stephen Henson <steve@openssl.org>
Wed, 22 Mar 2006 13:34:19 +0000 (13:34 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 22 Mar 2006 13:34:19 +0000 (13:34 +0000)
*_prn.c files in each algorithm directory.

crypto/asn1/t_pkey.c
crypto/dh/Makefile
crypto/dh/dh_prn.c [new file with mode: 0644]
crypto/dsa/Makefile
crypto/dsa/dsa_prn.c [new file with mode: 0644]
crypto/ec/Makefile
crypto/ec/ec_ameth.c
crypto/ec/eck_prn.c [new file with mode: 0644]
crypto/rsa/Makefile
crypto/rsa/rsa_prn.c [new file with mode: 0644]

index 4586dcc..9dd18f6 100644 (file)
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Binary polynomial ECC support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
 
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/bn.h>
-#include <openssl/evp.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_EC
-#include <openssl/ec.h>
-#endif
-
-#ifndef OPENSSL_NO_RSA
-#ifndef OPENSSL_NO_FP_API
-int RSA_print_fp(FILE *fp, const RSA *x, int off)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               RSAerr(RSA_F_RSA_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=RSA_print(b,x,off);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int RSA_print(BIO *bp, const RSA *x, int off)
-       {
-       EVP_PKEY *pk;
-       int ret;
-       pk = EVP_PKEY_new();
-       if (!pk || !EVP_PKEY_set1_RSA(pk, (RSA *)x))
-               return 0;
-       ret = EVP_PKEY_print_private(bp, pk, off, NULL);
-       EVP_PKEY_free(pk);
-       return ret;
-       }
-
-#endif /* OPENSSL_NO_RSA */
-
-#ifndef OPENSSL_NO_DSA
-#ifndef OPENSSL_NO_FP_API
-int DSA_print_fp(FILE *fp, const DSA *x, int off)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               DSAerr(DSA_F_DSA_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=DSA_print(b,x,off);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int DSA_print(BIO *bp, const DSA *x, int off)
-       {
-       EVP_PKEY *pk;
-       int ret;
-       pk = EVP_PKEY_new();
-       if (!pk || !EVP_PKEY_set1_DSA(pk, (DSA *)x))
-               return 0;
-       ret = EVP_PKEY_print_private(bp, pk, off, NULL);
-       EVP_PKEY_free(pk);
-       return ret;
-       }
-
-#endif /* !OPENSSL_NO_DSA */
-
-#ifndef OPENSSL_NO_EC
-#ifndef OPENSSL_NO_FP_API
-int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               ECerr(EC_F_ECPKPARAMETERS_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b, fp, BIO_NOCLOSE);
-       ret = ECPKParameters_print(b, x, off);
-       BIO_free(b);
-       return(ret);
-       }
-
-int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off)
-       {
-       BIO *b;
-       int ret;
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               ECerr(EC_F_EC_KEY_PRINT_FP, ERR_R_BIO_LIB);
-               return(0);
-               }
-       BIO_set_fp(b, fp, BIO_NOCLOSE);
-       ret = EC_KEY_print(b, x, off);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
-       {
-       EVP_PKEY *pk;
-       int ret;
-       pk = EVP_PKEY_new();
-       if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x))
-               return 0;
-       ret = EVP_PKEY_print_private(bp, pk, off, NULL);
-       EVP_PKEY_free(pk);
-       return ret;
-       }
-
-#endif /* OPENSSL_NO_EC */
 
 int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
                        unsigned char *buf, int off)
@@ -245,132 +112,3 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
                }
        return(1);
        }
-
-#ifndef OPENSSL_NO_DH
-#ifndef OPENSSL_NO_FP_API
-int DHparams_print_fp(FILE *fp, const DH *x)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=DHparams_print(b, x);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int DHparams_print(BIO *bp, const DH *x)
-       {
-       unsigned char *m=NULL;
-       int reason=ERR_R_BUF_LIB,ret=0;
-       size_t buf_len=0, i;
-
-       if (x->p)
-               buf_len = (size_t)BN_num_bytes(x->p);
-       else
-               {
-               reason = ERR_R_PASSED_NULL_PARAMETER;
-               goto err;
-               }
-       if (x->g)
-               if (buf_len < (i = (size_t)BN_num_bytes(x->g)))
-                       buf_len = i;
-       m=(unsigned char *)OPENSSL_malloc(buf_len+10);
-       if (m == NULL)
-               {
-               reason=ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-
-       if (BIO_printf(bp,"Diffie-Hellman-Parameters: (%d bit)\n",
-               BN_num_bits(x->p)) <= 0)
-               goto err;
-       if (!ASN1_bn_print(bp,"prime:",x->p,m,4)) goto err;
-       if (!ASN1_bn_print(bp,"generator:",x->g,m,4)) goto err;
-       if (x->length != 0)
-               {
-               if (BIO_printf(bp,"    recommended-private-length: %d bits\n",
-                       (int)x->length) <= 0) goto err;
-               }
-       ret=1;
-       if (0)
-               {
-err:
-               DHerr(DH_F_DHPARAMS_PRINT,reason);
-               }
-       if (m != NULL) OPENSSL_free(m);
-       return(ret);
-       }
-#endif
-
-#ifndef OPENSSL_NO_DSA
-#ifndef OPENSSL_NO_FP_API
-int DSAparams_print_fp(FILE *fp, const DSA *x)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               DSAerr(DSA_F_DSAPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=DSAparams_print(b, x);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int DSAparams_print(BIO *bp, const DSA *x)
-       {
-       EVP_PKEY *pk;
-       int ret;
-       pk = EVP_PKEY_new();
-       if (!pk || !EVP_PKEY_set1_DSA(pk, (DSA *)x))
-               return 0;
-       ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
-       EVP_PKEY_free(pk);
-       return ret;
-       }
-
-#endif /* !OPENSSL_NO_DSA */
-
-#ifndef OPENSSL_NO_EC
-#ifndef OPENSSL_NO_FP_API
-int ECParameters_print_fp(FILE *fp, const EC_KEY *x)
-       {
-       BIO *b;
-       int ret;
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               ECerr(EC_F_ECPARAMETERS_PRINT_FP, ERR_R_BIO_LIB);
-               return(0);
-               }
-       BIO_set_fp(b, fp, BIO_NOCLOSE);
-       ret = ECParameters_print(b, x);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int ECParameters_print(BIO *bp, const EC_KEY *x)
-       {
-       EVP_PKEY *pk;
-       int ret;
-       pk = EVP_PKEY_new();
-       if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x))
-               return 0;
-       ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
-       EVP_PKEY_free(pk);
-       return ret;
-       }
-
-#endif
index 75bd705..c0867d2 100644 (file)
@@ -18,9 +18,9 @@ APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \
-       dh_ameth.c
+       dh_ameth.c dh_prn.c
 LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o \
-       dh_ameth.o
+       dh_ameth.o dh_prn.o
 
 SRC= $(LIBSRC)
 
diff --git a/crypto/dh/dh_prn.c b/crypto/dh/dh_prn.c
new file mode 100644 (file)
index 0000000..04e7c55
--- /dev/null
@@ -0,0 +1,124 @@
+/* crypto/asn1/t_pkey.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/evp.h>
+#include <openssl/dh.h>
+
+#ifndef OPENSSL_NO_FP_API
+int DHparams_print_fp(FILE *fp, const DH *x)
+       {
+       BIO *b;
+       int ret;
+
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
+               return(0);
+               }
+       BIO_set_fp(b,fp,BIO_NOCLOSE);
+       ret=DHparams_print(b, x);
+       BIO_free(b);
+       return(ret);
+       }
+#endif
+
+int DHparams_print(BIO *bp, const DH *x)
+       {
+       unsigned char *m=NULL;
+       int reason=ERR_R_BUF_LIB,ret=0;
+       size_t buf_len=0, i;
+
+       if (x->p)
+               buf_len = (size_t)BN_num_bytes(x->p);
+       else
+               {
+               reason = ERR_R_PASSED_NULL_PARAMETER;
+               goto err;
+               }
+       if (x->g)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->g)))
+                       buf_len = i;
+       m=(unsigned char *)OPENSSL_malloc(buf_len+10);
+       if (m == NULL)
+               {
+               reason=ERR_R_MALLOC_FAILURE;
+               goto err;
+               }
+
+       if (BIO_printf(bp,"Diffie-Hellman-Parameters: (%d bit)\n",
+               BN_num_bits(x->p)) <= 0)
+               goto err;
+       if (!ASN1_bn_print(bp,"prime:",x->p,m,4)) goto err;
+       if (!ASN1_bn_print(bp,"generator:",x->g,m,4)) goto err;
+       if (x->length != 0)
+               {
+               if (BIO_printf(bp,"    recommended-private-length: %d bits\n",
+                       (int)x->length) <= 0) goto err;
+               }
+       ret=1;
+       if (0)
+               {
+err:
+               DHerr(DH_F_DHPARAMS_PRINT,reason);
+               }
+       if (m != NULL) OPENSSL_free(m);
+       return(ret);
+       }
+
index 483a5c3..b1c067a 100644 (file)
@@ -18,9 +18,9 @@ APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \
-       dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c
+       dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_prn.c
 LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \
-       dsa_err.o dsa_ossl.o dsa_depr.o dsa_ameth.o
+       dsa_err.o dsa_ossl.o dsa_depr.o dsa_ameth.o dsa_prn.o
 
 SRC= $(LIBSRC)
 
diff --git a/crypto/dsa/dsa_prn.c b/crypto/dsa/dsa_prn.c
new file mode 100644 (file)
index 0000000..7e5229a
--- /dev/null
@@ -0,0 +1,120 @@
+/* crypto/dsa/dsa_prn.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/evp.h>
+#include <openssl/dsa.h>
+
+#ifndef OPENSSL_NO_FP_API
+int DSA_print_fp(FILE *fp, const DSA *x, int off)
+       {
+       BIO *b;
+       int ret;
+
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               DSAerr(DSA_F_DSA_PRINT_FP,ERR_R_BUF_LIB);
+               return(0);
+               }
+       BIO_set_fp(b,fp,BIO_NOCLOSE);
+       ret=DSA_print(b,x,off);
+       BIO_free(b);
+       return(ret);
+       }
+
+int DSAparams_print_fp(FILE *fp, const DSA *x)
+       {
+       BIO *b;
+       int ret;
+
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               DSAerr(DSA_F_DSAPARAMS_PRINT_FP,ERR_R_BUF_LIB);
+               return(0);
+               }
+       BIO_set_fp(b,fp,BIO_NOCLOSE);
+       ret=DSAparams_print(b, x);
+       BIO_free(b);
+       return(ret);
+       }
+#endif
+
+int DSA_print(BIO *bp, const DSA *x, int off)
+       {
+       EVP_PKEY *pk;
+       int ret;
+       pk = EVP_PKEY_new();
+       if (!pk || !EVP_PKEY_set1_DSA(pk, (DSA *)x))
+               return 0;
+       ret = EVP_PKEY_print_private(bp, pk, off, NULL);
+       EVP_PKEY_free(pk);
+       return ret;
+       }
+
+int DSAparams_print(BIO *bp, const DSA *x)
+       {
+       EVP_PKEY *pk;
+       int ret;
+       pk = EVP_PKEY_new();
+       if (!pk || !EVP_PKEY_set1_DSA(pk, (DSA *)x))
+               return 0;
+       ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
+       EVP_PKEY_free(pk);
+       return ret;
+       }
+
index 4a1622e..7c2bdf8 100644 (file)
@@ -19,11 +19,11 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC=        ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
        ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\
-       ec2_smpl.c ec2_mult.c ec_ameth.c
+       ec2_smpl.c ec2_mult.c ec_ameth.c eck_prn.c
 
 LIBOBJ=        ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\
        ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\
-       ec2_smpl.o ec2_mult.o ec_ameth.o
+       ec2_smpl.o ec2_mult.o ec_ameth.o eck_prn.o
 
 SRC= $(LIBSRC)
 
index 96491d9..98003b1 100644 (file)
@@ -561,252 +561,3 @@ EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
        int_ec_free,
        0
        };
-
-static int print_bin(BIO *fp, const char *str, const unsigned char *num,
-               size_t len, int off);
-
-int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
-       {
-       unsigned char *buffer=NULL;
-       size_t  buf_len=0, i;
-       int     ret=0, reason=ERR_R_BIO_LIB;
-       BN_CTX  *ctx=NULL;
-       const EC_POINT *point=NULL;
-       BIGNUM  *p=NULL, *a=NULL, *b=NULL, *gen=NULL,
-               *order=NULL, *cofactor=NULL;
-       const unsigned char *seed;
-       size_t  seed_len=0;
-       
-       static const char *gen_compressed = "Generator (compressed):";
-       static const char *gen_uncompressed = "Generator (uncompressed):";
-       static const char *gen_hybrid = "Generator (hybrid):";
-       if (!x)
-               {
-               reason = ERR_R_PASSED_NULL_PARAMETER;
-               goto err;
-               }
-
-       ctx = BN_CTX_new();
-       if (ctx == NULL)
-               {
-               reason = ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-
-       if (EC_GROUP_get_asn1_flag(x))
-               {
-               /* the curve parameter are given by an asn1 OID */
-               int nid;
-
-               if (!BIO_indent(bp, off, 128))
-                       goto err;
-
-               nid = EC_GROUP_get_curve_name(x);
-               if (nid == 0)
-                       goto err;
-
-               if (BIO_printf(bp, "ASN1 OID: %s", OBJ_nid2sn(nid)) <= 0)
-                       goto err;
-               if (BIO_printf(bp, "\n") <= 0)
-                       goto err;
-               }
-       else
-               {
-               /* explicit parameters */
-               int is_char_two = 0;
-               point_conversion_form_t form;
-               int tmp_nid = EC_METHOD_get_field_type(EC_GROUP_method_of(x));
-
-               if (tmp_nid == NID_X9_62_characteristic_two_field)
-                       is_char_two = 1;
-
-               if ((p = BN_new()) == NULL || (a = BN_new()) == NULL ||
-                       (b = BN_new()) == NULL || (order = BN_new()) == NULL ||
-                       (cofactor = BN_new()) == NULL)
-                       {
-                       reason = ERR_R_MALLOC_FAILURE;
-                       goto err;
-                       }
-
-               if (is_char_two)
-                       {
-                       if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx))
-                               {
-                               reason = ERR_R_EC_LIB;
-                               goto err;
-                               }
-                       }
-               else /* prime field */
-                       {
-                       if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
-                               {
-                               reason = ERR_R_EC_LIB;
-                               goto err;
-                               }
-                       }
-
-               if ((point = EC_GROUP_get0_generator(x)) == NULL)
-                       {
-                       reason = ERR_R_EC_LIB;
-                       goto err;
-                       }
-               if (!EC_GROUP_get_order(x, order, NULL) || 
-                       !EC_GROUP_get_cofactor(x, cofactor, NULL))
-                       {
-                       reason = ERR_R_EC_LIB;
-                       goto err;
-                       }
-               
-               form = EC_GROUP_get_point_conversion_form(x);
-
-               if ((gen = EC_POINT_point2bn(x, point, 
-                               form, NULL, ctx)) == NULL)
-                       {
-                       reason = ERR_R_EC_LIB;
-                       goto err;
-                       }
-
-               buf_len = (size_t)BN_num_bytes(p);
-               if (buf_len < (i = (size_t)BN_num_bytes(a)))
-                       buf_len = i;
-               if (buf_len < (i = (size_t)BN_num_bytes(b)))
-                       buf_len = i;
-               if (buf_len < (i = (size_t)BN_num_bytes(gen)))
-                       buf_len = i;
-               if (buf_len < (i = (size_t)BN_num_bytes(order)))
-                       buf_len = i;
-               if (buf_len < (i = (size_t)BN_num_bytes(cofactor))) 
-                       buf_len = i;
-
-               if ((seed = EC_GROUP_get0_seed(x)) != NULL)
-                       seed_len = EC_GROUP_get_seed_len(x);
-
-               buf_len += 10;
-               if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
-                       {
-                       reason = ERR_R_MALLOC_FAILURE;
-                       goto err;
-                       }
-
-               if (!BIO_indent(bp, off, 128))
-                       goto err;
-
-               /* print the 'short name' of the field type */
-               if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid))
-                       <= 0)
-                       goto err;  
-
-               if (is_char_two)
-                       {
-                       /* print the 'short name' of the base type OID */
-                       int basis_type = EC_GROUP_get_basis_type(x);
-                       if (basis_type == 0)
-                               goto err;
-
-                       if (!BIO_indent(bp, off, 128))
-                               goto err;
-
-                       if (BIO_printf(bp, "Basis Type: %s\n", 
-                               OBJ_nid2sn(basis_type)) <= 0)
-                               goto err;
-
-                       /* print the polynomial */
-                       if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, buffer,
-                               off))
-                               goto err;
-                       }
-               else
-                       {
-                       if ((p != NULL) && !ASN1_bn_print(bp, "Prime:", p, buffer,off))
-                               goto err;
-                       }
-               if ((a != NULL) && !ASN1_bn_print(bp, "A:   ", a, buffer, off)) 
-                       goto err;
-               if ((b != NULL) && !ASN1_bn_print(bp, "B:   ", b, buffer, off))
-                       goto err;
-               if (form == POINT_CONVERSION_COMPRESSED)
-                       {
-                       if ((gen != NULL) && !ASN1_bn_print(bp, gen_compressed, gen,
-                               buffer, off))
-                               goto err;
-                       }
-               else if (form == POINT_CONVERSION_UNCOMPRESSED)
-                       {
-                       if ((gen != NULL) && !ASN1_bn_print(bp, gen_uncompressed, gen,
-                               buffer, off))
-                               goto err;
-                       }
-               else /* form == POINT_CONVERSION_HYBRID */
-                       {
-                       if ((gen != NULL) && !ASN1_bn_print(bp, gen_hybrid, gen,
-                               buffer, off))
-                               goto err;
-                       }
-               if ((order != NULL) && !ASN1_bn_print(bp, "Order: ", order, 
-                       buffer, off)) goto err;
-               if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor, 
-                       buffer, off)) goto err;
-               if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
-                       goto err;
-               }
-       ret=1;
-err:
-       if (!ret)
-               ECerr(EC_F_ECPKPARAMETERS_PRINT, reason);
-       if (p) 
-               BN_free(p);
-       if (a) 
-               BN_free(a);
-       if (b)
-               BN_free(b);
-       if (gen)
-               BN_free(gen);
-       if (order)
-               BN_free(order);
-       if (cofactor)
-               BN_free(cofactor);
-       if (ctx)
-               BN_CTX_free(ctx);
-       if (buffer != NULL) 
-               OPENSSL_free(buffer);
-       return(ret);    
-       }
-
-static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
-               size_t len, int off)
-       {
-       size_t i;
-       char str[128];
-
-       if (buf == NULL)
-               return 1;
-       if (off)
-               {
-               if (off > 128)
-                       off=128;
-               memset(str,' ',off);
-               if (BIO_write(fp, str, off) <= 0)
-                       return 0;
-               }
-
-       if (BIO_printf(fp,"%s", name) <= 0)
-               return 0;
-
-       for (i=0; i<len; i++)
-               {
-               if ((i%15) == 0)
-                       {
-                       str[0]='\n';
-                       memset(&(str[1]),' ',off+4);
-                       if (BIO_write(fp, str, off+1+4) <= 0)
-                               return 0;
-                       }
-               if (BIO_printf(fp,"%02x%s",buf[i],((i+1) == len)?"":":") <= 0)
-                       return 0;
-               }
-       if (BIO_write(fp,"\n",1) <= 0)
-               return 0;
-
-       return 1;
-       }
diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c
new file mode 100644 (file)
index 0000000..6aa2333
--- /dev/null
@@ -0,0 +1,390 @@
+/* crypto/ec/eck_prn.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Binary polynomial ECC support in OpenSSL originally developed by 
+ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/evp.h>
+#include <openssl/ec.h>
+
+#ifndef OPENSSL_NO_FP_API
+int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
+       {
+       BIO *b;
+       int ret;
+
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               ECerr(EC_F_ECPKPARAMETERS_PRINT_FP,ERR_R_BUF_LIB);
+               return(0);
+               }
+       BIO_set_fp(b, fp, BIO_NOCLOSE);
+       ret = ECPKParameters_print(b, x, off);
+       BIO_free(b);
+       return(ret);
+       }
+
+int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off)
+       {
+       BIO *b;
+       int ret;
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               ECerr(EC_F_EC_KEY_PRINT_FP, ERR_R_BIO_LIB);
+               return(0);
+               }
+       BIO_set_fp(b, fp, BIO_NOCLOSE);
+       ret = EC_KEY_print(b, x, off);
+       BIO_free(b);
+       return(ret);
+       }
+
+int ECParameters_print_fp(FILE *fp, const EC_KEY *x)
+       {
+       BIO *b;
+       int ret;
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               ECerr(EC_F_ECPARAMETERS_PRINT_FP, ERR_R_BIO_LIB);
+               return(0);
+               }
+       BIO_set_fp(b, fp, BIO_NOCLOSE);
+       ret = ECParameters_print(b, x);
+       BIO_free(b);
+       return(ret);
+       }
+#endif
+
+int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
+       {
+       EVP_PKEY *pk;
+       int ret;
+       pk = EVP_PKEY_new();
+       if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x))
+               return 0;
+       ret = EVP_PKEY_print_private(bp, pk, off, NULL);
+       EVP_PKEY_free(pk);
+       return ret;
+       }
+
+int ECParameters_print(BIO *bp, const EC_KEY *x)
+       {
+       EVP_PKEY *pk;
+       int ret;
+       pk = EVP_PKEY_new();
+       if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x))
+               return 0;
+       ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
+       EVP_PKEY_free(pk);
+       return ret;
+       }
+
+static int print_bin(BIO *fp, const char *str, const unsigned char *num,
+               size_t len, int off);
+
+int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
+       {
+       unsigned char *buffer=NULL;
+       size_t  buf_len=0, i;
+       int     ret=0, reason=ERR_R_BIO_LIB;
+       BN_CTX  *ctx=NULL;
+       const EC_POINT *point=NULL;
+       BIGNUM  *p=NULL, *a=NULL, *b=NULL, *gen=NULL,
+               *order=NULL, *cofactor=NULL;
+       const unsigned char *seed;
+       size_t  seed_len=0;
+       
+       static const char *gen_compressed = "Generator (compressed):";
+       static const char *gen_uncompressed = "Generator (uncompressed):";
+       static const char *gen_hybrid = "Generator (hybrid):";
+       if (!x)
+               {
+               reason = ERR_R_PASSED_NULL_PARAMETER;
+               goto err;
+               }
+
+       ctx = BN_CTX_new();
+       if (ctx == NULL)
+               {
+               reason = ERR_R_MALLOC_FAILURE;
+               goto err;
+               }
+
+       if (EC_GROUP_get_asn1_flag(x))
+               {
+               /* the curve parameter are given by an asn1 OID */
+               int nid;
+
+               if (!BIO_indent(bp, off, 128))
+                       goto err;
+
+               nid = EC_GROUP_get_curve_name(x);
+               if (nid == 0)
+                       goto err;
+
+               if (BIO_printf(bp, "ASN1 OID: %s", OBJ_nid2sn(nid)) <= 0)
+                       goto err;
+               if (BIO_printf(bp, "\n") <= 0)
+                       goto err;
+               }
+       else
+               {
+               /* explicit parameters */
+               int is_char_two = 0;
+               point_conversion_form_t form;
+               int tmp_nid = EC_METHOD_get_field_type(EC_GROUP_method_of(x));
+
+               if (tmp_nid == NID_X9_62_characteristic_two_field)
+                       is_char_two = 1;
+
+               if ((p = BN_new()) == NULL || (a = BN_new()) == NULL ||
+                       (b = BN_new()) == NULL || (order = BN_new()) == NULL ||
+                       (cofactor = BN_new()) == NULL)
+                       {
+                       reason = ERR_R_MALLOC_FAILURE;
+                       goto err;
+                       }
+
+               if (is_char_two)
+                       {
+                       if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx))
+                               {
+                               reason = ERR_R_EC_LIB;
+                               goto err;
+                               }
+                       }
+               else /* prime field */
+                       {
+                       if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
+                               {
+                               reason = ERR_R_EC_LIB;
+                               goto err;
+                               }
+                       }
+
+               if ((point = EC_GROUP_get0_generator(x)) == NULL)
+                       {
+                       reason = ERR_R_EC_LIB;
+                       goto err;
+                       }
+               if (!EC_GROUP_get_order(x, order, NULL) || 
+                       !EC_GROUP_get_cofactor(x, cofactor, NULL))
+                       {
+                       reason = ERR_R_EC_LIB;
+                       goto err;
+                       }
+               
+               form = EC_GROUP_get_point_conversion_form(x);
+
+               if ((gen = EC_POINT_point2bn(x, point, 
+                               form, NULL, ctx)) == NULL)
+                       {
+                       reason = ERR_R_EC_LIB;
+                       goto err;
+                       }
+
+               buf_len = (size_t)BN_num_bytes(p);
+               if (buf_len < (i = (size_t)BN_num_bytes(a)))
+                       buf_len = i;
+               if (buf_len < (i = (size_t)BN_num_bytes(b)))
+                       buf_len = i;
+               if (buf_len < (i = (size_t)BN_num_bytes(gen)))
+                       buf_len = i;
+               if (buf_len < (i = (size_t)BN_num_bytes(order)))
+                       buf_len = i;
+               if (buf_len < (i = (size_t)BN_num_bytes(cofactor))) 
+                       buf_len = i;
+
+               if ((seed = EC_GROUP_get0_seed(x)) != NULL)
+                       seed_len = EC_GROUP_get_seed_len(x);
+
+               buf_len += 10;
+               if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
+                       {
+                       reason = ERR_R_MALLOC_FAILURE;
+                       goto err;
+                       }
+
+               if (!BIO_indent(bp, off, 128))
+                       goto err;
+
+               /* print the 'short name' of the field type */
+               if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid))
+                       <= 0)
+                       goto err;  
+
+               if (is_char_two)
+                       {
+                       /* print the 'short name' of the base type OID */
+                       int basis_type = EC_GROUP_get_basis_type(x);
+                       if (basis_type == 0)
+                               goto err;
+
+                       if (!BIO_indent(bp, off, 128))
+                               goto err;
+
+                       if (BIO_printf(bp, "Basis Type: %s\n", 
+                               OBJ_nid2sn(basis_type)) <= 0)
+                               goto err;
+
+                       /* print the polynomial */
+                       if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, buffer,
+                               off))
+                               goto err;
+                       }
+               else
+                       {
+                       if ((p != NULL) && !ASN1_bn_print(bp, "Prime:", p, buffer,off))
+                               goto err;
+                       }
+               if ((a != NULL) && !ASN1_bn_print(bp, "A:   ", a, buffer, off)) 
+                       goto err;
+               if ((b != NULL) && !ASN1_bn_print(bp, "B:   ", b, buffer, off))
+                       goto err;
+               if (form == POINT_CONVERSION_COMPRESSED)
+                       {
+                       if ((gen != NULL) && !ASN1_bn_print(bp, gen_compressed, gen,
+                               buffer, off))
+                               goto err;
+                       }
+               else if (form == POINT_CONVERSION_UNCOMPRESSED)
+                       {
+                       if ((gen != NULL) && !ASN1_bn_print(bp, gen_uncompressed, gen,
+                               buffer, off))
+                               goto err;
+                       }
+               else /* form == POINT_CONVERSION_HYBRID */
+                       {
+                       if ((gen != NULL) && !ASN1_bn_print(bp, gen_hybrid, gen,
+                               buffer, off))
+                               goto err;
+                       }
+               if ((order != NULL) && !ASN1_bn_print(bp, "Order: ", order, 
+                       buffer, off)) goto err;
+               if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor, 
+                       buffer, off)) goto err;
+               if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
+                       goto err;
+               }
+       ret=1;
+err:
+       if (!ret)
+               ECerr(EC_F_ECPKPARAMETERS_PRINT, reason);
+       if (p) 
+               BN_free(p);
+       if (a) 
+               BN_free(a);
+       if (b)
+               BN_free(b);
+       if (gen)
+               BN_free(gen);
+       if (order)
+               BN_free(order);
+       if (cofactor)
+               BN_free(cofactor);
+       if (ctx)
+               BN_CTX_free(ctx);
+       if (buffer != NULL) 
+               OPENSSL_free(buffer);
+       return(ret);    
+       }
+
+static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
+               size_t len, int off)
+       {
+       size_t i;
+       char str[128];
+
+       if (buf == NULL)
+               return 1;
+       if (off)
+               {
+               if (off > 128)
+                       off=128;
+               memset(str,' ',off);
+               if (BIO_write(fp, str, off) <= 0)
+                       return 0;
+               }
+
+       if (BIO_printf(fp,"%s", name) <= 0)
+               return 0;
+
+       for (i=0; i<len; i++)
+               {
+               if ((i%15) == 0)
+                       {
+                       str[0]='\n';
+                       memset(&(str[1]),' ',off+4);
+                       if (BIO_write(fp, str, off+1+4) <= 0)
+                               return 0;
+                       }
+               if (BIO_printf(fp,"%02x%s",buf[i],((i+1) == len)?"":":") <= 0)
+                       return 0;
+               }
+       if (BIO_write(fp,"\n",1) <= 0)
+               return 0;
+
+       return 1;
+       }
index 71efa61..dacdf11 100644 (file)
@@ -19,10 +19,10 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
        rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
-       rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c
+       rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c
 LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \
        rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \
-       rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o rsa_ameth.o
+       rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o rsa_ameth.o rsa_prn.o
 
 SRC= $(LIBSRC)
 
diff --git a/crypto/rsa/rsa_prn.c b/crypto/rsa/rsa_prn.c
new file mode 100644 (file)
index 0000000..b487420
--- /dev/null
@@ -0,0 +1,93 @@
+/* crypto/rsa/rsa_prn.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+
+#ifndef OPENSSL_NO_FP_API
+int RSA_print_fp(FILE *fp, const RSA *x, int off)
+       {
+       BIO *b;
+       int ret;
+
+       if ((b=BIO_new(BIO_s_file())) == NULL)
+               {
+               RSAerr(RSA_F_RSA_PRINT_FP,ERR_R_BUF_LIB);
+               return(0);
+               }
+       BIO_set_fp(b,fp,BIO_NOCLOSE);
+       ret=RSA_print(b,x,off);
+       BIO_free(b);
+       return(ret);
+       }
+#endif
+
+int RSA_print(BIO *bp, const RSA *x, int off)
+       {
+       EVP_PKEY *pk;
+       int ret;
+       pk = EVP_PKEY_new();
+       if (!pk || !EVP_PKEY_set1_RSA(pk, (RSA *)x))
+               return 0;
+       ret = EVP_PKEY_print_private(bp, pk, off, NULL);
+       EVP_PKEY_free(pk);
+       return ret;
+       }
+