From: Sascha Schumann <sas@php.net>
Date: Sun, 25 Apr 1999 21:49:01 +0000 (+0000)
Subject: final change (?), add get_algorithms_name
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77baa4ebb4c323fed71eec0844ec4bcf3f12524a;p=php

final change (?), add get_algorithms_name
---

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 14e99ca944..09d0c31dd2 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -42,6 +42,7 @@ function_entry mcrypt_functions[] = {
 	PHP_FE(mcrypt_cbc, NULL)
 	PHP_FE(mcrypt_cfb, NULL)
 	PHP_FE(mcrypt_ofb, NULL)
+	PHP_FE(mcrypt_get_algorithms_name, NULL)
 	PHP_FE(mcrypt_get_block_size, NULL)
 	PHP_FE(mcrypt_get_key_size, NULL)
 	PHP_FE(mcrypt_create_iv, NULL)
@@ -122,8 +123,8 @@ static mcrypt_global_struct mcryptg;
 static int php3_minit_mcrypt(INIT_FUNC_ARGS)
 {
 	/* modes for mcrypt_??? routines */
-	REGISTER_LONG_CONSTANT("MCRYPT_ENCODE", 0, 0);
-	REGISTER_LONG_CONSTANT("MCRYPT_DECODE", 1, 0);
+	REGISTER_LONG_CONSTANT("MCRYPT_ENCRYPT", 0, 0);
+	REGISTER_LONG_CONSTANT("MCRYPT_DECRYPT", 1, 0);
 	
 	/* sources for mcrypt_create_iv */
 	REGISTER_LONG_CONSTANT("MCRYPT_DEV_RANDOM", 0, 0);
@@ -194,6 +195,26 @@ PHP_FUNCTION(mcrypt_create_iv)
 	RETURN_STRINGL(iv, size->value.lval, 0);
 }
 
+/* proto mcrypt_get_algorithms_name(int cipher)
+   get the name of cipher */
+PHP_FUNCTION(mcrypt_get_algorithms_name)
+{
+	pval *cipher;
+	char *str, *nstr;
+
+	if(ARG_COUNT(ht) != 1 || getParameters(ht, 1, &cipher) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(cipher);
+
+	str = get_algorithms_name(cipher->value.lval);
+	nstr = estrdup(str);
+	free(str);
+
+	RETURN_STRING(nstr, 0);
+}
+
 /* proto mcrypt_get_key_size(int cipher)
    get the key size of cipher */
 PHP_FUNCTION(mcrypt_get_key_size)
diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h
index 70331e3bba..97ca367b7d 100644
--- a/ext/mcrypt/php_mcrypt.h
+++ b/ext/mcrypt/php_mcrypt.h
@@ -10,6 +10,7 @@ PHP_FUNCTION(mcrypt_ecb);
 PHP_FUNCTION(mcrypt_cbc);
 PHP_FUNCTION(mcrypt_cfb);
 PHP_FUNCTION(mcrypt_ofb);
+PHP_FUNCTION(mcrypt_get_algorithms_name);
 PHP_FUNCTION(mcrypt_get_block_size);
 PHP_FUNCTION(mcrypt_get_key_size);
 PHP_FUNCTION(mcrypt_create_iv);