Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Pkcs11 Proxy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
smallstep
Pkcs11 Proxy
Commits
637df799
Commit
637df799
authored
12 years ago
by
Fredrik Thulin
Browse files
Options
Downloads
Patches
Plain Diff
Check pkcs11_initialized in a number of functions.
This harmonizes with the softhsm test suite.
parent
4bbb8bc2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gck-rpc-module.c
+10
-0
10 additions, 0 deletions
gck-rpc-module.c
with
10 additions
and
0 deletions
gck-rpc-module.c
+
10
−
0
View file @
637df799
...
@@ -1334,6 +1334,7 @@ static CK_RV rpc_C_Finalize(CK_VOID_PTR reserved)
...
@@ -1334,6 +1334,7 @@ static CK_RV rpc_C_Finalize(CK_VOID_PTR reserved)
static
CK_RV
rpc_C_GetInfo
(
CK_INFO_PTR
info
)
static
CK_RV
rpc_C_GetInfo
(
CK_INFO_PTR
info
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetInfo
);
BEGIN_CALL
(
C_GetInfo
);
...
@@ -1352,6 +1353,7 @@ static CK_RV
...
@@ -1352,6 +1353,7 @@ static CK_RV
rpc_C_GetSlotList
(
CK_BBOOL
token_present
,
CK_SLOT_ID_PTR
slot_list
,
rpc_C_GetSlotList
(
CK_BBOOL
token_present
,
CK_SLOT_ID_PTR
slot_list
,
CK_ULONG_PTR
count
)
CK_ULONG_PTR
count
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
count
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
count
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetSlotList
);
BEGIN_CALL
(
C_GetSlotList
);
...
@@ -1364,6 +1366,7 @@ rpc_C_GetSlotList(CK_BBOOL token_present, CK_SLOT_ID_PTR slot_list,
...
@@ -1364,6 +1366,7 @@ rpc_C_GetSlotList(CK_BBOOL token_present, CK_SLOT_ID_PTR slot_list,
static
CK_RV
rpc_C_GetSlotInfo
(
CK_SLOT_ID
id
,
CK_SLOT_INFO_PTR
info
)
static
CK_RV
rpc_C_GetSlotInfo
(
CK_SLOT_ID
id
,
CK_SLOT_INFO_PTR
info
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetSlotInfo
);
BEGIN_CALL
(
C_GetSlotInfo
);
...
@@ -1375,6 +1378,7 @@ static CK_RV rpc_C_GetSlotInfo(CK_SLOT_ID id, CK_SLOT_INFO_PTR info)
...
@@ -1375,6 +1378,7 @@ static CK_RV rpc_C_GetSlotInfo(CK_SLOT_ID id, CK_SLOT_INFO_PTR info)
static
CK_RV
rpc_C_GetTokenInfo
(
CK_SLOT_ID
id
,
CK_TOKEN_INFO_PTR
info
)
static
CK_RV
rpc_C_GetTokenInfo
(
CK_SLOT_ID
id
,
CK_TOKEN_INFO_PTR
info
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetTokenInfo
);
BEGIN_CALL
(
C_GetTokenInfo
);
...
@@ -1388,6 +1392,7 @@ static CK_RV
...
@@ -1388,6 +1392,7 @@ static CK_RV
rpc_C_GetMechanismList
(
CK_SLOT_ID
id
,
CK_MECHANISM_TYPE_PTR
mechanism_list
,
rpc_C_GetMechanismList
(
CK_SLOT_ID
id
,
CK_MECHANISM_TYPE_PTR
mechanism_list
,
CK_ULONG_PTR
count
)
CK_ULONG_PTR
count
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
count
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
count
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetMechanismList
);
BEGIN_CALL
(
C_GetMechanismList
);
...
@@ -1403,6 +1408,7 @@ static CK_RV
...
@@ -1403,6 +1408,7 @@ static CK_RV
rpc_C_GetMechanismInfo
(
CK_SLOT_ID
id
,
CK_MECHANISM_TYPE
type
,
rpc_C_GetMechanismInfo
(
CK_SLOT_ID
id
,
CK_MECHANISM_TYPE
type
,
CK_MECHANISM_INFO_PTR
info
)
CK_MECHANISM_INFO_PTR
info
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetMechanismInfo
);
BEGIN_CALL
(
C_GetMechanismInfo
);
...
@@ -1443,6 +1449,7 @@ rpc_C_OpenSession(CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data,
...
@@ -1443,6 +1449,7 @@ rpc_C_OpenSession(CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data,
CK_NOTIFY
callback
,
CK_SESSION_HANDLE_PTR
session
)
CK_NOTIFY
callback
,
CK_SESSION_HANDLE_PTR
session
)
{
{
return_val_if_fail
(
session
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
session
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
BEGIN_CALL
(
C_OpenSession
);
BEGIN_CALL
(
C_OpenSession
);
IN_ULONG
(
id
);
IN_ULONG
(
id
);
...
@@ -1487,6 +1494,7 @@ static CK_RV rpc_C_CancelFunction(CK_SESSION_HANDLE session)
...
@@ -1487,6 +1494,7 @@ static CK_RV rpc_C_CancelFunction(CK_SESSION_HANDLE session)
static
CK_RV
static
CK_RV
rpc_C_GetSessionInfo
(
CK_SESSION_HANDLE
session
,
CK_SESSION_INFO_PTR
info
)
rpc_C_GetSessionInfo
(
CK_SESSION_HANDLE
session
,
CK_SESSION_INFO_PTR
info
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
info
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_GetSessionInfo
);
BEGIN_CALL
(
C_GetSessionInfo
);
...
@@ -1572,6 +1580,7 @@ static CK_RV
...
@@ -1572,6 +1580,7 @@ static CK_RV
rpc_C_CreateObject
(
CK_SESSION_HANDLE
session
,
CK_ATTRIBUTE_PTR
template
,
rpc_C_CreateObject
(
CK_SESSION_HANDLE
session
,
CK_ATTRIBUTE_PTR
template
,
CK_ULONG
count
,
CK_OBJECT_HANDLE_PTR
new_object
)
CK_ULONG
count
,
CK_OBJECT_HANDLE_PTR
new_object
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
return_val_if_fail
(
new_object
,
CKR_ARGUMENTS_BAD
);
return_val_if_fail
(
new_object
,
CKR_ARGUMENTS_BAD
);
BEGIN_CALL
(
C_CreateObject
);
BEGIN_CALL
(
C_CreateObject
);
...
@@ -2169,6 +2178,7 @@ static CK_RV
...
@@ -2169,6 +2178,7 @@ static CK_RV
rpc_C_GenerateRandom
(
CK_SESSION_HANDLE
session
,
CK_BYTE_PTR
random_data
,
rpc_C_GenerateRandom
(
CK_SESSION_HANDLE
session
,
CK_BYTE_PTR
random_data
,
CK_ULONG
random_len
)
CK_ULONG
random_len
)
{
{
return_val_if_fail
(
pkcs11_initialized
,
CKR_CRYPTOKI_NOT_INITIALIZED
);
BEGIN_CALL
(
C_GenerateRandom
);
BEGIN_CALL
(
C_GenerateRandom
);
IN_ULONG
(
session
);
IN_ULONG
(
session
);
IN_BYTE_BUFFER
(
random_data
,
&
random_len
);
IN_BYTE_BUFFER
(
random_data
,
&
random_len
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment