Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master from upstream #15

Merged
merged 55 commits into from
Jan 23, 2017
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
87eae4a
fixed crash at mediaplayer closing, fixed tsmf event parameters-no video
AMV007 Apr 15, 2015
f3a1fe5
fixed-check for calloc return memory
AMV007 Apr 15, 2015
26c054d
fixed - detect realloc failed and return if calloc failed
AMV007 Apr 15, 2015
be7ff45
fixed crash at mediaplayer closing, fixed tsmf event parameters-no vi…
AMV007 Apr 17, 2015
ed89fc7
coding style update
AMV007 May 14, 2015
c9d6611
added start for suspended threads
AMV007 May 14, 2015
6fec7e5
Do not reset V-Bar storage.
akallabeth Jan 13, 2017
bbb6bf6
Include major version number in library names
bmiklautz Dec 21, 2016
3a4e1ad
utils: remove unnecessary debug message.
bmiklautz Jan 11, 2017
2f93c0f
winpr-hash: cleanup cmd line and add man page
bmiklautz Jan 11, 2017
960f464
winpr-makecert: use sha256 and update command line
bmiklautz Jan 12, 2017
8aeb9df
makecert: fix a regression with > 2048 bit
bmiklautz Jan 12, 2017
84b542e
winpr-makecert: add initial man page
bmiklautz Jan 12, 2017
af7febf
cmdline: fix wlog man page reference
bmiklautz Jan 12, 2017
d98f117
shadow server: add more error messages
bmiklautz Jan 16, 2017
38e0bce
shadow-cli: add initial man page
bmiklautz Jan 16, 2017
9c0e3e3
wlfreerdp: add initial man page
bmiklautz Jan 16, 2017
d817469
Install man pages
bmiklautz Jan 16, 2017
c74f051
Updated android build scripts for OpenSSL 1.1
akallabeth Jan 16, 2017
62544e0
Added android release build configurations.
akallabeth Jan 16, 2017
548927e
Renamed OpenSSL library
akallabeth Jan 16, 2017
77a8821
Updated gradle settings.
akallabeth Jan 16, 2017
6d93b92
Updated library names after change in #3704
akallabeth Jan 16, 2017
0f3dcc2
Merge branch 'patch-2' of https://github.com/AMV007/FreeRDP into AMV0…
akallabeth Jan 17, 2017
5be65ac
Fixed SONAME
akallabeth Jan 17, 2017
2a6bac6
Fix typos in man pages.
bmiklautz Jan 17, 2017
95b3665
Merge pull request #3704 from bmiklautz/versioning
mfleisz Jan 17, 2017
9942042
Fixed warnings due to API changes.
akallabeth Jan 18, 2017
497db0d
Merge pull request #3707 from akallabeth/AMV007-patch-2
bmiklautz Jan 18, 2017
de34329
Merge pull request #3702 from akallabeth/clear_reset_fix
bmiklautz Jan 18, 2017
d76ecc7
Optimized general_yCbCrToRGB_16s8u_P3AC4R for BGRX
akallabeth Jan 16, 2017
948e633
Optimized general_RGBToRGB_16s8u_P3AC4R for BGRX
akallabeth Jan 16, 2017
4d40b3c
Inlined heavy used functions.
akallabeth Jan 16, 2017
6b7b1ce
Optimized general_YUV444ToRGB_8u_P3AC4R for BGRX
akallabeth Jan 16, 2017
6be6eb2
Optimized freerdp_image_fill
akallabeth Jan 16, 2017
da84552
Inlined interleaved helper functions.
akallabeth Jan 16, 2017
326aafc
Inlined freerdp_image_copy helpers.
akallabeth Jan 16, 2017
9cf6af3
Inlined shift operations.
akallabeth Jan 16, 2017
7e4c6c6
Optimized functions, removed duplicates.
akallabeth Jan 16, 2017
7198970
Removed obsolete primitive usage.
akallabeth Jan 16, 2017
ace5100
Progressive conversion and speed fixes
akallabeth Jan 18, 2017
d9810dd
Progressive struct now opaque.
akallabeth Jan 18, 2017
34eb0e5
Progressive structs to private header for tests.
akallabeth Jan 18, 2017
676871e
Disabled OpenH264 in default android build.
akallabeth Jan 18, 2017
14d0767
Merge pull request #3705 from akallabeth/android_openssl_1_1
bmiklautz Jan 19, 2017
e775a2a
Treat the result of the Capabilities callback
hardening Jan 19, 2017
f68888a
Add a callback that allows to adjust monitors layout
hardening Jan 19, 2017
ac815e2
Merge pull request #3711 from hardening/monitor_layout
bmiklautz Jan 23, 2017
85da68c
Merge pull request #3703 from akallabeth/prim_optimize
bmiklautz Jan 23, 2017
0acc54a
Fixed scanline for RFX.
akallabeth Jan 19, 2017
6188a12
Fixed planar with if local framebuffer is 16bpp
akallabeth Jan 19, 2017
b32c241
Fixed color format selection for 16bpp
akallabeth Jan 19, 2017
6ceb574
Fixed staging surface scanline.
akallabeth Jan 19, 2017
00c32f6
Fixed alpha channel for color formats without.
akallabeth Jan 23, 2017
13d69ca
Merge pull request #3710 from akallabeth/local_16bpp_fixes
mfleisz Jan 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
makecert: fix a regression with > 2048 bit
When certificates with more than 2048 bits were generated and written to
file the read function used a erroneous calculated length causing the
used buffer to overflow.
  • Loading branch information
bmiklautz committed Jan 16, 2017
commit 8aeb9df0f54bd06a66bd3abb696ec058dc6a832a
5 changes: 3 additions & 2 deletions winpr/tools/makecert/makecert.c
Original file line number Diff line number Diff line change
Expand Up @@ -1073,14 +1073,15 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
break;
}

length = new_len;
x509_str = new_str;

status = BIO_read(bio, &x509_str[offset], length);
status = BIO_read(bio, &x509_str[offset], new_len);


if (status < 0)
break;

length = length + new_len;
offset += status;
}

Expand Down