Fix bug in DSA, EC methods.

[openssl.git] / crypto / ec / ec_ameth.c

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index e6a0d20faa7dcc834a38ade65a94d23bd1f41469..4a136619ab92a7b83367812eeb3195ae017d99c3 100644 (file)
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -2,7 +2,7 @@
  * project 2006.
  */
 /* ====================================================================
  * project 2006.
  */
 /* ====================================================================

- * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -59,6 +59,7 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/ec.h>
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/ec.h>

+#include "asn1_locl.h"

 
 static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)
        {
 
 static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)
        {


@@ -419,20 +420,136 @@ static void int_ec_free(EVP_PKEY *pkey)
        EC_KEY_free(pkey->pkey.ec);
        }
 
        EC_KEY_free(pkey->pkey.ec);
        }
 

+static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, int ktype)
+       {
+       unsigned char *buffer=NULL;
+       const char *ecstr;
+       size_t  buf_len=0, i;
+       int     ret=0, reason=ERR_R_BIO_LIB;
+       BIGNUM  *pub_key=NULL, *order=NULL;
+       BN_CTX  *ctx=NULL;
+       const EC_GROUP *group;
+       const EC_POINT *public_key;
+       const BIGNUM *priv_key;
+ 
+       if (x == NULL || (group = EC_KEY_get0_group(x)) == NULL)
+               {
+               reason = ERR_R_PASSED_NULL_PARAMETER;
+               goto err;
+               }
+
+       ctx = BN_CTX_new();
+       if (ctx == NULL)
+               {
+               reason = ERR_R_MALLOC_FAILURE;
+               goto err;
+               }
+
+       if (ktype > 0)
+               {
+               public_key = EC_KEY_get0_public_key(x);
+               if ((pub_key = EC_POINT_point2bn(group, public_key,
+                       EC_KEY_get_conv_form(x), NULL, ctx)) == NULL)
+                       {
+                       reason = ERR_R_EC_LIB;
+                       goto err;
+                       }
+               if (pub_key)
+                       buf_len = (size_t)BN_num_bytes(pub_key);
+               }
+
+       if (ktype == 2)
+               {
+               priv_key = EC_KEY_get0_private_key(x);
+               if (priv_key && (i = (size_t)BN_num_bytes(priv_key)) > buf_len)
+                       buf_len = i;
+               }
+       else
+               priv_key = NULL;
+
+       if (ktype > 0)
+               {
+               buf_len += 10;
+               if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
+                       {
+                       reason = ERR_R_MALLOC_FAILURE;
+                       goto err;
+                       }
+               }
+       if (ktype == 2)
+               ecstr = "Private-Key";
+       else if (ktype == 1)
+               ecstr = "Public-Key";
+       else
+               ecstr = "ECDSA-Parameters";
+
+       if (!BIO_indent(bp, off, 128))
+               goto err;
+       if ((order = BN_new()) == NULL)
+               goto err;
+       if (!EC_GROUP_get_order(group, order, NULL))
+               goto err;
+       if (BIO_printf(bp, "%s: (%d bit)\n", ecstr,
+               BN_num_bits(order)) <= 0) goto err;
+  
+       if ((priv_key != NULL) && !ASN1_bn_print(bp, "priv:", priv_key, 
+               buffer, off))
+               goto err;
+       if ((pub_key != NULL) && !ASN1_bn_print(bp, "pub: ", pub_key,
+               buffer, off))
+               goto err;
+       if (!ECPKParameters_print(bp, group, off))
+               goto err;
+       ret=1;
+err:
+       if (!ret)
+               ECerr(EC_F_EC_KEY_PRINT, reason);
+       if (pub_key) 
+               BN_free(pub_key);
+       if (order)
+               BN_free(order);
+       if (ctx)
+               BN_CTX_free(ctx);
+       if (buffer != NULL)
+               OPENSSL_free(buffer);
+       return(ret);
+       }
+
+static int eckey_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
+                                                       ASN1_PCTX *ctx)
+       {
+       return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 0);
+       }
+
+static int eckey_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
+                                                       ASN1_PCTX *ctx)
+       {
+       return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 1);
+       }
+
+
+static int eckey_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
+                                                       ASN1_PCTX *ctx)
+       {
+       return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 2);
+       }
+

 EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
        {
        EVP_PKEY_EC,
 EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
        {
        EVP_PKEY_EC,

+       EVP_PKEY_EC,

        0,
        0,

-       0,
+       "ec",
+       "OpenSSL EC algorithm",

 
        eckey_pub_decode,
        eckey_pub_encode,
        eckey_pub_cmp,
 
        eckey_pub_decode,
        eckey_pub_encode,
        eckey_pub_cmp,

-       0,
+       eckey_pub_print,

 
        eckey_priv_decode,
        eckey_priv_encode,
 
        eckey_priv_decode,
        eckey_priv_encode,

-       0,
+       eckey_priv_print,

 
        int_ec_size,
        ec_bits,
 
        int_ec_size,
        ec_bits,


@@ -441,7 +558,7 @@ EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
        ec_missing_parameters,
        ec_copy_parameters,
        ec_cmp_parameters,
        ec_missing_parameters,
        ec_copy_parameters,
        ec_cmp_parameters,

-       0,
+       eckey_param_print,

 
        int_ec_free,
        0
 
        int_ec_free,
        0