Move algorithm specific print code from crypto/asn1/t_pkey.c to separate
[openssl.git] / crypto / ec / ec_ameth.c
index 96491d990aeeb4a031a111b9939ad2be26e5aed9..98003b1b0ed82c2dd3e22f1f75a98c719cb18e2c 100644 (file)
@@ -561,252 +561,3 @@ EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
        int_ec_free,
        0
        };
        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;
-       }