database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-22 14:32:25 +03:00
Code Activity

This makes encrypt() parser more strict.

Browse Source 
Marko Kreen
This commit is contained in:
Bruce Momjian
2001-09-06 03:21:39 +00:00
parent 57040f78f7
commit 74dde13e2c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/pgcrypto/px.c
View File

@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: px.c,v 1.1 2001/08/21 01:32:01 momjian Exp $ * $Id: px.c,v 1.2 2001/09/06 03:21:39 momjian Exp $
*/ */
#include <postgres.h> #include <postgres.h>
@@ -208,7 +208,7 @@ combo_free(PX_Combo *cx)
/* PARSER */ /* PARSER */
static void static int
parse_cipher_name(char *full, char **cipher, char **pad) parse_cipher_name(char *full, char **cipher, char **pad)
{ {
char *p, *p2, *q; char *p, *p2, *q;
@@ -229,14 +229,16 @@ parse_cipher_name(char *full, char **cipher, char **pad)
p2 = strchr(p, ':'); p2 = strchr(p, ':');
if (p2 != NULL) { if (p2 != NULL) {
*p2++ = 0; *p2++ = 0;
if (!strcmp(p, "pad")) { if (!strcmp(p, "pad"))
*pad = p2; *pad = p2;
} else { else
elog(ERROR, "Unknown component: '%s'", p); return -1;
} } else
} return -1;
p = q; p = q;
} }
return 0;
} }
/* provider */ /* provider */
@@ -255,11 +257,11 @@ px_find_combo(const char *name, PX_Combo **res)
buf = px_alloc(strlen(name) + 1); buf = px_alloc(strlen(name) + 1);
strcpy(buf, name); strcpy(buf, name);
parse_cipher_name(buf, &s_cipher, &s_pad); err = parse_cipher_name(buf, &s_cipher, &s_pad);
if (s_cipher == NULL) { if (err) {
px_free(buf); px_free(buf);
px_free(cx); px_free(cx);
return -1; return err;
} }
err = px_find_cipher(s_cipher, &cx->cipher); err = px_find_cipher(s_cipher, &cx->cipher);