make
[openssl.git] / crypto / asn1 / t_pkey.c
index c456b67..939979f 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"
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
+#ifndef OPENSSL_NO_EC
+#include <openssl/ec.h>
 #endif
 
-static int print(BIO *fp,const char *str,BIGNUM *num,
+static int print(BIO *fp,const char *str, const BIGNUM *num,
                unsigned char *buf,int off);
+#ifndef OPENSSL_NO_EC
+static int print_bin(BIO *fp, const char *str, const unsigned char *num,
+               size_t len, int off);
+#endif
 #ifndef OPENSSL_NO_RSA
 #ifndef OPENSSL_NO_FP_API
 int RSA_print_fp(FILE *fp, const RSA *x, int off)
@@ -100,32 +109,52 @@ int RSA_print(BIO *bp, const RSA *x, int off)
        char str[128];
        const char *s;
        unsigned char *m=NULL;
-       int i,ret=0;
+       int ret=0;
+       size_t buf_len=0, i;
+
+       if (x->n)
+               buf_len = (size_t)BN_num_bytes(x->n);
+       if (x->e)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->e)))
+                       buf_len = i;
+       if (x->d)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->d)))
+                       buf_len = i;
+       if (x->p)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->p)))
+                       buf_len = i;
+       if (x->q)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
+                       buf_len = i;
+       if (x->dmp1)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->dmp1)))
+                       buf_len = i;
+       if (x->dmq1)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->dmq1)))
+                       buf_len = i;
+       if (x->iqmp)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->iqmp)))
+                       buf_len = i;
 
-       i=RSA_size(x);
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
+       m=(unsigned char *)OPENSSL_malloc(buf_len+10);
        if (m == NULL)
                {
                RSAerr(RSA_F_RSA_PRINT,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
-       if (off)
-               {
-               if (off > 128) off=128;
-               memset(str,' ',off);
-               }
        if (x->d != NULL)
                {
-               if (off && (BIO_write(bp,str,off) <= 0)) goto err;
+               if(!BIO_indent(bp,off,128))
+                  goto err;
                if (BIO_printf(bp,"Private-Key: (%d bit)\n",BN_num_bits(x->n))
                        <= 0) goto err;
                }
 
        if (x->d == NULL)
-               sprintf(str,"Modulus (%d bit):",BN_num_bits(x->n));
+               BIO_snprintf(str,sizeof str,"Modulus (%d bit):",BN_num_bits(x->n));
        else
-               strcpy(str,"modulus:");
+               BUF_strlcpy(str,"modulus:",sizeof str);
        if (!print(bp,str,x->n,m,off)) goto err;
        s=(x->d == NULL)?"Exponent:":"publicExponent:";
        if (!print(bp,s,x->e,m,off)) goto err;
@@ -163,38 +192,36 @@ int DSA_print_fp(FILE *fp, const DSA *x, int off)
 
 int DSA_print(BIO *bp, const DSA *x, int off)
        {
-       char str[128];
        unsigned char *m=NULL;
-       int i,ret=0;
-       BIGNUM *bn=NULL;
-
-       if (x->p != NULL)
-               bn=x->p;
-       else if (x->priv_key != NULL)
-               bn=x->priv_key;
-       else if (x->pub_key != NULL)
-               bn=x->pub_key;
-               
-       /* larger than needed but what the hell :-) */
-       if (bn != NULL)
-               i=BN_num_bytes(bn)*2;
-       else
-               i=256;
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
+       int ret=0;
+       size_t buf_len=0,i;
+
+       if (x->p)
+               buf_len = (size_t)BN_num_bytes(x->p);
+       if (x->q)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
+                       buf_len = i;
+       if (x->g)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->g)))
+                       buf_len = i;
+       if (x->priv_key)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->priv_key)))
+                       buf_len = i;
+       if (x->pub_key)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->pub_key)))
+                       buf_len = i;
+
+       m=(unsigned char *)OPENSSL_malloc(buf_len+10);
        if (m == NULL)
                {
                DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
-       if (off)
-               {
-               if (off > 128) off=128;
-               memset(str,' ',off);
-               }
        if (x->priv_key != NULL)
                {
-               if (off && (BIO_write(bp,str,off) <= 0)) goto err;
+               if(!BIO_indent(bp,off,128))
+                  goto err;
                if (BIO_printf(bp,"Private-Key: (%d bit)\n",BN_num_bits(x->p))
                        <= 0) goto err;
                }
@@ -230,18 +257,35 @@ int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int 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 ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
        {
-       char str[128];
        unsigned char *buffer=NULL;
        size_t  buf_len=0, i;
        int     ret=0, reason=ERR_R_BIO_LIB;
        BN_CTX  *ctx=NULL;
-       EC_POINT *point=NULL;
+       const EC_POINT *point=NULL;
        BIGNUM  *p=NULL, *a=NULL, *b=NULL, *gen=NULL,
-               *order=NULL, *cofactor=NULL, *seed=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):";
@@ -258,16 +302,10 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                /* the curve parameter are given by an asn1 OID */
                int nid;
 
-               if (off)
-                       {
-                       if (off > 128)
-                               off=128;
-                       memset(str, ' ', off);
-                       if (BIO_write(bp, str, off) <= 0)
-                               goto err;
-                       }
+               if (!BIO_indent(bp, off, 128))
+                       goto err;
 
-               nid = EC_GROUP_get_nid(x);
+               nid = EC_GROUP_get_curve_name(x);
                if (nid == 0)
                        goto err;
 
@@ -279,8 +317,12 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
        else
                {
                /* explicit parameters */
-               /* TODO */
+               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 ||
@@ -290,10 +332,21 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                        goto err;
                        }
 
-               if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
+               if (is_char_two)
                        {
-                       reason = ERR_R_EC_LIB;
-                       goto err;
+                       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)
@@ -329,18 +382,8 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                if (buf_len < (i = (size_t)BN_num_bytes(cofactor))) 
                        buf_len = i;
 
-               if (EC_GROUP_get0_seed(x))
-                       {
-                       seed = BN_bin2bn(EC_GROUP_get0_seed(x),
-                               EC_GROUP_get_seed_len(x), NULL);
-                       if (seed == NULL)
-                               {
-                               reason = ERR_R_BN_LIB;
-                               goto err;
-                               }
-                       if (buf_len < (i = (size_t)BN_num_bytes(seed))) 
-                               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)
@@ -348,14 +391,39 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                        reason = ERR_R_MALLOC_FAILURE;
                        goto err;
                        }
