-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1 parent
b63df30
commit 44f272b
Showing
85 changed files
with
1,009 additions
and
345 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,7 +45,7 @@ IF(COVERAGE) | |
SET(GCOVR_FILE "${PROJECT_BINARY_DIR}/gcovr.xml") | ||
SET(GCOVR_CMD ${GCOVR_BIN} -x -o ${GCOVR_FILE} --exclude="src/external" --exclude="test" -r ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}) | ||
|
||
ADD_CUSTOM_COMMAND(OUTPUT ${GCOVR_FILE} COMMAND ${GCOVR_CMD}) | ||
ADD_CUSTOM_COMMAND(OUTPUT ${GCOVR_FILE} COMMAND ${GCOVR_CMD} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) | ||
ADD_CUSTOM_TARGET(gcovr DEPENDS ${GCOVR_FILE}) | ||
ENDIF() | ||
|
||
|
@@ -140,7 +140,7 @@ IF(UNCRUSTIFY) | |
EXECUTE_PROCESS(COMMAND ${UNCRUSTIFY} --version OUTPUT_VARIABLE UNCRUSTIFY_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
STRING(REPLACE "uncrustify " "" UNCRUSTIFY_VERSION ${UNCRUSTIFY_VERSION}) | ||
|
||
SET(UNCRUSTIFY_NEEDED_VERSION "0.65") | ||
SET(UNCRUSTIFY_NEEDED_VERSION "0.67") | ||
IF("${UNCRUSTIFY_VERSION}" STRLESS "${UNCRUSTIFY_NEEDED_VERSION}") | ||
MESSAGE(WARNING "Uncrustify seems to be too old. Use at least ${UNCRUSTIFY_NEEDED_VERSION}... you are using: ${UNCRUSTIFY_VERSION}") | ||
ELSE() | ||
|
@@ -210,31 +210,39 @@ IF(CONVERT) | |
WORKING_DIRECTORY ${RESOURCES_DIR}/images) | ||
|
||
ADD_CUSTOM_TARGET(npaicons.ios.beta | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 29x29 npa_beta.svg iOS/appIcons/beta/iconSmall.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 58x58 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 87x87 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 40x40 npa_beta.svg iOS/appIcons/beta/iconSmall40.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 80x80 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 180x180 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 76x76 npa_beta.svg iOS/appIcons/beta/icon76.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 152x152 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 167x167 npa_beta.svg iOS/appIcons/beta/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 20x20 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon20.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 40x40 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 60x60 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 29x29 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/iconSmall.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 58x58 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 87x87 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 40x40 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/iconSmall40.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 80x80 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 180x180 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 76x76 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon76.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 152x152 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 167x167 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 1024x1024 npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon1024.png | ||
WORKING_DIRECTORY ${RESOURCES_DIR}/images) | ||
|
||
ADD_CUSTOM_TARGET(npaicons.ios | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 29x29 npa.svg iOS/appIcons/iconSmall.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 58x58 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 87x87 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 40x40 npa.svg iOS/appIcons/iconSmall40.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 80x80 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 180x180 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 76x76 npa.svg iOS/appIcons/icon76.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 152x152 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 167x167 npa.svg iOS/appIcons/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 20x20 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/icon20.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 40x40 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 60x60 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 29x29 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/iconSmall.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 58x58 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 87x87 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 40x40 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/iconSmall40.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 80x80 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 120x120 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 180x180 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 76x76 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/icon76.png | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 152x152 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 167x167 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${CONVERT_CMD} -background '${BACKGROUND_COLOR}' -resize 1024x1024 npa.svg iOS/appIcons/Images.xcassets/AppIcon.appiconset/icon1024.png | ||
WORKING_DIRECTORY ${RESOURCES_DIR}/images) | ||
|
||
SET(BACKGROUND_COLOR "rgb\(220,235,246\)") | ||
|
@@ -265,31 +273,35 @@ FIND_PROGRAM(PNGQUANT pngquant CMAKE_FIND_ROOT_PATH_BOTH) | |
IF(PNGQUANT) | ||
SET(PNGQUANT_CMD pngquant -f -o) | ||
ADD_CUSTOM_TARGET(pngquant.ios.beta | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/iconSmall.png -- iOS/appIcons/beta/iconSmall.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/iconSmall40.png -- iOS/appIcons/beta/iconSmall40.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/icon76.png -- iOS/appIcons/beta/icon76.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/[email protected] -- iOS/appIcons/beta/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon20.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon20.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/iconSmall.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/iconSmall.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/iconSmall40.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/iconSmall40.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon76.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon76.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon1024.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon1024.png | ||
WORKING_DIRECTORY ${RESOURCES_DIR}/images) | ||
|
||
ADD_CUSTOM_TARGET(pngquant.ios | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/iconSmall.png -- iOS/appIcons/iconSmall.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/iconSmall40.png -- iOS/appIcons/iconSmall40.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/icon76.png -- iOS/appIcons/icon76.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/[email protected] -- iOS/appIcons/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/iconSmall.png -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/iconSmall.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/iconSmall40.png -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/iconSmall40.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/icon76.png -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/icon76.png | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] -- iOS/appIcons/Images.xcassets/AppIcon.appiconset/[email protected] | ||
COMMAND ${PNGQUANT_CMD} iOS/launchImages/[email protected] -- iOS/launchImages/[email protected] | ||
WORKING_DIRECTORY ${RESOURCES_DIR}/images) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
AusweisApp2 1.14.3 | ||
^^^^^^^^^^^^^^^^^^ | ||
|
||
**Releasedatum:** 10. Juli 2018 | ||
|
||
|
||
|
||
Anwender | ||
"""""""" | ||
- Hinweis zur Datenschutzerklärung hinzugefügt. | ||
|
||
|
||
Entwickler | ||
"""""""""" | ||
- Das Vor-Ort-Auslesen von Ausweisdaten unter Anwesenden (gem. §18a PAuswG) | ||
funktioniert jetzt, wenn ein Smartphone als Kartenlesegerät genutzt wird | ||
und der Tastaturmodus "PIN-Eingabe auf diesem Gerät" aktiviert ist. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ Release Notes | |
.. toctree:: | ||
:maxdepth: 1 | ||
|
||
1.14.3 | ||
1.14.2 | ||
1.14.1 | ||
1.14.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ Versionszweig 1.14 | |
.. toctree:: | ||
:maxdepth: 1 | ||
|
||
1.14.3 | ||
1.14.2 | ||
1.14.1 | ||
1.14.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
patches/openssl-Reject-excessively-large-primes-in-DH-key-generation.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001 | ||
From: Guido Vranken <[email protected]> | ||
Date: Mon, 11 Jun 2018 19:38:54 +0200 | ||
Subject: [PATCH] Reject excessively large primes in DH key generation. | ||
|
||
CVE-2018-0732 | ||
|
||
Signed-off-by: Guido Vranken <[email protected]> | ||
|
||
(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) | ||
|
||
Reviewed-by: Tim Hudson <[email protected]> | ||
Reviewed-by: Matt Caswell <[email protected]> | ||
(Merged from https://github.com/openssl/openssl/pull/6457) | ||
--- | ||
crypto/dh/dh_key.c | 7 ++++++- | ||
1 file changed, 6 insertions(+), 1 deletion(-) | ||
|
||
diff --git x/crypto/dh/dh_key.c y/crypto/dh/dh_key.c | ||
index 387558f146..f235e0d682 100644 | ||
--- x/crypto/dh/dh_key.c | ||
+++ y/crypto/dh/dh_key.c | ||
@@ -130,10 +130,15 @@ static int generate_key(DH *dh) | ||
int ok = 0; | ||
int generate_new_key = 0; | ||
unsigned l; | ||
- BN_CTX *ctx; | ||
+ BN_CTX *ctx = NULL; | ||
BN_MONT_CTX *mont = NULL; | ||
BIGNUM *pub_key = NULL, *priv_key = NULL; | ||
|
||
+ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { | ||
+ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); | ||
+ return 0; | ||
+ } | ||
+ | ||
ctx = BN_CTX_new(); | ||
if (ctx == NULL) | ||
goto err; | ||
-- | ||
2.18.0 | ||
|
Oops, something went wrong.