optimise SHA functions and as.character method

Author: shikokuchuo

R/sha.R

@@ -45,15 +45,7 @@
 #'
 #' @export
 #'
-sha224 <- function(x, key = NULL) {
-
-  if (!is.raw(x))
-    x <- if (is.character(x)) charToRaw(x) else serialize(x, NULL)
-  if (!is.null(key) && !is.raw(key))
-    key <- if (is.character(key)) charToRaw(key) else serialize(key, NULL)
-  .Call(rnng_sha224, x, key)
-
-}
+sha224 <- function(x, key = NULL) .Call(rnng_sha224, x, key)
 
 #' Cryptographic Hashing Using the SHA-256 Algorithm
 #'
@@ -84,15 +76,7 @@ sha224 <- function(x, key = NULL) {
 #'
 #' @export
 #'
-sha256 <- function(x, key = NULL) {
-
-  if (!is.raw(x))
-    x <- if (is.character(x)) charToRaw(x) else serialize(x, NULL)
-  if (!is.null(key) && !is.raw(key))
-      key <- if (is.character(key)) charToRaw(key) else serialize(key, NULL)
-  .Call(rnng_sha256, x, key)
-
-}
+sha256 <- function(x, key = NULL) .Call(rnng_sha256, x, key)
 
 #' Cryptographic Hashing Using the SHA-384 Algorithm
 #'
@@ -123,15 +107,7 @@ sha256 <- function(x, key = NULL) {
 #'
 #' @export
 #'
-sha384 <- function(x, key = NULL) {
-
-  if (!is.raw(x))
-    x <- if (is.character(x)) charToRaw(x) else serialize(x, NULL)
-  if (!is.null(key) && !is.raw(key))
-    key <- if (is.character(key)) charToRaw(key) else serialize(key, NULL)
-  .Call(rnng_sha384, x, key)
-
-}
+sha384 <- function(x, key = NULL) .Call(rnng_sha384, x, key)
 
 #' Cryptographic Hashing Using the SHA-512 Algorithm
 #'
@@ -162,19 +138,11 @@ sha384 <- function(x, key = NULL) {
 #'
 #' @export
 #'
-sha512 <- function(x, key = NULL) {
-
-  if (!is.raw(x))
-    x <- if (is.character(x)) charToRaw(x) else serialize(x, NULL)
-  if (!is.null(key) && !is.raw(key))
-    key <- if (is.character(key)) charToRaw(key) else serialize(key, NULL)
-  .Call(rnng_sha512, x, key)
-
-}
+sha512 <- function(x, key = NULL) .Call(rnng_sha512, x, key)
 
 #' @export
 #'
-as.character.nanoHash <- function(x, ...) paste(unclass(x), collapse = "")
+as.character.nanoHash <- function(x, ...) .Call(rnng_hashToChar, x)
 
 #' @export
 #'

src/init.c

@@ -20,13 +20,15 @@
 
 SEXP nano_AioSymbol;
 SEXP nano_ContextSymbol;
+SEXP nano_CtrSymbol;
 SEXP nano_DataSymbol;
 SEXP nano_DialerSymbol;
 SEXP nano_IdSymbol;
 SEXP nano_ListenerSymbol;
 SEXP nano_ProtocolSymbol;
 SEXP nano_ResultSymbol;
 SEXP nano_RtcSymbol;
+SEXP nano_SerialSymbol;
 SEXP nano_SocketSymbol;
 SEXP nano_StateSymbol;
 SEXP nano_StreamSymbol;
@@ -37,13 +39,15 @@ SEXP nano_UrlSymbol;
 static void RegisterSymbols(void) {
   nano_AioSymbol = Rf_install("aio");
   nano_ContextSymbol = Rf_install("context");
+  nano_CtrSymbol = Rf_install("charToRaw");
   nano_DataSymbol = Rf_install("data");
   nano_DialerSymbol = Rf_install("dialer");
   nano_IdSymbol = Rf_install("id");
   nano_ListenerSymbol = Rf_install("listener");
   nano_ProtocolSymbol = Rf_install("protocol");
   nano_ResultSymbol = Rf_install("result");
   nano_RtcSymbol = Rf_install("rawToChar");
+  nano_SerialSymbol = Rf_install("serialize");
   nano_SocketSymbol = Rf_install("socket");
   nano_StateSymbol = Rf_install("state");
   nano_StreamSymbol = Rf_install("stream");
@@ -75,6 +79,7 @@ static const R_CallMethodDef CallEntries[] = {
   {"rnng_dialer_create", (DL_FUNC) &rnng_dialer_create, 2},
   {"rnng_dialer_set", (DL_FUNC) &rnng_dialer_set, 4},
   {"rnng_dialer_start", (DL_FUNC) &rnng_dialer_start, 2},
+  {"rnng_hashToChar", (DL_FUNC) &rnng_hashToChar, 1},
   {"rnng_listen", (DL_FUNC) &rnng_listen, 2},
   {"rnng_listener_close", (DL_FUNC) &rnng_listener_close, 1},
   {"rnng_listener_create", (DL_FUNC) &rnng_listener_create, 2},

src/nanonext.h

@@ -71,13 +71,15 @@ extern void listener_finalizer(SEXP);
 
 extern SEXP nano_AioSymbol;
 extern SEXP nano_ContextSymbol;
+extern SEXP nano_CtrSymbol;
 extern SEXP nano_DataSymbol;
 extern SEXP nano_DialerSymbol;
 extern SEXP nano_IdSymbol;
 extern SEXP nano_ListenerSymbol;
 extern SEXP nano_ProtocolSymbol;
 extern SEXP nano_ResultSymbol;
 extern SEXP nano_RtcSymbol;
+extern SEXP nano_SerialSymbol;
 extern SEXP nano_SocketSymbol;
 extern SEXP nano_StateSymbol;
 extern SEXP nano_StreamSymbol;
@@ -107,6 +109,7 @@ extern SEXP rnng_dialer_close(SEXP);
 extern SEXP rnng_dialer_create(SEXP, SEXP);
 extern SEXP rnng_dialer_set(SEXP, SEXP, SEXP, SEXP);
 extern SEXP rnng_dialer_start(SEXP, SEXP);
+extern SEXP rnng_hashToChar(SEXP);
 extern SEXP rnng_listen(SEXP, SEXP);
 extern SEXP rnng_listener_close(SEXP);
 extern SEXP rnng_listener_create(SEXP, SEXP);