X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fasn1%2Ft_pkey.c;h=06e85f3b4c25f37e505725411cacdbfe85af4f04;hp=fb01e38d79db701016a5b5263e93a19c12a241f5;hb=7e8c30b5897fb9fae87e42bf19dca29ca1b0dcac;hpb=14a7cfb32a0347a4bc620ae1b552b21c4c1e270b diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index fb01e38d79..06e85f3b4c 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -55,6 +55,11 @@ * 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 #include "cryptlib.h" @@ -76,6 +81,8 @@ static int print(BIO *fp,const char *str,BIGNUM *num, unsigned char *buf,int off); +static int print_bin(BIO *fp, const char *str, const unsigned char *num, + size_t len, int off); #ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_FP_API int RSA_print_fp(FILE *fp, const RSA *x, int off) @@ -134,14 +141,10 @@ int RSA_print(BIO *bp, const RSA *x, int off) 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; } @@ -187,7 +190,6 @@ 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 ret=0; size_t buf_len=0,i; @@ -214,14 +216,10 @@ int DSA_print(BIO *bp, const DSA *x, int off) 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; } @@ -277,14 +275,15 @@ int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off) 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; 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):"; @@ -301,14 +300,8 @@ 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); if (nid == 0) @@ -322,8 +315,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 || @@ -333,10 +330,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) @@ -372,18 +380,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) @@ -391,14 +389,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)) @@ -425,8 +448,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: @@ -444,8 +467,6 @@ err: BN_free(order); if (cofactor) BN_free(cofactor); - if (seed) - BN_free(seed); if (ctx) BN_CTX_free(ctx); if (buffer != NULL) @@ -455,11 +476,10 @@ err: int EC_KEY_print(BIO *bp, const EC_KEY *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; if (!x || !x->group) @@ -488,16 +508,17 @@ int EC_KEY_print(BIO *bp, const EC_KEY *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 (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(x->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, @@ -514,6 +535,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) @@ -526,16 +549,17 @@ static int print(BIO *bp, const char *number, 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_get_sign(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) @@ -560,9 +584,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); @@ -572,6 +596,44 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf, return(1); } +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