Skip to content

Commit 254cc71

Browse files
srs-codebotsrs-codebot
committed
Merge branch 'next' into agpl_next
# Conflicts: # cmake/modules/FindPolarssl.cmake
2 parents e1d5f40 + ba34570 commit 254cc71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+270
-255
lines changed

‎.github/workflows/ccpp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
os: [ubuntu-20.04, ubuntu-18.04]
10+
os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
1111
compiler: [gcc, clang]
1212
steps:
1313
- uses: actions/checkout@v3

‎.github/workflows/codeql.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [ "master" ]
9+
schedule:
10+
- cron: '38 10 * * 2'
11+
12+
jobs:
13+
analyze:
14+
name: Analyze
15+
runs-on: ubuntu-latest
16+
permissions:
17+
actions: read
18+
contents: read
19+
security-events: write
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
language: [ 'cpp' ]
25+
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v3
29+
30+
- name: Install dependencies
31+
run: |
32+
sudo apt-get install \
33+
build-essential \
34+
cmake \
35+
libfftw3-dev \
36+
libmbedtls-dev \
37+
libpcsclite-dev \
38+
libboost-program-options-dev \
39+
libconfig++-dev \
40+
libsctp-dev \
41+
libuhd-dev \
42+
libzmq3-dev
43+
44+
# Initializes the CodeQL tools for scanning.
45+
- name: Initialize CodeQL
46+
uses: github/codeql-action/init@v2
47+
with:
48+
languages: ${{ matrix.language }}
49+
50+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
51+
# If this step fails, then you should remove it and run the build manually (see below)
52+
- name: Autobuild
53+
uses: github/codeql-action/autobuild@v2
54+
55+
# ℹ️ Command-line programs to run using the OS shell.
56+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
57+
58+
# If the Autobuild fails above, remove it and uncomment the following three lines.
59+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
60+
61+
# - run: |
62+
# echo "Run, Build Application using script"
63+
# ./location_of_script_within_repo/buildscript.sh
64+
65+
- name: Perform CodeQL Analysis
66+
uses: github/codeql-action/analyze@v2
67+
with:
68+
category: "/language:${{matrix.language}}"

‎.lgtm.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎CHANGELOG‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
Change Log for Releases
22
=======================
33

4+
## 22.10
5+
* Fix DL NAS integrity checks in srsUE
6+
* Remove Travis and LGTM as CI platforms
7+
* Remove polarssl as optional dependency (only mbedTLS used and required for security)
8+
* Allow to specify multiple PLMNs in SIB1
9+
* Allow non-blocking S1AP connect and expose various other SCTP options
10+
* Add support to broadcast MAC backoff indicator
11+
* Seperate T300/T301 timer in srsENB
12+
* Fix in eMBMS payload buffer handling
13+
* Fix memleak in NR scheduler
14+
415
## 22.04.1
516
* Various bug fixes in RLC AM and PDCP for NR
617
* Fix crash when UE attempted to reestablish in SA

‎CMakeLists.txt‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -180,29 +180,17 @@ else(USE_MKL)
180180
endif(USE_MKL)
181181

