firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed CORE-6186: Original content of column which is involved into ENCRYPT() is displayed as distorted view after this call

Browse Source
This commit is contained in:
AlexPeshkoff 2019-12-06 17:25:58 +03:00
parent 913b9499e9
commit d5019220f1
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/sql.extensions/README.builtin_functions.txt
View File

@ -471,7 +471,9 @@ Important:
- Initial counter value (COUNTER) may be specified only for CHACHA20 cipher, default is 0. - Initial counter value (COUNTER) may be specified only for CHACHA20 cipher, default is 0.
- Sizes of data strings passed to this functions are according to selected algorithm and mode - Sizes of data strings passed to this functions are according to selected algorithm and mode
requirements. requirements.
- Functions return BLOB when first argument is blob and varbinary for all text types. - Functions return BLOB when first argument is blob and varbinary for all other types.
- Other parameters (except algorithm, mode and endianness) may have any type provided that data size
is appropriate for selected algorithm and mode.
Example: Example:
select encrypt('897897' using sober128 key 'AbcdAbcdAbcdAbcd' iv '01234567') from rdb$database; select encrypt('897897' using sober128 key 'AbcdAbcdAbcdAbcd' iv '01234567') from rdb$database;

49
src/jrd/SysFunction.cpp
View File

@ -183,6 +183,9 @@ void setParamsInteger(DataTypeUtilBase* dataTypeUtil, const SysFunction* functio
void setParamsInt64(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args); void setParamsInt64(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args);
void setParamsSecondInteger(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args); void setParamsSecondInteger(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args);
// helper functions for setParams
void setParamVarying(dsc* param, USHORT textType, bool condition = false);
// specific setParams functions // specific setParams functions
void setParamsAsciiVal(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args); void setParamsAsciiVal(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args);
void setParamsCharToUuid(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args); void setParamsCharToUuid(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, int argsCount, dsc** args);
@ -599,6 +602,18 @@ void setParamsDateDiff(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc
} }
void setParamVarying(dsc* param, USHORT textType, bool condition)
{
if (param->isUnknown() || condition)
{
USHORT l = param->getStringLength();
if (param->isUnknown() || l == 0)
l = 64;
param->makeVarying(l, textType);
}
}
const unsigned CRYPT_ARG_VALUE = 0; const unsigned CRYPT_ARG_VALUE = 0;
const unsigned CRYPT_ARG_ALGORITHM = 1; const unsigned CRYPT_ARG_ALGORITHM = 1;
const unsigned CRYPT_ARG_MODE = 2; const unsigned CRYPT_ARG_MODE = 2;
@ -612,18 +627,10 @@ void setParamsEncrypt(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc*
{ {
fb_assert(argsCount == CRYPT_ARG_MAX); fb_assert(argsCount == CRYPT_ARG_MAX);
if (!args[CRYPT_ARG_VALUE]->isBlob()) setParamVarying(args[CRYPT_ARG_VALUE], ttype_binary);
args[CRYPT_ARG_VALUE]->makeVarying(args[CRYPT_ARG_VALUE]->getStringLength(), ttype_binary);
fb_assert(args[CRYPT_ARG_ALGORITHM]->dsc_address && args[CRYPT_ARG_ALGORITHM]->isText()); fb_assert(args[CRYPT_ARG_ALGORITHM]->dsc_address && args[CRYPT_ARG_ALGORITHM]->isText());
setParamVarying(args[CRYPT_ARG_KEY], ttype_binary);
args[CRYPT_ARG_KEY]->makeVarying(args[CRYPT_ARG_KEY]->getStringLength(), ttype_binary); setParamVarying(args[CRYPT_ARG_CTRTYPE], ttype_ascii, args[CRYPT_ARG_CTRTYPE]->dsc_length > 0);
if (args[CRYPT_ARG_IV]->dsc_length)
args[CRYPT_ARG_IV]->makeVarying(args[CRYPT_ARG_IV]->getStringLength(), ttype_binary);
if (args[CRYPT_ARG_CTRTYPE]->dsc_length)
args[CRYPT_ARG_CTRTYPE]->makeVarying(args[CRYPT_ARG_CTRTYPE]->getStringLength(), ttype_ascii);
if (args[CRYPT_ARG_COUNTER]->dsc_length) if (args[CRYPT_ARG_COUNTER]->dsc_length)
args[CRYPT_ARG_COUNTER]->makeInt64(0); args[CRYPT_ARG_COUNTER]->makeInt64(0);
@ -640,8 +647,8 @@ void setParamsRsaEncrypt(DataTypeUtilBase*, const SysFunction*, int argsCount, d
{ {
fb_assert(argsCount == RSA_CRYPT_ARG_MAX); fb_assert(argsCount == RSA_CRYPT_ARG_MAX);
args[RSA_CRYPT_ARG_VALUE]->makeVarying(args[RSA_CRYPT_ARG_VALUE]->getStringLength(), ttype_binary); setParamVarying(args[RSA_CRYPT_ARG_VALUE], ttype_binary);
args[RSA_CRYPT_ARG_KEY]->makeVarying(args[RSA_CRYPT_ARG_KEY]->getStringLength(), ttype_binary); setParamVarying(args[RSA_CRYPT_ARG_KEY], ttype_binary);
if (args[RSA_CRYPT_ARG_LPARAM]->dsc_length) if (args[RSA_CRYPT_ARG_LPARAM]->dsc_length)
args[RSA_CRYPT_ARG_LPARAM]->makeVarying(args[RSA_CRYPT_ARG_LPARAM]->getStringLength(), ttype_binary); args[RSA_CRYPT_ARG_LPARAM]->makeVarying(args[RSA_CRYPT_ARG_LPARAM]->getStringLength(), ttype_binary);
@ -661,8 +668,8 @@ void setParamsRsaSign(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc*
{ {
fb_assert(argsCount == RSA_SIGN_ARG_MAX); fb_assert(argsCount == RSA_SIGN_ARG_MAX);
args[RSA_SIGN_ARG_VALUE]->makeVarying(args[RSA_SIGN_ARG_VALUE]->getStringLength(), ttype_binary); setParamVarying(args[RSA_SIGN_ARG_VALUE], ttype_binary);
args[RSA_SIGN_ARG_KEY]->makeVarying(args[RSA_SIGN_ARG_KEY]->getStringLength(), ttype_binary); setParamVarying(args[RSA_SIGN_ARG_KEY], ttype_binary);
if (args[RSA_SIGN_ARG_HASH]->dsc_length) if (args[RSA_SIGN_ARG_HASH]->dsc_length)
args[RSA_SIGN_ARG_HASH]->makeVarying(args[RSA_SIGN_ARG_HASH]->getStringLength(), ttype_binary); args[RSA_SIGN_ARG_HASH]->makeVarying(args[RSA_SIGN_ARG_HASH]->getStringLength(), ttype_binary);
@ -683,9 +690,9 @@ void setParamsRsaVerify(DataTypeUtilBase*, const SysFunction*, int argsCount, ds
{ {
fb_assert(argsCount == RSA_VERIFY_ARG_MAX); fb_assert(argsCount == RSA_VERIFY_ARG_MAX);
args[RSA_VERIFY_ARG_VALUE]->makeVarying(args[RSA_VERIFY_ARG_VALUE]->getStringLength(), ttype_binary); setParamVarying(args[RSA_VERIFY_ARG_VALUE], ttype_binary);
args[RSA_VERIFY_ARG_KEY]->makeVarying(args[RSA_VERIFY_ARG_KEY]->getStringLength(), ttype_binary); setParamVarying(args[RSA_VERIFY_ARG_KEY], ttype_binary);
args[RSA_VERIFY_ARG_SIGNATURE]->makeVarying(args[RSA_VERIFY_ARG_SIGNATURE]->getStringLength(), ttype_binary); setParamVarying(args[RSA_VERIFY_ARG_SIGNATURE], ttype_binary);
if (args[RSA_VERIFY_ARG_HASH]->dsc_length) if (args[RSA_VERIFY_ARG_HASH]->dsc_length)
args[RSA_VERIFY_ARG_HASH]->makeVarying(args[RSA_VERIFY_ARG_HASH]->getStringLength(), ttype_binary); args[RSA_VERIFY_ARG_HASH]->makeVarying(args[RSA_VERIFY_ARG_HASH]->getStringLength(), ttype_binary);
@ -699,7 +706,7 @@ void setParamsRsaPublic(DataTypeUtilBase*, const SysFunction*, int argsCount, ds
{ {
fb_assert(argsCount == 1); fb_assert(argsCount == 1);
args[0]->makeVarying(args[0]->getStringLength(), ttype_binary); setParamVarying(args[0], ttype_binary);
} }
@ -2547,11 +2554,7 @@ public:
newBlob(nullptr) newBlob(nullptr)
{ {
if (!blobMode) if (!blobMode)
{
if (!desc->isText())
status_exception::raise(Arg::Gds(isc_tom_strblob));
ptr = CVT_get_bytes(desc, len); ptr = CVT_get_bytes(desc, len);
}
else else
{ {
blobDesc.makeBlob(0, ttype_none); blobDesc.makeBlob(0, ttype_none);