if dsa_int_validate_* fails return consistently CRYPT_INVALID_PACKET

karel-m · karel-m · commit bb6a7e1c6c07 · 2017-09-14T18:53:09.000+02:00
diff --git a/src/pk/dsa/dsa_set.c b/src/pk/dsa/dsa_set.c
@@ -48,7 +48,7 @@ int dsa_set_pqg(const unsigned char *p,  unsigned long plen,
    /* do only a quick validation, without primality testing */
    if ((err = dsa_int_validate_pqg(key, &stat)) != CRYPT_OK)                        { goto LBL_ERR; }
    if (stat == 0) {
-      err = CRYPT_INVALID_ARG;
+      err = CRYPT_INVALID_PACKET;
       goto LBL_ERR;
    }
 
@@ -94,7 +94,7 @@ int dsa_set_key(const unsigned char *in, unsigned long inlen, int type, dsa_key
 
    if ((err = dsa_int_validate_xy(key, &stat)) != CRYPT_OK)                             { goto LBL_ERR; }
    if (stat == 0) {
-      err = CRYPT_INVALID_ARG;
+      err = CRYPT_INVALID_PACKET;
       goto LBL_ERR;
    }
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ int dsa_set_pqg(const unsigned char *p, unsigned long plen,`
`48`	`48`	`/* do only a quick validation, without primality testing */`
`49`	`49`	`if ((err = dsa_int_validate_pqg(key, &stat)) != CRYPT_OK) { goto LBL_ERR; }`
`50`	`50`	`if (stat == 0) {`
`51`		`- err = CRYPT_INVALID_ARG;`
	`51`	`+ err = CRYPT_INVALID_PACKET;`
`52`	`52`	`goto LBL_ERR;`
`53`	`53`	`}`
`54`	`54`
`@@ -94,7 +94,7 @@ int dsa_set_key(const unsigned char *in, unsigned long inlen, int type, dsa_key`
`94`	`94`
`95`	`95`	`if ((err = dsa_int_validate_xy(key, &stat)) != CRYPT_OK) { goto LBL_ERR; }`
`96`	`96`	`if (stat == 0) {`
`97`		`- err = CRYPT_INVALID_ARG;`
	`97`	`+ err = CRYPT_INVALID_PACKET;`
`98`	`98`	`goto LBL_ERR;`
`99`	`99`	`}`
`100`	`100`