@@ -129,11 +129,11 @@
 	dk_len = iklen+ivlen;
     }
 
     /* Derive key */
     if (!PKCS5_PBKDF2_HMAC(pass, (int) pass_len, salt, (int) salt_len, iter, md, dk_len, tmpkeyiv)) {
-	Tcl_AppendResult(interp, "Key derivation failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Key derivation failed: ", GET_ERR_REASON(), (char *) NULL);
 	return TCL_ERROR;
     }
 
    /* Set result to key and iv */
     if (cipher == NULL) {
@@ -248,29 +248,29 @@
 	Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL);
 	goto error;
     }
 
     if (EVP_PKEY_derive_init(pctx) < 1) {
-	Tcl_AppendResult(interp, "Initialize failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Initialize failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
 
     /* Set config parameters */
     if (EVP_PKEY_CTX_set_hkdf_md(pctx, md) < 1) {
-	Tcl_AppendResult(interp, "Set digest failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set digest failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (EVP_PKEY_CTX_set1_hkdf_key(pctx, key, (int) key_len) < 1) {
-	Tcl_AppendResult(interp, "Set key failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set key failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (salt != NULL && EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt, (int) salt_len) < 1) {
-	Tcl_AppendResult(interp, "Set salt failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set salt failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (info != NULL && EVP_PKEY_CTX_add1_hkdf_info(pctx, info, (int) info_len) < 1) {
-	Tcl_AppendResult(interp, "Set info failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set info failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
 
     /* Get buffer */
     resultObj = Tcl_NewObj();
@@ -286,11 +286,11 @@
 	Tcl_SetByteArrayLength(resultObj, (Tcl_Size) out_len);
 	Tcl_SetObjResult(interp, resultObj);
 	res = TCL_OK;
 	goto done;
     } else {
-	Tcl_AppendResult(interp, "Key derivation failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Key derivation failed: ", GET_ERR_REASON(), (char *) NULL);
 	Tcl_DecrRefCount(resultObj);
     }
 
 error:
     res = TCL_ERROR;
@@ -396,37 +396,37 @@
 	Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL);
 	goto error;
     }
 
     if (EVP_PKEY_derive_init(pctx) < 1) {
-	Tcl_AppendResult(interp, "Initialize failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Initialize failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
 
     /* Set config parameters */
     if (EVP_PKEY_CTX_set1_pbe_pass(pctx, pass, (int) pass_len) < 1) {
-	Tcl_AppendResult(interp, "Set key failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set key failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (EVP_PKEY_CTX_set1_scrypt_salt(pctx, salt, (int) salt_len) < 1) {
-	Tcl_AppendResult(interp, "Set salt failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set salt failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (N != 0 && EVP_PKEY_CTX_set_scrypt_N(pctx, N) < 1) {
-	Tcl_AppendResult(interp, "Set cost parameter (N) failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set cost parameter (N) failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (r != 0 && EVP_PKEY_CTX_set_scrypt_r(pctx, r) < 1) {
-	Tcl_AppendResult(interp, "Set lock size parameter (r) failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set lock size parameter (r) failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
    }
     if (p != 0 && EVP_PKEY_CTX_set_scrypt_p(pctx, p) < 1) {
-	Tcl_AppendResult(interp, "Set Parallelization parameter (p) failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set Parallelization parameter (p) failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
     if (maxmem != 0 && EVP_PKEY_CTX_set_scrypt_maxmem_bytes(pctx, maxmem) < 1) {
-	Tcl_AppendResult(interp, "Set max memory failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Set max memory failed: ", GET_ERR_REASON(), (char *) NULL);
 	goto error;
     }
 
     /* Get buffer */
     resultObj = Tcl_NewObj();
@@ -442,11 +442,11 @@
 	Tcl_SetByteArrayLength(resultObj, (Tcl_Size) out_len);
 	Tcl_SetObjResult(interp, resultObj);
 	goto done;
 
     } else {
-	Tcl_AppendResult(interp, "Key derivation failed: ", REASON(), (char *) NULL);
+	Tcl_AppendResult(interp, "Key derivation failed: ", GET_ERR_REASON(), (char *) NULL);
 	Tcl_DecrRefCount(resultObj);
     }
 
 error:
     res = TCL_ERROR;