Revert to original...
[openssl.git] / crypto / asn1 / t_pkey.c
index 1b29fdc4a8911e2d66875fdd415c015fa52c2668..9dd18f65793733798a5ee62e0f812c44e18544b6 100644 (file)
 
 #include <stdio.h>
 #include "cryptlib.h"
+#include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
 
-static int print(BIO *fp,const char *str,BIGNUM *num,
-               unsigned char *buf,int off);
-#ifndef OPENSSL_NO_RSA
-#ifndef OPENSSL_NO_FP_API
-int RSA_print_fp(FILE *fp, const RSA *x, int off)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               RSAerr(RSA_F_RSA_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=RSA_print(b,x,off);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int RSA_print(BIO *bp, const RSA *x, int off)
-       {
-       char str[128];
-       const char *s;
-       unsigned char *m=NULL;
-       int i,ret=0;
-
-       i=RSA_size(x);
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+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_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));
-       else
-               strcpy(str,"modulus:");
-       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;
-       ret=1;
-err:
-       if (m != NULL) OPENSSL_free(m);
-       return(ret);
-       }
-#endif /* OPENSSL_NO_RSA */
-
-#ifndef OPENSSL_NO_DSA
-#ifndef OPENSSL_NO_FP_API
-int DSA_print_fp(FILE *fp, const DSA *x, int off)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               DSAerr(DSA_F_DSA_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=DSA_print(b,x,off);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-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);
-       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_printf(bp,"Private-Key: (%d bit)\n",BN_num_bits(x->p))
-                       <= 0) goto err;
-               }
-
-       if ((x->priv_key != NULL) && !print(bp,"priv:",x->priv_key,m,off))
-               goto err;
-       if ((x->pub_key  != NULL) && !print(bp,"pub: ",x->pub_key,m,off))
-               goto err;
-       if ((x->p != NULL) && !print(bp,"P:   ",x->p,m,off)) goto err;
-       if ((x->q != NULL) && !print(bp,"Q:   ",x->q,m,off)) goto err;
-       if ((x->g != NULL) && !print(bp,"G:   ",x->g,m,off)) goto err;
-       ret=1;
-err:
-       if (m != NULL) OPENSSL_free(m);
-       return(ret);
-       }
-#endif /* !OPENSSL_NO_DSA */
-
-#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)
-       {
-               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;
-       int     i, buf_len=0, ret=0, reason=ERR_R_BIO_LIB;
-       BIGNUM  *tmp_1=NULL, *tmp_2=NULL, *tmp_3=NULL,
-               *tmp_4=NULL, *tmp_5=NULL, *tmp_6=NULL,
-               *tmp_7=NULL;
-       BN_CTX  *ctx=NULL;
-       EC_POINT *point=NULL;
-       /* TODO: fields other than prime fields */
-       
-       if (!x || !x->group)
-               {
-               reason = ECDSA_R_MISSING_PARAMETERS;
-               goto err;
-               }
-       if ((tmp_1 = BN_new()) == NULL || (tmp_2 = BN_new()) == NULL ||
-               (tmp_3 = BN_new()) == NULL || (ctx = BN_CTX_new()) == NULL ||
-               (tmp_6 = BN_new()) == NULL || (tmp_7 = BN_new()) == NULL)
-               {
-               reason = ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-       if (!EC_GROUP_get_curve_GFp(x->group, tmp_1, tmp_2, tmp_3, ctx))
-               {
-               reason = ERR_R_EC_LIB;
-               goto err;
-               }
-       if ((point = EC_GROUP_get0_generator(x->group)) == NULL)
-               {
-               reason = ERR_R_EC_LIB;
-               goto err;
-               }
-       if (!EC_GROUP_get_order(x->group, tmp_6, NULL) || !EC_GROUP_get_cofactor(x->group, tmp_7, NULL))
-               {
-               reason = ERR_R_EC_LIB;
-               goto err;
-               }
-       if ((buf_len = EC_POINT_point2oct(x->group, point, ECDSA_get_conversion_form(x), NULL, 0, ctx)) == 0)
-               {
-               reason = ECDSA_R_UNEXPECTED_PARAMETER_LENGTH;
-               goto err;
-               }
-       if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
-               {
-               reason = ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-       if (!EC_POINT_point2oct(x->group, point, ECDSA_get_conversion_form(x), 
-                               buffer, buf_len, ctx)) goto err;
-       if ((tmp_4 = BN_bin2bn(buffer, buf_len, NULL)) == NULL)
-               {
-               reason = ERR_R_BN_LIB;
-               goto err;
-               }
-       if ((i = EC_POINT_point2oct(x->group, x->pub_key, ECDSA_get_conversion_form(x), NULL, 0, ctx)) == 0)
-               {
-               reason = ECDSA_R_UNEXPECTED_PARAMETER_LENGTH;
-               goto err;
-               }
-       if (i > buf_len && (buffer = OPENSSL_realloc(buffer, i)) == NULL)
-               {
-               reason = ERR_R_MALLOC_FAILURE;
-               buf_len = i;
-               goto err;
-               }
-       if (!EC_POINT_point2oct(x->group, x->pub_key, ECDSA_get_conversion_form(x), 
-                               buffer, buf_len, ctx))
-               {
-               reason = ERR_R_EC_LIB;
-               goto err;
-               }
-       if ((tmp_5 = BN_bin2bn(buffer, buf_len, NULL)) == NULL)
-               {
-               reason = ERR_R_BN_LIB;
-               goto err;
-               }
-       if (tmp_1 != NULL)
-               i = BN_num_bytes(tmp_1)*2;
-       else
-               i=256;
-       if ((i + 10) > buf_len && (buffer = OPENSSL_realloc(buffer, i+10)) == NULL)
-               {
-               reason = ERR_R_MALLOC_FAILURE;
-               buf_len = i;
-               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_printf(bp, "Private-Key: (%d bit)\n", BN_num_bits(tmp_1)) <= 0) goto err;
-               }
-  
-       if ((x->priv_key != NULL) && !print(bp, "priv:", x->priv_key, buffer, off)) goto err;
-       if ((tmp_5 != NULL) && !print(bp, "pub: ", tmp_5, buffer, off)) goto err;
-       if ((tmp_1 != NULL) && !print(bp, "P:   ", tmp_1, buffer, off)) goto err;
-       if ((tmp_2 != NULL) && !print(bp, "A:   ", tmp_2, buffer, off)) goto err;
-       if ((tmp_3 != NULL) && !print(bp, "B:   ", tmp_3, buffer, off)) goto err;
-       if ((tmp_4 != NULL) && !print(bp, "Gen: ", tmp_4, buffer, off)) goto err;
-       if ((tmp_6 != NULL) && !print(bp, "Order: ", tmp_6, buffer, off)) goto err;
-       if ((tmp_7 != NULL) && !print(bp, "Cofactor: ", tmp_7, buffer, off)) goto err;
-       ret=1;
-err:
-       if (!ret)
-               ECDSAerr(ECDSA_F_ECDSA_PRINT, reason);
-       if (tmp_1) BN_free(tmp_1);
-       if (tmp_2) BN_free(tmp_2);
-       if (tmp_3) BN_free(tmp_3);
-       if (tmp_4) BN_free(tmp_4);
-       if (tmp_5) BN_free(tmp_5);
-       if (tmp_6) BN_free(tmp_6);
-       if (tmp_7) BN_free(tmp_7);
-       if (ctx)   BN_CTX_free(ctx);
-       if (buffer != NULL) OPENSSL_free(buffer);
-       return(ret);
-       }
-#endif
-
-static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
-            int off)
+int ASN1_bn_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)
@@ -394,9 +101,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);
@@ -405,196 +112,3 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
                }
        return(1);
        }
