The recent deletion of the SECU_Password function from cmd/lib made this

progam stop compiling.  So, as a temporary measure, to fix the build,
ifdef out the calls to the missing functions, and always behave as if
the "-n none" option had been supplied.

1 files changed, 13 insertions, 0 deletions

diff --git a/security/nss/cmd/rsaperf/rsaperf.c b/security/nss/cmd/rsaperf/rsaperf.c
index 4c79d7ffb..be5016693 100644
--- a/security/nss/cmd/rsaperf/rsaperf.c
+++ b/security/nss/cmd/rsaperf/rsaperf.c
@@ -299,6 +299,7 @@ main(int argc, char **argv)
 	    exit(1);
 	}
     }
+#if defined(SECU_GetPassword)
     if (doPub) {
 	if (!strcmp(nickname, "none")) {
 	    pubKey = getDefaultRSAPublicKey();
@@ -346,6 +347,18 @@ main(int argc, char **argv)
 	fn = (RSAOp)RSA_PrivateKeyOp;
 	rsaKey = (void *)(&privKey->u.rsa);
     }
+#else
+    if (doPub) {
+	pubKey = getDefaultRSAPublicKey();
+	fn = (RSAOp)RSA_PublicKeyOp;
+	rsaKey = (void *)(&pubKey->u.rsa);
+    }
+    if (doPriv) {
+	privKey = getDefaultRSAPrivateKey();
+	fn = (RSAOp)RSA_PrivateKeyOp;
+	rsaKey = (void *)(&privKey->u.rsa);
+    }
+#endif
 
     memset(buf, 1, sizeof buf);
     rv = fn(rsaKey, buf2, buf);