Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6e44e13a
Kaydet (Commit)
6e44e13a
authored
Şub 10, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
cppcheck: variableScope
Change-Id: Ibdea832c607494d5d6b36b3655a0af7de540d0c7
üst
2877b291
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
securityenvironment_nssimpl.cxx
...ecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+4
-11
No files found.
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
Dosyayı görüntüle @
6e44e13a
...
@@ -299,22 +299,17 @@ SECKEYPrivateKey* SecurityEnvironment_NssImpl :: getPriKey( unsigned int positio
...
@@ -299,22 +299,17 @@ SECKEYPrivateKey* SecurityEnvironment_NssImpl :: getPriKey( unsigned int positio
void
SecurityEnvironment_NssImpl
::
updateSlots
()
void
SecurityEnvironment_NssImpl
::
updateSlots
()
{
{
//In case new tokens are present then we can obtain the corresponding slot
//In case new tokens are present then we can obtain the corresponding slot
PK11SlotList
*
soltList
=
NULL
;
PK11SlotListElement
*
soltEle
=
NULL
;
PK11SlotInfo
*
pSlot
=
NULL
;
PK11SymKey
*
pSymKey
=
NULL
;
osl
::
MutexGuard
guard
(
m_mutex
);
osl
::
MutexGuard
guard
(
m_mutex
);
m_Slots
.
clear
();
m_Slots
.
clear
();
m_tSymKeyList
.
clear
();
m_tSymKeyList
.
clear
();
soltList
=
PK11_GetAllTokens
(
CKM_INVALID_MECHANISM
,
PR_FALSE
,
PR_FALSE
,
NULL
)
;
PK11SlotList
*
soltList
=
PK11_GetAllTokens
(
CKM_INVALID_MECHANISM
,
PR_FALSE
,
PR_FALSE
,
NULL
)
;
if
(
soltList
!=
NULL
)
if
(
soltList
!=
NULL
)
{
{
for
(
soltEle
=
soltList
->
head
;
soltEle
!=
NULL
;
soltEle
=
soltEle
->
next
)
for
(
PK11SlotListElement
*
soltEle
=
soltList
->
head
;
soltEle
!=
NULL
;
soltEle
=
soltEle
->
next
)
{
{
pSlot
=
soltEle
->
slot
;
PK11SlotInfo
*
pSlot
=
soltEle
->
slot
;
if
(
pSlot
!=
NULL
)
if
(
pSlot
!=
NULL
)
{
{
...
@@ -333,7 +328,7 @@ void SecurityEnvironment_NssImpl::updateSlots()
...
@@ -333,7 +328,7 @@ void SecurityEnvironment_NssImpl::updateSlots()
// By doing this, the encryption may fail if a smart card is being used which does not
// By doing this, the encryption may fail if a smart card is being used which does not
// support this key generation.
// support this key generation.
//
//
pSymKey
=
PK11_KeyGen
(
pSlot
,
CKM_DES3_CBC
,
NULL
,
128
,
NULL
)
;
PK11SymKey
*
pSymKey
=
PK11_KeyGen
(
pSlot
,
CKM_DES3_CBC
,
NULL
,
128
,
NULL
)
;
// if( pSymKey == NULL )
// if( pSymKey == NULL )
// {
// {
// PK11_FreeSlot( pSlot ) ;
// PK11_FreeSlot( pSlot ) ;
...
@@ -354,10 +349,8 @@ void SecurityEnvironment_NssImpl::updateSlots()
...
@@ -354,10 +349,8 @@ void SecurityEnvironment_NssImpl::updateSlots()
}
// end of if(pSlot != NULL)
}
// end of if(pSlot != NULL)
}
// end of for
}
// end of for
}
// end of if( soltList != NULL )
}
// end of if( soltList != NULL )
}
}
Sequence
<
Reference
<
XCertificate
>
>
Sequence
<
Reference
<
XCertificate
>
>
SecurityEnvironment_NssImpl
::
getPersonalCertificates
()
throw
(
SecurityException
,
RuntimeException
,
std
::
exception
)
SecurityEnvironment_NssImpl
::
getPersonalCertificates
()
throw
(
SecurityException
,
RuntimeException
,
std
::
exception
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment