Skip to content

O
openssl

btwise / openssl

通知 1
Star 0
Fork 0
O
openssl

体验新版 GitCode，发现更多精彩内容 >>

提交 7e31164a 编写于 作者: B Bodo Möller
浏览文件
操作

ASN1 for binary curves 

Submitted by: Nils Larsch
上级 ad55f581
显示空白变更内容
内联 并排
Showing with 415 addition and 132 deletion
crypto/asn1/t_pkey.c
浏览文件 @ 7e31164a
...@@ -412,13 +412,32 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) ...@@ -412,13 +412,32 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
if (BIO_write(bp, str, off) <= 0) if (BIO_write(bp, str, off) <= 0)
goto err; goto err;
} }
/* print the 'short name' of the field type */
if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid)) if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid))
<= 0) <= 0)
goto err; goto err;
if (is_char_two) if (is_char_two)
{ {
/* print the 'short name' of the base type OID */
int basis_type = EC_GROUP_get_basis_type(x, NULL,
NULL, NULL);
if (basis_type == 0)
goto err;
if (off)
{
if (off > 128) off=128;
memset(str,' ',off);
if (BIO_write(bp, str, off) <= 0)
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, if ((p != NULL) && !print(bp, "Polynomial:", p, buffer,
off)) off))
goto err; goto err;
...@@ -565,6 +584,13 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf, ...@@ -565,6 +584,13 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
if (BIO_write(bp,str,off) <= 0) return(0); if (BIO_write(bp,str,off) <= 0) return(0);
} }
if (BN_is_zero(num))
{
if (BIO_printf(bp, "%s 0\n", number) <= 0)
return 0;
return 1;
}
if (BN_num_bytes(num) <= BN_BYTES) if (BN_num_bytes(num) <= BN_BYTES)
{ {
if (BIO_printf(bp,"%s %s%lu (%s0x%lx)\n",number,neg, if (BIO_printf(bp,"%s %s%lu (%s0x%lx)\n",number,neg,
......
crypto/ec/ec.h
浏览文件 @ 7e31164a
...@@ -191,6 +191,14 @@ const char *EC_GROUP_get0_comment(int nid); ...@@ -191,6 +191,14 @@ const char *EC_GROUP_get0_comment(int nid);
* with the given index i from the internal curve list */ * with the given index i from the internal curve list */
int ec_group_index2nid(int i); int ec_group_index2nid(int i);
/* EC_GROUP_get_basis_type() returns the NID of the basis type
* used to represent the field elements (in case of a pentanomial or trinomial
* basis the coefficient are returned in the k? arguments) */
int EC_GROUP_get_basis_type(const EC_GROUP *, unsigned int *k1,
unsigned int *k2, unsigned int *k3);
/* EC_POINT functions */
EC_POINT *EC_POINT_new(const EC_GROUP *); EC_POINT *EC_POINT_new(const EC_GROUP *);
void EC_POINT_free(EC_POINT *); void EC_POINT_free(EC_POINT *);
......
crypto/ec/ec_asn1.c
浏览文件 @ 7e31164a
/* crypto/ec/ec_asn1.c */ /* crypto/ec/ec_asn1.c */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
/* ==================================================================== /* ====================================================================
* Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
* *
...@@ -58,7 +61,6 @@ ...@@ -58,7 +61,6 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#include <string.h>
/* some structures needed for the asn1 encoding */ /* some structures needed for the asn1 encoding */
typedef struct x9_62_fieldid_st { typedef struct x9_62_fieldid_st {
...@@ -67,15 +69,15 @@ typedef struct x9_62_fieldid_st { ...@@ -67,15 +69,15 @@ typedef struct x9_62_fieldid_st {
} X9_62_FIELDID; } X9_62_FIELDID;
typedef struct x9_62_characteristic_two_st { typedef struct x9_62_characteristic_two_st {
ASN1_INTEGER *m; long m;
ASN1_OBJECT *basis; ASN1_OBJECT *basis;
ASN1_TYPE *parameters; ASN1_TYPE *parameters;
} X9_62_CHARACTERISTIC_TWO; } X9_62_CHARACTERISTIC_TWO;
typedef struct x9_62_pentanomial_st { typedef struct x9_62_pentanomial_st {
ASN1_INTEGER k1; long k1;
ASN1_INTEGER k2; long k2;
ASN1_INTEGER k3; long k3;
} X9_62_PENTANOMIAL; } X9_62_PENTANOMIAL;
typedef struct x9_62_curve_st { typedef struct x9_62_curve_st {
...@@ -85,7 +87,7 @@ typedef struct x9_62_curve_st { ...@@ -85,7 +87,7 @@ typedef struct x9_62_curve_st {
} X9_62_CURVE; } X9_62_CURVE;
typedef struct ec_parameters_st { typedef struct ec_parameters_st {
ASN1_INTEGER *version; long version;
X9_62_FIELDID *fieldID; X9_62_FIELDID *fieldID;
X9_62_CURVE *curve; X9_62_CURVE *curve;
ASN1_OCTET_STRING *base; ASN1_OCTET_STRING *base;
...@@ -104,7 +106,7 @@ struct ecpk_parameters_st { ...@@ -104,7 +106,7 @@ struct ecpk_parameters_st {
/* SEC1 ECPrivateKey */ /* SEC1 ECPrivateKey */
typedef struct ec_privatekey_st { typedef struct ec_privatekey_st {
int version; long version;
ASN1_OCTET_STRING *privateKey; ASN1_OCTET_STRING *privateKey;
ECPKPARAMETERS *parameters; ECPKPARAMETERS *parameters;
ASN1_BIT_STRING *publicKey; ASN1_BIT_STRING *publicKey;
...@@ -122,7 +124,7 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_FIELDID, X9_62_FIELDID) ...@@ -122,7 +124,7 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_FIELDID, X9_62_FIELDID)
IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_FIELDID) IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_FIELDID)
ASN1_SEQUENCE(X9_62_CHARACTERISTIC_TWO) = { ASN1_SEQUENCE(X9_62_CHARACTERISTIC_TWO) = {
ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, m, ASN1_INTEGER), ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, m, LONG),
ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, basis, ASN1_OBJECT), ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, basis, ASN1_OBJECT),
ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, parameters, ASN1_ANY) ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, parameters, ASN1_ANY)
} ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO) } ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO)
...@@ -132,9 +134,9 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_CHARACTERISTIC_TWO, X9_62_CHARACTERIST ...@@ -132,9 +134,9 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_CHARACTERISTIC_TWO, X9_62_CHARACTERIST
IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_CHARACTERISTIC_TWO) IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_CHARACTERISTIC_TWO)
ASN1_SEQUENCE(X9_62_PENTANOMIAL) = { ASN1_SEQUENCE(X9_62_PENTANOMIAL) = {
ASN1_SIMPLE(X9_62_PENTANOMIAL, k1, ASN1_INTEGER), ASN1_SIMPLE(X9_62_PENTANOMIAL, k1, LONG),
ASN1_SIMPLE(X9_62_PENTANOMIAL, k2, ASN1_INTEGER), ASN1_SIMPLE(X9_62_PENTANOMIAL, k2, LONG),
ASN1_SIMPLE(X9_62_PENTANOMIAL, k3, ASN1_INTEGER) ASN1_SIMPLE(X9_62_PENTANOMIAL, k3, LONG)
} ASN1_SEQUENCE_END(X9_62_PENTANOMIAL) } ASN1_SEQUENCE_END(X9_62_PENTANOMIAL)
DECLARE_ASN1_FUNCTIONS_const(X9_62_PENTANOMIAL) DECLARE_ASN1_FUNCTIONS_const(X9_62_PENTANOMIAL)
...@@ -152,7 +154,7 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_CURVE, X9_62_CURVE) ...@@ -152,7 +154,7 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_CURVE, X9_62_CURVE)
IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_CURVE) IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_CURVE)
ASN1_SEQUENCE(ECPARAMETERS) = { ASN1_SEQUENCE(ECPARAMETERS) = {
ASN1_SIMPLE(ECPARAMETERS, version, ASN1_INTEGER), ASN1_SIMPLE(ECPARAMETERS, version, LONG),
ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID), ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID),
ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE), ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE),
ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING), ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING),
...@@ -185,22 +187,42 @@ DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) ...@@ -185,22 +187,42 @@ DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY)
DECLARE_ASN1_ENCODE_FUNCTIONS_const(EC_PRIVATEKEY, EC_PRIVATEKEY) DECLARE_ASN1_ENCODE_FUNCTIONS_const(EC_PRIVATEKEY, EC_PRIVATEKEY)
IMPLEMENT_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) IMPLEMENT_ASN1_FUNCTIONS_const(EC_PRIVATEKEY)
/* some internal functions */ /* some declarations of internal function */
/* ec_asn1_group2field() creates a X9_62_FIELDID object from a
* EC_GROUP object */
static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *, X9_62_FIELDID *); static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *, X9_62_FIELDID *);
/* ec_asn1_group2curve() creates a X9_62_CURVE object from a
* EC_GROUP object */
static X9_62_CURVE *ec_asn1_group2curve(const EC_GROUP *, X9_62_CURVE *); static X9_62_CURVE *ec_asn1_group2curve(const EC_GROUP *, X9_62_CURVE *);
/* ec_asn1_parameters2group() creates a EC_GROUP object from a
* ECPARAMETERS object */
static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *); static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *);
static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *, /* ec_asn1_group2parameters() creates a ECPARAMETERS object from a
ECPARAMETERS *); * EC_GROUP object */
EC_GROUP *EC_ASN1_pkparameters2group(const ECPKPARAMETERS *); static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *,ECPARAMETERS *);
ECPKPARAMETERS *EC_ASN1_group2pkparameters(const EC_GROUP *, ECPKPARAMETERS *); /* ec_asn1_pkparameters2group() creates a EC_GROUP object from a
* ECPKPARAMETERS object */
static EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *);
/* ec_asn1_group2pkparameters() creates a ECPKPARAMETERS object from a
* EC_GROUP object */
static ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *,
ECPKPARAMETERS *);
/* the function definitions */
static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group, static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group,
X9_62_FIELDID *field) X9_62_FIELDID *field)
{ {
int ok=0, nid; int ok=0, nid;
X9_62_FIELDID *ret=NULL; X9_62_FIELDID *ret = NULL;
BIGNUM *tmp=NULL; X9_62_CHARACTERISTIC_TWO *char_two = NULL;
X9_62_PENTANOMIAL *penta = NULL;
BIGNUM *tmp = NULL;
unsigned char *buffer = NULL;
unsigned char *pp;
size_t buf_len = 0;
if (field == NULL) if (field == NULL)
{ {
...@@ -213,6 +235,7 @@ static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group, ...@@ -213,6 +235,7 @@ static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group,
else else
{ {
ret = field; ret = field;
/* clear the old values */
if (ret->fieldType != NULL) if (ret->fieldType != NULL)
ASN1_OBJECT_free(ret->fieldType); ASN1_OBJECT_free(ret->fieldType);
if (ret->parameters != NULL) if (ret->parameters != NULL)
...@@ -220,31 +243,34 @@ static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group, ...@@ -220,31 +243,34 @@ static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group,
} }
nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group)); nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group));
/* set OID for the field */
if ((ret->fieldType = OBJ_nid2obj(nid)) == NULL) if ((ret->fieldType = OBJ_nid2obj(nid)) == NULL)
{ {
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_OBJ_LIB); ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_OBJ_LIB);
goto err; goto err;
} }
if (nid == NID_X9_62_prime_field) if ((ret->parameters = ASN1_TYPE_new()) == NULL)
{
if ((tmp = BN_new()) == NULL)
{ {
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE); ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
if ((ret->parameters = ASN1_TYPE_new()) == NULL)
if (nid == NID_X9_62_prime_field)
{
if ((tmp = BN_new()) == NULL)
{ {
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE); ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
/* the parameters are specified by the prime number p */
ret->parameters->type = V_ASN1_INTEGER; ret->parameters->type = V_ASN1_INTEGER;
if (!EC_GROUP_get_curve_GFp(group, tmp, NULL, NULL, NULL)) if (!EC_GROUP_get_curve_GFp(group, tmp, NULL, NULL, NULL))
{ {
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_EC_LIB); ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_EC_LIB);
goto err; goto err;
} }
/* set the prime number */
ret->parameters->value.integer = BN_to_ASN1_INTEGER(tmp, NULL); ret->parameters->value.integer = BN_to_ASN1_INTEGER(tmp, NULL);
if (ret->parameters->value.integer == NULL) if (ret->parameters->value.integer == NULL)
{ {
...@@ -252,8 +278,99 @@ static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group, ...@@ -252,8 +278,99 @@ static X9_62_FIELDID *ec_asn1_group2field(const EC_GROUP *group,
goto err; goto err;
} }
} }
else else /* nid == NID_X9_62_characteristic_two_field */
{
int field_type;
unsigned int k1, k2, k3;
char_two = X9_62_CHARACTERISTIC_TWO_new();
if (char_two == NULL)
{
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
goto err;
}
char_two->m = (long)EC_GROUP_get_degree(group);
field_type = EC_GROUP_get_basis_type(group, &k1, &k2, &k3);
if (field_type == 0)
{
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_EC_LIB);
goto err;
}
/* set base type OID */
if ((char_two->basis = OBJ_nid2obj(field_type)) == NULL)
{
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_OBJ_LIB);
goto err;
}
if (field_type == NID_X9_62_tpBasis)
{
char_two->parameters->type = V_ASN1_INTEGER;
char_two->parameters->value.integer =
ASN1_INTEGER_new();
if (char_two->parameters->value.integer == NULL)
{
ECerr(EC_F_EC_ASN1_GROUP2FIELDID,
ERR_R_ASN1_LIB);
goto err;
}
if (!ASN1_INTEGER_set(char_two->parameters->value.integer, (long)k1))
{
ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS,
ERR_R_ASN1_LIB);
goto err;
}
}
else if (field_type == NID_X9_62_ppBasis)
{
penta = X9_62_PENTANOMIAL_new();
/* set k? values */
penta->k1 = (long)k1;
penta->k2 = (long)k2;
penta->k3 = (long)k3;
/* get the length of the encoded structure */
buf_len = i2d_X9_62_PENTANOMIAL(penta, NULL);
if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
{
ECerr(EC_F_EC_ASN1_GROUP2FIELDID,
ERR_R_MALLOC_FAILURE);
goto err; goto err;
}
pp = buffer;
i2d_X9_62_PENTANOMIAL(penta, &pp);
/* set the encoded pentanomial */
char_two->parameters->type=V_ASN1_SEQUENCE;
char_two->parameters->value.sequence=ASN1_STRING_new();
ASN1_STRING_set(char_two->parameters->value.sequence,
buffer, buf_len);
OPENSSL_free(buffer);
buffer = NULL;
}
else /* field_type == NID_X9_62_onBasis */
{
/* for ONB the parameters are (asn1) NULL */
char_two->parameters->type = V_ASN1_NULL;
}
/* encoded the X9_62_CHARACTERISTIC_TWO structure */
buf_len = i2d_X9_62_CHARACTERISTIC_TWO(char_two, NULL);
if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
{
ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
goto err;
}
pp = buffer;
i2d_X9_62_CHARACTERISTIC_TWO(char_two, &pp);
/* set the encoded parameters */
ret->parameters->type = V_ASN1_SEQUENCE;
ret->parameters->value.sequence = ASN1_STRING_new();
ASN1_STRING_set(ret->parameters->value.sequence,
buffer, buf_len);
}
ok = 1; ok = 1;
...@@ -265,6 +382,12 @@ err : if (!ok) ...@@ -265,6 +382,12 @@ err : if (!ok)
} }
if (tmp) if (tmp)
BN_free(tmp); BN_free(tmp);
if (char_two)
X9_62_CHARACTERISTIC_TWO_free(char_two);
if (penta)
X9_62_PENTANOMIAL_free(penta);
if (buffer)
OPENSSL_free(buffer);
return(ret); return(ret);
} }
...@@ -317,6 +440,15 @@ static X9_62_CURVE *ec_asn1_group2curve(const EC_GROUP *group, ...@@ -317,6 +440,15 @@ static X9_62_CURVE *ec_asn1_group2curve(const EC_GROUP *group,
ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB); ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB);
goto err; goto err;
} }
}
else /* nid == NID_X9_62_characteristic_two_field */
{
if (!EC_GROUP_get_curve_GF2m(group, NULL, tmp_1, tmp_2, NULL))
{
ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB);
goto err;
}
}
len_1 = (size_t)BN_num_bytes(tmp_1); len_1 = (size_t)BN_num_bytes(tmp_1);
len_2 = (size_t)BN_num_bytes(tmp_2); len_2 = (size_t)BN_num_bytes(tmp_2);
...@@ -364,9 +496,6 @@ static X9_62_CURVE *ec_asn1_group2curve(const EC_GROUP *group, ...@@ -364,9 +496,6 @@ static X9_62_CURVE *ec_asn1_group2curve(const EC_GROUP *group,
} }
b_buf = buffer_2; b_buf = buffer_2;
} }
}
else
goto err;
/* set a and b */ /* set a and b */
if ((ret->a = M_ASN1_OCTET_STRING_new()) == NULL || if ((ret->a = M_ASN1_OCTET_STRING_new()) == NULL ||
...@@ -413,7 +542,7 @@ err : if (!ok) ...@@ -413,7 +542,7 @@ err : if (!ok)
if (tmp_2) if (tmp_2)
BN_free(tmp_2); BN_free(tmp_2);
return(ret); return(ret);
} }
static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *group, static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *group,
ECPARAMETERS *param) ECPARAMETERS *param)
...@@ -445,16 +574,7 @@ static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *group, ...@@ -445,16 +574,7 @@ static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *group,
ret = param; ret = param;
/* set the version (always one) */ /* set the version (always one) */
if (ret->version == NULL && !(ret->version = ASN1_INTEGER_new())) ret->version = (long)0x1;
{
ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_MALLOC_FAILURE);
goto err;
}
if (!ASN1_INTEGER_set(ret->version, (long)0x1))
{
ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
goto err;
}
/* set the fieldID */ /* set the fieldID */
ret->fieldID = ec_asn1_group2field(group, ret->fieldID); ret->fieldID = ec_asn1_group2field(group, ret->fieldID);
...@@ -549,7 +669,7 @@ err : if(!ok) ...@@ -549,7 +669,7 @@ err : if(!ok)
return(ret); return(ret);
} }
ECPKPARAMETERS *EC_ASN1_group2pkparameters(const EC_GROUP *group, ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *group,
ECPKPARAMETERS *params) ECPKPARAMETERS *params)
{ {
int ok = 1, tmp; int ok = 1, tmp;
...@@ -585,16 +705,9 @@ ECPKPARAMETERS *EC_ASN1_group2pkparameters(const EC_GROUP *group, ...@@ -585,16 +705,9 @@ ECPKPARAMETERS *EC_ASN1_group2pkparameters(const EC_GROUP *group,
ok = 0; ok = 0;
} }
else else
{ /* we don't kmow the nid => ERROR */
/* we have no nid => use the normal
* ECPARAMETERS structure
*/
ret->type = 1;
if ((ret->value.parameters = ec_asn1_group2parameters(
group, NULL)) == NULL)
ok = 0; ok = 0;
} }
}
else else
{ {
/* use the ECPARAMETERS structure */ /* use the ECPARAMETERS structure */
...@@ -614,10 +727,13 @@ ECPKPARAMETERS *EC_ASN1_group2pkparameters(const EC_GROUP *group, ...@@ -614,10 +727,13 @@ ECPKPARAMETERS *EC_ASN1_group2pkparameters(const EC_GROUP *group,
static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params) static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
{ {
int ok=0, tmp; int ok = 0, tmp;
EC_GROUP *ret=NULL; EC_GROUP *ret = NULL;
BIGNUM *p=NULL, *a=NULL, *b=NULL; BIGNUM *p = NULL, *a = NULL, *b = NULL;
EC_POINT *point=NULL; EC_POINT *point=NULL;
X9_62_CHARACTERISTIC_TWO *char_two = NULL;
X9_62_PENTANOMIAL *penta = NULL;
unsigned char *pp;
if (!params->fieldID || !params->fieldID->fieldType || if (!params->fieldID || !params->fieldID->fieldType ||
!params->fieldID->parameters) !params->fieldID->parameters)
...@@ -626,67 +742,153 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params) ...@@ -626,67 +742,153 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
goto err; goto err;
} }
/* now extract the curve parameters a and b */
if (!params->curve || !params->curve->a ||
!params->curve->a->data || !params->curve->b ||
!params->curve->b->data)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
goto err;
}
a = BN_bin2bn(params->curve->a->data, params->curve->a->length, NULL);
if (a == NULL)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB);
goto err;
}
b = BN_bin2bn(params->curve->b->data, params->curve->b->length, NULL);
if (b == NULL)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB);
goto err;
}
/* get the field parameters */
tmp = OBJ_obj2nid(params->fieldID->fieldType); tmp = OBJ_obj2nid(params->fieldID->fieldType);
if (tmp == NID_X9_62_characteristic_two_field) if (tmp == NID_X9_62_characteristic_two_field)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_NOT_IMPLEMENTED); ASN1_TYPE *parameters = params->fieldID->parameters;
if (parameters->type != V_ASN1_SEQUENCE)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
goto err; goto err;
} }
else if (tmp == NID_X9_62_prime_field)
{ if ((p = BN_new()) == NULL)
/* we have a curve over a prime field */
/* extract the prime number */
if (params->fieldID->parameters->type != V_ASN1_INTEGER ||
!params->fieldID->parameters->value.integer)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR); ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
p = ASN1_INTEGER_to_BN(params->fieldID->parameters->value.integer, NULL);
if (p == NULL) /* extract the X9_62_CHARACTERISTIC_TWO object */
pp = M_ASN1_STRING_data(parameters->value.sequence);
char_two = d2i_X9_62_CHARACTERISTIC_TWO(NULL,
(const unsigned char **) &pp,
M_ASN1_STRING_length(parameters->value.sequence));
if (char_two == NULL)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB); ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
goto err; goto err;
} }
/* now extract the curve parameters a and b */ /* get the base type */
if (!params->curve || !params->curve->a || tmp = OBJ_obj2nid(char_two->basis);
!params->curve->a->data || !params->curve->b ||
!params->curve->b->data) if (tmp == NID_X9_62_tpBasis)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR); long tmp_long;
if (char_two->parameters->type != V_ASN1_INTEGER ||
char_two->parameters->value.integer == NULL)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
EC_R_ASN1_ERROR);
goto err; goto err;
} }
a = BN_bin2bn(params->curve->a->data,
params->curve->a->length, NULL); tmp_long = ASN1_INTEGER_get(char_two->parameters->value.integer);
if (a == NULL) /* create the polynomial */
if (!BN_set_bit(p, (int)char_two->m)) goto err;
if (!BN_set_bit(p, (int)tmp_long)) goto err;
if (!BN_set_bit(p, 0)) goto err;
}
else if (tmp == NID_X9_62_ppBasis)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB); if (char_two->parameters->type != V_ASN1_SEQUENCE ||
char_two->parameters->value.sequence == NULL)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
EC_R_ASN1_ERROR);
goto err; goto err;
} }
b = BN_bin2bn(params->curve->b->data, params->curve->b->length, NULL); /* extract the pentanomial data */
if (b == NULL) pp = M_ASN1_STRING_data(
char_two->parameters->value.sequence);
penta = d2i_X9_62_PENTANOMIAL(NULL,
(const unsigned char **) &pp,
M_ASN1_STRING_length(
char_two->parameters->value.sequence));
if (penta == NULL)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB); ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
ERR_R_ASN1_LIB);
goto err;
}
/* create the polynomial */
if (!BN_set_bit(p, (int)char_two->m)) goto err;
if (!BN_set_bit(p, (int)penta->k1)) goto err;
if (!BN_set_bit(p, (int)penta->k2)) goto err;
if (!BN_set_bit(p, (int)penta->k3)) goto err;
if (!BN_set_bit(p, 0)) goto err;
}
else if (tmp == NID_X9_62_onBasis)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
EC_R_NOT_IMPLEMENTED);
goto err;
}
else /* error */
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
goto err; goto err;
} }
/* create the EC_GROUP structure */ /* create the EC_GROUP structure */
/* TODO */ ret = EC_GROUP_new_curve_GF2m(p, a, b, NULL);
ret = EC_GROUP_new_curve_GFp(p, a, b, NULL);
if (ret == NULL) if (ret == NULL)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB); ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
goto err; goto err;
} }
/* create the generator */
if ((point = EC_POINT_new(ret)) == NULL) goto err;
} }
else else if (tmp == NID_X9_62_prime_field)
{
/* we have a curve over a prime field */
/* extract the prime number */
if (params->fieldID->parameters->type != V_ASN1_INTEGER ||
!params->fieldID->parameters->value.integer)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
goto err;
}
p = ASN1_INTEGER_to_BN(params->fieldID->parameters->value.integer, NULL);
if (p == NULL)
{
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
goto err;
}
/* create the EC_GROUP structure */
ret = EC_GROUP_new_curve_GFp(p, a, b, NULL);
if (ret == NULL)
{ {
ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_UNKNOWN_FIELD); ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
goto err; goto err;
} }
}
/* extract seed (optional) */
if (params->curve->seed != NULL) if (params->curve->seed != NULL)
{ {
if (ret->seed != NULL) if (ret->seed != NULL)
...@@ -702,6 +904,7 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params) ...@@ -702,6 +904,7 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
ret->seed_len = params->curve->seed->length; ret->seed_len = params->curve->seed->length;
} }
/* extract the order, cofactor and generator */
if (!params->order || !params->cofactor || !params->base || if (!params->order || !params->cofactor || !params->base ||
!params->base->data) !params->base->data)
{ {
...@@ -709,6 +912,7 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params) ...@@ -709,6 +912,7 @@ static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
goto err; goto err;
} }
if ((point = EC_POINT_new(ret)) == NULL) goto err;
a = ASN1_INTEGER_to_BN(params->order, a); a = ASN1_INTEGER_to_BN(params->order, a);
b = ASN1_INTEGER_to_BN(params->cofactor, b); b = ASN1_INTEGER_to_BN(params->cofactor, b);
...@@ -752,10 +956,14 @@ err: if (!ok) ...@@ -752,10 +956,14 @@ err: if (!ok)
BN_free(b); BN_free(b);
if (point) if (point)
EC_POINT_free(point); EC_POINT_free(point);
if (char_two)
X9_62_CHARACTERISTIC_TWO_free(char_two);
if (penta)
X9_62_PENTANOMIAL_free(penta);
return(ret); return(ret);
} }
EC_GROUP *EC_ASN1_pkparameters2group(const ECPKPARAMETERS *params) EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *params)
{ {
EC_GROUP *ret=NULL; EC_GROUP *ret=NULL;
int tmp=0; int tmp=0;
...@@ -800,7 +1008,7 @@ EC_GROUP *EC_ASN1_pkparameters2group(const ECPKPARAMETERS *params) ...@@ -800,7 +1008,7 @@ EC_GROUP *EC_ASN1_pkparameters2group(const ECPKPARAMETERS *params)
} }
return ret; return ret;
} }
/* EC_GROUP <-> DER encoding of ECPKPARAMETERS */ /* EC_GROUP <-> DER encoding of ECPKPARAMETERS */
...@@ -816,7 +1024,7 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len) ...@@ -816,7 +1024,7 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
return NULL; return NULL;
} }
if ((group = EC_ASN1_pkparameters2group(params)) == NULL) if ((group = ec_asn1_pkparameters2group(params)) == NULL)
{ {
ECerr(EC_F_D2I_ECPKPARAMETERS, EC_R_PKPARAMETERS2GROUP_FAILURE); ECerr(EC_F_D2I_ECPKPARAMETERS, EC_R_PKPARAMETERS2GROUP_FAILURE);
return NULL; return NULL;
...@@ -835,7 +1043,7 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len) ...@@ -835,7 +1043,7 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
int i2d_ECPKParameters(const EC_GROUP *a, unsigned char **out) int i2d_ECPKParameters(const EC_GROUP *a, unsigned char **out)
{ {
int ret=0; int ret=0;
ECPKPARAMETERS *tmp = EC_ASN1_group2pkparameters(a, NULL); ECPKPARAMETERS *tmp = ec_asn1_group2pkparameters(a, NULL);
if (tmp == NULL) if (tmp == NULL)
{ {
ECerr(EC_F_I2D_ECPKPARAMETERS, EC_R_GROUP2PKPARAMETERS_FAILURE); ECerr(EC_F_I2D_ECPKPARAMETERS, EC_R_GROUP2PKPARAMETERS_FAILURE);
...@@ -890,7 +1098,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len) ...@@ -890,7 +1098,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
{ {
if (ret->group) if (ret->group)
EC_GROUP_clear_free(ret->group); EC_GROUP_clear_free(ret->group);
ret->group = EC_ASN1_pkparameters2group(priv_key->parameters); ret->group = ec_asn1_pkparameters2group(priv_key->parameters);
} }
if (ret->group == NULL) if (ret->group == NULL)
...@@ -1001,7 +1209,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out) ...@@ -1001,7 +1209,7 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS))
{ {
if ((priv_key->parameters = EC_ASN1_group2pkparameters( if ((priv_key->parameters = ec_asn1_group2pkparameters(
a->group, priv_key->parameters)) == NULL) a->group, priv_key->parameters)) == NULL)
{ {
ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_EC_LIB); ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_EC_LIB);
......
crypto/ec/ec_lib.c
浏览文件 @ 7e31164a
...@@ -537,6 +537,45 @@ void EC_GROUP_clear_free_extra_data(EC_GROUP *group) ...@@ -537,6 +537,45 @@ void EC_GROUP_clear_free_extra_data(EC_GROUP *group)
} }
int EC_GROUP_get_basis_type(const EC_GROUP *group, unsigned int *k1,
unsigned int *k2, unsigned int *k3)
{
int i = 0;
if (group == NULL)
return 0;
if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
NID_X9_62_characteristic_two_field)
/* everything else is currently not supported */
return 0;
while (group->poly[i] != 0)
i++;
if (i == 4)
{
if (k1)
*k1 = group->poly[3];
if (k2)
*k2 = group->poly[2];
if (k3)
*k3 = group->poly[1];
return NID_X9_62_ppBasis;
}
else if (i == 2)
{
if (k1)
*k1 = group->poly[1];
return NID_X9_62_tpBasis;
}
else
/* everything else is currently not supported */
return 0;
}
/* functions for EC_POINT objects */ /* functions for EC_POINT objects */
EC_POINT *EC_POINT_new(const EC_GROUP *group) EC_POINT *EC_POINT_new(const EC_GROUP *group)
......
util/libeay.num
浏览文件 @ 7e31164a
...@@ -3005,3 +3005,5 @@ ENGINE_set_default_ECDH 3438 EXIST::FUNCTION: ...@@ -3005,3 +3005,5 @@ ENGINE_set_default_ECDH 3438 EXIST::FUNCTION:
ENGINE_register_ECDH 3439 EXIST::FUNCTION: ENGINE_register_ECDH 3439 EXIST::FUNCTION:
EC_GROUP_get0_comment 3440 EXIST::FUNCTION:EC EC_GROUP_get0_comment 3440 EXIST::FUNCTION:EC
ec_group_index2nid 3441 EXIST::FUNCTION:EC ec_group_index2nid 3441 EXIST::FUNCTION:EC
EC_GROUP_get_basis_type 3442 EXIST::FUNCTION:EC
X509_REQ_print_ex 3443 EXIST::FUNCTION:BIO
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或