Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1030f0b

Browse files
guanzhiguanzhi
authored
Merge pull request GmSSL#22 from yxk123/main
fix:sm3pbkdf2 test error,update README.md,remove unnecessary files.
2 parents 1c6587e + 5a4e20d commit 1030f0b

20 files changed

+331
-6950
lines changed

‎.github/workflows/maven-ci-macos.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
pull_request:
1414
branches: [ "main" ]
1515
env:
16-
BUILD_TYPE: Release
16+
BUILD_TYPE: Debug
1717

1818
jobs:
1919
build:
@@ -35,9 +35,12 @@ jobs:
3535
cd GmSSL
3636
mkdir build
3737
cd build
38-
cmake ..
38+
cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64
3939
make
4040
sudo make install
4141
42+
- name: Set DYLD_LIBRARY_PATH
43+
run: echo "DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
44+
4245
- name: Build with Maven
4346
run: sudo mvn -B -X package --file pom.xml

‎.github/workflows/maven-ci-release-macos.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: maven-ci-release-macos
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
env:
9+
BUILD_TYPE: Release
10+
11+
jobs:
12+
build:
13+
runs-on: macos-latest
14+
15+
steps:
16+
- uses: actions/checkout@v3
17+
18+
- name: Set up JDK 18
19+
uses: actions/setup-java@v2
20+
with:
21+
java-version: '18'
22+
distribution: 'temurin'
23+
cache: maven
24+
25+
- name: Download GmSSL release
26+
run: curl -L "https://github.com/guanzhi/GmSSL/archive/refs/tags/v3.1.1.zip" -o "GmSSL.zip"
27+
28+
- name: Extract GmSSL
29+
run: unzip GmSSL.zip
30+
31+
- name: Build GmSSL
32+
run: |
33+
cd GmSSL-3.1.1
34+
mkdir build
35+
cd build
36+
cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64
37+
make
38+
sudo make install
39+
40+
- name: Set DYLD_LIBRARY_PATH
41+
run: echo "DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
42+
43+
- name: Verify Installation and Environment
44+
run: gmssl version
45+
46+
- name: Build with Maven
47+
run: mvn clean install
48+
49+
- name: Clean up
50+
if: always()
51+
run: rm GmSSL.zip

‎.github/workflows/maven-ci-release-ubuntu.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: maven-ci-release-ubuntu
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
env:
9+
BUILD_TYPE: Release
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v3
17+
18+
- name: Set up JDK 18
19+
uses: actions/setup-java@v2
20+
with:
21+
java-version: '18'
22+
distribution: 'temurin'
23+
cache: maven
24+
25+
- name: Install dependencies
26+
run: sudo apt-get update && sudo apt-get install -y cmake build-essential
27+
28+
- name: Download GmSSL release
29+
run: wget "https://github.com/guanzhi/GmSSL/archive/refs/tags/v3.1.1.zip" -O "GmSSL.zip"
30+
31+
- name: Extract GmSSL
32+
run: unzip GmSSL.zip
33+
34+
- name: Build GmSSL
35+
run: |
36+
cd GmSSL-3.1.1
37+
mkdir build
38+
cd build
39+
cmake ..
40+
make
41+
sudo make install
42+
sudo ldconfig
43+
44+
- name: Verify Installation and Environment
45+
run: gmssl version
46+
47+
- name: Build with Maven
48+
run: mvn clean install
49+
50+
- name: Clean up
51+
if: always()
52+
run: rm GmSSL.zip

‎.github/workflows/maven-ci-release-windows.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
3+
4+
# This workflow uses actions that are not certified by GitHub.
5+
# They are provided by a third-party and are governed by
6+
# separate terms of service, privacy policy, and support
7+
# documentation.
8+
9+
name: maven-ci-release-windows
10+
11+
on:
12+
push:
13+
branches: [ "main" ]
14+
pull_request:
15+
branches: [ "main" ]
16+
env:
17+
BUILD_TYPE: Release
18+
19+
jobs:
20+
build:
21+
runs-on: windows-latest
22+
23+
steps:
24+
- uses: actions/checkout@v3
25+
26+
- name: Configure build for x86
27+
uses: ilammy/msvc-dev-cmd@v1
28+
with:
29+
arch: amd64
30+
31+
- name: Set up JDK 18
32+
uses: actions/setup-java@v2
33+
with:
34+
java-version: '18'
35+
distribution: 'temurin'
36+
cache: maven
37+
38+
- name: Set up environment variable in windows
39+
uses: myci-actions/append-to-path-windows@2
40+
with:
41+
path: C:\Program Files\GmSSL\bin
42+
env-var: PATH
43+
44+
- name: Download GmSSL release
45+
run: |
46+
Invoke-WebRequest -Uri "https://github.com/guanzhi/GmSSL/archive/refs/tags/v3.1.1.zip" -OutFile "GmSSL.zip"
47+
48+
- name: Extract GmSSL
49+
run: |
50+
Expand-Archive -Path "GmSSL.zip" -DestinationPath "."
51+
52+
- name: Build GmSSL
53+
run: |
54+
cd GmSSL-3.1.1;
55+
mkdir build;
56+
cd build;
57+
cmake .. -G "NMake Makefiles" -DWIN32=ON;
58+
nmake ;
59+
nmake install;
60+
61+
- name: Verify Installation and Environment
62+
run: |
63+
gmssl version
64+
65+
- name: Build with Maven
66+
run: mvn clean install
67+
68+
- name: Clean up
69+
if: always()
70+
run: |
71+
Remove-Item GmSSL.zip

‎.github/workflows/maven-ci-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
branches: [ "main" ]
1515
env:
1616
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
17-
BUILD_TYPE: Release
17+
BUILD_TYPE: Debug
1818

1919
jobs:
2020
build:

‎.github/workflows/maven-ci-windows.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
pull_request:
1515
branches: [ "main" ]
1616
env:
17-
BUILD_TYPE: Release
17+
BUILD_TYPE: Debug
1818

1919
jobs:
2020
build:
@@ -26,7 +26,7 @@ jobs:
2626
- name: Configure build for x86
2727
uses: ilammy/msvc-dev-cmd@v1
2828
with:
29-
arch: amd64_x86
29+
arch: amd64
3030

3131
- name: Set up JDK 18
3232
uses: actions/setup-java@v2
@@ -35,7 +35,12 @@ jobs:
3535
distribution: 'temurin'
3636
cache: maven
3737

38-
38+
- name: Set up environment variable in windows
39+
uses: myci-actions/append-to-path-windows@2
40+
with:
41+
path: C:\Program Files\GmSSL\bin
42+
env-var: PATH
43+
3944
- name: Build GmSSL
4045
run : |
4146
git clone https://github.com/guanzhi/GmSSL.git;

‎CMakeLists.txt

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

0 commit comments

Comments
 (0)