-               if (off)
+
+               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)
                        {
-                       if (off > 128) off=128;
-                       memset(str,' ',off);
+                       /* 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) && !print(bp, "Polynomial:", p, buffer,
+                               off))
+                               goto err;
+                       }
+               else
+                       {
+                       if ((p != NULL) && !print(bp, "Prime:", p, buffer,off))
+                               goto err;
                        }
-  
-               if ((p != NULL) && !print(bp, "P:   ", p, buffer, off)) 
-                       goto err;
                if ((a != NULL) && !print(bp, "A:   ", a, buffer, off)) 
                        goto err;
                if ((b != NULL) && !print(bp, "B:   ", b, buffer, off))
@@ -382,8 +450,8 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                        buffer, off)) goto err;
                if ((cofactor != NULL) && !print(bp, "Cofactor: ", cofactor, 
                        buffer, off)) goto err;
-               if ((seed != NULL) && !print(bp, "Seed:", seed, 
-                       buffer, off)) goto err;
+               if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
+                       goto err;
                }
        ret=1;
 err:
@@ -401,62 +469,43 @@ err:
                BN_free(order);
        if (cofactor)
                BN_free(cofactor);
-       if (seed) 
-               BN_free(seed);
        if (ctx)
                BN_CTX_free(ctx);
        if (buffer != NULL) 
                OPENSSL_free(buffer);
        return(ret);    
        }
-#endif /* OPENSSL_NO_EC */
 
-
-#ifndef OPENSSL_NO_ECDSA
-#ifndef OPENSSL_NO_FP_API
-int ECDSA_print_fp(FILE *fp, const ECDSA *x, int off)
-{
-       BIO *b;
-       int ret;
-       if ((b=BIO_new(BIO_s_file())) == NULL)
+int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
        {
-               ECDSAerr(ECDSA_F_ECDSA_PRINT_FP, ERR_R_BIO_LIB);
-               return(0);
-       }
-       BIO_set_fp(b, fp, BIO_NOCLOSE);
-       ret = ECDSA_print(b, x, off);
-       BIO_free(b);
-       return(ret);
-}
-#endif
-
-int ECDSA_print(BIO *bp, const ECDSA *x, int off)
-       {
-       char str[128];
        unsigned char *buffer=NULL;
        size_t  buf_len=0, i;
        int     ret=0, reason=ERR_R_BIO_LIB;
-       BIGNUM  *pub_key=NULL;
+       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 || !x->group)
+       if (x == NULL || (group = EC_KEY_get0_group(x)) == NULL)
                {
                reason = ERR_R_PASSED_NULL_PARAMETER;
                goto err;
                }
 
-       if ((pub_key = EC_POINT_point2bn(x->group, x->pub_key,
-               ECDSA_get_conversion_form(x), NULL, ctx)) == NULL)
+       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;
                }
 
        buf_len = (size_t)BN_num_bytes(pub_key);
