denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Tobias Brunner
2008-06-10 09:19:18 +00:00
parent ea0823dffd
commit a57e0580f6
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
+3 -27
View File
@@ -19,11 +19,10 @@
#include <openssl/objects.h> #include <openssl/objects.h>
#include "openssl_ec_diffie_hellman.h" #include "openssl_ec_diffie_hellman.h"
#include "openssl_util.h"
#include <debug.h> #include <debug.h>
#define COORD_LEN(group) ((EC_GROUP_get_degree(group) + 7) / 8)
typedef struct private_openssl_ec_diffie_hellman_t private_openssl_ec_diffie_hellman_t; typedef struct private_openssl_ec_diffie_hellman_t private_openssl_ec_diffie_hellman_t;
/** /**
@@ -74,7 +73,6 @@ static bool chunk2ecp(const EC_GROUP *group, chunk_t chunk, EC_POINT *point)
{ {
BN_CTX *ctx; BN_CTX *ctx;
BIGNUM *x, *y; BIGNUM *x, *y;
int coord_len;
bool ret = FALSE; bool ret = FALSE;
ctx = BN_CTX_new(); ctx = BN_CTX_new();
@@ -91,14 +89,7 @@ static bool chunk2ecp(const EC_GROUP *group, chunk_t chunk, EC_POINT *point)
goto error; goto error;
} }
coord_len = COORD_LEN(group); if (!openssl_bn_split(chunk, x, y))
if (chunk.len != coord_len * 2)
{
goto error;
}
if (!BN_bin2bn(chunk.ptr, coord_len, x) ||
!BN_bin2bn(chunk.ptr + coord_len, coord_len, y))
{ {
goto error; goto error;
} }
@@ -123,7 +114,6 @@ static bool ecp2chunk(const EC_GROUP *group, const EC_POINT *point, chunk_t *chu
{ {
BN_CTX *ctx; BN_CTX *ctx;
BIGNUM *x, *y; BIGNUM *x, *y;
int coord_len, offset;
bool ret = FALSE; bool ret = FALSE;
ctx = BN_CTX_new(); ctx = BN_CTX_new();
@@ -145,22 +135,8 @@ static bool ecp2chunk(const EC_GROUP *group, const EC_POINT *point, chunk_t *chu
goto error; goto error;
} }
coord_len = COORD_LEN(group); if (!openssl_bn_cat(EC_FIELD_ELEMENT_LEN(group), x, y, chunk))
chunk->len = coord_len * 2;
chunk->ptr = malloc(chunk->len);
memset(chunk->ptr, 0, chunk->len);
offset = coord_len - BN_num_bytes(x);
if (!BN_bn2bin(x, chunk->ptr + offset))
{ {
chunk_free(chunk);
goto error;
}
offset = coord_len - BN_num_bytes(y);
if (!BN_bn2bin(y, chunk->ptr + coord_len + offset))
{
chunk_free(chunk);
goto error; goto error;
} }