054e682675
Beyond generally eliminating unnecessary includes, eliminate as many includes of headers that declare/define particularly error-prone functionality like strlen, malloc, and free. crypto/err/internal.h was added to remove the dependency on openssl/thread.h from the public openssl/err.h header. The include of <stdlib.h> in openssl/mem.h was retained since it defines OPENSSL_malloc and friends as macros around the stdlib.h functions. The public x509.h, x509v3.h, and ssl.h headers were not changed in order to minimize breakage of source compatibility with external code. Change-Id: I0d264b73ad0a720587774430b2ab8f8275960329 Reviewed-on: https://boringssl-review.googlesource.com/4220 Reviewed-by: Adam Langley <agl@google.com>
125 lines
3.4 KiB
C
125 lines
3.4 KiB
C
/* Copyright (c) 2014, Google Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <openssl/crypto.h>
|
|
#include <openssl/ec_key.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/mem.h>
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
static const uint8_t kECKeyWithoutPublic[] = {
|
|
0x30, 0x31, 0x02, 0x01, 0x01, 0x04, 0x20, 0xc6, 0xc1, 0xaa, 0xda, 0x15, 0xb0,
|
|
0x76, 0x61, 0xf8, 0x14, 0x2c, 0x6c, 0xaf, 0x0f, 0xdb, 0x24, 0x1a, 0xff, 0x2e,
|
|
0xfe, 0x46, 0xc0, 0x93, 0x8b, 0x74, 0xf2, 0xbc, 0xc5, 0x30, 0x52, 0xb0, 0x77,
|
|
0xa0, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07,
|
|
};
|
|
|
|
int test_d2i_ECPrivateKey(void) {
|
|
int len, ret = 0;
|
|
uint8_t *out = NULL, *outp;
|
|
const uint8_t *inp;
|
|
EC_KEY *key = NULL;
|
|
BIGNUM *x = NULL, *y = NULL;
|
|
const EC_POINT *public;
|
|
char *x_hex = NULL, *y_hex = NULL;
|
|
|
|
inp = kECKeyWithoutPublic;
|
|
key = d2i_ECPrivateKey(NULL, &inp, sizeof(kECKeyWithoutPublic));
|
|
|
|
if (key == NULL || inp != kECKeyWithoutPublic + sizeof(kECKeyWithoutPublic)) {
|
|
fprintf(stderr, "Failed to parse private key.\n");
|
|
ERR_print_errors_fp(stderr);
|
|
goto out;
|
|
}
|
|
|
|
len = i2d_ECPrivateKey(key, NULL);
|
|
out = malloc(len);
|
|
outp = out;
|
|
if (len != i2d_ECPrivateKey(key, &outp)) {
|
|
fprintf(stderr, "Failed to serialize private key.\n");
|
|
ERR_print_errors_fp(stderr);
|
|
goto out;
|
|
}
|
|
|
|
if (0 != memcmp(out, kECKeyWithoutPublic, len)) {
|
|
fprintf(stderr, "Serialisation of key doesn't match original.\n");
|
|
goto out;
|
|
}
|
|
|
|
public = EC_KEY_get0_public_key(key);
|
|
if (public == NULL) {
|
|
fprintf(stderr, "Public key missing.\n");
|
|
goto out;
|
|
}
|
|
|
|
x = BN_new();
|
|
y = BN_new();
|
|
if (x == NULL || y == NULL) {
|
|
goto out;
|
|
}
|
|
if (!EC_POINT_get_affine_coordinates_GFp(EC_KEY_get0_group(key), public, x, y,
|
|
NULL)) {
|
|
fprintf(stderr, "Failed to get public key in affine coordinates.\n");
|
|
goto out;
|
|
}
|
|
x_hex = BN_bn2hex(x);
|
|
y_hex = BN_bn2hex(y);
|
|
if (0 != strcmp(x_hex, "c81561ecf2e54edefe6617db1c7a34a70744ddb261f269b83dacfcd2ade5a681") ||
|
|
0 != strcmp(y_hex, "e0e2afa3f9b6abe4c698ef6495f1be49a3196c5056acb3763fe4507eec596e88")) {
|
|
fprintf(stderr, "Incorrect public key: %s %s\n", x_hex, y_hex);
|
|
goto out;
|
|
}
|
|
|
|
ret = 1;
|
|
|
|
out:
|
|
if (key != NULL) {
|
|
EC_KEY_free(key);
|
|
}
|
|
if (out != NULL) {
|
|
free(out);
|
|
}
|
|
if (x != NULL) {
|
|
BN_free(x);
|
|
}
|
|
if (y != NULL) {
|
|
BN_free(y);
|
|
}
|
|
if (x_hex != NULL) {
|
|
OPENSSL_free(x_hex);
|
|
}
|
|
if (y_hex != NULL) {
|
|
OPENSSL_free(y_hex);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
int main(void) {
|
|
CRYPTO_library_init();
|
|
ERR_load_crypto_strings();
|
|
|
|
if (!test_d2i_ECPrivateKey()) {
|
|
fprintf(stderr, "failed\n");
|
|
return 1;
|
|
}
|
|
|
|
printf("PASS\n");
|
|
return 0;
|
|
}
|