-
-#ifndef OPENSSL_NO_DH
-#ifndef OPENSSL_NO_FP_API
-int DHparams_print_fp(FILE *fp, const DH *x)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=DHparams_print(b, x);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int DHparams_print(BIO *bp, const DH *x)
-       {
-       unsigned char *m=NULL;
-       int reason=ERR_R_BUF_LIB,i,ret=0;
-
-       i=BN_num_bytes(x->p);
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
-       if (m == NULL)
-               {
-               reason=ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-
-       if (BIO_printf(bp,"Diffie-Hellman-Parameters: (%d bit)\n",
-               BN_num_bits(x->p)) <= 0)
-               goto err;
-       if (!print(bp,"prime:",x->p,m,4)) goto err;
-       if (!print(bp,"generator:",x->g,m,4)) goto err;
-       if (x->length != 0)
-               {
-               if (BIO_printf(bp,"    recommended-private-length: %d bits\n",
-                       (int)x->length) <= 0) goto err;
-               }
-       ret=1;
-       if (0)
-               {
-err:
-               DHerr(DH_F_DHPARAMS_PRINT,reason);
-               }
-       if (m != NULL) OPENSSL_free(m);
-       return(ret);
-       }
-#endif
-
-#ifndef OPENSSL_NO_DSA
-#ifndef OPENSSL_NO_FP_API
-int DSAparams_print_fp(FILE *fp, const DSA *x)
-       {
-       BIO *b;
-       int ret;
-
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-               {
-               DSAerr(DSA_F_DSAPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-               return(0);
-               }
-       BIO_set_fp(b,fp,BIO_NOCLOSE);
-       ret=DSAparams_print(b, x);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int DSAparams_print(BIO *bp, const DSA *x)
-       {
-       unsigned char *m=NULL;
-       int reason=ERR_R_BUF_LIB,i,ret=0;
-
-       i=BN_num_bytes(x->p);
-       m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
-       if (m == NULL)
-               {
-               reason=ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-
-       if (BIO_printf(bp,"DSA-Parameters: (%d bit)\n",
-               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;
-       ret=1;
-err:
-       if (m != NULL) OPENSSL_free(m);
-       DSAerr(DSA_F_DSAPARAMS_PRINT,reason);
-       return(ret);
-       }
-
-#endif /* !OPENSSL_NO_DSA */
-
-#ifndef OPENSSL_NO_ECDSA
-#ifndef OPENSSL_NO_FP_API
-int ECDSAParameters_print_fp(FILE *fp, const ECDSA *x)
-       {
-       BIO *b;
-       int ret;
-       if ((b=BIO_new(BIO_s_file())) == NULL)
-       {
-               ECDSAerr(ECDSA_F_ECDSAPARAMETERS_PRINT_FP, ERR_R_BIO_LIB);
-               return(0);
-       }
-       BIO_set_fp(b, fp, BIO_NOCLOSE);
-       ret = ECDSAParameters_print(b, x);
-       BIO_free(b);
-       return(ret);
-       }
-#endif
-
-int ECDSAParameters_print(BIO *bp, const ECDSA *x)
-       {
-       unsigned char *buffer=NULL;
-       int     buf_len;
-       int     reason=ERR_R_EC_LIB, i, ret=0;
-       BIGNUM  *tmp_1=NULL, *tmp_2=NULL, *tmp_3=NULL, *tmp_4=NULL,
-               *tmp_5=NULL, *tmp_6=NULL;
-       BN_CTX  *ctx=NULL;
-       EC_POINT *point=NULL;
-       /* TODO: fields other than prime fields */
-       if (!x || !x->group)
-       {
-               reason = ECDSA_R_MISSING_PARAMETERS;
-               goto err;
-       }
-       if ((tmp_1 = BN_new()) == NULL || (tmp_2 = BN_new()) == NULL ||
-          (tmp_3 = BN_new()) == NULL || (tmp_5 = BN_new()) == NULL ||
-           (tmp_6 = BN_new()) == NULL || (ctx = BN_CTX_new()) == NULL)
-       {
-               reason = ERR_R_MALLOC_FAILURE;
-               goto err;
-       }
-       if (!EC_GROUP_get_curve_GFp(x->group, tmp_1, tmp_2, tmp_3, ctx)) goto err;
-       if ((point = EC_GROUP_get0_generator(x->group)) == NULL) goto err;
-       if (!EC_GROUP_get_order(x->group, tmp_5, ctx)) goto err;
-       if (!EC_GROUP_get_cofactor(x->group, tmp_6, ctx)) goto err;     
-       buf_len = EC_POINT_point2oct(x->group, point, ECDSA_get_conversion_form(x), NULL, 0, ctx);
-       if (!buf_len || (buffer = OPENSSL_malloc(buf_len)) == NULL)
-       {
-               reason = ERR_R_MALLOC_FAILURE;
-               goto err;
-       }
-       if (!EC_POINT_point2oct(x->group, point, ECDSA_get_conversion_form(x), buffer, buf_len, ctx))
-       {
-               reason = ERR_R_EC_LIB;
-               goto err;
-       }
-       if ((tmp_4 = BN_bin2bn(buffer, buf_len, NULL)) == NULL)
-       {
-               reason = ERR_R_BN_LIB;
-               goto err;
-       }
-  
-       i = BN_num_bits(tmp_1) + 10;
-       if (i > buf_len && (buffer = OPENSSL_realloc(buffer, i)) == NULL)
-       {
-               reason=ERR_R_MALLOC_FAILURE;
-               goto err;
-       }
-       if (BIO_printf(bp, "ECDSA-Parameters: (%d bit)\n", BN_num_bits(tmp_1)) <= 0) goto err;
-       if (!print(bp, "Prime p:", tmp_1, buffer, 4)) goto err;
-       if (!print(bp, "Curve a:", tmp_2, buffer, 4)) goto err;
-       if (!print(bp, "Curve b:", tmp_3, buffer, 4)) goto err;
-       if (!print(bp, "Generator (compressed):", tmp_4, buffer, 4)) goto err; 
-       if (!print(bp, "Order:", tmp_5, buffer, 4)) goto err;
-       if (!print(bp, "Cofactor:", tmp_6, buffer, 4)) goto err;
-       ret=1;
-err:
-       if (tmp_1)  BN_free(tmp_1);
-       if (tmp_2)  BN_free(tmp_2);
-       if (tmp_3)  BN_free(tmp_3);
-       if (tmp_4)  BN_free(tmp_4);
-       if (tmp_5)  BN_free(tmp_5);
-       if (tmp_6)  BN_free(tmp_6);
-       if (ctx)    BN_CTX_free(ctx);
-       if (buffer) OPENSSL_free(buffer);
-       ECDSAerr(ECDSA_F_ECDSAPARAMETERS_PRINT, reason);
-       return(ret);
-       }
-  
-#endif