Merge remote-tracking branch 'origin/pr/2239' into development
* origin/pr/2239:
Add ChangeLog entry
Fix private DER output shifted by one byte.
diff --git a/ChangeLog b/ChangeLog
index aa7f517..9deefa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
extensions in CSRs and CRTs that caused these bitstrings to not be encoded
correctly as trailing zeroes were not accounted for as unused bits in the
leading content octet. Fixes #1610.
+ * Fix private key DER output in the key_app_writer example. File contents
+ were shifted by one byte, creating an invalid ASN.1 tag. Fixed by
+ Christian Walther in #2239.
Changes
* Reduce RAM consumption during session renegotiation by not storing
diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index 500e258..b81530c 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -189,7 +189,7 @@
return( ret );
len = ret;
- c = output_buf + sizeof(output_buf) - len - 1;
+ c = output_buf + sizeof(output_buf) - len;
}
if( ( f = fopen( output_file, "w" ) ) == NULL )