← Back to branch summary

~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to demos/tunala/cb.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-01 23:51:53 UTC
  • mfrom: (11.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110501235153-bjcxitndquaezb68
Tags: 1.0.0d-2ubuntu1
https://launchpad.net/bugs/675566
* Resynchronise with Debian (LP: #675566).  Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification bubble on libssl1.0.0
      upgrade.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/aesni.patch: Backport Intel AES-NI support, now from
    http://rt.openssl.org/Ticket/Display.html?id=2065 rather than the
    0.9.8 variant.
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i486, i586 (on
      i386), v8 (on sparc).
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
* Update architectures affected by Bsymbolic-functions.patch.
* Drop debian/patches/no-sslv2.patch; Debian now adds the 'no-ssl2'
  configure option, which compiles out SSLv2 support entirely, so this is
  no longer needed.
* Drop openssl-doc in favour of the libssl-doc package introduced by
  Debian.  Add Conflicts/Replaces until the next LTS release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
demos/tunala/cb.c
134
134
        /* TODO: Perhaps make it so our global key can be generated on-the-fly
135
135
         * after certain intervals? */
136
136
        static RSA *rsa_tmp = NULL;
137
 
        if(!rsa_tmp)
138
 
                rsa_tmp = RSA_generate_key(keylength, RSA_F4, NULL, NULL);
 
137
        BIGNUM *bn = NULL;
 
138
        int ok = 1;
 
139
        if(!rsa_tmp) {
 
140
                ok = 0;
 
141
                if(!(bn = BN_new()))
 
142
                        goto end;
 
143
                if(!BN_set_word(bn, RSA_F4))
 
144
                        goto end;
 
145
                if(!(rsa_tmp = RSA_new()))
 
146
                        goto end;
 
147
                if(!RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL))
 
148
                        goto end;
 
149
                ok = 1;
 
150
        }
 
151
end:
 
152
        if(bn)
 
153
                BN_free(bn);
 
154
        if(!ok) {
 
155
                RSA_free(rsa_tmp);
 
156
                rsa_tmp = NULL;
 
157
        }
139
158
        return rsa_tmp;
140
159
}
141
160