Remove PQG_DestroyParams(), PQG_DestroyVerify from pqg.c because they

duplicate the functions in lib/util/pqgutil.c.  Also, the functions in
pqgutil correctly handle the case where the Params or Verify was
constructed without an arena (a fact which is now more obvious when
reading the code there).

security/nss/lib/freebl/pqg.c

@@ -682,22 +682,3 @@ cleanup:
 }
 
 
-void 
-PQG_DestroyParams(PQGParams *params)
-{
-    if (!params) {
-	PORT_SetError(SEC_ERROR_INVALID_ARGS);
-	return;
-    }
-    PORT_FreeArena(params->arena, PR_TRUE);
-}
-
-void 
-PQG_DestroyVerify(PQGVerify *vfy)
-{
-    if (!vfy) {
-	PORT_SetError(SEC_ERROR_INVALID_ARGS);
-	return;
-    }
-    PORT_FreeArena(vfy->arena, PR_TRUE);
-}

security/nss/lib/util/pqgutil.c

@@ -146,12 +146,12 @@ PQG_DestroyParams(PQGParams *params)
     	return;
     if (params->arena != NULL) {
 	PORT_FreeArena(params->arena, PR_FALSE);	/* don't zero it */
-	return;
+    } else {
+	SECITEM_FreeItem(&params->prime,    PR_FALSE); /* don't free prime */
+	SECITEM_FreeItem(&params->subPrime, PR_FALSE); /* don't free subPrime */
+	SECITEM_FreeItem(&params->base,     PR_FALSE); /* don't free base */
+	PORT_Free(params);
     }
-    SECITEM_FreeItem(&params->prime,    PR_FALSE); /* don't free prime */
-    SECITEM_FreeItem(&params->subPrime, PR_FALSE); /* don't free subPrime */
-    SECITEM_FreeItem(&params->base,     PR_FALSE); /* don't free base */
-    PORT_Free(params);
 }
 
 /**************************************************************************
@@ -259,9 +259,9 @@ PQG_DestroyVerify(PQGVerify *vfy)
     	return;
     if (vfy->arena != NULL) {
 	PORT_FreeArena(vfy->arena, PR_FALSE);	/* don't zero it */
-	return;
+    } else {
+	SECITEM_FreeItem(&vfy->seed,   PR_FALSE); /* don't free seed */
+	SECITEM_FreeItem(&vfy->h,      PR_FALSE); /* don't free h */
+	PORT_Free(vfy);
     }
-    SECITEM_FreeItem(&vfy->seed,   PR_FALSE); /* don't free seed */
-    SECITEM_FreeItem(&vfy->h,      PR_FALSE); /* don't free h */
-    PORT_Free(vfy);
 }