Changes of Revision 421
commit_7c14073533e6f1ce39c53d4187fab6847fac0d44.txt
Added
commit_cf4ad1f2484ce8229aa0c468af77d7474736e4ec.txt
Deleted
open5gs_2.7.0.116.cf4ad.dsc -> open5gs_2.7.0.117.7c140.dsc
Changed
x
1
2
Source: open5gs3
Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg4
Architecture: any5
-Version: 2.7.0.116.cf4ad6
+Version: 2.7.0.117.7c1407
Maintainer: Harald Welte <laforge@gnumonks.org>8
Uploaders: Sukchan Lee <acetcom@gmail.com>9
Homepage: https://open5gs.org10
11
open5gs-udr deb net optional arch=any12
open5gs-upf deb net optional arch=any13
Checksums-Sha1:14
- adea80b9dd81c8dc704497fe01a9e45691c98fc2 14485984 open5gs_2.7.0.116.cf4ad.tar.xz15
+ 07fe51dc333933e2a58a908d7b3822081bee8743 14485772 open5gs_2.7.0.117.7c140.tar.xz16
Checksums-Sha256:17
- 6c36daf5a374a6405234ef4af4f3df6362ed9305ad61a813565d40a18dbc2c15 14485984 open5gs_2.7.0.116.cf4ad.tar.xz18
+ e3a3bea16bb26ef8072725172848b1bd23971b8558c015af6ddad2a2527ae419 14485772 open5gs_2.7.0.117.7c140.tar.xz19
Files:20
- e87fdd14d65d8502fb46a11048994d32 14485984 open5gs_2.7.0.116.cf4ad.tar.xz21
+ 26d169a248642364e8d5fa99d6e93340 14485772 open5gs_2.7.0.117.7c140.tar.xz22
open5gs_2.7.0.116.cf4ad.tar.xz/.tarball-version -> open5gs_2.7.0.117.7c140.tar.xz/.tarball-version
Changed
4
1
2
-2.7.0.116-cf4ad3
+2.7.0.117-7c1404
open5gs_2.7.0.116.cf4ad.tar.xz/debian/changelog -> open5gs_2.7.0.117.7c140.tar.xz/debian/changelog
Changed
12
1
2
-open5gs (2.7.0.116.cf4ad) unstable; urgency=medium3
+open5gs (2.7.0.117.7c140) unstable; urgency=medium4
5
* Automatically generated changelog entry for building the Osmocom master feed6
7
- -- Osmocom OBS scripts <info@osmocom.org> Sun, 24 Mar 2024 00:50:48 +00008
+ -- Osmocom OBS scripts <info@osmocom.org> Sun, 24 Mar 2024 05:20:52 +00009
10
open5gs (2.7.0) unstable; urgency=medium11
12
open5gs_2.7.0.116.cf4ad.tar.xz/lib/crypt/ecc.c -> open5gs_2.7.0.117.7c140.tar.xz/lib/crypt/ecc.c
Changed
138
1
2
3
#include <string.h>4
5
+#include "ogs-core.h"6
+7
#define NUM_ECC_DIGITS (ECC_BYTES/8)8
#define MAX_TRIES 169
10
11
HCRYPTPROV l_prov;12
if(!CryptAcquireContext(&l_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))13
{14
+ ogs_error("CryptAcquireContext() failed");15
return 0;16
}17
18
19
int l_fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);20
if(l_fd == -1)21
{22
+ ogs_error("open(/dev/urandom) failed");23
l_fd = open("/dev/random", O_RDONLY | O_CLOEXEC);24
if(l_fd == -1)25
{26
+ ogs_error("open(/dev/random) failed");27
return 0;28
}29
}30
31
if(l_read <= 0)32
{ // read failed33
close(l_fd);34
+ ogs_error("read() failed");35
return 0;36
}37
l_left -= l_read;38
39
{40
if(!getRandomNumber(l_private) || (l_tries++ >= MAX_TRIES))41
{42
+ ogs_error("getRandomNumber() failed %d", l_tries);43
return 0;44
}45
if(vli_isZero(l_private))46
47
return 1;48
}49
50
+#define CURVE_A_32 {0xFFFFFFFFFFFFFFFCull, 0x00000000FFFFFFFFull, 0x0000000000000000ull, 0xFFFFFFFF00000001ull}51
+52
+static int ecdh_validate_pubkey(EccPoint l_public, uint64_t l_privateNUM_ECC_DIGITS) {53
+ uint64_t leftNUM_ECC_DIGITS;54
+ uint64_t rightNUM_ECC_DIGITS;55
+ uint64_t curve_aNUM_ECC_DIGITS = CURVE_A_32;56
+ /*57
+ * To ensure l_public is a valid point on the curve, we need to check:58
+ * y^2 % p == (x^3 + a * x + b) % p)59
+ */60
+61
+ /* Compute y^2 % p and store in `left` */62
+ vli_modSquare_fast(left, l_public.y);63
+64
+ /* Compute x^3 and store in `right` */65
+ vli_modSquare_fast(right, l_public.x);66
+ vli_modMult_fast(right, right, l_public.x);67
+68
+ /* Compute a * x and store in `curve_a` */69
+ vli_modMult_fast(curve_a, curve_a, l_public.x);70
+ /* Store ((a * x) + b) % p in `curve_a */71
+ vli_modAdd(curve_a, curve_a, curve_b, curve_p);72
+73
+ /*74
+ * Combine x^3 and ((a * x) + b) to make (x^3 + a * x + b) % p);75
+ * store in `right`76
+ */77
+ vli_modAdd(right, right, curve_a, curve_p);78
+79
+ int i;80
+ for (i = 0; i < NUM_ECC_DIGITS; i++) {81
+ if (lefti != righti) {82
+ return 0; // y^2 % p != (x^3 + a * x + b) % p)83
+ }84
+ }85
+86
+ return 1;87
+}88
+89
int ecdh_shared_secret(const uint8_t p_publicKeyECC_BYTES+1, const uint8_t p_privateKeyECC_BYTES, uint8_t p_secretECC_BYTES)90
{91
EccPoint l_public;92
93
94
if(!getRandomNumber(l_random))95
{96
+ ogs_error("getRandomNumber() failed");97
return 0;98
}99
100
ecc_point_decompress(&l_public, p_publicKey);101
ecc_bytes2native(l_private, p_privateKey);102
103
+ /*104
+ * Validate received public key `p_publicKey` is a valid point105
+ * on curve P-256106
+ */107
+ if (!ecdh_validate_pubkey(l_public, l_private))108
+ {109
+ ogs_error("ecdh_validate_pubkey() failed");110
+ return 0;111
+ }112
+113
EccPoint l_product;114
EccPoint_mult(&l_product, &l_public, l_private, l_random);115
116
117
{118
if(!getRandomNumber(k) || (l_tries++ >= MAX_TRIES))119
{120
+ ogs_error("getRandomNumber() failed %d", l_tries);121
return 0;122
}123
if(vli_isZero(k))124
125
126
if(vli_isZero(l_r) || vli_isZero(l_s))127
{ /* r, s must not be 0. */128
+ ogs_error("r, s must not be 0");129
return 0;130
}131
132
if(vli_cmp(curve_n, l_r) != 1 || vli_cmp(curve_n, l_s) != 1)133
{ /* r, s must be < n. */134
+ ogs_error("r, s must be < n");135
return 0;136
}137
138