projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add additional checks + cleanup
[openssl.git] / crypto / asn1 / t_pkey.c
diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index 687a2bd6f561ad0993425d9ef627813d491f58b3..afb95d67121a0995b2f7cd3ecf29df0d92f9d0e1 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)
@@ -107,7 +109,7 @@ int RSA_print(BIO *bp, const RSA *x, int off)
        char str[128];
        const char *s;
        unsigned char *m=NULL;
-       int ret=0;
+       int ret=0, mod_len = 0;
        size_t buf_len=0, i;
 
        if (x->n)
@@ -141,27 +143,37 @@ int RSA_print(BIO *bp, const RSA *x, int off)
                goto err;
                }
 
+       if (x->n != NULL)
+               mod_len = BN_num_bits(x->n);
+
        if (x->d != NULL)
                {
                if(!BIO_indent(bp,off,128))
                   goto err;
-               if (BIO_printf(bp,"Private-Key: (%d bit)\n",BN_num_bits(x->n))
+               if (BIO_printf(bp,"Private-Key: (%d bit)\n", mod_len)
                        <= 0) goto err;
                }
 
        if (x->d == NULL)
-               BIO_snprintf(str,sizeof str,"Modulus (%d bit):",BN_num_bits(x->n));
+               BIO_snprintf(str,sizeof str,"Modulus (%d bit):", mod_len);
        else
                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;
-       if (!print(bp,"privateExponent:",x->d,m,off)) goto err;
-       if (!print(bp,"prime1:",x->p,m,off)) goto err;
-       if (!print(bp,"prime2:",x->q,m,off)) goto err;
-       if (!print(bp,"exponent1:",x->dmp1,m,off)) goto err;
-       if (!print(bp,"exponent2:",x->dmq1,m,off)) goto err;
-       if (!print(bp,"coefficient:",x->iqmp,m,off)) goto err;
+       if ((x->e != NULL) && !print(bp,s,x->e,m,off))
+               goto err;
+       if ((x->d != NULL) && !print(bp,"privateExponent:",x->d,m,off))
+               goto err;
+       if ((x->p != NULL) && !print(bp,"prime1:",x->p,m,off))
+               goto err;
+       if ((x->q != NULL) && !print(bp,"prime2:",x->q,m,off))
+               goto err;
+       if ((x->dmp1 != NULL) && !print(bp,"exponent1:",x->dmp1,m,off))
+               goto err;
+       if ((x->dmq1 != NULL) && !print(bp,"exponent2:",x->dmq1,m,off))
+               goto err;
+       if ((x->iqmp != NULL) && !print(bp,"coefficient:",x->iqmp,m,off))
+               goto err;
        ret=1;
 err:
        if (m != NULL) OPENSSL_free(m);
@@ -196,6 +208,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 +296,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;
@@ -481,24 +498,29 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
        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 || !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,25 +531,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(x->group, order, NULL))
+               if (!EC_GROUP_get_order(group, order, NULL))
                        goto err;
                if (BIO_printf(bp, "Private-Key: (%d bit)\n", 
                        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:
@@ -545,7 +567,7 @@ 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;
@@ -596,6 +618,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)
        {
@@ -633,6 +656,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
@@ -661,6 +685,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;
@@ -714,11 +743,16 @@ 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,ret=0;
+       int ret=0;
        size_t buf_len=0,i;
 
        if (x->p)
                buf_len = (size_t)BN_num_bytes(x->p);
+       else
+               {
+               DSAerr(DSA_F_DSAPARAMS_PRINT,DSA_R_MISSING_PARAMETERS);
+               goto err;
+               }
        if (x->q)
                if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
                        buf_len = i;
@@ -728,7 +762,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_DSAPARAMS_PRINT,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
@@ -736,12 +770,11 @@ int DSAparams_print(BIO *bp, const DSA *x)
                BN_num_bits(x->p)) <= 0)
                goto err;
        if (!print(bp,"p:",x->p,m,4)) goto err;
-       if (!print(bp,"q:",x->q,m,4)) goto err;
-       if (!print(bp,"g:",x->g,m,4)) goto err;
+       if ((x->q != NULL) && !print(bp,"q:",x->q,m,4)) goto err;
+       if ((x->g != NULL) && !print(bp,"g:",x->g,m,4)) goto err;
        ret=1;
 err:
        if (m != NULL) OPENSSL_free(m);
-       DSAerr(DSA_F_DSAPARAMS_PRINT,reason);
        return(ret);
        }
 
@@ -770,8 +803,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;
@@ -783,7 +817,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;
@@ -792,7 +826,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:
Unnamed repository; edit this file 'description' to name the repository.