182182
# Crypto
183-
find_package(Polarssl)
184-
if (POLARSSL_FOUND)
185-
set(SEC_INCLUDE_DIRS "${POLARSSL_INCLUDE_DIRS}")
183+
find_package(MbedTLS REQUIRED)
184+
if (MBEDTLS_FOUND)
185+
set(SEC_INCLUDE_DIRS "${MBEDTLS_INCLUDE_DIRS}")
186186
if(BUILD_STATIC)
187-
set(SEC_LIBRARIES "${POLARSSL_STATIC_LIBRARIES}")
187+
set(SEC_LIBRARIES "${MBEDTLS_STATIC_LIBRARIES}")
188188
else(BUILD_STATIC)
189-
set(SEC_LIBRARIES "${POLARSSL_LIBRARIES}")
189+
set(SEC_LIBRARIES "${MBEDTLS_LIBRARIES}")
190190
endif(BUILD_STATIC)
191-
add_definitions(-DHAVE_POLARSSL)
192-
else(POLARSSL_FOUND)
193-
find_package(MbedTLS REQUIRED)
194-
if (MBEDTLS_FOUND)
195-
set(SEC_INCLUDE_DIRS "${MBEDTLS_INCLUDE_DIRS}")
196-
if(BUILD_STATIC)
197-
set(SEC_LIBRARIES "${MBEDTLS_STATIC_LIBRARIES}")
198-
else(BUILD_STATIC)
199-
set(SEC_LIBRARIES "${MBEDTLS_LIBRARIES}")
200-
endif(BUILD_STATIC)
201-
add_definitions(-DHAVE_MBEDTLS)
202-
else(MBEDTLS_FOUND)
203-
message(FATAL_ERROR "Either PolarSSL or mbedTLS are required to build srsRAN")
204-
endif (MBEDTLS_FOUND)
205-
endif(POLARSSL_FOUND)
191+
else(MBEDTLS_FOUND)
192+
message(FATAL_ERROR "mbedTLS is required to build srsRAN")
193+
endif (MBEDTLS_FOUND)
206194

207195
# Hard-SIM support
208196
if(ENABLE_HARDSIM)

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
srsRAN
22
======
33

4-
[![Build Status](https://github.com/srsran/srsRAN/actions/workflows/ccpp.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN/actions)
5-
[![Build Status](https://app.travis-ci.com/srsran/srsRAN.svg?branch=master)](https://app.travis-ci.com/github/srsran/srsRAN)
6-
[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/srsran/srsRAN.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/srsran/srsRAN/context:cpp)
4+
[![Build Status](https://github.com/srsran/srsRAN/actions/workflows/ccpp.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN/actions/workflows/ccpp.yml)
5+
[![CodeQL](https://github.com/srsran/srsRAN/actions/workflows/codeql.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN/actions/workflows/codeql.yml)
76
[![Coverity](https://scan.coverity.com/projects/23045/badge.svg)](https://scan.coverity.com/projects/srsran)
87

98
srsRAN is a 4G/5G software radio suite developed by [SRS](http://www.srs.io).

‎cmake/modules/FindPolarssl.cmake‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎cmake/modules/SRSRANVersion.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020

2121
SET(SRSRAN_VERSION_MAJOR 22)
22-
SET(SRSRAN_VERSION_MINOR 04)
23-
SET(SRSRAN_VERSION_PATCH 1)
22+
SET(SRSRAN_VERSION_MINOR 10)
23+
SET(SRSRAN_VERSION_PATCH 0)
2424
SET(SRSRAN_VERSION_STRING "${SRSRAN_VERSION_MAJOR}.${SRSRAN_VERSION_MINOR}.${SRSRAN_VERSION_PATCH}")
2525
SET(SRSRAN_SOVERSION 0)

‎lib/include/srsran/common/ssl.h‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,6 @@
2222
#ifndef SRSRAN_SSL_H
2323
#define SRSRAN_SSL_H
2424

25-
#ifdef HAVE_POLARSSL
26-
27-
#include "polarssl/aes.h"
28-
#include "polarssl/sha256.h"
29-
30-
inline void sha256(const unsigned char* key,
31-
size_t keylen,
32-
const unsigned char* input,
33-
size_t ilen,
34-
unsigned char output[32],
35-
int is224)
36-
{
37-
sha256_hmac(key, keylen, input, ilen, output, is224);
38-
}
39-
40-
#endif // HAVE_POLARSSL
41-
42-
#ifdef HAVE_MBEDTLS
43-
4425
#include "mbedtls/aes.h"
4526
#include "mbedtls/md.h"
4627

@@ -80,6 +61,4 @@ inline void sha256(const unsigned char* key,
8061
mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), key, keylen, input, ilen, output);
8162
}
8263

83-
#endif // HAVE_MBEDTLS
84-
8564
#endif // SRSRAN_SSL_H

0 commit comments

Comments
 (0)