Fixed Enum

gamringer · Mar 21, 2021 · ed6a096 · ed6a096
1 parent 6d767b8
commit ed6a096
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkcs11int.h b/pkcs11int.h
@@ -72,6 +72,7 @@ typedef struct _pkcs11_keypair_object {
 } pkcs11_keypair_object;
 
 enum knownParamTypes {
+    None,
     GcmParams,
     RsaOaepParams,
     RsaPssParams,

diff --git a/pkcs11mechanism.c b/pkcs11mechanism.c
@@ -49,7 +49,7 @@ PHP_METHOD(Mechanism, __construct) {
         } else if (Z_TYPE_P(mechanismArgument) == IS_OBJECT) {
             if(zend_string_equals_literal(Z_OBJ_P(mechanismArgument)->ce->name, "Pkcs11\\GcmParams")) {
                 pkcs11_gcmparams_object *mechanismParamsObj = Z_PKCS11_GCMPARAMS_P(mechanismArgument);
-                objval->paramsObj = &mechanismParamsObj;
+                objval->paramsObj = mechanismParamsObj;
                 objval->paramsObjType = GcmParams;
                 objval->mechanism.pParameter = &mechanismParamsObj->params;
                 objval->mechanism.ulParameterLen = sizeof(mechanismParamsObj->params);
@@ -58,7 +58,7 @@ PHP_METHOD(Mechanism, __construct) {
 
             if(zend_string_equals_literal(Z_OBJ_P(mechanismArgument)->ce->name, "Pkcs11\\RsaOaepParams")) {
                 pkcs11_rsaoaepparams_object *mechanismParamsObj = Z_PKCS11_RSAOAEPPARAMS_P(mechanismArgument);
-                objval->paramsObj = &mechanismParamsObj;
+                objval->paramsObj = mechanismParamsObj;
                 objval->paramsObjType = RsaOaepParams;
                 objval->mechanism.pParameter = &mechanismParamsObj->params;
                 objval->mechanism.ulParameterLen = sizeof(mechanismParamsObj->params);
@@ -67,7 +67,7 @@ PHP_METHOD(Mechanism, __construct) {
 
             if(zend_string_equals_literal(Z_OBJ_P(mechanismArgument)->ce->name, "Pkcs11\\RsaPssParams")) {
                 pkcs11_rsapssparams_object *mechanismParamsObj = Z_PKCS11_RSAPSSPARAMS_P(mechanismArgument);
-                objval->paramsObj = &mechanismParamsObj;
+                objval->paramsObj = mechanismParamsObj;
                 objval->paramsObjType = RsaPssParams;
                 objval->mechanism.pParameter = &mechanismParamsObj->params;
                 objval->mechanism.ulParameterLen = sizeof(mechanismParamsObj->params);
@@ -76,7 +76,7 @@ PHP_METHOD(Mechanism, __construct) {
 
             if(zend_string_equals_literal(Z_OBJ_P(mechanismArgument)->ce->name, "Pkcs11\\Ecdh1DeriveParams")) {
                 pkcs11_ecdh1deriveparams_object *mechanismParamsObj = Z_PKCS11_ECDH1DERIVEPARAMS_P(mechanismArgument);
-                objval->paramsObj = &mechanismParamsObj;
+                objval->paramsObj = mechanismParamsObj;
                 objval->paramsObjType = Ecdh1DeriveParams;
                 objval->mechanism.pParameter = &mechanismParamsObj->params;
                 objval->mechanism.ulParameterLen = sizeof(mechanismParamsObj->params);