improved error checking and some fixes

[openssl.git] / crypto / asn1 / t_pkey.c

diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index b418bf035a8c1150db555c128da438e34da8adcd..296033d55322328031d331d56695e773409866f9 100644 (file)
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -79,10 +79,12 @@
 #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)
@@ -150,9 +152,9 @@ int RSA_print(BIO *bp, const RSA *x, int off)
                }
 
        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;
@@ -196,6 +198,11 @@ int DSA_print(BIO *bp, const DSA *x, int off)
 
        if (x->p)
                buf_len = (size_t)BN_num_bytes(x->p);
+       else
+               {
+               DSAerr(DSA_F_DSA_PRINT,DSA_R_MISSING_PARAMETERS);
+               goto err;
+               }
        if (x->q)
                if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
                        buf_len = i;
@@ -279,7 +286,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
        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;
        const unsigned char *seed;
@@ -303,7 +310,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                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;
 
@@ -479,26 +486,31 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
        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,
-               x->conv_form, 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;
                }
 
@@ -509,21 +521,25 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
                goto err;
                }
 
-       if (x->priv_key != NULL)
+       if (priv_key != NULL)
                {
                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:
@@ -531,6 +547,8 @@ err:
                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)
@@ -539,14 +557,14 @@ err:
        }
 #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;
        const char *neg;
 
        if (num == NULL) return(1);
-       neg = (BN_get_sign(num))?"-":"";
+       neg = (BN_is_negative(num))?"-":"";
        if(!BIO_indent(bp,off,128))
                return 0;
        if (BN_is_zero(num))
@@ -590,6 +608,7 @@ 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)
        {
@@ -627,6 +646,7 @@ static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
 
        return 1;
        }
+#endif
 
 #ifndef OPENSSL_NO_DH
 #ifndef OPENSSL_NO_FP_API
@@ -655,6 +675,11 @@ int DHparams_print(BIO *bp, const DH *x)
 
        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;
@@ -713,6 +738,11 @@ int DSAparams_print(BIO *bp, const DSA *x)
 
        if (x->p)
                buf_len = (size_t)BN_num_bytes(x->p);
+       else
+               {
+               DSAerr(DSA_F_DSA_PRINT,DSA_R_MISSING_PARAMETERS);
+               goto err;
+               }
        if (x->q)
                if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
                        buf_len = i;
@@ -722,7 +752,7 @@ int DSAparams_print(BIO *bp, const DSA *x)
        m=(unsigned char *)OPENSSL_malloc(buf_len+10);
        if (m == NULL)
                {
-               reason=ERR_R_MALLOC_FAILURE;
+               DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
@@ -735,7 +765,6 @@ int DSAparams_print(BIO *bp, const DSA *x)
        ret=1;
 err:
        if (m != NULL) OPENSSL_free(m);
-       DSAerr(DSA_F_DSAPARAMS_PRINT,reason);
        return(ret);
        }
 
@@ -764,8 +793,9 @@ 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;
@@ -777,7 +807,7 @@ int ECParameters_print(BIO *bp, const EC_KEY *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;
@@ -786,7 +816,7 @@ int ECParameters_print(BIO *bp, const EC_KEY *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: