← Back to branch summary

~ubuntu-branches/ubuntu/trusty/tomcat6/trusty

« back to all changes in this revision

Viewing changes to java/org/apache/tomcat/jni/SSL.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2014-02-17 00:02:00 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20140217000200-qs6ki7bhqnfhkas7
Tags: 6.0.39-1
* Team upload.
* New upstream release.
  - Refreshed the patches
* Standards-Version updated to 3.9.5 (no changes)
* Switch to debhelper level 9
* Use XZ compression for the upstream tarball
* Use canonical URL for the Vcs-Git field

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/tomcat/jni/SSL.java
20
20
/** SSL
21
21
 *
22
22
 * @author Mladen Turk
23
 
 * @version $Id: SSL.java 1461021 2013-03-26 08:48:14Z kkolinko $
 
23
 * @version $Id: SSL.java 1561803 2014-01-27 19:31:53Z markt $
24
24
 */
25
25
 
26
26
public final class SSL {
326
326
     * SSL_TMP_KEY_DH_4096
327
327
     * </PRE>
328
328
     * @param idx temporary key index.
329
 
     * @param file File contatining DH params.
 
329
     * @param file File containing DH params.
330
330
     */
331
331
    public static native boolean loadDSATempKey(int idx, String file);
332
332
 
339
339
     * Return true if all the requested SSL_OP_* are supported by OpenSSL.
340
340
     * 
341
341
     * <i>Note that for versions of tcnative &lt; 1.1.25, this method will
342
 
     * return <code>true</code> if and only if <code>op</code>=
343
 
     * {@link #SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION} and tcnative
 
342
     * return <code>true</code> if and only if <code>op=0x00040000</code>
 
343
     * (SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) and tcnative
344
344
     * supports that flag.</i>
345
345
     *
346
346
     * @param op Bitwise-OR of all SSL_OP_* to test.