-       if (x->priv_key)
+       priv_key = EC_KEY_get0_private_key(x);
+       if (priv_key != NULL)
                {
-               if ((i = (size_t)BN_num_bytes(x->priv_key)) > buf_len)
+               if ((i = (size_t)BN_num_bytes(priv_key)) > buf_len)
                        buf_len = i;
                }
 
@@ -466,54 +515,58 @@ int ECDSA_print(BIO *bp, const ECDSA *x, int off)
                reason = ERR_R_MALLOC_FAILURE;
                goto err;
                }
-       if (off)
-               {
-               if (off > 128) off=128;
-               memset(str,' ',off);
-               }
-       if (x->priv_key != NULL)
+
+       if (priv_key != NULL)
                {
-               if (off && (BIO_write(bp, str, off) <= 0)) goto err;
+               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, "Private-Key: (%d bit)\n", 
-                       BN_num_bits(x->priv_key)) <= 0) goto err;
+                       BN_num_bits(order)) <= 0) goto err;
                }
   
-       if ((x->priv_key != NULL) && !print(bp, "priv:", x->priv_key, 
+       if ((priv_key != NULL) && !print(bp, "priv:", priv_key, 
                buffer, off))
                goto err;
        if ((pub_key != NULL) && !print(bp, "pub: ", pub_key,
                buffer, off))
                goto err;
-       if (!ECPKParameters_print(bp, x->group, off))
+       if (!ECPKParameters_print(bp, group, off))
                goto err;
        ret=1;
 err:
        if (!ret)
-               ECDSAerr(ECDSA_F_ECDSA_PRINT, reason);
+               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);
        }
-#endif
+#endif /* OPENSSL_NO_EC */
 
-static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
+static int print(BIO *bp, const char *number, const BIGNUM *num, unsigned char *buf,
             int off)
        {
        int n,i;
-       char str[128];
        const char *neg;
 
        if (num == NULL) return(1);
-       neg=(num->neg)?"-":"";
-       if (off)
+       neg = (BN_is_negative(num))?"-":"";
+       if(!BIO_indent(bp,off,128))
+               return 0;
+       if (BN_is_zero(num))
                {
-               if (off > 128) off=128;
-               memset(str,' ',off);
-               if (BIO_write(bp,str,off) <= 0) return(0);
+               if (BIO_printf(bp, "%s 0\n", number) <= 0)
+                       return 0;
+               return 1;
                }
 
        if (BN_num_bytes(num) <= BN_BYTES)
@@ -538,9 +591,9 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
                        {
                        if ((i%15) == 0)
                                {
-                               str[0]='\n';
-                               memset(&(str[1]),' ',off+4);
-                               if (BIO_write(bp,str,off+1+4) <= 0) return(0);
+                               if(BIO_puts(bp,"\n") <= 0
+                                  || !BIO_indent(bp,off+4,128))
+                                   return 0;
                                }
                        if (BIO_printf(bp,"%02x%s",buf[i],((i+1) == n)?"":":")
                                <= 0) return(0);
@@ -550,6 +603,46 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
        return(1);
        }
 
+#ifndef OPENSSL_NO_EC
+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;
+       }
+#endif
+
 #ifndef OPENSSL_NO_DH
 #ifndef OPENSSL_NO_FP_API
 int DHparams_print_fp(FILE *fp, const DH *x)
