Skip to content

Fix OPENSSL_RAW_DATA description for encrypt/decrypt #5268

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.

Sign up for GitHub

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

Open
lacatoire wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −10
Open

Fix OPENSSL_RAW_DATA description for encrypt/decrypt #5268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions reference/openssl/constants.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,10 +779,10 @@
</term>
<listitem>
<simpara>
If <constant>OPENSSL_RAW_DATA</constant> is set in the
<function>openssl_encrypt</function> or <function>openssl_decrypt</function>,
the returned data is returned as-is.
When it is not specified, Base64 encoded data is returned to the caller.
Used with <function>openssl_encrypt</function> and
<function>openssl_decrypt</function> to indicate that data
should be in raw binary format rather than base64-encoded.
See the respective function descriptions for details.
</simpara>
</listitem>
</varlistentry>
Expand Down
12 changes: 9 additions & 3 deletions reference/openssl/functions/openssl-decrypt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,16 @@
<term><parameter>options</parameter></term>
<listitem>
<para>
<parameter>options</parameter> can be one of
<parameter>options</parameter> is a bitwise disjunction of the flags
<constant>OPENSSL_RAW_DATA</constant>,
<constant>OPENSSL_ZERO_PADDING</constant>
or <constant>OPENSSL_DONT_ZERO_PAD_KEY</constant>.
<constant>OPENSSL_ZERO_PADDING</constant>,
and <constant>OPENSSL_DONT_ZERO_PAD_KEY</constant>.
</para>
<para>
When <constant>OPENSSL_RAW_DATA</constant> is set,
<parameter>data</parameter> is expected to be raw binary
ciphertext. When it is not set, <parameter>data</parameter>
is expected to be base64-encoded.
</para>
</listitem>
</varlistentry>
Expand Down
11 changes: 8 additions & 3 deletions reference/openssl/functions/openssl-encrypt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,14 @@
<listitem>
<para>
<parameter>options</parameter> is a bitwise disjunction of the flags
<constant>OPENSSL_RAW_DATA</constant>, and
<constant>OPENSSL_ZERO_PADDING</constant>
or <constant>OPENSSL_DONT_ZERO_PAD_KEY</constant>.
<constant>OPENSSL_RAW_DATA</constant>,
<constant>OPENSSL_ZERO_PADDING</constant>,
and <constant>OPENSSL_DONT_ZERO_PAD_KEY</constant>.
</para>
<para>
When <constant>OPENSSL_RAW_DATA</constant> is set, the
encrypted output is returned as raw binary data. When it
is not set, the return value is base64-encoded.
</para>
</listitem>
</varlistentry>
Expand Down