mirror of
https://github.com/openssl/openssl.git
synced 2025-01-30 14:01:55 +08:00
25f2138b0a
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
76 lines
2.1 KiB
C
76 lines
2.1 KiB
C
/*
|
|
* Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "dh_locl.h"
|
|
#include <openssl/bn.h>
|
|
#include <openssl/objects.h>
|
|
#include "crypto/bn_dh.h"
|
|
|
|
static DH *dh_param_init(const BIGNUM *p, int32_t nbits)
|
|
{
|
|
DH *dh = DH_new();
|
|
if (dh == NULL)
|
|
return NULL;
|
|
dh->p = (BIGNUM *)p;
|
|
dh->g = (BIGNUM *)&_bignum_const_2;
|
|
dh->length = nbits;
|
|
dh->dirty_cnt++;
|
|
return dh;
|
|
}
|
|
|
|
DH *DH_new_by_nid(int nid)
|
|
{
|
|
switch (nid) {
|
|
case NID_ffdhe2048:
|
|
return dh_param_init(&_bignum_ffdhe2048_p, 225);
|
|
case NID_ffdhe3072:
|
|
return dh_param_init(&_bignum_ffdhe3072_p, 275);
|
|
case NID_ffdhe4096:
|
|
return dh_param_init(&_bignum_ffdhe4096_p, 325);
|
|
case NID_ffdhe6144:
|
|
return dh_param_init(&_bignum_ffdhe6144_p, 375);
|
|
case NID_ffdhe8192:
|
|
return dh_param_init(&_bignum_ffdhe8192_p, 400);
|
|
default:
|
|
DHerr(DH_F_DH_NEW_BY_NID, DH_R_INVALID_PARAMETER_NID);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
int DH_get_nid(const DH *dh)
|
|
{
|
|
int nid;
|
|
|
|
if (BN_get_word(dh->g) != 2)
|
|
return NID_undef;
|
|
if (!BN_cmp(dh->p, &_bignum_ffdhe2048_p))
|
|
nid = NID_ffdhe2048;
|
|
else if (!BN_cmp(dh->p, &_bignum_ffdhe3072_p))
|
|
nid = NID_ffdhe3072;
|
|
else if (!BN_cmp(dh->p, &_bignum_ffdhe4096_p))
|
|
nid = NID_ffdhe4096;
|
|
else if (!BN_cmp(dh->p, &_bignum_ffdhe6144_p))
|
|
nid = NID_ffdhe6144;
|
|
else if (!BN_cmp(dh->p, &_bignum_ffdhe8192_p))
|
|
nid = NID_ffdhe8192;
|
|
else
|
|
return NID_undef;
|
|
if (dh->q != NULL) {
|
|
BIGNUM *q = BN_dup(dh->p);
|
|
|
|
/* Check q = p * 2 + 1 we already know q is odd, so just shift right */
|
|
if (q == NULL || !BN_rshift1(q, q) || !BN_cmp(dh->q, q))
|
|
nid = NID_undef;
|
|
BN_free(q);
|
|
}
|
|
return nid;
|
|
}
|