35e471bb4d
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
109 lines
3.0 KiB
C++
109 lines
3.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
|
|
#include <biginteger.hxx>
|
|
|
|
#include <xmlsec-wrapper.h>
|
|
#include <com/sun/star/uno/Sequence.hxx>
|
|
|
|
using namespace ::com::sun::star::uno ;
|
|
|
|
namespace xmlsecurity
|
|
{
|
|
Sequence< sal_Int8 > numericStringToBigInteger ( std::u16string_view numeral )
|
|
{
|
|
xmlChar* chNumeral ;
|
|
const xmlSecByte* bnInteger ;
|
|
xmlSecSize length ;
|
|
xmlSecBn bn ;
|
|
|
|
OString onumeral = OUStringToOString( numeral , RTL_TEXTENCODING_ASCII_US ) ;
|
|
|
|
chNumeral = xmlStrndup( reinterpret_cast<const xmlChar*>(onumeral.getStr()), static_cast<int>(onumeral.getLength()) ) ;
|
|
|
|
if( xmlSecBnInitialize( &bn, 0 ) < 0 ) {
|
|
xmlFree( chNumeral ) ;
|
|
return Sequence< sal_Int8 >();
|
|
}
|
|
|
|
if( xmlSecBnFromDecString( &bn, chNumeral ) < 0 ) {
|
|
xmlFree( chNumeral ) ;
|
|
xmlSecBnFinalize( &bn ) ;
|
|
return Sequence< sal_Int8 >();
|
|
}
|
|
|
|
xmlFree( chNumeral ) ;
|
|
|
|
length = xmlSecBnGetSize( &bn ) ;
|
|
if( length <= 0 ) {
|
|
xmlSecBnFinalize( &bn ) ;
|
|
return Sequence< sal_Int8 >();
|
|
}
|
|
|
|
bnInteger = xmlSecBnGetData( &bn ) ;
|
|
if( bnInteger == nullptr ) {
|
|
xmlSecBnFinalize( &bn ) ;
|
|
return Sequence< sal_Int8 >();
|
|
}
|
|
|
|
Sequence< sal_Int8 > integer( length ) ;
|
|
for( xmlSecSize i = 0 ; i < length ; i ++ )
|
|
{
|
|
integer[i] = *( bnInteger + i ) ;
|
|
}
|
|
|
|
xmlSecBnFinalize( &bn ) ;
|
|
return integer ;
|
|
}
|
|
|
|
OUString bigIntegerToNumericString ( const Sequence< sal_Int8 >& integer )
|
|
{
|
|
OUString aRet ;
|
|
|
|
if( integer.hasElements() ) {
|
|
xmlSecBn bn ;
|
|
xmlChar* chNumeral ;
|
|
|
|
if( xmlSecBnInitialize( &bn, 0 ) < 0 )
|
|
return aRet ;
|
|
|
|
if( xmlSecBnSetData( &bn, reinterpret_cast<const unsigned char*>(integer.getConstArray()), integer.getLength() ) < 0 ) {
|
|
xmlSecBnFinalize( &bn ) ;
|
|
return aRet ;
|
|
}
|
|
|
|
chNumeral = xmlSecBnToDecString( &bn ) ;
|
|
if( chNumeral == nullptr ) {
|
|
xmlSecBnFinalize( &bn ) ;
|
|
return aRet ;
|
|
}
|
|
|
|
aRet = OUString::createFromAscii( reinterpret_cast<char*>(chNumeral) ) ;
|
|
|
|
xmlSecBnFinalize( &bn ) ;
|
|
xmlFree( chNumeral ) ;
|
|
}
|
|
|
|
return aRet ;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|