File jss-eliminate-java-compiler-warnings.patch of Package jss

File jss-eliminate-java-compiler-warnings.patch of Package jss (Revision b21318b55b526ba8424630719800059e)

Currently displaying revision b21318b55b526ba8424630719800059e , Show latest

Index: jss/security/jss/org/mozilla/jss/CryptoManager.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:41:14.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 22:00:46.978107345 +0300
@@ -1231,7 +1231,7 @@
 * Imports a single certificate into the permanent certificate
 * database.
 *
- * @param derCert the certificate you want to add
+ * @param cert the certificate you want to add
 * @param nickname the nickname you want to refer to the certificate as
 * (must not be null)
 */
@@ -1497,11 +1497,11 @@
 public static final String
 JAR_JDK_VERSION = "JDK_VERSION = N/A";
 public static final String
- JAR_NSS_VERSION = "NSS_VERSION = NSS_3_12_RTM";
+ JAR_NSS_VERSION = "NSS_VERSION = N/A";
 public static final String
 JAR_DBM_VERSION = "DBM_VERSION = N/A";
 public static final String
- JAR_NSPR_VERSION = "NSPR_VERSION = NSPR_4_7_RTM";
+ JAR_NSPR_VERSION = "NSPR_VERSION = N/A";
 
 /**
 * Loads the JSS dynamic library if necessary.
@@ -1539,8 +1539,8 @@
 * this thread's token to <tt>null</tt> will also cause the
 * InternalKeyStorageToken to be used.
 *
- * @param The token to use for crypto operations. Specifying <tt>null</tt>
- * will cause the InternalKeyStorageToken to be used.
+ * @param token The token to use for crypto operations. Specifying
+ * <tt>null</tt> will cause the InternalKeyStorageToken to be used.
 */
 public void setThreadToken(CryptoToken token) {
 if( token != null ) {
@@ -1684,7 +1684,7 @@
 * Verify a certificate in memory. Check if
 * valid and that we trust the issuer. Verify time
 * against Now.
- * @param certificate in memory
+ * @param certPackage certificate in memory
 * @param checkSig verify the signature of the certificate
 * @param certUsage see exposed certUsage defines to verify Certificate
 * @return true for success; false otherwise
Index: jss/security/jss/org/mozilla/jss/crypto/Cipher.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/crypto/Cipher.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/crypto/Cipher.java	2011-10-04 22:00:46.978107345 +0300
@@ -144,8 +144,8 @@
 * B is the block size, the padding string consists of
 * B - (M mod B) octets, each having the value
 * B - (M mod B).
- * @param The block size of the encryption algorithm. Must be greater
- * than zero.
+ * @param blockSize The block size of the encryption algorithm.
+ * Must be greater than zero.
 * @see #unPad
 */
 public static byte[]
Index: jss/security/jss/org/mozilla/jss/crypto/CryptoToken.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/crypto/CryptoToken.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/crypto/CryptoToken.java	2011-10-04 22:00:46.978107345 +0300
@@ -194,7 +194,7 @@
 * Login to the token. If a token is logged in, it will not trigger
 * password callbacks.
 *
- * @param password The password for this token.
+ * @param pwcb The password callback for this token.
 * @exception IncorrectPasswordException If the supplied password is
 * incorrect.
 * @see #setLoginMode
Index: jss/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java	2011-10-04 22:00:46.978107345 +0300
@@ -88,7 +88,7 @@
 * Completes digestion.
 * 
 * @return The, ahem, output of the digest operation.
- * @param If an error occurs while digesting.
+ * @exception DigestException If an error occurs while digesting.
 */
 public byte[] digest() throws DigestException {
 byte[] output = new byte[getOutputSize()];
Index: jss/security/jss/org/mozilla/jss/crypto/PBEKeyGenParams.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/crypto/PBEKeyGenParams.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/crypto/PBEKeyGenParams.java	2011-10-04 22:00:46.978107345 +0300
@@ -60,7 +60,7 @@
 * Must not be null. It is the responsibility of the caller to
 * use the right salt length for the algorithm. Most algorithms
 * use 8 bytes of salt.
- * @param The iteration count for the PBE algorithm.
+ * @param iterations The iteration count for the PBE algorithm.
 */
 public PBEKeyGenParams(Password pass, byte[] salt, int iterations) {
 if(pass==null || salt==null) {
@@ -80,7 +80,7 @@
 * Must not be null. It is the responsibility of the caller to
 * use the right salt length for the algorithm. Most algorithms
 * use 8 bytes of salt.
- * @param The iteration count for the PBE algorithm.
+ * @param iterations The iteration count for the PBE algorithm.
 */
 public PBEKeyGenParams(char[] pass, byte[] salt, int iterations) {
 if(pass==null || salt==null) {
Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2011-10-04 22:00:46.978107345 +0300
@@ -228,8 +228,8 @@
 * Initialize PIN. This sets the user's new PIN, using the current
 * security officer PIN for authentication.
 *
- * @param ssopw The security officer's current password.
- * @param userpw The user's new password.
+ * @param ssopwcb The security officer's current password callback.
+ * @param userpwcb The user's new password callback.
 * @exception IncorrectPinException If the security officer PIN is
 * incorrect.
 * @exception TokenException If the PIN was already initialized,
@@ -322,8 +322,8 @@
 * Change password. This changes the user's PIN after it has already
 * been initialized.
 *
- * @param oldPIN The user's old PIN.
- * @param newPIN The new PIN.
+ * @param oldPINcb The user's old PIN callback.
+ * @param newPINcb The new PIN callback.
 * @exception IncorrectPasswordException If the old PIN is incorrect.
 * @exception TokenException If some other error occurs on the token.
 *
Index: jss/security/jss/org/mozilla/jss/pkcs12/SafeBag.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/pkcs12/SafeBag.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/pkcs12/SafeBag.java	2011-10-04 22:00:46.978107345 +0300
@@ -288,7 +288,7 @@
 * as the nickname of the associated cert.
 * @param localKeyID The localKeyID for the key; should be the same as
 * the localKeyID of the associated cert.
- * @param The password used to encrypt the private key.
+ * @param password The password used to encrypt the private key.
 */
 public static SafeBag
 createEncryptedPrivateKeyBag(PrivateKeyInfo privk, String friendlyName,
Index: jss/security/jss/org/mozilla/jss/pkcs7/SignerInfo.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/pkcs7/SignerInfo.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/pkcs7/SignerInfo.java	2011-10-04 22:00:46.978107345 +0300
@@ -430,7 +430,6 @@
 * SignerInfo.
 * @param contentType The type of the content that is signed by this
 * SignerInfo.
- * @param pubkey The public key to use to verify the signature.
 * @exception NoSuchObjectException If no certificate matching the
 * the issuer name and serial number can be found.
 */
Index: jss/security/jss/org/mozilla/jss/pkix/cmc/CMCStatusInfo.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/pkix/cmc/CMCStatusInfo.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/pkix/cmc/CMCStatusInfo.java	2011-10-04 22:00:46.978107345 +0300
@@ -108,7 +108,7 @@
 * @param status A CMCStatus constant.
 * @param bodyList The sequence of bodyPartID.
 * @param statusString A String.
- * @param OtherInfo The OtherInfo choice.
+ * @param otherInfo The OtherInfo choice.
 */
 public CMCStatusInfo(int status, SEQUENCE bodyList, String
 						 statusString, OtherInfo otherInfo) {
Index: jss/security/jss/org/mozilla/jss/pkix/cmmf/PKIStatusInfo.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/pkix/cmmf/PKIStatusInfo.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/pkix/cmmf/PKIStatusInfo.java	2011-10-04 22:00:46.982107345 +0300
@@ -88,7 +88,6 @@
 /**
 * Create a PKIStatusInfo with no failure info.
 * @param status A PKIStatus constant.
- * @param failInfo The bitwise AND of the PKIFailureInfo constants.
 */
 public PKIStatusInfo(int status) {
 this.status = new INTEGER(status);
Index: jss/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java	2011-10-04 22:00:46.982107345 +0300
@@ -115,10 +115,6 @@
 
 /**
 * Converts an ASN.1 DirectoryString to a Java string.
- *
- * @param dirstr An ANY containing a BER-encoded DirectoryString.
- * @exception InvalidBERException If the encoding does not contain a
- * valid DirectoryString.
 */
 public String toString() {
 return asn1String.toString();
@@ -176,6 +172,8 @@
 /**
 * @param implicitTag This parameter is ignored, because
 * DirectoryStrings (being CHOICEs) cannot have implicit tags.
+ * @exception InvalidBERException If the encoding does not contain a
+ * valid DirectoryString.
 */
 public ASN1Value decode(Tag implicitTag, InputStream istream)
 throws IOException, InvalidBERException
Index: jss/security/jss/org/mozilla/jss/provider/javax/crypto/JSSSecretKeyFactorySpi.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/provider/javax/crypto/JSSSecretKeyFactorySpi.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/provider/javax/crypto/JSSSecretKeyFactorySpi.java	2011-10-04 22:00:46.982107345 +0300
@@ -91,14 +91,18 @@
 // versions is to use the reflection API.
 Class specClass = spec.getClass();
 try {
- Method getSaltMethod = specClass.getMethod("getSalt", null);
+ Method getSaltMethod = specClass.getMethod("getSalt",
+ (java.lang.Class) null);
 Method getIterationMethod =
- specClass.getMethod("getIterationCount", null);
+ specClass.getMethod("getIterationCount",
+ (java.lang.Class) null);
 
- byte[] salt = (byte[]) getSaltMethod.invoke(spec, null);
+ byte[] salt = (byte[]) getSaltMethod.invoke(spec,
+ (java.lang.Class) null);
 
 Integer itCountObj =
- (Integer) getIterationMethod.invoke(spec,null);
+ (Integer) getIterationMethod.invoke(spec,
+ (java.lang.Class) null);
 int iterationCount = itCountObj.intValue();
 
 Password pass = new Password(spec.getPassword());
Index: jss/security/jss/org/mozilla/jss/ssl/SSLSocket.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2011-10-04 21:41:14.810070106 +0300
+++ jss/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2011-10-04 22:00:46.982107345 +0300
@@ -188,11 +188,11 @@
 }
 
 /**
- * Creates an SSL client socket and connects to the specified host and
+ * Creates an SSL client socket and connects to the specified address and
 * port. Binds to the given local address and port. Installs the given
 * callbacks for certificate approval and client certificate selection.
 *
- * @param host The hostname to connect to.
+ * @param address The IP address to connect to.
 * @param port The port to connect to.
 * @param localAddr The local address to bind to. It can be null, in which
 * case an unspecified local address will be chosen.
Index: jss/security/jss/org/mozilla/jss/tests/HMACTest.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/HMACTest.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/HMACTest.java	2011-10-04 22:00:46.982107345 +0300
@@ -155,7 +155,7 @@
 
 /**
 * Main test method.
- * @params args[]
+ * @param argv
 */
 public static void main(String[] argv) {
 
Index: jss/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java	2011-10-04 22:00:46.982107345 +0300
@@ -116,9 +116,9 @@
 }
 /**
 * 
- * @param key
- * @param kg
- * @return
+ * @param keyType
+ * @param provider
+ * @return javax.crypto.SecretKey key
 */
 public javax.crypto.SecretKey genSecretKey(String keyType, String provider){
 javax.crypto.SecretKey key = null;
@@ -155,7 +155,7 @@
 * 
 * @param keyType 
 * @param provider 
- * @return 
+ * @return javax.crypto.SecretKey key
 */
 public javax.crypto.SecretKey genPBESecretKey(String keyType,
 String provider){
@@ -197,8 +197,10 @@
 /**
 *
 * @param sKey
- * @param AlgType
- * @param provider
+ * @param algFamily
+ * @param algType
+ * @param providerForEncrypt
+ * @param providerForDecrypt
 */
 public void testCipher(javax.crypto.SecretKey sKey, String algFamily,
 String algType, String providerForEncrypt, String providerForDecrypt)
@@ -304,8 +306,10 @@
 /**
 *
 * @param sKey
- * @param AlgType
- * @param provider
+ * @param algFamily
+ * @param algType
+ * @param providerForEncrypt
+ * @param providerForDecrypt
 */
 public void testMultiPartCipher(javax.crypto.SecretKey sKey, String algFamily,
 String algType, String providerForEncrypt, String providerForDecrypt)
Index: jss/security/jss/org/mozilla/jss/tests/JSSE_SSLClient.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/JSSE_SSLClient.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/JSSE_SSLClient.java	2011-10-04 22:00:46.982107345 +0300
@@ -78,7 +78,7 @@
 
 /**
 * Set the protocol type and revision
- * @param String sslRevision
+ * @param fSslRevision
 */
 public void setSslRevision(String fSslRevision) {
 
@@ -91,7 +91,7 @@
 
 /**
 * Set the host name to connect to.
- * @param String hostname
+ * @param fHost
 */
 public void setHost(String fHost) {
 this.host = fHost;
@@ -99,7 +99,7 @@
 
 /**
 * Set the port number to connect to.
- * @param int portnumber
+ * @param fPort
 */
 public void setPort(int fPort) {
 this.port = fPort;
@@ -107,7 +107,7 @@
 
 /**
 * Set the cipher suite name to use.
- * @param String cipherSuiteName
+ * @param fCipherSuite
 */
 public void setCipherSuite(String fCipherSuite) {
 this.cipherName = fCipherSuite;
@@ -115,7 +115,7 @@
 
 /**
 * Set the location of rsa.pfx
- * @param String fKeystoreLoc
+ * @param fKeystoreLoc
 */
 public void setKeystoreLoc(String fKeystoreLoc) {
 keystoreLoc = fKeystoreLoc + "/" + keystoreLoc;
Index: jss/security/jss/org/mozilla/jss/tests/JSSE_SSLServer.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/JSSE_SSLServer.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/JSSE_SSLServer.java	2011-10-04 22:00:46.982107345 +0300
@@ -75,7 +75,7 @@
 
 /**
 * Set the provider to use.
- * @param String p
+ * @param p
 */
 public void setProvider(String p) {
 provider = p;
@@ -90,7 +90,7 @@
 }
 /**
 * Set the location of keystore file.
- * @param String fconfigDir
+ * @param fconfigDir
 */
 public void setKeystore(String fconfigDir) {
 configDir = fconfigDir;
@@ -117,7 +117,7 @@
 
 /**
 * Start SSLServer and accept connections.
- * @param args[]
+ * @param args
 */
 public void startSSLServer(String[] args) throws Exception {
 String configDir = "";
Index: jss/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java	2011-10-04 22:00:46.982107345 +0300
@@ -75,7 +75,7 @@
 /**
 * Initialize the desired cipher to be set
 * on the socket.
- * @param int Cipher
+ * @param aCipher
 */
 public void setCipher(int aCipher) {
 fCipher = aCipher;
@@ -83,7 +83,7 @@
 
 /**
 * Initialize the hostname to run the server
- * @param String ServerName
+ * @param aHostName
 */
 public void setHostName(String aHostName) {
 serverHost = aHostName;
@@ -91,7 +91,7 @@
 
 /**
 * Initialize the port to run the server
- * @param int port
+ * @param aPort
 */
 public void setPort(int aPort) {
 port = aPort;
@@ -99,7 +99,7 @@
 
 /**
 * Initialize the passwords file name
- * @param String passwords
+ * @param aPasswordFile
 */
 public void setPasswordFile(String aPasswordFile) {
 fPasswordFile = aPasswordFile;
@@ -107,7 +107,7 @@
 
 /**
 * Initialize the cert db path name
- * @param String CertDbPath
+ * @param aCertDbPath
 */
 public void setCertDbPath(String aCertDbPath) {
 fCertDbPath = aCertDbPath;
@@ -116,7 +116,7 @@
 /**
 * Initialize the name of the file to
 * be used for testing along with full path.
- * @param String UploadFile
+ * @param aUploadFile
 */
 public void setUploadFile(String aUploadFile) {
 fUploadFile = aUploadFile;
@@ -124,7 +124,7 @@
 
 /**
 * Enable/disable Test Cert Callback.
- * @param boolean
+ * @param aTestCertCallback
 */
 public void setTestCertCallback(boolean aTestCertCallback) {
 TestCertCallBack = aTestCertCallback;
@@ -132,7 +132,7 @@
 
 /**
 * Set client certificate
- * @param String Certificate Nick Name
+ * @param aClientCertNick Certificate Nick Name
 */
 public void setClientCertNick(String aClientCertNick) {
 clientCertNick = aClientCertNick;
@@ -166,7 +166,7 @@
 
 /**
 * Set EOF for closing server socket
- * @param null for closing server socket
+ * @param fEof null for closing server socket
 */
 public void setEOF(String fEof) {
 this.EOF = fEof;
Index: jss/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java	2011-10-04 22:00:46.982107345 +0300
@@ -327,7 +327,7 @@
 /**
 * Initialize the desired ciphersuite to be set
 * on the socket.
- * @param int Cipher
+ * @param aCipher
 */
 public void setCipher(int aCipher) {
 
@@ -379,7 +379,7 @@
 
 /**
 * Initialize the hostname to run the server
- * @param String ServerName
+ * @param aHostName
 */
 public void setHostName(String aHostName) {
 serverHost = aHostName;
@@ -387,7 +387,7 @@
 
 /**
 * Initialize the port to run the server
- * @param int port
+ * @param aPort
 */
 public void setPort(int aPort) {
 port = aPort;
@@ -395,7 +395,7 @@
 
 /**
 * Initialize the passwords file name
- * @param String passwords
+ * @param aPasswordFile
 */
 public void setPasswordFile(String aPasswordFile) {
 fPasswordFile = aPasswordFile;
@@ -403,7 +403,7 @@
 
 /**
 * Initialize the cert db path name
- * @param String CertDbPath
+ * @param aCertDbPath
 */
 public void setCertDbPath(String aCertDbPath) {
 fCertDbPath = aCertDbPath;
@@ -411,7 +411,7 @@
 
 /**
 * Enable/disable Test Cert Callback.
- * @param boolean
+ * @param aTestCertCallback
 */
 public void setTestCertCallback(boolean aTestCertCallback) {
 TestCertCallBack = aTestCertCallback;
@@ -419,7 +419,7 @@
 
 /**
 * Set client certificate
- * @param String Certificate Nick Name
+ * @param aClientCertNick Certificate Nick Name
 */
 public void setClientCertNick(String aClientCertNick) {
 clientCertNick = aClientCertNick;
Index: jss/security/jss/org/mozilla/jss/tests/SSLClientAuth.java
===================================================================
--- jss.orig/security/jss/org/mozilla/jss/tests/SSLClientAuth.java	2011-10-04 20:07:40.000000000 +0300
+++ jss/security/jss/org/mozilla/jss/tests/SSLClientAuth.java	2011-10-04 22:00:46.986107345 +0300
@@ -71,7 +71,7 @@
 * @param rand
 * @param extensions
 * @throws java.lang.Exception
- * @return
+ * @return Certificate
 */
 public static Certificate makeCert(String issuerName, String subjectName,
 int serialNumber, PrivateKey privKey, PublicKey pubKey, int rand,