@@ -572,10 +665,15 @@ int DHparams_print_fp(FILE *fp, const DH *x)
 int DHparams_print(BIO *bp, const DH *x)
        {
        unsigned char *m=NULL;
-       int reason=ERR_R_BUF_LIB,i,ret=0;
+       int reason=ERR_R_BUF_LIB,ret=0;
+       size_t buf_len=0, i;
 
-       i=BN_num_bytes(x->p);
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
+       if (x->p)
+               buf_len = (size_t)BN_num_bytes(x->p);
+       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;
@@ -625,10 +723,18 @@ int DSAparams_print_fp(FILE *fp, const DSA *x)
 int DSAparams_print(BIO *bp, const DSA *x)
        {
        unsigned char *m=NULL;
-       int reason=ERR_R_BUF_LIB,i,ret=0;
+       int reason=ERR_R_BUF_LIB,ret=0;
+       size_t buf_len=0,i;
 
-       i=BN_num_bytes(x->p);
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
+       if (x->p)
+               buf_len = (size_t)BN_num_bytes(x->p);
+       if (x->q)
+               if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
+                       buf_len = i;
+       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;
@@ -650,31 +756,32 @@ err:
 
 #endif /* !OPENSSL_NO_DSA */
 
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
 #ifndef OPENSSL_NO_FP_API
-int ECDSAParameters_print_fp(FILE *fp, const ECDSA *x)
+int ECParameters_print_fp(FILE *fp, const EC_KEY *x)
        {
        BIO *b;
        int ret;
  
        if ((b=BIO_new(BIO_s_file())) == NULL)
-       {
-               ECDSAerr(ECDSA_F_ECDSAPARAMETERS_PRINT_FP, ERR_R_BIO_LIB);
+               {
+               ECerr(EC_F_ECPARAMETERS_PRINT_FP, ERR_R_BIO_LIB);
                return(0);
-       }
+               }
        BIO_set_fp(b, fp, BIO_NOCLOSE);
-       ret = ECDSAParameters_print(b, x);
+       ret = ECParameters_print(b, x);
        BIO_free(b);
        return(ret);
        }
 #endif
 
-int ECDSAParameters_print(BIO *bp, const ECDSA *x)
+int ECParameters_print(BIO *bp, const EC_KEY *x)
        {
        int     reason=ERR_R_EC_LIB, ret=0;
        BIGNUM  *order=NULL;
+       const EC_GROUP *group;
  
-       if (!x || !x->group)
+       if (x == NULL || (group = EC_KEY_get0_group(x)) == NULL)
                {
                reason = ERR_R_PASSED_NULL_PARAMETER;;
                goto err;
@@ -686,7 +793,7 @@ int ECDSAParameters_print(BIO *bp, const ECDSA *x)
                goto err;
                }
 
-       if (!EC_GROUP_get_order(x->group, order, NULL))
+       if (!EC_GROUP_get_order(group, order, NULL))
                {
                reason = ERR_R_EC_LIB;
                goto err;
@@ -695,13 +802,13 @@ int ECDSAParameters_print(BIO *bp, const ECDSA *x)
        if (BIO_printf(bp, "ECDSA-Parameters: (%d bit)\n", 
                BN_num_bits(order)) <= 0)
                goto err;
-       if (!ECPKParameters_print(bp, x->group, 4))
+       if (!ECPKParameters_print(bp, group, 4))
                goto err;
        ret=1;
 err:
        if (order)
                BN_free(order);
-       ECDSAerr(ECDSA_F_ECDSAPARAMETERS_PRINT, reason);
+       ECerr(EC_F_ECPARAMETERS_PRINT, reason);
        return(ret);
        }