← Back to branch summary

~ubuntu-branches/ubuntu/trusty/openssl/trusty

« back to all changes in this revision

Viewing changes to demos/x509/mkreq.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-01-08 15:57:24 UTC
  • mfrom: (11.1.46 sid)
  • Revision ID: package-import@ubuntu.com-20140108155724-kl61on9fyqmod2z9
Tags: 1.0.1f-1ubuntu1
* Merge with Debian, remaining changes.
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification on libssl1.0.0
      upgrade on servers.
    + 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/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: i586 (on i386)
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
  - debian/control: Mark Debian Vcs-* as XS-Debian-Vcs-*
  - debian/patches/ubuntu_deb676533_arm_asm.patch: Enable arm assembly
    code.
  - debian/rules: Enable optimized 64bit elliptic curve code contributed
    by Google.
* Dropped changes:
  - debian/patches/arm64-support: included in debian-targets.patch
  - debian/patches/no_default_rdrand.patch: upstream
  - debian/patches/openssl-1.0.1e-env-zlib.patch: zlib is now completely
    disabled in debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
demos/x509/mkreq.c
7
7
 
8
8
#include <openssl/pem.h>
9
9
#include <openssl/conf.h>
 
10
#include <openssl/x509.h>
10
11
#include <openssl/x509v3.h>
11
12
#ifndef OPENSSL_NO_ENGINE
12
13
#include <openssl/engine.h>
13
14
#endif
14
15
 
15
16
int mkreq(X509_REQ **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days);
16
 
int add_ext(STACK_OF(X509_REQUEST) *sk, int nid, char *value);
 
17
int add_ext(STACK_OF(X509_EXTENSION) *sk, int nid, char *value);
17
18
 
18
19
int main(int argc, char **argv)
19
20
        {
148
149
 * because we wont reference any other sections.
149
150
 */
150
151
 
151
 
int add_ext(STACK_OF(X509_REQUEST) *sk, int nid, char *value)
 
152
int add_ext(STACK_OF(X509_EXTENSION) *sk, int nid, char *value)
152
153
        {
153
154
        X509_EXTENSION *ex;
154
155
        ex = X509V3_EXT_conf_nid(NULL, NULL, nid, value);