ms/uplink-x86.pl: make it work.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 740b2b9a6cf31b02916a4d18f868e8a95934c083)

.gitignore

@@ -0,0 +1,110 @@
+# Object files
+*.o
+*.obj
+
+# editor artefacts
+*.swp
+.#*
+#*#
+*~
+/.dir-locals.el
+
+# Top level excludes
+/Makefile.bak
+/Makefile
+/*.a
+/include
+/*.pc
+/rehash.time
+
+# Most *.c files under test/ are symlinks
+/test/*.c
+# Apart from these
+!/test/asn1test.c
+!/test/methtest.c
+!/test/dummytest.c
+!/test/igetest.c
+!/test/r160test.c
+!/test/fips_algvs.c
+
+/test/*.ss
+/test/*.srl
+/test/.rnd
+/test/test*.pem
+/test/newkey.pem
+
+# Certificate symbolic links
+*.0
+
+# Links under apps
+/apps/CA.pl
+/apps/md4.c
+
+
+# Auto generated headers
+/crypto/buildinf.h
+/crypto/opensslconf.h
+
+# Auto generated assembly language source files
+*.s
+!/crypto/bn/asm/pa-risc2.s
+!/crypto/bn/asm/pa-risc2W.s
+crypto/aes/asm/a_win32.asm
+crypto/bf/asm/b_win32.asm
+crypto/bn/asm/bn_win32.asm
+crypto/bn/asm/co_win32.asm
+crypto/bn/asm/mt_win32.asm
+crypto/cast/asm/c_win32.asm
+crypto/cpu_win32.asm
+crypto/des/asm/d_win32.asm
+crypto/des/asm/y_win32.asm
+crypto/md5/asm/m5_win32.asm
+crypto/rc4/asm/r4_win32.asm
+crypto/rc5/asm/r5_win32.asm
+crypto/ripemd/asm/rm_win32.asm
+crypto/sha/asm/s1_win32.asm
+crypto/sha/asm/sha512-sse2.asm
+
+# Executables
+/apps/openssl
+/test/sha256t
+/test/sha512t
+/test/*test
+/test/fips_aesavs
+/test/fips_desmovs
+/test/fips_dhvs
+/test/fips_drbgvs
+/test/fips_dssvs
+/test/fips_ecdhvs
+/test/fips_ecdsavs
+/test/fips_rngvs
+/test/fips_test_suite
+*.so*
+*.dylib*
+*.dll*
+# Exceptions
+!/test/bctest
+!/crypto/des/times/486-50.sol
+
+# Misc auto generated files
+/tools/c_rehash
+/test/evptests.txt
+lib
+Makefile.save
+*.bak
+tags
+TAGS
+
+# Windows
+/tmp32dll
+/tmp32dll.dbg
+/out32dll
+/out32dll.dbg
+/inc32
+/MINFO
+ms/bcb.mak
+ms/libeay32.def
+ms/nt.mak
+ms/ntdll.mak
+ms/ssleay32.def
+ms/version32.rc

.travis.yml

@@ -0,0 +1,50 @@
+language: c
+
+addons:
+    apt_packages:
+        - binutils-mingw-w64
+        - gcc-mingw-w64
+
+os:
+    - linux
+    - osx
+
+compiler:
+    - clang
+    - gcc
+    - i686-w64-mingw32-gcc
+    - x86_64-w64-mingw32-gcc
+
+env:
+    - CONFIG_OPTS=""
+    - CONFIG_OPTS="shared"
+    - CONFIG_OPTS="-d"
+
+matrix:
+    exclude:
+        - os: osx
+          compiler: i686-w64-mingw32-gcc
+        - os: osx
+          compiler: x86_64-w64-mingw32-gcc
+
+before_script:
+    - if [ "$CC" == i686-w64-mingw32-gcc ]; then
+          export CROSS_COMPILE=${CC%%gcc}; unset CC;
+          ./Configure mingw $CONFIG_OPTS;
+      elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
+          export CROSS_COMPILE=${CC%%gcc}; unset CC;
+          ./Configure mingw64 $CONFIG_OPTS;
+      else
+          ./config $CONFIG_OPTS;
+      fi
+
+script:
+    - make
+    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
+
+notifications:
+    recipient:
+        - openssl-commits@openssl.org
+    email:
+        on_success: change
+        on_failure: always

ACKNOWLEDGMENTS

@@ -0,0 +1,30 @@
+The OpenSSL project depends on volunteer efforts and financial support from
+the end user community. That support comes in the form of donations and paid
+sponsorships, software support contracts, paid consulting services
+and commissioned software development.
+
+Since all these activities support the continued development and improvement
+of OpenSSL we consider all these clients and customers as sponsors of the
+OpenSSL project.
+
+We would like to identify and thank the following such sponsors for their past
+or current significant support of the OpenSSL project:
+
+Major support:
+
+	Qualys		http://www.qualys.com/
+
+Very significant support:
+
+	OpenGear:	http://www.opengear.com/
+
+Significant support:
+
+	PSW Group:	http://www.psw.net/
+	Acano Ltd.	http://acano.com/
+
+Please note that we ask permission to identify sponsors and that some sponsors
+we consider eligible for inclusion here have requested to remain anonymous.
+
+Additional sponsorship or financial support is always welcome: for more
+information please contact the OpenSSL Software Foundation.

CHANGES

@@ -2,10 +2,645 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.0a and 1.0.0b  [xx XXX xxxx]
+ Changes between 1.0.0t and 1.0.0u [xx XXX xxxx]
 
   *)
 
+ Changes between 1.0.0s and 1.0.0t [3 Dec 2015]
+
+  *) X509_ATTRIBUTE memory leak
+
+     When presented with a malformed X509_ATTRIBUTE structure OpenSSL will leak
+     memory. This structure is used by the PKCS#7 and CMS routines so any
+     application which reads PKCS#7 or CMS data from untrusted sources is
+     affected. SSL/TLS is not affected.
+
+     This issue was reported to OpenSSL by Adam Langley (Google/BoringSSL) using
+     libFuzzer.
+     (CVE-2015-3195)
+     [Stephen Henson]
+
+  *) Race condition handling PSK identify hint
+
+     If PSK identity hints are received by a multi-threaded client then
+     the values are wrongly updated in the parent SSL_CTX structure. This can
+     result in a race condition potentially leading to a double free of the
+     identify hint data.
+     (CVE-2015-3196)
+     [Stephen Henson]
+
+ Changes between 1.0.0r and 1.0.0s [11 Jun 2015]
+
+  *) Malformed ECParameters causes infinite loop
+
+     When processing an ECParameters structure OpenSSL enters an infinite loop
+     if the curve specified is over a specially malformed binary polynomial
+     field.
+
+     This can be used to perform denial of service against any
+     system which processes public keys, certificate requests or
+     certificates.  This includes TLS clients and TLS servers with
+     client authentication enabled.
+
+     This issue was reported to OpenSSL by Joseph Barr-Pixton.
+     (CVE-2015-1788)
+     [Andy Polyakov]
+
+  *) Exploitable out-of-bounds read in X509_cmp_time
+
+     X509_cmp_time does not properly check the length of the ASN1_TIME
+     string and can read a few bytes out of bounds. In addition,
+     X509_cmp_time accepts an arbitrary number of fractional seconds in the
+     time string.
+
+     An attacker can use this to craft malformed certificates and CRLs of
+     various sizes and potentially cause a segmentation fault, resulting in
+     a DoS on applications that verify certificates or CRLs. TLS clients
+     that verify CRLs are affected. TLS clients and servers with client
+     authentication enabled may be affected if they use custom verification
+     callbacks.
+
+     This issue was reported to OpenSSL by Robert Swiecki (Google), and
+     independently by Hanno Böck.
+     (CVE-2015-1789)
+     [Emilia Käsper]
+
+  *) PKCS7 crash with missing EnvelopedContent
+
+     The PKCS#7 parsing code does not handle missing inner EncryptedContent
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs
+     with missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that decrypt PKCS#7 data or otherwise parse PKCS#7
+     structures from untrusted sources are affected. OpenSSL clients and
+     servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-1790)
+     [Emilia Käsper]
+
+  *) CMS verify infinite loop with unknown hash function
+
+     When verifying a signedData message the CMS code can enter an infinite loop
+     if presented with an unknown hash function OID. This can be used to perform
+     denial of service against any system which verifies signedData messages using
+     the CMS code.
+     This issue was reported to OpenSSL by Johannes Bauer.
+     (CVE-2015-1792)
+     [Stephen Henson]
+
+  *) Race condition handling NewSessionTicket
+
+     If a NewSessionTicket is received by a multi-threaded client when attempting to
+     reuse a previous ticket then a race condition can occur potentially leading to
+     a double free of the ticket data.
+     (CVE-2015-1791)
+     [Matt Caswell]
+
+ Changes between 1.0.0q and 1.0.0r [19 Mar 2015]
+
+  *) Segmentation fault in ASN1_TYPE_cmp fix
+
+     The function ASN1_TYPE_cmp will crash with an invalid read if an attempt is
+     made to compare ASN.1 boolean types. Since ASN1_TYPE_cmp is used to check
+     certificate signature algorithm consistency this can be used to crash any
+     certificate verification operation and exploited in a DoS attack. Any
+     application which performs certificate verification is vulnerable including
+     OpenSSL clients and servers which enable client authentication.
+     (CVE-2015-0286)
+     [Stephen Henson]
+
+  *) ASN.1 structure reuse memory corruption fix
+
+     Reusing a structure in ASN.1 parsing may allow an attacker to cause
+     memory corruption via an invalid write. Such reuse is and has been
+     strongly discouraged and is believed to be rare.
+
+     Applications that parse structures containing CHOICE or ANY DEFINED BY
+     components may be affected. Certificate parsing (d2i_X509 and related
+     functions) are however not affected. OpenSSL clients and servers are
+     not affected.
+     (CVE-2015-0287)
+     [Stephen Henson]
+
+  *) PKCS7 NULL pointer dereferences fix
+
+     The PKCS#7 parsing code does not handle missing outer ContentInfo
+     correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs with
+     missing content and trigger a NULL pointer dereference on parsing.
+
+     Applications that verify PKCS#7 signatures, decrypt PKCS#7 data or
+     otherwise parse PKCS#7 structures from untrusted sources are
+     affected. OpenSSL clients and servers are not affected.
+
+     This issue was reported to OpenSSL by Michal Zalewski (Google).
+     (CVE-2015-0289)
+     [Emilia Käsper]
+
+  *) DoS via reachable assert in SSLv2 servers fix
+
+     A malicious client can trigger an OPENSSL_assert (i.e., an abort) in
+     servers that both support SSLv2 and enable export cipher suites by sending
+     a specially crafted SSLv2 CLIENT-MASTER-KEY message.
+
+     This issue was discovered by Sean Burford (Google) and Emilia Käsper
+     (OpenSSL development team).
+     (CVE-2015-0293)
+     [Emilia Käsper]
+
+  *) Use After Free following d2i_ECPrivatekey error fix
+
+     A malformed EC private key file consumed via the d2i_ECPrivateKey function
+     could cause a use after free condition. This, in turn, could cause a double
+     free in several private key parsing functions (such as d2i_PrivateKey
+     or EVP_PKCS82PKEY) and could lead to a DoS attack or memory corruption
+     for applications that receive EC private keys from untrusted
+     sources. This scenario is considered rare.
+
+     This issue was discovered by the BoringSSL project and fixed in their
+     commit 517073cd4b.
+     (CVE-2015-0209)
+     [Matt Caswell]
+
+  *) X509_to_X509_REQ NULL pointer deref fix
+
+     The function X509_to_X509_REQ will crash with a NULL pointer dereference if
+     the certificate key is invalid. This function is rarely used in practice.
+
+     This issue was discovered by Brian Carpenter.
+     (CVE-2015-0288)
+     [Stephen Henson]
+
+  *) Removed the export ciphers from the DEFAULT ciphers
+     [Kurt Roeckx]
+
+ Changes between 1.0.0p and 1.0.0q [15 Jan 2015]
+
+  *) Build fixes for the Windows and OpenVMS platforms
+     [Matt Caswell and Richard Levitte]
+
+ Changes between 1.0.0o and 1.0.0p [8 Jan 2015]
+
+  *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
+     message can cause a segmentation fault in OpenSSL due to a NULL pointer
+     dereference. This could lead to a Denial Of Service attack. Thanks to
+     Markus Stenberg of Cisco Systems, Inc. for reporting this issue.
+     (CVE-2014-3571)
+     [Steve Henson]
+
+  *) Fix DTLS memory leak in dtls1_buffer_record. A memory leak can occur in the
+     dtls1_buffer_record function under certain conditions. In particular this
+     could occur if an attacker sent repeated DTLS records with the same
+     sequence number but for the next epoch. The memory leak could be exploited
+     by an attacker in a Denial of Service attack through memory exhaustion.
+     Thanks to Chris Mueller for reporting this issue.
+     (CVE-2015-0206)
+     [Matt Caswell]
+
+  *) Fix issue where no-ssl3 configuration sets method to NULL. When openssl is
+     built with the no-ssl3 option and a SSL v3 ClientHello is received the ssl
+     method would be set to NULL which could later result in a NULL pointer
+     dereference. Thanks to Frank Schmirler for reporting this issue.
+     (CVE-2014-3569)
+     [Kurt Roeckx]
+     
+  *) Abort handshake if server key exchange message is omitted for ephemeral
+     ECDH ciphersuites.
+
+     Thanks to Karthikeyan Bhargavan of the PROSECCO team at INRIA for
+     reporting this issue.
+     (CVE-2014-3572)
+     [Steve Henson]
+
+  *) Remove non-export ephemeral RSA code on client and server. This code
+     violated the TLS standard by allowing the use of temporary RSA keys in
+     non-export ciphersuites and could be used by a server to effectively
+     downgrade the RSA key length used to a value smaller than the server
+     certificate. Thanks for Karthikeyan Bhargavan of the PROSECCO team at
+     INRIA or reporting this issue.
+     (CVE-2015-0204)
+     [Steve Henson]
+
+  *) Fixed issue where DH client certificates are accepted without verification.
+     An OpenSSL server will accept a DH certificate for client authentication
+     without the certificate verify message. This effectively allows a client to
+     authenticate without the use of a private key. This only affects servers
+     which trust a client certificate authority which issues certificates
+     containing DH keys: these are extremely rare and hardly ever encountered.
+     Thanks for Karthikeyan Bhargavan of the PROSECCO team at INRIA or reporting
+     this issue.
+     (CVE-2015-0205)
+     [Steve Henson]
+
+   *) Correct Bignum squaring. Bignum squaring (BN_sqr) may produce incorrect
+      results on some platforms, including x86_64. This bug occurs at random
+      with a very low probability, and is not known to be exploitable in any
+      way, though its exact impact is difficult to determine. Thanks to Pieter
+      Wuille (Blockstream) who reported this issue and also suggested an initial
+      fix. Further analysis was conducted by the OpenSSL development team and
+      Adam Langley of Google. The final fix was developed by Andy Polyakov of
+      the OpenSSL core team.
+      (CVE-2014-3570)
+      [Andy Polyakov]
+
+  *) Fix various certificate fingerprint issues.
+
+     By using non-DER or invalid encodings outside the signed portion of a
+     certificate the fingerprint can be changed without breaking the signature.
+     Although no details of the signed portion of the certificate can be changed
+     this can cause problems with some applications: e.g. those using the
+     certificate fingerprint for blacklists.
+
+     1. Reject signatures with non zero unused bits.
+
+     If the BIT STRING containing the signature has non zero unused bits reject
+     the signature. All current signature algorithms require zero unused bits.
+
+     2. Check certificate algorithm consistency.
+
+     Check the AlgorithmIdentifier inside TBS matches the one in the
+     certificate signature. NB: this will result in signature failure
+     errors for some broken certificates.
+
+     Thanks to Konrad Kraszewski from Google for reporting this issue.
+
+     3. Check DSA/ECDSA signatures use DER.
+
+     Reencode DSA/ECDSA signatures and compare with the original received
+     signature. Return an error if there is a mismatch.
+
+     This will reject various cases including garbage after signature
+     (thanks to Antti Karjalainen and Tuomo Untinen from the Codenomicon CROSS
+     program for discovering this case) and use of BER or invalid ASN.1 INTEGERs
+     (negative or with leading zeroes).
+
+     Further analysis was conducted and fixes were developed by Stephen Henson
+     of the OpenSSL core team.
+
+     (CVE-2014-8275)
+     [Steve Henson]
+
+ Changes between 1.0.0n and 1.0.0o [15 Oct 2014]
+
+  *) Session Ticket Memory Leak.
+
+     When an OpenSSL SSL/TLS/DTLS server receives a session ticket the
+     integrity of that ticket is first verified. In the event of a session
+     ticket integrity check failing, OpenSSL will fail to free memory
+     causing a memory leak. By sending a large number of invalid session
+     tickets an attacker could exploit this issue in a Denial Of Service
+     attack.
+     (CVE-2014-3567)
+     [Steve Henson]
+
+  *) Build option no-ssl3 is incomplete.
+
+     When OpenSSL is configured with "no-ssl3" as a build option, servers
+     could accept and complete a SSL 3.0 handshake, and clients could be
+     configured to send them.
+     (CVE-2014-3568)
+     [Akamai and the OpenSSL team]
+
+  *) Add support for TLS_FALLBACK_SCSV.
+     Client applications doing fallback retries should call
+     SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV).
+     (CVE-2014-3566)
+     [Adam Langley, Bodo Moeller]
+
+  *) Add additional DigestInfo checks.
+ 
+     Reencode DigestInto in DER and check against the original when
+     verifying RSA signature: this will reject any improperly encoded
+     DigestInfo structures.
+
+     Note: this is a precautionary measure and no attacks are currently known.
+
+     [Steve Henson]
+
+ Changes between 1.0.0m and 1.0.0n [6 Aug 2014]
+
+  *) OpenSSL DTLS clients enabling anonymous (EC)DH ciphersuites are subject
+     to a denial of service attack. A malicious server can crash the client
+     with a null pointer dereference (read) by specifying an anonymous (EC)DH
+     ciphersuite and sending carefully crafted handshake messages.
+
+     Thanks to Felix Gröbert (Google) for discovering and researching this
+     issue.
+     (CVE-2014-3510)
+     [Emilia Käsper]
+
+  *) By sending carefully crafted DTLS packets an attacker could cause openssl
+     to leak memory. This can be exploited through a Denial of Service attack.
+     Thanks to Adam Langley for discovering and researching this issue.
+     (CVE-2014-3507)
+     [Adam Langley]
+
+  *) An attacker can force openssl to consume large amounts of memory whilst
+     processing DTLS handshake messages. This can be exploited through a
+     Denial of Service attack.
+     Thanks to Adam Langley for discovering and researching this issue.
+     (CVE-2014-3506)
+     [Adam Langley]
+
+  *) An attacker can force an error condition which causes openssl to crash
+     whilst processing DTLS packets due to memory being freed twice. This
+     can be exploited through a Denial of Service attack.
+     Thanks to Adam Langley and Wan-Teh Chang for discovering and researching
+     this issue.
+     (CVE-2014-3505)
+     [Adam Langley]
+
+  *) If a multithreaded client connects to a malicious server using a resumed
+     session and the server sends an ec point format extension it could write
+     up to 255 bytes to freed memory.
+
+     Thanks to Gabor Tyukasz (LogMeIn Inc) for discovering and researching this
+     issue.
+     (CVE-2014-3509)
+     [Gabor Tyukasz]
+
+  *) A flaw in OBJ_obj2txt may cause pretty printing functions such as
+     X509_name_oneline, X509_name_print_ex et al. to leak some information
+     from the stack. Applications may be affected if they echo pretty printing
+     output to the attacker.
+
+     Thanks to Ivan Fratric (Google) for discovering this issue.
+     (CVE-2014-3508)
+     [Emilia Käsper, and Steve Henson]
+
+  *) Fix ec_GFp_simple_points_make_affine (thus, EC_POINTs_mul etc.)
+     for corner cases. (Certain input points at infinity could lead to
+     bogus results, with non-infinity inputs mapped to infinity too.)
+     [Bodo Moeller]
+
+ Changes between 1.0.0l and 1.0.0m [5 Jun 2014]
+
+  *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted
+     handshake can force the use of weak keying material in OpenSSL
+     SSL/TLS clients and servers.
+
+     Thanks to KIKUCHI Masashi (Lepidum Co. Ltd.) for discovering and
+     researching this issue. (CVE-2014-0224)
+     [KIKUCHI Masashi, Steve Henson]
+
+  *) Fix DTLS recursion flaw. By sending an invalid DTLS handshake to an
+     OpenSSL DTLS client the code can be made to recurse eventually crashing
+     in a DoS attack.
+
+     Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue.
+     (CVE-2014-0221)
+     [Imre Rad, Steve Henson]
+
+  *) Fix DTLS invalid fragment vulnerability. A buffer overrun attack can
+     be triggered by sending invalid DTLS fragments to an OpenSSL DTLS
+     client or server. This is potentially exploitable to run arbitrary
+     code on a vulnerable client or server.
+
+     Thanks to Jüri Aedla for reporting this issue. (CVE-2014-0195)
+     [Jüri Aedla, Steve Henson]
+
+  *) Fix bug in TLS code where clients enable anonymous ECDH ciphersuites
+     are subject to a denial of service attack.
+
+     Thanks to Felix Gröbert and Ivan Fratric at Google for discovering
+     this issue. (CVE-2014-3470)
+     [Felix Gröbert, Ivan Fratric, Steve Henson]
+
+  *) Harmonize version and its documentation. -f flag is used to display
+     compilation flags.
+     [mancha <mancha1@zoho.com>]
+
+  *) Fix eckey_priv_encode so it immediately returns an error upon a failure
+     in i2d_ECPrivateKey.
+     [mancha <mancha1@zoho.com>]
+
+  *) Fix some double frees. These are not thought to be exploitable.
+     [mancha <mancha1@zoho.com>]
+
+  *) Fix for the attack described in the paper "Recovering OpenSSL
+     ECDSA Nonces Using the FLUSH+RELOAD Cache Side-channel Attack"
+     by Yuval Yarom and Naomi Benger. Details can be obtained from:
+     http://eprint.iacr.org/2014/140
+
+     Thanks to Yuval Yarom and Naomi Benger for discovering this
+     flaw and to Yuval Yarom for supplying a fix (CVE-2014-0076)
+     [Yuval Yarom and Naomi Benger]
+
+ Changes between 1.0.0k and 1.0.0l [6 Jan 2014]
+
+  *) Keep original DTLS digest and encryption contexts in retransmission
+     structures so we can use the previous session parameters if they need
+     to be resent. (CVE-2013-6450)
+     [Steve Henson]
+
+  *) Add option SSL_OP_SAFARI_ECDHE_ECDSA_BUG (part of SSL_OP_ALL) which
+     avoids preferring ECDHE-ECDSA ciphers when the client appears to be
+     Safari on OS X.  Safari on OS X 10.8..10.8.3 advertises support for
+     several ECDHE-ECDSA ciphers, but fails to negotiate them.  The bug
+     is fixed in OS X 10.8.4, but Apple have ruled out both hot fixing
+     10.8..10.8.3 and forcing users to upgrade to 10.8.4 or newer.
+     [Rob Stradling, Adam Langley]
+
+ Changes between 1.0.0j and 1.0.0k [5 Feb 2013]
+
+  *) Make the decoding of SSLv3, TLS and DTLS CBC records constant time.
+
+     This addresses the flaw in CBC record processing discovered by 
+     Nadhem Alfardan and Kenny Paterson. Details of this attack can be found
+     at: http://www.isg.rhul.ac.uk/tls/     
+
+     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
+     Security Group at Royal Holloway, University of London
+     (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
+     Emilia Käsper for the initial patch.
+     (CVE-2013-0169)
+     [Emilia Käsper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
+
+  *) Return an error when checking OCSP signatures when key is NULL.
+     This fixes a DoS attack. (CVE-2013-0166)
+     [Steve Henson]
+
+  *) Call OCSP Stapling callback after ciphersuite has been chosen, so
+     the right response is stapled. Also change SSL_get_certificate()
+     so it returns the certificate actually sent.
+     See http://rt.openssl.org/Ticket/Display.html?id=2836.
+     (This is a backport)
+     [Rob Stradling <rob.stradling@comodo.com>]
+
+  *) Fix possible deadlock when decoding public keys.
+     [Steve Henson]
+
+ Changes between 1.0.0i and 1.0.0j [10 May 2012]
+
+  [NB: OpenSSL 1.0.0i and later 1.0.0 patch levels were released after
+  OpenSSL 1.0.1.]
+
+  *) Sanity check record length before skipping explicit IV in DTLS
+     to fix DoS attack.
+
+     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
+     fuzzing as a service testing platform.
+     (CVE-2012-2333)
+     [Steve Henson]
+
+  *) Initialise tkeylen properly when encrypting CMS messages.
+     Thanks to Solar Designer of Openwall for reporting this issue.
+     [Steve Henson]
+
+ Changes between 1.0.0h and 1.0.0i [19 Apr 2012]
+
+  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
+     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
+     in CRYPTO_realloc_clean.
+
+     Thanks to Tavis Ormandy, Google Security Team, for discovering this
+     issue and to Adam Langley <agl@chromium.org> for fixing it.
+     (CVE-2012-2110)
+     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
+
+ Changes between 1.0.0g and 1.0.0h [12 Mar 2012]
+
+  *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
+     in CMS and PKCS7 code. When RSA decryption fails use a random key for
+     content decryption and always return the same error. Note: this attack
+     needs on average 2^20 messages so it only affects automated senders. The
+     old behaviour can be reenabled in the CMS code by setting the
+     CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where
+     an MMA defence is not necessary.
+     Thanks to Ivan Nestlerode <inestlerode@us.ibm.com> for discovering
+     this issue. (CVE-2012-0884)
+     [Steve Henson]
+
+  *) Fix CVE-2011-4619: make sure we really are receiving a 
+     client hello before rejecting multiple SGC restarts. Thanks to
+     Ivan Nestlerode <inestlerode@us.ibm.com> for discovering this bug.
+     [Steve Henson]
+
+ Changes between 1.0.0f and 1.0.0g [18 Jan 2012]
+
+  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
+     Thanks to Antonio Martin, Enterprise Secure Access Research and
+     Development, Cisco Systems, Inc. for discovering this bug and
+     preparing a fix. (CVE-2012-0050)
+     [Antonio Martin]
+
+ Changes between 1.0.0e and 1.0.0f [4 Jan 2012]
+
+  *) Nadhem Alfardan and Kenny Paterson have discovered an extension
+     of the Vaudenay padding oracle attack on CBC mode encryption
+     which enables an efficient plaintext recovery attack against
+     the OpenSSL implementation of DTLS. Their attack exploits timing
+     differences arising during decryption processing. A research
+     paper describing this attack can be found at:
+                  http://www.isg.rhul.ac.uk/~kp/dtls.pdf
+     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
+     Security Group at Royal Holloway, University of London
+     (www.isg.rhul.ac.uk) for discovering this flaw and to Robin Seggelmann
+     <seggelmann@fh-muenster.de> and Michael Tuexen <tuexen@fh-muenster.de>
+     for preparing the fix. (CVE-2011-4108)
+     [Robin Seggelmann, Michael Tuexen]
+
+  *) Clear bytes used for block padding of SSL 3.0 records.
+     (CVE-2011-4576)
+     [Adam Langley (Google)]
+
+  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
+     Kadianakis <desnacked@gmail.com> for discovering this issue and
+     Adam Langley for preparing the fix. (CVE-2011-4619)
+     [Adam Langley (Google)]
+
+  *) Check parameters are not NULL in GOST ENGINE. (CVE-2012-0027)
+     [Andrey Kulikov <amdeich@gmail.com>]
+
+  *) Prevent malformed RFC3779 data triggering an assertion failure.
+     Thanks to Andrew Chi, BBN Technologies, for discovering the flaw
+     and Rob Austein <sra@hactrn.net> for fixing it. (CVE-2011-4577)
+     [Rob Austein <sra@hactrn.net>]
+
+  *) Improved PRNG seeding for VOS.
+     [Paul Green <Paul.Green@stratus.com>]
+
+  *) Fix ssl_ciph.c set-up race.
+     [Adam Langley (Google)]
+
+  *) Fix spurious failures in ecdsatest.c.
+     [Emilia Käsper (Google)]
+
+  *) Fix the BIO_f_buffer() implementation (which was mixing different
+     interpretations of the '..._len' fields).
+     [Adam Langley (Google)]
+
+  *) Fix handling of BN_BLINDING: now BN_BLINDING_invert_ex (rather than
+     BN_BLINDING_invert_ex) calls BN_BLINDING_update, ensuring that concurrent
+     threads won't reuse the same blinding coefficients.
+
+     This also avoids the need to obtain the CRYPTO_LOCK_RSA_BLINDING
+     lock to call BN_BLINDING_invert_ex, and avoids one use of
+     BN_BLINDING_update for each BN_BLINDING structure (previously,
+     the last update always remained unused).
+     [Emilia Käsper (Google)]
+
+  *) In ssl3_clear, preserve s3->init_extra along with s3->rbuf.
+     [Bob Buckholz (Google)]
+
+ Changes between 1.0.0d and 1.0.0e [6 Sep 2011]
+
+  *) Fix bug where CRLs with nextUpdate in the past are sometimes accepted
+     by initialising X509_STORE_CTX properly. (CVE-2011-3207)
+     [Kaspar Brand <ossl@velox.ch>]
+
+  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular
+     for multi-threaded use of ECDH. (CVE-2011-3210)
+     [Adam Langley (Google)]
+
+  *) Fix x509_name_ex_d2i memory leak on bad inputs.
+     [Bodo Moeller]
+
+  *) Remove hard coded ecdsaWithSHA1 signature tests in ssl code and check
+     signature public key algorithm by using OID xref utilities instead.
+     Before this you could only use some ECC ciphersuites with SHA1 only.
+     [Steve Henson]
+
+  *) Add protection against ECDSA timing attacks as mentioned in the paper
+     by Billy Bob Brumley and Nicola Tuveri, see:
+
+	http://eprint.iacr.org/2011/232.pdf
+
+     [Billy Bob Brumley and Nicola Tuveri]
+
+ Changes between 1.0.0c and 1.0.0d [8 Feb 2011]
+
+  *) Fix parsing of OCSP stapling ClientHello extension. CVE-2011-0014
+     [Neel Mehta, Adam Langley, Bodo Moeller (Google)]
+
+  *) Fix bug in string printing code: if *any* escaping is enabled we must
+     escape the escape character (backslash) or the resulting string is
+     ambiguous.
+     [Steve Henson]
+
+ Changes between 1.0.0b and 1.0.0c  [2 Dec 2010]
+
+  *) Disable code workaround for ancient and obsolete Netscape browsers
+     and servers: an attacker can use it in a ciphersuite downgrade attack.
+     Thanks to Martin Rex for discovering this bug. CVE-2010-4180
+     [Steve Henson]
+
+  *) Fixed J-PAKE implementation error, originally discovered by
+     Sebastien Martini, further info and confirmation from Stefan
+     Arentz and Feng Hao. Note that this fix is a security fix. CVE-2010-4252
+     [Ben Laurie]
+
+ Changes between 1.0.0a and 1.0.0b  [16 Nov 2010]
+
+  *) Fix extension code to avoid race conditions which can result in a buffer
+     overrun vulnerability: resumed sessions must not be modified as they can
+     be shared by multiple threads. CVE-2010-3864
+     [Steve Henson]
+
+  *) Fix WIN32 build system to correctly link an ENGINE directory into
+     a DLL. 
+     [Steve Henson]
+
  Changes between 1.0.0 and 1.0.0a  [01 Jun 2010]
 
   *) Check return value of int_rsa_verify in pkey_rsa_verifyrecover 
@@ -853,17 +1488,6 @@
   *) Change 'Configure' script to enable Camellia by default.
      [NTT]
 
- Changes between 0.9.8n and 0.9.8o [xx XXX xxxx]
-
-  *) Correct a typo in the CMS ASN1 module which can result in invalid memory
-     access or freeing data twice (CVE-2010-0742)
-     [Steve Henson, Ronald Moesbergen <intercommit@gmail.com>]
-
-  *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more
-     common in certificates and some applications which only call
-     SSL_library_init and not OpenSSL_add_all_algorithms() will fail.
-     [Steve Henson]
-
  Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
 
   *) When rejecting SSL/TLS records due to an incorrect version number, never
@@ -872,8 +1496,8 @@
      - OpenSSL 0.9.8f if 'short' is longer than 16 bits,
      the previous behavior could result in a read attempt at NULL when
      receiving specific incorrect SSL/TLS records once record payload
-     protection is active.  (CVE-2010-####)
+     protection is active.  (CVE-2010-0740)
-     [Bodo Moeller, Adam Langley]
+     [Bodo Moeller, Adam Langley <agl@chromium.org>]
 
   *) Fix for CVE-2010-0433 where some kerberos enabled versions of OpenSSL 
      could be crashed if the relevant tables were not present (e.g. chrooted).

Configure

@@ -167,18 +167,19 @@ my %table=(
 "debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
 "debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
 "debug-ben-debug",	"gcc44:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O2 -pipe::(unknown)::::::",
+"debug-ben-debug-64",	"gcc:$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=strict-aliasing -Wno-error=uninitialized -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-ben-no-opt",	"gcc: -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3::(unknown)::::::",
 "debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+"debug-bodo",	"gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
 "debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-geoff32","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-geoff64","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
@@ -196,8 +197,8 @@ my %table=(
 "cc",		"cc:-O::(unknown)::::::",
 
 ####VOS Configurations
-"vos-gcc","gcc:-O3 -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
+"vos-gcc","gcc:-O3 -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
-"debug-vos-gcc","gcc:-O0 -g -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
+"debug-vos-gcc","gcc:-O0 -g -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
 
 #### Solaris x86 with GNU C setups
 # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it
@@ -237,7 +238,7 @@ my %table=(
 "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64",
+"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
 ####
 "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
@@ -438,8 +439,8 @@ my %table=(
 "aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
 # at build time. $OBJECT_MODE is respected at ./config stage!
-"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
+"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
-"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
+"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
 
 #
 # Cray T90 and similar (SDSC)
@@ -492,6 +493,8 @@ my %table=(
 # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
 "VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
 "VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
+"debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
+"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
 # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
 # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
 "VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
@@ -551,7 +554,7 @@ my %table=(
 "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 
 ##### A/UX
@@ -583,6 +586,7 @@ my %table=(
 );
 
 my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
+		    debug-VC-WIN64I debug-VC-WIN64A
 		    VC-NT VC-CE VC-WIN32 debug-VC-WIN32
 		    BC-32 
 		    netware-clib netware-clib-bsdsock
@@ -1012,6 +1016,8 @@ foreach (sort (keys %disabled))
 			else
 				{
 				push @skip, $algo;
+				# fix-up crypto/directory name(s)
+				@skip[$#skip]="whrlpool" if $algo eq "whirlpool";
 				print " (skip dir)";
 
 				$depflags .= " -DOPENSSL_NO_$ALGO";
@@ -1093,6 +1099,12 @@ my $ar = $ENV{'AR'} || "ar";
 my $arflags = $fields[$idx_arflags];
 my $multilib = $fields[$idx_multilib];
 
+# if $prefix/lib$multilib is not an existing directory, then
+# assume that it's not searched by linker automatically, in
+# which case adding $multilib suffix causes more grief than
+# we're ready to tolerate, so don't...
+$multilib="" if !-d "$prefix/lib$multilib";
+
 $libdir="lib$multilib" if $libdir eq "";
 
 $cflags = "$cflags$exp_cflags";
@@ -1102,6 +1114,12 @@ my ($prelflags,$postlflags)=split('%',$lflags);
 if (defined($postlflags))	{ $lflags=$postlflags;	}
 else				{ $lflags=$prelflags; undef $prelflags;	}
 
+if ($target =~ /^mingw/ && `$cc --target-help 2>&1` !~ m/\-mno\-cygwin/m)
+	{
+	$cflags =~ s/\-mno\-cygwin\s*//;
+	$shared_ldflag =~ s/\-mno\-cygwin\s*//;
+	}
+
 my $no_shared_warn=0;
 my $no_user_cflags=0;
 
@@ -1400,7 +1418,7 @@ else	{
 	$aes_obj=$aes_enc;
 	}
 $wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
-if ($wp_obj =~ /\.o$/)
+if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"})
 	{
 	$cflags.=" -DWHIRLPOOL_ASM";
 	}

FAQ

@@ -1,982 +1,2 @@
-OpenSSL  -  Frequently Asked Questions
+The FAQ is now maintained on the web:
---------------------------------------
+        https://www.openssl.org/docs/faq.html
-
-[MISC] Miscellaneous questions
-
-* Which is the current version of OpenSSL?
-* Where is the documentation?
-* How can I contact the OpenSSL developers?
-* Where can I get a compiled version of OpenSSL?
-* Why aren't tools like 'autoconf' and 'libtool' used?
-* What is an 'engine' version?
-* How do I check the authenticity of the OpenSSL distribution?
-
-[LEGAL] Legal questions
-
-* Do I need patent licenses to use OpenSSL?
-* Can I use OpenSSL with GPL software? 
-
-[USER] Questions on using the OpenSSL applications
-
-* Why do I get a "PRNG not seeded" error message?
-* Why do I get an "unable to write 'random state'" error message?
-* How do I create certificates or certificate requests?
-* Why can't I create certificate requests?
-* Why does <SSL program> fail with a certificate verify error?
-* Why can I only use weak ciphers when I connect to a server using OpenSSL?
-* How can I create DSA certificates?
-* Why can't I make an SSL connection using a DSA certificate?
-* How can I remove the passphrase on a private key?
-* Why can't I use OpenSSL certificates with SSL client authentication?
-* Why does my browser give a warning about a mismatched hostname?
-* How do I install a CA certificate into a browser?
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-* What is a "128 bit certificate"? Can I create one with OpenSSL?
-* Why does OpenSSL set the authority key identifier extension incorrectly?
-* How can I set up a bundle of commercial root CA certificates?
-
-[BUILD] Questions about building and testing OpenSSL
-
-* Why does the linker complain about undefined symbols?
-* Why does the OpenSSL test fail with "bc: command not found"?
-* Why does the OpenSSL test fail with "bc: 1 no implemented"?
-* Why does the OpenSSL test fail with "bc: stack empty"?
-* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
-* Why does the OpenSSL compilation fail with "ar: command not found"?
-* Why does the OpenSSL compilation fail on Win32 with VC++?
-* What is special about OpenSSL on Redhat?
-* Why does the OpenSSL compilation fail on MacOS X?
-* Why does the OpenSSL test suite fail on MacOS X?
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
-* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
-* Why does compiler fail to compile sha512.c?
-* Test suite still fails, what to do?
-
-[PROG] Questions about programming with OpenSSL
-
-* Is OpenSSL thread-safe?
-* I've compiled a program under Windows and it crashes: why?
-* How do I read or write a DER encoded buffer using the ASN1 functions?
-* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
-* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
-* I've called <some function> and it fails, why?
-* I just get a load of numbers for the error output, what do they mean?
-* Why do I get errors about unknown algorithms?
-* Why can't the OpenSSH configure script detect OpenSSL?
-* Can I use OpenSSL's SSL library with non-blocking I/O?
-* Why doesn't my server application receive a client certificate?
-* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
-* I think I've detected a memory leak, is this a bug?
-* Why does Valgrind complain about the use of uninitialized data?
-* Why doesn't a memory BIO work when a file does?
-* Where are the declarations and implementations of d2i_X509() etc?
-
-===============================================================================
-
-[MISC] ========================================================================
-
-* Which is the current version of OpenSSL?
-
-The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 1.0.0a was released on Jun 1st, 2010.
-
-In addition to the current stable release, you can also access daily
-snapshots of the OpenSSL development version at <URL:
-ftp://ftp.openssl.org/snapshot/>, or get it by anonymous CVS access.
-
-
-* Where is the documentation?
-
-OpenSSL is a library that provides cryptographic functionality to
-applications such as secure web servers.  Be sure to read the
-documentation of the application you want to use.  The INSTALL file
-explains how to install this library.
-
-OpenSSL includes a command line utility that can be used to perform a
-variety of cryptographic functions.  It is described in the openssl(1)
-manpage.  Documentation for developers is currently being written. Many
-manual pages are available; overviews over libcrypto and
-libssl are given in the crypto(3) and ssl(3) manpages.
-
-The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a
-different directory if you specified one as described in INSTALL).
-In addition, you can read the most current versions at
-<URL: http://www.openssl.org/docs/>. Note that the online documents refer
-to the very latest development versions of OpenSSL and may include features
-not present in released versions. If in doubt refer to the documentation
-that came with the version of OpenSSL you are using.
-
-For information on parts of libcrypto that are not yet documented, you
-might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
-predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
-of this still applies to OpenSSL.
-
-There is some documentation about certificate extensions and PKCS#12
-in doc/openssl.txt
-
-The original SSLeay documentation is included in OpenSSL as
-doc/ssleay.txt.  It may be useful when none of the other resources
-help, but please note that it reflects the obsolete version SSLeay
-0.6.6.
-
-
-* How can I contact the OpenSSL developers?
-
-The README file describes how to submit bug reports and patches to
-OpenSSL.  Information on the OpenSSL mailing lists is available from
-<URL: http://www.openssl.org>.
-
-
-* Where can I get a compiled version of OpenSSL?
-
-You can finder pointers to binary distributions in
-http://www.openssl.org/related/binaries.html .
-
-Some applications that use OpenSSL are distributed in binary form.
-When using such an application, you don't need to install OpenSSL
-yourself; the application will include the required parts (e.g. DLLs).
-
-If you want to build OpenSSL on a Windows system and you don't have
-a C compiler, read the "Mingw32" section of INSTALL.W32 for information
-on how to obtain and install the free GNU C compiler.
-
-A number of Linux and *BSD distributions include OpenSSL.
-
-
-* Why aren't tools like 'autoconf' and 'libtool' used?
-
-autoconf will probably be used in future OpenSSL versions. If it was
-less Unix-centric, it might have been used much earlier.
-
-* What is an 'engine' version?
-
-With version 0.9.6 OpenSSL was extended to interface to external crypto
-hardware. This was realized in a special release '0.9.6-engine'. With
-version 0.9.7 the changes were merged into the main development line,
-so that the special release is no longer necessary.
-
-* How do I check the authenticity of the OpenSSL distribution?
-
-We provide MD5 digests and ASC signatures of each tarball.
-Use MD5 to check that a tarball from a mirror site is identical:
-
-   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
-
-You can check authenticity using pgp or gpg. You need the OpenSSL team
-member public key used to sign it (download it from a key server, see a
-list of keys at <URL: http://www.openssl.org/about/>). Then
-just do:
-
-   pgp TARBALL.asc
-
-[LEGAL] =======================================================================
-
-* Do I need patent licenses to use OpenSSL?
-
-The patents section of the README file lists patents that may apply to
-you if you want to use OpenSSL.  For information on intellectual
-property rights, please consult a lawyer.  The OpenSSL team does not
-offer legal advice.
-
-You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
- ./config no-idea no-mdc2 no-rc5
-
-
-* Can I use OpenSSL with GPL software?
-
-On many systems including the major Linux and BSD distributions, yes (the
-GPL does not place restrictions on using libraries that are part of the
-normal operating system distribution).
-
-On other systems, the situation is less clear. Some GPL software copyright
-holders claim that you infringe on their rights if you use OpenSSL with
-their software on operating systems that don't normally include OpenSSL.
-
-If you develop open source software that uses OpenSSL, you may find it
-useful to choose an other license than the GPL, or state explicitly that
-"This program is released under the GPL with the additional exemption that
-compiling, linking, and/or using OpenSSL is allowed."  If you are using
-GPL software developed by others, you may want to ask the copyright holder
-for permission to use their software with OpenSSL.
-
-
-[USER] ========================================================================
-
-* Why do I get a "PRNG not seeded" error message?
-
-Cryptographic software needs a source of unpredictable data to work
-correctly.  Many open source operating systems provide a "randomness
-device" (/dev/urandom or /dev/random) that serves this purpose.
-All OpenSSL versions try to use /dev/urandom by default; starting with
-version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
-available.
-
-On other systems, applications have to call the RAND_add() or
-RAND_seed() function with appropriate data before generating keys or
-performing public key encryption. (These functions initialize the
-pseudo-random number generator, PRNG.)  Some broken applications do
-not do this.  As of version 0.9.5, the OpenSSL functions that need
-randomness report an error if the random number generator has not been
-seeded with at least 128 bits of randomness.  If this error occurs and
-is not discussed in the documentation of the application you are
-using, please contact the author of that application; it is likely
-that it never worked correctly.  OpenSSL 0.9.5 and later make the
-error visible by refusing to perform potentially insecure encryption.
-
-If you are using Solaris 8, you can add /dev/urandom and /dev/random
-devices by installing patch 112438 (Sparc) or 112439 (x86), which are
-available via the Patchfinder at <URL: http://sunsolve.sun.com>
-(Solaris 9 includes these devices by default). For /dev/random support
-for earlier Solaris versions, see Sun's statement at
-<URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
-(the SUNWski package is available in patch 105710).
-
-On systems without /dev/urandom and /dev/random, it is a good idea to
-use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
-details.  Starting with version 0.9.7, OpenSSL will automatically look
-for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and
-/etc/entropy.
-
-Most components of the openssl command line utility automatically try
-to seed the random number generator from a file.  The name of the
-default seeding file is determined as follows: If environment variable
-RANDFILE is set, then it names the seeding file.  Otherwise if
-environment variable HOME is set, then the seeding file is $HOME/.rnd.
-If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will
-use file .rnd in the current directory while OpenSSL 0.9.6a uses no
-default seeding file at all.  OpenSSL 0.9.6b and later will behave
-similarly to 0.9.6a, but will use a default of "C:\" for HOME on
-Windows systems if the environment variable has not been set.
-
-If the default seeding file does not exist or is too short, the "PRNG
-not seeded" error message may occur.
-
-The openssl command line utility will write back a new state to the
-default seeding file (and create this file if necessary) unless
-there was no sufficient seeding.
-
-Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work.
-Use the "-rand" option of the OpenSSL command line tools instead.
-The $RANDFILE environment variable and $HOME/.rnd are only used by the
-OpenSSL command line tools. Applications using the OpenSSL library
-provide their own configuration options to specify the entropy source,
-please check out the documentation coming the with application.
-
-
-* Why do I get an "unable to write 'random state'" error message?
-
-
-Sometimes the openssl command line utility does not abort with
-a "PRNG not seeded" error message, but complains that it is
-"unable to write 'random state'".  This message refers to the
-default seeding file (see previous answer).  A possible reason
-is that no default filename is known because neither RANDFILE
-nor HOME is set.  (Versions up to 0.9.6 used file ".rnd" in the
-current directory in this case, but this has changed with 0.9.6a.)
-
-
-* How do I create certificates or certificate requests?
-
-Check out the CA.pl(1) manual page. This provides a simple wrapper round
-the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
-out the manual pages for the individual utilities and the certificate
-extensions documentation (currently in doc/openssl.txt).
-
-
-* Why can't I create certificate requests?
-
-You typically get the error:
-
-	unable to find 'distinguished_name' in config
-	problems making Certificate Request
-
-This is because it can't find the configuration file. Check out the
-DIAGNOSTICS section of req(1) for more information.
-
-
-* Why does <SSL program> fail with a certificate verify error?
-
-This problem is usually indicated by log messages saying something like
-"unable to get local issuer certificate" or "self signed certificate".
-When a certificate is verified its root CA must be "trusted" by OpenSSL
-this typically means that the CA certificate must be placed in a directory
-or file and the relevant program configured to read it. The OpenSSL program
-'verify' behaves in a similar way and issues similar error messages: check
-the verify(1) program manual page for more information.
-
-
-* Why can I only use weak ciphers when I connect to a server using OpenSSL?
-
-This is almost certainly because you are using an old "export grade" browser
-which only supports weak encryption. Upgrade your browser to support 128 bit
-ciphers.
-
-
-* How can I create DSA certificates?
-
-Check the CA.pl(1) manual page for a DSA certificate example.
-
-
-* Why can't I make an SSL connection to a server using a DSA certificate?
-
-Typically you'll see a message saying there are no shared ciphers when
-the same setup works fine with an RSA certificate. There are two possible
-causes. The client may not support connections to DSA servers most web
-browsers (including Netscape and MSIE) only support connections to servers
-supporting RSA cipher suites. The other cause is that a set of DH parameters
-has not been supplied to the server. DH parameters can be created with the
-dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example:
-check the source to s_server in apps/s_server.c for an example.
-
-
-* How can I remove the passphrase on a private key?
-
-Firstly you should be really *really* sure you want to do this. Leaving
-a private key unencrypted is a major security risk. If you decide that
-you do have to do this check the EXAMPLES sections of the rsa(1) and
-dsa(1) manual pages.
-
-
-* Why can't I use OpenSSL certificates with SSL client authentication?
-
-What will typically happen is that when a server requests authentication
-it will either not include your certificate or tell you that you have
-no client certificates (Netscape) or present you with an empty list box
-(MSIE). The reason for this is that when a server requests a client
-certificate it includes a list of CAs names which it will accept. Browsers
-will only let you select certificates from the list on the grounds that
-there is little point presenting a certificate which the server will
-reject.
-
-The solution is to add the relevant CA certificate to your servers "trusted
-CA list". How you do this depends on the server software in uses. You can
-print out the servers list of acceptable CAs using the OpenSSL s_client tool:
-
-openssl s_client -connect www.some.host:443 -prexit
-
-If your server only requests certificates on certain URLs then you may need
-to manually issue an HTTP GET command to get the list when s_client connects:
-
-GET /some/page/needing/a/certificate.html
-
-If your CA does not appear in the list then this confirms the problem.
-
-
-* Why does my browser give a warning about a mismatched hostname?
-
-Browsers expect the server's hostname to match the value in the commonName
-(CN) field of the certificate. If it does not then you get a warning.
-
-
-* How do I install a CA certificate into a browser?
-
-The usual way is to send the DER encoded certificate to the browser as
-MIME type application/x-x509-ca-cert, for example by clicking on an appropriate
-link. On MSIE certain extensions such as .der or .cacert may also work, or you
-can import the certificate using the certificate import wizard.
-
-You can convert a certificate to DER form using the command:
-
-openssl x509 -in ca.pem -outform DER -out ca.der
-
-Occasionally someone suggests using a command such as:
-
-openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem
-
-DO NOT DO THIS! This command will give away your CAs private key and
-reduces its security to zero: allowing anyone to forge certificates in
-whatever name they choose.
-
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-
-The ways to print out the oneline format of the DN (Distinguished Name) have
-been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
-interface, the "-nameopt" option could be introduded. See the manual
-page of the "openssl x509" commandline tool for details. The old behaviour
-has however been left as default for the sake of compatibility.
-
-* What is a "128 bit certificate"? Can I create one with OpenSSL?
-
-The term "128 bit certificate" is a highly misleading marketing term. It does
-*not* refer to the size of the public key in the certificate! A certificate
-containing a 128 bit RSA key would have negligible security.
-
-There were various other names such as "magic certificates", "SGC
-certificates", "step up certificates" etc.
-
-You can't generally create such a certificate using OpenSSL but there is no
-need to any more. Nowadays web browsers using unrestricted strong encryption
-are generally available.
-
-When there were tight restrictions on the export of strong encryption
-software from the US only weak encryption algorithms could be freely exported
-(initially 40 bit and then 56 bit). It was widely recognised that this was
-inadequate. A relaxation of the rules allowed the use of strong encryption but
-only to an authorised server.
-
-Two slighly different techniques were developed to support this, one used by
-Netscape was called "step up", the other used by MSIE was called "Server Gated
-Cryptography" (SGC). When a browser initially connected to a server it would
-check to see if the certificate contained certain extensions and was issued by
-an authorised authority. If these test succeeded it would reconnect using
-strong encryption.
-
-Only certain (initially one) certificate authorities could issue the
-certificates and they generally cost more than ordinary certificates.
-
-Although OpenSSL can create certificates containing the appropriate extensions
-the certificate would not come from a permitted authority and so would not
-be recognized.
-
-The export laws were later changed to allow almost unrestricted use of strong
-encryption so these certificates are now obsolete.
-
-
-* Why does OpenSSL set the authority key identifier (AKID) extension incorrectly?
-
-It doesn't: this extension is often the cause of confusion.
-
-Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose
-certificate C contains AKID.
-
-The purpose of this extension is to identify the authority certificate B. This
-can be done either by including the subject key identifier of B or its issuer
-name and serial number.
-
-In this latter case because it is identifying certifcate B it must contain the
-issuer name and serial number of B.
-
-It is often wrongly assumed that it should contain the subject name of B. If it
-did this would be redundant information because it would duplicate the issuer
-name of C.
-
-
-* How can I set up a bundle of commercial root CA certificates?
-
-The OpenSSL software is shipped without any root CA certificate as the
-OpenSSL project does not have any policy on including or excluding
-any specific CA and does not intend to set up such a policy. Deciding
-about which CAs to support is up to application developers or
-administrators.
-
-Other projects do have other policies so you can for example extract the CA
-bundle used by Mozilla and/or modssl as described in this article:
-
-  http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html
-
-
-[BUILD] =======================================================================
-
-* Why does the linker complain about undefined symbols?
-
-Maybe the compilation was interrupted, and make doesn't notice that
-something is missing.  Run "make clean; make".
-
-If you used ./Configure instead of ./config, make sure that you
-selected the right target.  File formats may differ slightly between
-OS versions (for example sparcv8/sparcv9, or a.out/elf).
-
-In case you get errors about the following symbols, use the config
-option "no-asm", as described in INSTALL:
-
- BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt,
- CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt,
- RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words,
- bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4,
- bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3,
- des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3,
- des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order
-
-If none of these helps, you may want to try using the current snapshot.
-If the problem persists, please submit a bug report.
-
-
-* Why does the OpenSSL test fail with "bc: command not found"?
-
-You didn't install "bc", the Unix calculator.  If you want to run the
-tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor.
-
-
-* Why does the OpenSSL test fail with "bc: 1 no implemented"?
-
-On some SCO installations or versions, bc has a bug that gets triggered
-when you run the test suite (using "make test").  The message returned is
-"bc: 1 not implemented".
-
-The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
-for download instructions) can be safely used, for example.
-
-
-* Why does the OpenSSL test fail with "bc: stack empty"?
-
-On some DG/ux versions, bc seems to have a too small stack for calculations
-that the OpenSSL bntest throws at it.  This gets triggered when you run the
-test suite (using "make test").  The message returned is "bc: stack empty".
-
-The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
-for download instructions) can be safely used, for example.
-
-
-* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
-
-On some Alpha installations running Tru64 Unix and Compaq C, the compilation
-of crypto/sha/sha_dgst.c fails with the message 'Fatal:  Insufficient virtual
-memory to continue compilation.'  As far as the tests have shown, this may be
-a compiler bug.  What happens is that it eats up a lot of resident memory
-to build something, probably a table.  The problem is clearly in the
-optimization code, because if one eliminates optimization completely (-O0),
-the compilation goes through (and the compiler consumes about 2MB of resident
-memory instead of 240MB or whatever one's limit is currently).
-
-There are three options to solve this problem:
-
-1. set your current data segment size soft limit higher.  Experience shows
-that about 241000 kbytes seems to be enough on an AlphaServer DS10.  You do
-this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of
-kbytes to set the limit to.
-
-2. If you have a hard limit that is lower than what you need and you can't
-get it changed, you can compile all of OpenSSL with -O0 as optimization
-level.  This is however not a very nice thing to do for those who expect to
-get the best result from OpenSSL.  A bit more complicated solution is the
-following:
-
------ snip:start -----
-  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
-       sed -e 's/ -O[0-9] / -O0 /'`"
-  rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
-  make
------ snip:end -----
-
-This will only compile sha_dgst.c with -O0, the rest with the optimization
-level chosen by the configuration process.  When the above is done, do the
-test and installation and you're set.
-
-3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It 
-should not be used and is not used in SSL/TLS nor any other recognized
-protocol in either case.
-
-
-* Why does the OpenSSL compilation fail with "ar: command not found"?
-
-Getting this message is quite usual on Solaris 2, because Sun has hidden
-away 'ar' and other development commands in directories that aren't in
-$PATH by default.  One of those directories is '/usr/ccs/bin'.  The
-quickest way to fix this is to do the following (it assumes you use sh
-or any sh-compatible shell):
-
------ snip:start -----
-  PATH=${PATH}:/usr/ccs/bin; export PATH
------ snip:end -----
-
-and then redo the compilation.  What you should really do is make sure
-'/usr/ccs/bin' is permanently in your $PATH, for example through your
-'.profile' (again, assuming you use a sh-compatible shell).
-
-
-* Why does the OpenSSL compilation fail on Win32 with VC++?
-
-Sometimes, you may get reports from VC++ command line (cl) that it
-can't find standard include files like stdio.h and other weirdnesses.
-One possible cause is that the environment isn't correctly set up.
-To solve that problem for VC++ versions up to 6, one should run
-VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
-installation directory (somewhere under 'Program Files').  For VC++
-version 7 (and up?), which is also called VS.NET, the file is called
-VSVARS32.BAT instead.
-This needs to be done prior to running NMAKE, and the changes are only
-valid for the current DOS session.
-
-
-* What is special about OpenSSL on Redhat?
-
-Red Hat Linux (release 7.0 and later) include a preinstalled limited
-version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
-is disabled in this version. The same may apply to other Linux distributions.
-Users may therefore wish to install more or all of the features left out.
-
-To do this you MUST ensure that you do not overwrite the openssl that is in
-/usr/bin on your Red Hat machine. Several packages depend on this file,
-including sendmail and ssh. /usr/local/bin is a good alternative choice. The
-libraries that come with Red Hat 7.0 onwards have different names and so are
-not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and
-/lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and
-/lib/libcrypto.so.2 respectively).
-
-Please note that we have been advised by Red Hat attempting to recompile the
-openssl rpm with all the cryptography enabled will not work. All other
-packages depend on the original Red Hat supplied openssl package. It is also
-worth noting that due to the way Red Hat supplies its packages, updates to
-openssl on each distribution never change the package version, only the
-build number. For example, on Red Hat 7.1, the latest openssl package has
-version number 0.9.6 and build number 9 even though it contains all the
-relevant updates in packages up to and including 0.9.6b.
-
-A possible way around this is to persuade Red Hat to produce a non-US
-version of Red Hat Linux.
-
-FYI: Patent numbers and expiry dates of US patents:
-MDC-2: 4,908,861 13/03/2007
-IDEA:  5,214,703 25/05/2010
-RC5:   5,724,428 03/03/2015
-
-
-* Why does the OpenSSL compilation fail on MacOS X?
-
-If the failure happens when trying to build the "openssl" binary, with
-a large number of undefined symbols, it's very probable that you have
-OpenSSL 0.9.6b delivered with the operating system (you can find out by
-running '/usr/bin/openssl version') and that you were trying to build
-OpenSSL 0.9.7 or newer.  The problem is that the loader ('ld') in
-MacOS X has a misfeature that's quite difficult to go around.
-Look in the file PROBLEMS for a more detailed explanation and for possible
-solutions.
-
-
-* Why does the OpenSSL test suite fail on MacOS X?
-
-If the failure happens when running 'make test' and the RC4 test fails,
-it's very probable that you have OpenSSL 0.9.6b delivered with the
-operating system (you can find out by running '/usr/bin/openssl version')
-and that you were trying to build OpenSSL 0.9.6d.  The problem is that
-the loader ('ld') in MacOS X has a misfeature that's quite difficult to
-go around and has linked the programs "openssl" and the test programs
-with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
-libraries you just built.
-Look in the file PROBLEMS for a more detailed explanation and for possible
-solutions.
-
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-
-Failure in BN_sqr test is most likely caused by a failure to configure the
-toolkit for current platform or lack of support for the platform in question.
-Run './config -t' and './apps/openssl version -p'. Do these platform
-identifiers match? If they don't, then you most likely failed to run
-./config and you're hereby advised to do so before filing a bug report.
-If ./config itself fails to run, then it's most likely problem with your
-local environment and you should turn to your system administrator (or
-similar). If identifiers match (and/or no alternative identifier is
-suggested by ./config script), then the platform is unsupported. There might
-or might not be a workaround. Most notably on SPARC64 platforms with GNU
-C compiler you should be able to produce a working build by running
-'./config -m32'. I understand that -m32 might not be what you want/need,
-but the build should be operational. For further details turn to
-<openssl-dev@openssl.org>.
-
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
-
-As of 0.9.7 assembler routines were overhauled for position independence
-of the machine code, which is essential for shared library support. For
-some reason OpenBSD is equipped with an out-of-date GNU assembler which
-finds the new code offensive. To work around the problem, configure with
-no-asm (and sacrifice a great deal of performance) or patch your assembler
-according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
-For your convenience a pre-compiled replacement binary is provided at
-<URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
-Reportedly elder *BSD a.out platforms also suffer from this problem and
-remedy should be same. Provided binary is statically linked and should be
-working across wider range of *BSD branches, not just OpenBSD.
-
-* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
-
-If the test program in question fails withs SIGILL, Illegal Instruction
-exception, then you more than likely to run SSE2-capable CPU, such as
-Intel P4, under control of kernel which does not support SSE2
-instruction extentions. See accompanying INSTALL file and
-OPENSSL_ia32cap(3) documentation page for further information.
-
-* Why does compiler fail to compile sha512.c?
-
-OpenSSL SHA-512 implementation depends on compiler support for 64-bit
-integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a
-couple] lack support for this and therefore are incapable of compiling
-the module in question. The recommendation is to disable SHA-512 by
-adding no-sha512 to ./config [or ./Configure] command line. Another
-possible alternative might be to switch to GCC.
-
-* Test suite still fails, what to do?
-
-Another common reason for failure to complete some particular test is
-simply bad code generated by a buggy component in toolchain or deficiency
-in run-time environment. There are few cases documented in PROBLEMS file,
-consult it for possible workaround before you beat the drum. Even if you
-don't find solution or even mention there, do reserve for possibility of
-a compiler bug. Compiler bugs might appear in rather bizarre ways, they
-never make sense, and tend to emerge when you least expect them. In order
-to identify one, drop optimization level, e.g. by editing CFLAG line in
-top-level Makefile, recompile and re-run the test.
-
-[PROG] ========================================================================
-
-* Is OpenSSL thread-safe?
-
-Yes (with limitations: an SSL connection may not concurrently be used
-by multiple threads).  On Windows and many Unix systems, OpenSSL
-automatically uses the multi-threaded versions of the standard
-libraries.  If your platform is not one of these, consult the INSTALL
-file.
-
-Multi-threaded applications must provide two callback functions to
-OpenSSL by calling CRYPTO_set_locking_callback() and
-CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
-including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
-and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
-and friends. This is described in the threads(3) manpage.
-
-* I've compiled a program under Windows and it crashes: why?
-
-This is usually because you've missed the comment in INSTALL.W32.
-Your application must link against the same version of the Win32
-C-Runtime against which your openssl libraries were linked.  The
-default version for OpenSSL is /MD - "Multithreaded DLL".
-
-If you are using Microsoft Visual C++'s IDE (Visual Studio), in
-many cases, your new project most likely defaulted to "Debug
-Singlethreaded" - /ML.  This is NOT interchangeable with /MD and your
-program will crash, typically on the first BIO related read or write
-operation.
-
-For each of the six possible link stage configurations within Win32,
-your application must link  against the same by which OpenSSL was
-built.  If you are using MS Visual C++ (Studio) this can be changed
-by:
-
- 1. Select Settings... from the Project Menu.
- 2. Select the C/C++ Tab.
- 3. Select "Code Generation from the "Category" drop down list box
- 4. Select the Appropriate library (see table below) from the "Use
-    run-time library" drop down list box.  Perform this step for both
-    your debug and release versions of your application (look at the
-    top left of the settings panel to change between the two)
-
-    Single Threaded           /ML        -  MS VC++ often defaults to
-                                            this for the release
-                                            version of a new project.
-    Debug Single Threaded     /MLd       -  MS VC++ often defaults to
-                                            this for the debug version
-                                            of a new project.
-    Multithreaded             /MT
-    Debug Multithreaded       /MTd
-    Multithreaded DLL         /MD        -  OpenSSL defaults to this.
-    Debug Multithreaded DLL   /MDd
-
-Note that debug and release libraries are NOT interchangeable.  If you
-built OpenSSL with /MD your application must use /MD and cannot use /MDd.
-
-As per 0.9.8 the above limitation is eliminated for .DLLs. OpenSSL
-.DLLs compiled with some specific run-time option [we insist on the
-default /MD] can be deployed with application compiled with different
-option or even different compiler. But there is a catch! Instead of
-re-compiling OpenSSL toolkit, as you would have to with prior versions,
-you have to compile small C snippet with compiler and/or options of
-your choice. The snippet gets installed as
-<install-root>/include/openssl/applink.c and should be either added to
-your application project or simply #include-d in one [and only one]
-of your application source files. Failure to link this shim module
-into your application manifests itself as fatal "no OPENSSL_Applink"
-run-time error. An explicit reminder is due that in this situation
-[mixing compiler options] it is as important to add CRYPTO_malloc_init
-prior first call to OpenSSL.
-
-* How do I read or write a DER encoded buffer using the ASN1 functions?
-
-You have two options. You can either use a memory BIO in conjunction
-with the i2d_*_bio() or d2i_*_bio() functions or you can use the
-i2d_*(), d2i_*() functions directly. Since these are often the
-cause of grief here are some code fragments using PKCS7 as an example:
-
- unsigned char *buf, *p;
- int len;
-
- len = i2d_PKCS7(p7, NULL);
- buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
- p = buf;
- i2d_PKCS7(p7, &p);
-
-At this point buf contains the len bytes of the DER encoding of
-p7.
-
-The opposite assumes we already have len bytes in buf:
-
- unsigned char *p;
- p = buf;
- p7 = d2i_PKCS7(NULL, &p, len);
-
-At this point p7 contains a valid PKCS7 structure of NULL if an error
-occurred. If an error occurred ERR_print_errors(bio) should give more
-information.
-
-The reason for the temporary variable 'p' is that the ASN1 functions
-increment the passed pointer so it is ready to read or write the next
-structure. This is often a cause of problems: without the temporary
-variable the buffer pointer is changed to point just after the data
-that has been read or written. This may well be uninitialized data
-and attempts to free the buffer will have unpredictable results
-because it no longer points to the same address.
-
-
-* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
-
-The short answer is yes, because DER is a special case of BER and OpenSSL
-ASN1 decoders can process BER.
-
-The longer answer is that ASN1 structures can be encoded in a number of
-different ways. One set of ways is the Basic Encoding Rules (BER) with various
-permissible encodings. A restriction of BER is the Distinguished Encoding
-Rules (DER): these uniquely specify how a given structure is encoded.
-
-Therefore, because DER is a special case of BER, DER is an acceptable encoding
-for BER.
-
-
-* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
-
-This usually happens when you try compiling something using the PKCS#12
-macros with a C++ compiler. There is hardly ever any need to use the
-PKCS#12 macros in a program, it is much easier to parse and create
-PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
-documented in doc/openssl.txt and with examples in demos/pkcs12. The
-'pkcs12' application has to use the macros because it prints out 
-debugging information.
-
-
-* I've called <some function> and it fails, why?
-
-Before submitting a report or asking in one of the mailing lists, you
-should try to determine the cause. In particular, you should call
-ERR_print_errors() or ERR_print_errors_fp() after the failed call
-and see if the message helps. Note that the problem may occur earlier
-than you think -- you should check for errors after every call where
-it is possible, otherwise the actual problem may be hidden because
-some OpenSSL functions clear the error state.
-
-
-* I just get a load of numbers for the error output, what do they mean?
-
-The actual format is described in the ERR_print_errors() manual page.
-You should call the function ERR_load_crypto_strings() before hand and
-the message will be output in text form. If you can't do this (for example
-it is a pre-compiled binary) you can use the errstr utility on the error
-code itself (the hex digits after the second colon).
-
-
-* Why do I get errors about unknown algorithms?
-
-The cause is forgetting to load OpenSSL's table of algorithms with
-OpenSSL_add_all_algorithms(). See the manual page for more information. This
-can cause several problems such as being unable to read in an encrypted
-PEM file, unable to decrypt a PKCS#12 file or signature failure when
-verifying certificates.
-
-* Why can't the OpenSSH configure script detect OpenSSL?
-
-Several reasons for problems with the automatic detection exist.
-OpenSSH requires at least version 0.9.5a of the OpenSSL libraries.
-Sometimes the distribution has installed an older version in the system
-locations that is detected instead of a new one installed. The OpenSSL
-library might have been compiled for another CPU or another mode (32/64 bits).
-Permissions might be wrong.
-
-The general answer is to check the config.log file generated when running
-the OpenSSH configure script. It should contain the detailed information
-on why the OpenSSL library was not detected or considered incompatible.
-
-
-* Can I use OpenSSL's SSL library with non-blocking I/O?
-
-Yes; make sure to read the SSL_get_error(3) manual page!
-
-A pitfall to avoid: Don't assume that SSL_read() will just read from
-the underlying transport or that SSL_write() will just write to it --
-it is also possible that SSL_write() cannot do any useful work until
-there is data to read, or that SSL_read() cannot do anything until it
-is possible to send data.  One reason for this is that the peer may
-request a new TLS/SSL handshake at any time during the protocol,
-requiring a bi-directional message exchange; both SSL_read() and
-SSL_write() will try to continue any pending handshake.
-
-
-* Why doesn't my server application receive a client certificate?
-
-Due to the TLS protocol definition, a client will only send a certificate,
-if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the
-SSL_CTX_set_verify() function to enable the use of client certificates.
-
-
-* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
-
-For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier
-versions, uniqueIdentifier was incorrectly used for X.509 certificates.
-The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier.
-Change your code to use the new name when compiling against OpenSSL 0.9.7.
-
-
-* I think I've detected a memory leak, is this a bug?
-
-In most cases the cause of an apparent memory leak is an OpenSSL internal table
-that is allocated when an application starts up. Since such tables do not grow
-in size over time they are harmless.
-
-These internal tables can be freed up when an application closes using various
-functions.  Currently these include following:
-
-Thread-local cleanup functions:
-
-  ERR_remove_state()
-
-Application-global cleanup functions that are aware of usage (and therefore
-thread-safe):
-
-  ENGINE_cleanup() and CONF_modules_unload()
-
-"Brutal" (thread-unsafe) Application-global cleanup functions:
-
-  ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
-
-
-* Why does Valgrind complain about the use of uninitialized data?
-
-When OpenSSL's PRNG routines are called to generate random numbers the supplied
-buffer contents are mixed into the entropy pool: so it technically does not
-matter whether the buffer is initialized at this point or not.  Valgrind (and
-other test tools) will complain about this. When using Valgrind, make sure the
-OpenSSL library has been compiled with the PURIFY macro defined (-DPURIFY)
-to get rid of these warnings.
-
-
-* Why doesn't a memory BIO work when a file does?
-
-This can occur in several cases for example reading an S/MIME email message.
-The reason is that a memory BIO can do one of two things when all the data
-has been read from it.
-
-The default behaviour is to indicate that no more data is available and that
-the call should be retried, this is to allow the application to fill up the BIO
-again if necessary.
-
-Alternatively it can indicate that no more data is available and that EOF has
-been reached.
-
-If a memory BIO is to behave in the same way as a file this second behaviour
-is needed. This must be done by calling:
-
-   BIO_set_mem_eof_return(bio, 0);
-
-See the manual pages for more details.
-
-
-* Where are the declarations and implementations of d2i_X509() etc?
-
-These are defined and implemented by macros of the form:
-
-
- DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509)
-
-The implementation passes an ASN1 "template" defining the structure into an
-ASN1 interpreter using generalised functions such as ASN1_item_d2i().
-
-
-===============================================================================

INSTALL.VMS

@@ -71,7 +71,7 @@ the top to understand how to use them.  However, if you want to
 compile all you can get, the simplest is to use MAKEVMS.COM in the top
 directory.  The syntax is the following:
 
-  @MAKEVMS <option> <rsaref-p> <debug-p> [<compiler>]
+  @MAKEVMS <option> <bits> <debug-p> [<compiler>]
 
 <option> must be one of the following:
 
@@ -87,24 +87,11 @@ directory.  The syntax is the following:
       TEST      Just build the "[.xxx.EXE.TEST]" test programs for OpenSSL.
       APPS      Just build the "[.xxx.EXE.APPS]" application programs for OpenSSL.
 
-<rsaref-p> must be one of the following:
+<bits> must be one of the following:
 
-      RSAREF    compile using the RSAREF Library
+      ""        compile using default pointer size
-      NORSAREF  compile without using RSAREF
+      32        compile using 32 bit pointer size
-
+      64        compile using 64 bit pointer size
-Note 0: The RSAREF library IS NO LONGER NEEDED.  The RSA patent
-        expires September 20, 2000, and RSA Security chose to make
-        the algorithm public domain two weeks before that.
-
-Note 1: If you still want to use RSAREF, the library is NOT INCLUDED
-        and you have to download it.  RSA Security doesn't carry it
-        any more, but there are a number of places where you can find
-        it.  You have to get the ".tar-Z" file as the ".zip" file
-        doesn't have the directory structure stored.  You have to
-        extract the file into the [.RSAREF] directory as that is where
-        the scripts will look for the files.
-
-Note 2: I have never done this, so I've no idea if it works or not.
 
 <debug-p> must be one of the following:
 
@@ -117,12 +104,13 @@ Note 2: I have never done this, so I've no idea if it works or not.
       GNUC      For GNU C.
 
 
-You will find the crypto library in [.xxx.EXE.CRYPTO], called LIBCRYPTO.OLB,
+You will find the crypto library in [.xxx.EXE.CRYPTO] (where xxx is VAX,
-where xxx is VAX or AXP.  You will find the SSL library in [.xxx.EXE.SSL],
+ALPHA or IA64), called SSL_LIBCRYPTO32.OLB or SSL_LIBCRYPTO.OLB depending
-named LIBSSL.OLB, and you will find a bunch of useful programs in
+on how it was built.  You will find the SSL library in [.xxx.EXE.SSL],
-[.xxx.EXE.APPS].  However, these shouldn't be used right off unless it's
+named SSL_LIBSSL32.OLB or SSL_LIBSSL.OLB, and you will find a bunch of
-just to test them.  For production use, make sure you install first, see
+useful programs in [.xxx.EXE.APPS].  However, these shouldn't be used
-Installation below.
+right off unless it's just to test them.  For production use, make sure
+you install first, see Installation below.
 
 Note 1: Some programs in this package require a TCP/IP library.
 
@@ -170,12 +158,14 @@ Installation:
 
 Installation is easy, just do the following:
 
-  @INSTALL <root>
+  @INSTALL <root> <bits>
 
 <root> is the directory in which everything will be installed,
 subdirectories, libraries, header files, programs and startup command
 procedures.
 
+<bits> works the same way as for MAKEVMS.COM
+
 N.B.: INSTALL.COM builds a new directory structure, different from
 the directory tree where you have now build OpenSSL.
 
@@ -196,6 +186,10 @@ following command procedures:
         sets up the symbols to the applications.  Should be called
         from for example SYS$MANAGER:SYLOGIN.COM 
 
+  OPENSSL_UNDO.COM
+
+	deassigns the logical names created with OPENSSL_STARTUP.COM.
+
 The logical names that are set up are the following:
 
   SSLROOT       a dotted concealed logical name pointing at the
@@ -203,7 +197,6 @@ The logical names that are set up are the following:
 
   SSLCERTS      Initially an empty directory, this is the default
 		location for certificate files.
-  SSLMISC	Various scripts.
   SSLPRIVATE	Initially an empty directory, this is the default
 		location for private key files.
 
@@ -211,8 +204,9 @@ The logical names that are set up are the following:
 		programs.
   SSLINCLUDE    Contains the header files needed if you want to
 		compile programs with libcrypto or libssl.
-  SSLLIB        Contains the OpenSSL library files (LIBCRYPTO.OLB
+  SSLLIB        Contains the OpenSSL library files themselves:
-		and LIBSSL.OLB) themselves.
+  		- SSL_LIBCRYPTO32.OLB and SSL_LIBSSL32.OLB or
+		- SSL_LIBCRYPTO.OLB and SSL_LIBSSL.OLB
 
   OPENSSL	Same as SSLINCLUDE.  This is because the standard
 		way to include OpenSSL header files from version
@@ -296,4 +290,4 @@ have any ideas.
 
 --
 Richard Levitte <richard@levitte.org>
-2000-02-27
+2000-02-27, 2011-03-18

INSTALL.W32

@@ -29,7 +29,7 @@
   is required if you intend to utilize assembler modules. Note that NASM
   is now the only supported assembler.
 
- If you are compiling from a tarball or a CVS snapshot then the Win32 files
+ If you are compiling from a tarball or a Git snapshot then the Win32 files
  may well be not up to date. This may mean that some "tweaking" is required to
  get it all to work. See the trouble shooting section later on for if (when?)
  it goes wrong.
@@ -185,6 +185,15 @@
    required. Run the installers and do whatever magic they say it takes
    to start MSYS bash shell with GNU tools on its PATH.
 
+   N.B. Since source tar-ball can contain symbolic links, it's essential
+   that you use accompanying MSYS tar to unpack the source. It will
+   either handle them in one way or another or fail to extract them,
+   which does the trick too. Latter means that you may safely ignore all
+   "cannot create symlink" messages, as they will be "re-created" at
+   configure stage by copying corresponding files. Alternative programs
+   were observed to create empty files instead, which results in build
+   failure.
+
  * Compile OpenSSL:
 
    $ ./config
@@ -248,7 +257,7 @@
 
  then ms\do_XXX should not give a warning any more. However the numbers that
  get assigned by this technique may not match those that eventually get
- assigned in the CVS tree: so anything linked against this version of the
+ assigned in the Git tree: so anything linked against this version of the
  library may need to be recompiled.
 
  If you get errors about unresolved symbols there are several possible
@@ -297,7 +306,18 @@
  desktop, which is not available to service processes. The toolkit is
  designed to detect in which context it's currently executed, GUI,
  console app or service, and act accordingly, namely whether or not to
- actually make GUI calls.
+ actually make GUI calls. Additionally those who wish to
+ /DELAYLOAD:GDI32.DLL and /DELAYLOAD:USER32.DLL and actually keep them
+ off service process should consider implementing and exporting from
+ .exe image in question own _OPENSSL_isservice not relying on USER32.DLL.
+ E.g., on Windows Vista and later you could:
+
+	__declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
+	{   DWORD sess;
+	    if (ProcessIdToSessionId(GetCurrentProcessId(),&sess))
+	        return sess==0;
+	    return FALSE;
+	}
 
  If you link with OpenSSL .DLLs, then you're expected to include into
  your application code small "shim" snippet, which provides glue between

LICENSE

@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

MacOS/GetHTTPS.src/MacSocket.h

@@ -5,97 +5,98 @@
 extern "C" {
 #endif
 
-
+enum {
-
+    kMacSocket_TimeoutErr = -2
-enum
-{
-	kMacSocket_TimeoutErr = -2
 };
 
+// Since MacSocket does busy waiting, I do a callback while waiting
 
-//	Since MacSocket does busy waiting, I do a callback while waiting
+typedef OSErr(*MacSocket_IdleWaitCallback) (void *);
 
-typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
+// Call this before anything else!
-
-
-//	Call this before anything else!
 
 OSErr MacSocket_Startup(void);
 
-
+// Call this to cleanup before quitting
-//	Call this to cleanup before quitting
 
 OSErr MacSocket_Shutdown(void);
 
+// Call this to allocate a "socket" (reference number is returned in
+// outSocketNum)
+// Note that inDoThreadSwitching is pretty much irrelevant right now, since I
+// ignore it
+// The inTimeoutTicks parameter is applied during reads/writes of data
+// The inIdleWaitCallback parameter specifies a callback which is called
+// during busy-waiting periods
+// The inUserRefPtr parameter is passed back to the idle-wait callback
 
-//	Call this to allocate a "socket" (reference number is returned in outSocketNum)
+OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
-//	Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
+                       const long inTimeoutTicks,
-//	The inTimeoutTicks parameter is applied during reads/writes of data
+                       MacSocket_IdleWaitCallback inIdleWaitCallback,
-//	The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
+                       void *inUserRefPtr);
-//	The inUserRefPtr parameter is passed back to the idle-wait callback
 
-OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);
+// Call this to connect to an IP/DNS address
+// Note that inTargetAddressAndPort is in "IP:port" format-- e.g.
+// 10.1.1.1:123
 
+OSErr MacSocket_connect(const int inSocketNum, char *inTargetAddressAndPort);
 
-//	Call this to connect to an IP/DNS address
+// Call this to listen on a port
-//	Note that inTargetAddressAndPort is in "IP:port" format-- e.g. 10.1.1.1:123
+// Since this a low-performance implementation, I allow a maximum of 1 (one!)
+// incoming request when I listen
 
-OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
+OSErr MacSocket_listen(const int inSocketNum, const int inPortNum);
 
-
+// Call this to close a socket
-//	Call this to listen on a port
-//	Since this a low-performance implementation, I allow a maximum of 1 (one!) incoming request when I listen
-
-OSErr MacSocket_listen(const int inSocketNum,const int inPortNum);
-
-
-//	Call this to close a socket
 
 OSErr MacSocket_close(const int inSocketNum);
 
+// Call this to receive data on a socket
+// Most parameters' purpose are obvious-- except maybe "inBlock" which
+// controls whether I wait for data or return immediately
 
-//	Call this to receive data on a socket
+int MacSocket_recv(const int inSocketNum, void *outBuff, int outBuffLength,
-//	Most parameters' purpose are obvious-- except maybe "inBlock" which controls whether I wait for data or return immediately
+                   const Boolean inBlock);
 
-int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const Boolean inBlock);
+// Call this to send data on a socket
 
+int MacSocket_send(const int inSocketNum, const void *inBuff,
+                   int inBuffLength);
 
-//	Call this to send data on a socket
+// If zero bytes were read in a call to MacSocket_recv(), it may be that the
-
+// remote end has done a half-close
-int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
+// This function will let you check whether that's true or not
-
-
-//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
-//	This function will let you check whether that's true or not
 
 Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
 
-
+// Call this to see if the listen has completed after a call to
-//	Call this to see if the listen has completed after a call to MacSocket_listen()
+// MacSocket_listen()
 
 Boolean MacSocket_ListenCompleted(const int inSocketNum);
 
-
+// These really aren't very useful anymore
-//	These really aren't very useful anymore
 
 Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
 Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
 
+// You may wish to change the userRefPtr for a socket callback-- use this to
+// do it
 
-//	You may wish to change the userRefPtr for a socket callback-- use this to do it
+void MacSocket_SetUserRefPtr(const int inSocketNum, void *inNewRefPtr);
 
-void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);
+// Call these to get the socket's IP:port descriptor
 
+void MacSocket_GetLocalIPAndPort(const int inSocketNum, char *outIPAndPort,
+                                 const int inIPAndPortLength);
+void MacSocket_GetRemoteIPAndPort(const int inSocketNum, char *outIPAndPort,
+                                  const int inIPAndPortLength);
 
-//	Call these to get the socket's IP:port descriptor
+// Call this to get error info from a socket
 
-void MacSocket_GetLocalIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
+void MacSocket_GetSocketErrorInfo(const int inSocketNum,
-void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
+                                  int *outSocketErrCode,
-
+                                  char *outSocketErrString,
-
+                                  const int inSocketErrStringMaxLength);
-//	Call this to get error info from a socket
-
-void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
 
 
 #ifdef __cplusplus

MacOS/Randomizer.h

@@ -1,43 +1,42 @@
 
-//	Gathers unpredictable system data to be used for generating
+// Gathers unpredictable system data to be used for generating
-//	random bits
+// random bits
 
 #include <MacTypes.h>
 
-class CRandomizer
+class CRandomizer {
-{
+ public:
-public:
+    CRandomizer(void);
-	CRandomizer (void);
+    void PeriodicAction(void);
-	void PeriodicAction (void);
 
-private:
+ private:
 
-	// Private calls
+    // Private calls
 
-	void		AddTimeSinceMachineStartup (void);
+    void AddTimeSinceMachineStartup(void);
-	void		AddAbsoluteSystemStartupTime (void);
+    void AddAbsoluteSystemStartupTime(void);
-	void		AddAppRunningTime (void);
+    void AddAppRunningTime(void);
-	void		AddStartupVolumeInfo (void);
+    void AddStartupVolumeInfo(void);
-	void		AddFiller (void);
+    void AddFiller(void);
 
-	void		AddCurrentMouse (void);
+    void AddCurrentMouse(void);
-	void		AddNow (double millisecondUncertainty);
+    void AddNow(double millisecondUncertainty);
-	void		AddBytes (void *data, long size, double entropy);
+    void AddBytes(void *data, long size, double entropy);
 
-	void		GetTimeBaseResolution (void);
+    void GetTimeBaseResolution(void);
-	unsigned long	SysTimer (void);
+    unsigned long SysTimer(void);
 
-	// System Info	
+    // System Info
-	bool		mSupportsLargeVolumes;
+    bool mSupportsLargeVolumes;
-	bool		mIsPowerPC;
+    bool mIsPowerPC;
-	bool		mIs601;
+    bool mIs601;
 
-	// Time info
+    // Time info
-	double		mTimebaseTicksPerMillisec;
+    double mTimebaseTicksPerMillisec;
-	unsigned long	mLastPeriodicTicks;
+    unsigned long mLastPeriodicTicks;
 
-	// Mouse info
+    // Mouse info
-	long		mSamplePeriod;
+    long mSamplePeriod;
-	Point		mLastMouse;
+    Point mLastMouse;
-	long		mMouseStill;
+    long mMouseStill;
 };

MacOS/_MWERKS_GUSI_prefix.h

@@ -1,9 +1,9 @@
 #include <MacHeaders.h>
 #define B_ENDIAN
 #ifdef __POWERPC__
-#pragma longlong on
+# pragma longlong on
 #endif
 #if 1
-#define MAC_OS_GUSI_SOURCE
+# define MAC_OS_GUSI_SOURCE
 #endif
 #define MONOLITH

MacOS/_MWERKS_prefix.h

@@ -1,9 +1,9 @@
 #include <MacHeaders.h>
 #define B_ENDIAN
 #ifdef __POWERPC__
-#pragma longlong on
+# pragma longlong on
 #endif
 #if 0
-#define MAC_OS_GUSI_SOURCE
+# define MAC_OS_GUSI_SOURCE
 #endif
 #define MONOLITH

MacOS/buildinf.h

@@ -1,5 +1,5 @@
 #ifndef MK1MF_BUILD
-#  define CFLAGS	"-DB_ENDIAN"
+# define CFLAGS        "-DB_ENDIAN"
-#  define PLATFORM	"macos"
+# define PLATFORM      "macos"
-#  define DATE		"Sun Feb 27 19:44:16 MET 2000"
+# define DATE          "Sun Feb 27 19:44:16 MET 2000"
 #endif

MacOS/opensslconf.h

@@ -1,116 +1,126 @@
 /* MacOS/opensslconf.h */
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define OPENSSLDIR "/usr/local/ssl"
+#  define OPENSSLDIR "/usr/local/ssl"
-#endif
+# endif
 #endif
 
 #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
+# define IDEA_INT unsigned int
 #endif
 
 #if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
+# define MD2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC2_H) && !defined(RC2_INT)
 /* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
+# define RC2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
+# if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
 /*
+ * using int types make the structure larger but make the code faster on most
+ * boxes I have tested - up to %20 faster.
+ */
+/*-
  * I don't know what does "most" mean, but declaring "int" is a must on:
  * - Intel P6 because partial register stalls are very expensive;
  * - elder Alpha because it lacks byte load/store instructions;
  */
-#define RC4_INT unsigned char
+#  define RC4_INT unsigned char
-#endif
+# endif
-#if !defined(RC4_CHUNK)
+# if !defined(RC4_CHUNK)
 /*
  * This enables code handling data aligned at natural CPU word
  * boundary. See crypto/rc4/rc4_enc.c for further details.
  */
-#define RC4_CHUNK unsigned long
+#  define RC4_CHUNK unsigned long
-#endif
+# endif
 #endif
 
 #if defined(HEADER_DES_H) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+/*
- * %20 speed up (longs are 8 bytes, int's are 4). */
+ * If this is set to 'unsigned int' on a DEC Alpha, this gives about a %20
-#ifndef DES_LONG
+ * speed up (longs are 8 bytes, int's are 4).
-#define DES_LONG unsigned long
+ */
-#endif
+# ifndef DES_LONG
+#  define DES_LONG unsigned long
+# endif
 #endif
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
+# define CONFIG_HEADER_BN_H
-#if __option(longlong)
+# if __option(longlong)
 #  define BN_LLONG
-#else
+# else
 #  undef BN_LLONG
-#endif
+# endif
 
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-/* The prime number generation stuff may not work when
+/*
- * EIGHT_BIT but I don't care since I've only used this mode
+ * The prime number generation stuff may not work when EIGHT_BIT but I don't
- * for debuging the bignum libraries */
+ * care since I've only used this mode for debuging the bignum libraries
-#undef SIXTY_FOUR_BIT_LONG
+ */
-#undef SIXTY_FOUR_BIT
+# undef SIXTY_FOUR_BIT_LONG
-#define THIRTY_TWO_BIT
+# undef SIXTY_FOUR_BIT
-#undef SIXTEEN_BIT
+# define THIRTY_TWO_BIT
-#undef EIGHT_BIT
+# undef SIXTEEN_BIT
+# undef EIGHT_BIT
 #endif
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
+# define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
+/*
- * speedup on x86 */
+ * if this is defined data[i] is used instead of *data, this is a %20 speedup
-#undef RC4_INDEX
+ * on x86
+ */
+# undef RC4_INDEX
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
+# define CONFIG_HEADER_BF_LOCL_H
-#define BF_PTR
+# define BF_PTR
-#endif /* HEADER_BF_LOCL_H */
+#endif                          /* HEADER_BF_LOCL_H */
 
 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
+# define CONFIG_HEADER_DES_LOCL_H
-/* the following is tweaked from a config script, that is why it is a
+/*
- * protected undef/define */
+ * the following is tweaked from a config script, that is why it is a
-#ifndef DES_PTR
+ * protected undef/define
-#define DES_PTR
+ */
-#endif
+# ifndef DES_PTR
+#  define DES_PTR
+# endif
 
-/* This helps C compiler generate the correct code for multiple functional
+/*
+ * This helps C compiler generate the correct code for multiple functional
  * units.  It reduces register dependancies at the expense of 2 more
- * registers */
+ * registers
-#ifndef DES_RISC1
+ */
-#define DES_RISC1
+# ifndef DES_RISC1
-#endif
+#  define DES_RISC1
+# endif
 
-#ifndef DES_RISC2
+# ifndef DES_RISC2
-#undef DES_RISC2
+#  undef DES_RISC2
-#endif
+# endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#define DES_UNROLL
-#endif
-
-#endif /* HEADER_DES_LOCL_H */
 
+# if defined(DES_RISC1) && defined(DES_RISC2)
+YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED ! !!!!
+# endif
+/*
+ * Unroll the inner loop, this sometimes helps, sometimes hinders. Very mucy
+ * CPU dependant
+ */
+# ifndef DES_UNROLL
+#  define DES_UNROLL
+# endif
+#endif                          /* HEADER_DES_LOCL_H */
 #ifndef __POWERPC__
-#define MD32_XARRAY
+# define MD32_XARRAY
 #endif

Makefile.org

@@ -172,7 +172,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
 		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
 		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
-		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}		\
+		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS}	\
 		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
@@ -322,7 +322,8 @@ libcrypto.pc: Makefile
 	    echo 'Description: OpenSSL cryptography library'; \
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
+	    echo 'Libs: -L$${libdir} -lcrypto'; \
+	    echo 'Libs.private: $(EX_LIBS)'; \
 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
 
 libssl.pc: Makefile
@@ -335,7 +336,8 @@ libssl.pc: Makefile
 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+	    echo 'Libs.private: $(EX_LIBS)'; \
 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
 
 openssl.pc: Makefile
@@ -348,7 +350,8 @@ openssl.pc: Makefile
 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+	    echo 'Libs.private: $(EX_LIBS)'; \
 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 
 Makefile: Makefile.org Configure config
@@ -413,6 +416,9 @@ tests: rehash
 report:
 	@$(PERL) util/selftest.pl
 
+update: errors stacks util/libeay.num util/ssleay.num TABLE
+	@set -e; target=update; $(RECURSIVE_BUILD_CMD)
+
 depend:
 	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
 
@@ -437,50 +443,37 @@ util/libeay.num::
 util/ssleay.num::
 	$(PERL) util/mkdef.pl ssl update
 
-crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
-	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
-crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
-	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
-crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
-	$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
-
-apps/openssl-vms.cnf: apps/openssl.cnf
-	$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
-
-crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
-	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
-
-
 TABLE: Configure
 	(echo 'Output of `Configure TABLE'"':"; \
 	$(PERL) Configure TABLE) > TABLE
 
-update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
-
 # Build distribution tar-file. As the list of files returned by "find" is
 # pretty long, on several platforms a "too many arguments" error or similar
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
-tar:
+TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
+	                       --owner openssl:0 --group openssl:0 \
+			       --transform 's|^|openssl-$(VERSION)/|' \
+			       -cvf -
+
+../$(TARFILE).list:
+	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
+	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \
+	    | sort > ../$(TARFILE).list
+
+tar: ../$(TARFILE).list
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
+	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
-	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
+	rm -f ../$(TARFILE).list
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - |\
-	gzip --best >../$(TARFILE).gz; \
-	rm -f ../$(TARFILE).list; \
 	ls -l ../$(TARFILE).gz
 
-tar-snap:
+tar-snap: ../$(TARFILE).list
-	@$(TAR) $(TARFLAGS) -cvf - \
+	$(TAR_COMMAND) > ../$(TARFILE)
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
+	rm -f ../$(TARFILE).list
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
 	ls -l ../$(TARFILE)
 
 dist:   

Makefile.shared

@@ -135,7 +135,7 @@ LINK_SO_A_VIA_O=	\
   ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
   ( $(SET_X); \
     ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
-  $(LINK_SO) && rm -f $(LIBNAME).o
+  $(LINK_SO) && rm -f lib$(LIBNAME).o
 
 LINK_SO_A_UNPACKED=	\
   UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
@@ -207,17 +207,29 @@ link_app.bsd:
 	fi; $(LINK_APP)
 
 # For Darwin AKA Mac OS/X (dyld)
-# link_o.darwin produces .so, because we let it use dso_dlfcn module,
+# Originally link_o.darwin produced .so, because it was hard-coded
-# which has .so extension hard-coded. One can argue that one should
+# in dso_dlfcn module. At later point dso_dlfcn switched to .dylib
-# develop special dso module for MacOS X. At least manual encourages
+# extension in order to allow for run-time linking with vendor-
-# to use native NSModule(3) API and refers to dlfcn as termporary hack.
+# supplied shared libraries such as libz, so that link_o.darwin had
+# to be harmonized with it. This caused minor controversy, because
+# it was believed that dlopen can't be used to dynamically load
+# .dylib-s, only so called bundle modules (ones linked with -bundle
+# flag). The belief seems to be originating from pre-10.4 release,
+# where dlfcn functionality was emulated by dlcompat add-on. In
+# 10.4 dlopen was rewritten as native part of dyld and is documented
+# to be capable of loading both dynamic libraries and bundles. In
+# order to provide compatibility with pre-10.4 dlopen, modules are
+# linked with -bundle flag, which makes .dylib extension misleading.
+# It works, because dlopen is [and always was] extension-agnostic.
+# Alternative to this heuristic approach is to develop specific
+# MacOS X dso module relying on whichever "native" dyld interface.
 link_o.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME); \
-	SHLIB_SUFFIX=.so; \
+	SHLIB_SUFFIX=.dylib; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
+	SHAREDFLAGS="$(CFLAGS) `echo $(SHARED_LDFLAGS) | sed s/dynamiclib/bundle/`"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \

NEWS

@@ -5,12 +5,148 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a:
+  Major changes between OpenSSL 1.0.0t and OpenSSL 1.0.0u [under development]
+
+      o
+
+  Major changes between OpenSSL 1.0.0s and OpenSSL 1.0.0t [3 Dec 2015]
+
+      o X509_ATTRIBUTE memory leak (CVE-2015-3195)
+      o Race condition handling PSK identify hint (CVE-2015-3196)
+
+  Major changes between OpenSSL 1.0.0r and OpenSSL 1.0.0s [11 Jun 2015]
+
+      o Malformed ECParameters causes infinite loop (CVE-2015-1788)
+      o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
+      o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
+      o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
+      o Race condition handling NewSessionTicket (CVE-2015-1791)
+
+  Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [19 Mar 2015]
+
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
+  Major changes between OpenSSL 1.0.0p and OpenSSL 1.0.0q [15 Jan 2015]
+
+      o Build fixes for the Windows and OpenVMS platforms
+
+  Major changes between OpenSSL 1.0.0o and OpenSSL 1.0.0p [8 Jan 2015]
+
+      o Fix for CVE-2014-3571
+      o Fix for CVE-2015-0206
+      o Fix for CVE-2014-3569
+      o Fix for CVE-2014-3572
+      o Fix for CVE-2015-0204
+      o Fix for CVE-2015-0205
+      o Fix for CVE-2014-8275
+      o Fix for CVE-2014-3570
+
+  Major changes between OpenSSL 1.0.0n and OpenSSL 1.0.0o [15 Oct 2014]
+
+      o Fix for CVE-2014-3513
+      o Fix for CVE-2014-3567
+      o Mitigation for CVE-2014-3566 (SSL protocol vulnerability)
+      o Fix for CVE-2014-3568
+
+  Major changes between OpenSSL 1.0.0m and OpenSSL 1.0.0n [6 Aug 2014]
+
+      o Fix for CVE-2014-3510
+      o Fix for CVE-2014-3507
+      o Fix for CVE-2014-3506
+      o Fix for CVE-2014-3505
+      o Fix for CVE-2014-3509
+      o Fix for CVE-2014-3508
+
+  Known issues in OpenSSL 1.0.0m:
+
+      o EAP-FAST and other applications using tls_session_secret_cb
+        wont resume sessions. Fixed in 1.0.0n-dev
+      o Compilation failure of s3_pkt.c on some platforms due to missing
+        <limits.h> include. Fixed in 1.0.0n-dev
+
+  Major changes between OpenSSL 1.0.0l and OpenSSL 1.0.0m [5 Jun 2014]
+
+      o Fix for CVE-2014-0224
+      o Fix for CVE-2014-0221
+      o Fix for CVE-2014-0198
+      o Fix for CVE-2014-0195
+      o Fix for CVE-2014-3470
+      o Fix for CVE-2014-0076
+      o Fix for CVE-2010-5298
+
+  Major changes between OpenSSL 1.0.0k and OpenSSL 1.0.0l [6 Jan 2014]
+
+      o Fix for DTLS retransmission bug CVE-2013-6450
+
+  Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [5 Feb 2013]:
+
+      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
+      o Fix OCSP bad key DoS attack CVE-2013-0166
+
+  Major changes between OpenSSL 1.0.0i and OpenSSL 1.0.0j [10 May 2012]:
+
+      o Fix DTLS record length checking bug CVE-2012-2333
+
+  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]:
+
+      o Fix for ASN1 overflow bug CVE-2012-2110
+
+  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
+
+      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
+      o Corrected fix for CVE-2011-4619
+      o Various DTLS fixes.
+
+  Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g [18 Jan 2012]:
+
+      o Fix for DTLS DoS issue CVE-2012-0050
+
+  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f [4 Jan 2012]:
+
+      o Fix for DTLS plaintext recovery attack CVE-2011-4108
+      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
+      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
+      o Check parameters are not NULL in GOST ENGINE CVE-2012-0027
+      o Check for malformed RFC3779 data CVE-2011-4577
+
+  Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e [6 Sep 2011]:
+
+      o Fix for CRL vulnerability issue CVE-2011-3207
+      o Fix for ECDH crashes CVE-2011-3210
+      o Protection against EC timing attacks.
+      o Support ECDH ciphersuites for certificates using SHA2 algorithms.
+      o Various DTLS fixes.
+
+  Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d [8 Feb 2011]:
+
+      o Fix for security issue CVE-2011-0014
+
+  Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c [2 Dec 2010]:
+
+      o Fix for security issue CVE-2010-4180
+      o Fix for CVE-2010-4252
+      o Fix mishandling of absent EC point format extension.
+      o Fix various platform compilation issues.
+      o Corrected fix for security issue CVE-2010-3864.
+
+  Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b [16 Nov 2010]:
+
+      o Fix for security issue CVE-2010-3864.
+      o Fix for CVE-2010-2939
+      o Fix WIN32 build system for GOST ENGINE.
+
+  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a [1 Jun 2010]:
 
       o Fix for security issue CVE-2010-1633.
       o GOST MAC and CFB fixes.
 
-  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0:
+  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0 [29 Mar 2010]:
 
       o RFC3280 path validation: sufficient to process PKITS tests.
       o Integrated support for PVK files and keyblobs.
@@ -33,20 +169,12 @@
       o Opaque PRF Input TLS extension support.
       o Updated time routines to avoid OS limitations.
 
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o:
+  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
-  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n:
 
       o CFB cipher definition fixes.
       o Fix security issues CVE-2010-0740 and CVE-2010-0433.
 
-  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m:
+  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]:
 
       o Cipher definition fixes.
       o Workaround for slow RAND_poll() on some WIN32 versions.
@@ -58,33 +186,33 @@
       o Ticket and SNI coexistence fixes.
       o Many fixes to DTLS handling. 
 
-  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l:
+  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]:
 
       o Temporary work around for CVE-2009-3555: disable renegotiation.
 
-  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k:
+  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]:
 
       o Fix various build issues.
       o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
 
-  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j:
+  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]:
 
       o Fix security issue (CVE-2008-5077)
       o Merge FIPS 140-2 branch code.
 
-  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h:
+  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h [28 May 2008]:
 
       o CryptoAPI ENGINE support.
       o Various precautionary measures.
       o Fix for bugs affecting certificate request creation.
       o Support for local machine keyset attribute in PKCS#12 files.
 
-  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g:
+  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g [19 Oct 2007]:
 
       o Backport of CMS functionality to 0.9.8.
       o Fixes for bugs introduced with 0.9.8f.
 
-  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f:
+  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f [11 Oct 2007]:
 
       o Add gcc 4.2 support.
       o Add support for AES and SSE2 assembly lanugauge optimization
@@ -95,23 +223,23 @@
       o RFC4507bis support.
       o TLS Extensions support.
 
-  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e:
+  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e [23 Feb 2007]:
 
       o Various ciphersuite selection fixes.
       o RFC3779 support.
 
-  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d:
+  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d [28 Sep 2006]:
 
       o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
       o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
       o Changes to ciphersuite selection algorithm
 
-  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c:
+  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c [5 Sep 2006]:
 
       o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
       o New cipher Camellia
 
-  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b:
+  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b [4 May 2006]:
 
       o Cipher string fixes.
       o Fixes for VC++ 2005.
@@ -121,12 +249,12 @@
       o Built in dynamic engine compilation support on Win32.
       o Fixes auto dynamic engine loading in Win32.
 
-  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a:
+  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a [11 Oct 2005]:
 
       o Fix potential SSL 2.0 rollback, CVE-2005-2969
       o Extended Windows CE support
 
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8 [5 Jul 2005]:
 
       o Major work on the BIGNUM library for higher efficiency and to
         make operations more streamlined and less contradictory.  This
@@ -200,36 +328,36 @@
       o Added initial support for Win64.
       o Added alternate pkg-config files.
 
-  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m:
+  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m [23 Feb 2007]:
 
       o FIPS 1.1.1 module linking.
       o Various ciphersuite selection fixes.
 
-  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l:
+  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l [28 Sep 2006]:
 
       o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
       o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
 
-  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k:
+  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k [5 Sep 2006]:
 
       o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
 
-  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j:
+  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j [4 May 2006]:
 
       o Visual C++ 2005 fixes.
       o Update Windows build system for FIPS.
 
-  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
+  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
 
       o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
 
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
 
       o Fix SSL 2.0 Rollback, CVE-2005-2969
       o Allow use of fixed-length exponent on DSA signing
       o Default fixed-window RSA, DSA, DH private-key operations
 
-  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g:
+  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g [11 Apr 2005]:
 
       o More compilation issues fixed.
       o Adaptation to more modern Kerberos API.
@@ -238,7 +366,7 @@
       o More constification.
       o Added processing of proxy certificates (RFC 3820).
 
-  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
+  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f [22 Mar 2005]:
 
       o Several compilation issues fixed.
       o Many memory allocation failure checks added.
@@ -246,12 +374,12 @@
       o Mandatory basic checks on certificates.
       o Performance improvements.
 
-  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
+  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
 
       o Fix race condition in CRL checking code.
       o Fixes to PKCS#7 (S/MIME) code.
 
-  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d:
+  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
 
       o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
       o Security: Fix null-pointer assignment in do_change_cipher_spec()
@@ -259,14 +387,14 @@
       o Multiple X509 verification fixes
       o Speed up HMAC and other operations
 
-  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c:
+  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c [30 Sep 2003]:
 
       o Security: fix various ASN1 parsing bugs.
       o New -ignore_err option to OCSP utility.
       o Various interop and bug fixes in S/MIME code.
       o SSL/TLS protocol fix for unrequested client certificates.
 
-  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b:
+  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b [10 Apr 2003]:
 
       o Security: counter the Klima-Pokorny-Rosa extension of
         Bleichbacher's attack 
@@ -277,7 +405,7 @@
       o ASN.1: treat domainComponent correctly.
       o Documentation: fixes and additions.
 
-  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
+  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a [19 Feb 2003]:
 
       o Security: Important security related bugfixes.
       o Enhanced compatibility with MIT Kerberos.
@@ -288,7 +416,7 @@
       o SSL/TLS: now handles manual certificate chain building.
       o SSL/TLS: certain session ID malfunctions corrected.
 
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7 [30 Dec 2002]:
 
       o New library section OCSP.
       o Complete rewrite of ASN1 code.
@@ -334,23 +462,23 @@
       o SSL/TLS: add callback to retrieve SSL/TLS messages.
       o SSL/TLS: support AES cipher suites (RFC3268).
 
-  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k [30 Sep 2003]:
 
       o Security: fix various ASN1 parsing bugs.
       o SSL/TLS protocol fix for unrequested client certificates.
 
-  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j [10 Apr 2003]:
 
       o Security: counter the Klima-Pokorny-Rosa extension of
         Bleichbacher's attack 
       o Security: make RSA blinding default.
       o Build: shared library support fixes.
 
-  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i [19 Feb 2003]:
 
       o Important security related bugfixes.
 
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
 
       o New configuration targets for Tandem OSS and A/UX.
       o New OIDs for Microsoft attributes.
@@ -364,25 +492,25 @@
       o Fixes for smaller building problems.
       o Updates of manuals, FAQ and other instructive documents.
 
-  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
+  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g [9 Aug 2002]:
 
       o Important building fixes on Unix.
 
-  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
+  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f [8 Aug 2002]:
 
       o Various important bugfixes.
 
-  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e:
+  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e [30 Jul 2002]:
 
       o Important security related bugfixes.
       o Various SSL/TLS library bugfixes.
 
-  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
+  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d [9 May 2002]:
 
       o Various SSL/TLS library bugfixes.
       o Fix DH parameter generation for 'non-standard' generators.
 
-  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c:
+  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c [21 Dec 2001]:
 
       o Various SSL/TLS library bugfixes.
       o BIGNUM library fixes.
@@ -395,7 +523,7 @@
         Broadcom and Cryptographic Appliance's keyserver
         [in 0.9.6c-engine release].
 
-  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b:
+  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b [9 Jul 2001]:
 
       o Security fix: PRNG improvements.
       o Security fix: RSA OAEP check.
@@ -412,7 +540,7 @@
       o Increase default size for BIO buffering filter.
       o Compatibility fixes in some scripts.
 
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a [5 Apr 2001]:
 
       o Security fix: change behavior of OpenSSL to avoid using
         environment variables when running as root.
@@ -437,7 +565,7 @@
       o New function BN_rand_range().
       o Add "-rand" option to openssl s_client and s_server.
 
-  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:
+  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6 [10 Oct 2000]:
 
       o Some documentation for BIO and SSL libraries.
       o Enhanced chain verification using key identifiers.
@@ -452,7 +580,7 @@
     [1] The support for external crypto devices is currently a separate
         distribution.  See the file README.ENGINE.
 
-  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a:
+  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a [1 Apr 2000]:
 
       o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 
       o Shared library support for HPUX and Solaris-gcc
@@ -461,7 +589,7 @@
       o New 'rand' application
       o New way to check for existence of algorithms from scripts
 
-  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5:
+  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5 [25 May 2000]:
 
       o S/MIME support in new 'smime' command
       o Documentation for the OpenSSL command line application
@@ -497,7 +625,7 @@
       o Enhanced support for Alpha Linux
       o Experimental MacOS support
 
-  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4:
+  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4 [9 Aug 1999]:
 
       o Transparent support for PKCS#8 format private keys: these are used
         by several software packages and are more secure than the standard
@@ -508,7 +636,7 @@
       o New pipe-like BIO that allows using the SSL library when actual I/O
         must be handled by the application (BIO pair)
 
-  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3:
+  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3 [24 May 1999]:
       o Lots of enhancements and cleanups to the Configuration mechanism
       o RSA OEAP related fixes
       o Added `openssl ca -revoke' option for revoking a certificate
@@ -522,7 +650,7 @@
       o Sparc assembler bignum implementation, optimized hash functions
       o Option to disable selected ciphers
 
-  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b:
+  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b [22 Mar 1999]:
       o Fixed a security hole related to session resumption
       o Fixed RSA encryption routines for the p < q case
       o "ALL" in cipher lists now means "everything except NULL ciphers"
@@ -544,7 +672,7 @@
       o Lots of memory leak fixes.
       o Lots of bug fixes.
 
-  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c:
+  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c [23 Dec 1998]:
       o Integration of the popular NO_RSA/NO_DSA patches
       o Initial support for compression inside the SSL record layer
       o Added BIO proxy and filtering functionality

PROBLEMS

@@ -36,7 +36,9 @@ may differ on your machine.
 
 
 As long as Apple doesn't fix the problem with ld, this problem building
-OpenSSL will remain as is.
+OpenSSL will remain as is. Well, the problem was addressed in 0.9.8f by
+passing -Wl,-search_paths_first, but it's unknown if the flag was
+supported from the initial MacOS X release.
 
 
 * Parallell make leads to errors
@@ -195,3 +197,17 @@ reconfigure with additional no-sse2 [or 386] option passed to ./config.
 We don't have framework to associate -ldl with no-dso, therefore the only
 way is to edit Makefile right after ./config no-dso and remove -ldl from
 EX_LIBS line.
+
+* hpux-parisc2-cc no-asm build fails with SEGV in ECDSA/DH.
+
+Compiler bug, presumably at particular patch level. Remaining
+hpux*-parisc*-cc configurations can be affected too. Drop optimization
+level to +O2 when compiling bn_nist.o.
+
+* solaris64-sparcv9-cc link failure
+
+Solaris 8 ar can fail to maintain symbol table in .a, which results in
+link failures. Apply 109147-09 or later or modify Makefile generated
+by ./Configure solaris64-sparcv9-cc and replace RANLIB assignment with
+
+	RANLIB= /usr/ccs/bin/ar rs

README

@@ -1,7 +1,7 @@
 
- OpenSSL 1.0.0b-dev
+ OpenSSL 1.0.0u-dev
 
- Copyright (c) 1998-2010 The OpenSSL Project
+ Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
@@ -164,16 +164,23 @@
  Report the bug to the OpenSSL project via the Request Tracker
  (http://www.openssl.org/support/rt.html) by mail to:
 
-    openssl-bugs@openssl.org
+    rt@openssl.org
 
- Note that the request tracker should NOT be used for general assistance
+ In order to avoid spam, this is a moderated mailing list, and it might
- or support queries. Just because something doesn't work the way you expect
+ take a day for the ticket to show up.  (We also scan posts to make sure
- does not mean it is necessarily a bug in OpenSSL.
+ that security disclosures aren't publically posted by mistake.) Mail to
+ this address is recorded in the public RT (request tracker) database (see
+ https://www.openssl.org/support/rt.html for details) and also forwarded
+ the public openssl-dev mailing list.  Confidential mail may be sent to
+ openssl-security@openssl.org (PGP key available from the key servers).
 
- Note that mail to openssl-bugs@openssl.org is recorded in the publicly
+ Please do NOT use this for general assistance or support queries.
- readable request tracker database and is forwarded to a public
+ Just because something doesn't work the way you expect does not mean it
- mailing list. Confidential mail may be sent to openssl-security@openssl.org
+ is necessarily a bug in OpenSSL.
- (PGP key available from the key servers).
+
+ You can also make GitHub pull requests. If you do this, please also send
+ mail to rt@openssl.org with a link to the PR so that we can more easily
+ keep track of it.
 
  HOW TO CONTRIBUTE TO OpenSSL
  ----------------------------
@@ -190,11 +197,10 @@
  reason as to why that feature isn't implemented.
 
  Patches should be as up to date as possible, preferably relative to the
- current CVS or the last snapshot. They should follow the coding style of
+ current Git or the last snapshot. They should follow our coding style
- OpenSSL and compile without warnings. Some of the core team developer targets
+ (see http://openssl.org/about/codingstyle.txt) and compile without
- can be used for testing purposes, (debug-steve64, debug-geoff etc). OpenSSL
+ warnings using the --strict-warnings flag.  OpenSSL compiles on many
- compiles on many varied platforms: try to ensure you only use portable
+ varied platforms: try to ensure you only use portable features.
- features.
 
  Note: For legal reasons, contributions from the US can be accepted only
  if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov

STATUS

@@ -1,140 +0,0 @@
-
-  OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2010/06/01 13:31:36 $
-
-  DEVELOPMENT STATE
-
-    o  OpenSSL 1.1.0:  Under development...
-    o  OpenSSL 1.0.0a: Released on June      1st,  2010
-    o  OpenSSL 1.0.0:  Released on March     29th, 2010
-    o  OpenSSL 0.9.8n: Released on March     24th, 2010
-    o  OpenSSL 0.9.8m: Released on February  25th, 2010
-    o  OpenSSL 0.9.8l: Released on November   5th, 2009
-    o  OpenSSL 0.9.8k: Released on March     25th, 2009
-    o  OpenSSL 0.9.8j: Released on January    7th, 2009
-    o  OpenSSL 0.9.8i: Released on September 15th, 2008
-    o  OpenSSL 0.9.8h: Released on May       28th, 2008
-    o  OpenSSL 0.9.8g: Released on October   19th, 2007
-    o  OpenSSL 0.9.8f: Released on October   11th, 2007
-    o  OpenSSL 0.9.8e: Released on February  23rd, 2007
-    o  OpenSSL 0.9.8d: Released on September 28th, 2006
-    o  OpenSSL 0.9.8c: Released on September  5th, 2006
-    o  OpenSSL 0.9.8b: Released on May        4th, 2006
-    o  OpenSSL 0.9.8a: Released on October   11th, 2005
-    o  OpenSSL 0.9.8:  Released on July       5th, 2005
-    o  OpenSSL 0.9.7m: Released on February  23rd, 2007
-    o  OpenSSL 0.9.7l: Released on September 28th, 2006
-    o  OpenSSL 0.9.7k: Released on September  5th, 2006
-    o  OpenSSL 0.9.7j: Released on May        4th, 2006
-    o  OpenSSL 0.9.7i: Released on October   14th, 2005
-    o  OpenSSL 0.9.7h: Released on October   11th, 2005
-    o  OpenSSL 0.9.7g: Released on April     11th, 2005
-    o  OpenSSL 0.9.7f: Released on March     22nd, 2005
-    o  OpenSSL 0.9.7e: Released on October   25th, 2004
-    o  OpenSSL 0.9.7d: Released on March     17th, 2004
-    o  OpenSSL 0.9.7c: Released on September 30th, 2003
-    o  OpenSSL 0.9.7b: Released on April     10th, 2003
-    o  OpenSSL 0.9.7a: Released on February  19th, 2003
-    o  OpenSSL 0.9.7:  Released on December  31st, 2002
-    o  OpenSSL 0.9.6m: Released on March     17th, 2004
-    o  OpenSSL 0.9.6l: Released on November   4th, 2003
-    o  OpenSSL 0.9.6k: Released on September 30th, 2003
-    o  OpenSSL 0.9.6j: Released on April     10th, 2003
-    o  OpenSSL 0.9.6i: Released on February  19th, 2003
-    o  OpenSSL 0.9.6h: Released on December   5th, 2002
-    o  OpenSSL 0.9.6g: Released on August     9th, 2002
-    o  OpenSSL 0.9.6f: Released on August     8th, 2002
-    o  OpenSSL 0.9.6e: Released on July      30th, 2002
-    o  OpenSSL 0.9.6d: Released on May        9th, 2002
-    o  OpenSSL 0.9.6c: Released on December  21st, 2001
-    o  OpenSSL 0.9.6b: Released on July       9th, 2001
-    o  OpenSSL 0.9.6a: Released on April      5th, 2001
-    o  OpenSSL 0.9.6:  Released on September 24th, 2000
-    o  OpenSSL 0.9.5a: Released on April      1st, 2000
-    o  OpenSSL 0.9.5:  Released on February  28th, 2000
-    o  OpenSSL 0.9.4:  Released on August    09th, 1999
-    o  OpenSSL 0.9.3a: Released on May       29th, 1999
-    o  OpenSSL 0.9.3:  Released on May       25th, 1999
-    o  OpenSSL 0.9.2b: Released on March     22th, 1999
-    o  OpenSSL 0.9.1c: Released on December  23th, 1998
-
-  [See also http://www.openssl.org/support/rt.html]
-
-  RELEASE SHOWSTOPPERS
-
-    o The Makefiles fail with some SysV makes.
-    o 
-
-  AVAILABLE PATCHES
-
-    o 
-
-  IN PROGRESS
-
-    o Steve is currently working on (in no particular order):
-        ASN1 code redesign, butchery, replacement.
-        OCSP
-        EVP cipher enhancement.
-        Enhanced certificate chain verification.
-	Private key, certificate and CRL API and implementation.
-	Developing and bugfixing PKCS#7 (S/MIME code).
-        Various X509 issues: character sets, certificate request extensions.
-    o Richard is currently working on:
-	Constification
-	Attribute Certificate support
-	Certificate Pair support
-	Storage Engines (primarly an LDAP storage engine)
-	Certificate chain validation with full RFC 3280 compatibility
-
-  NEEDS PATCH
-
-    o  0.9.8-dev: COMPLEMENTOFALL and COMPLEMENTOFDEFAULT do not
-       handle ECCdraft cipher suites correctly.
-
-    o  apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file
-
-    o  "OpenSSL STATUS" is never up-to-date.
-
-  OPEN ISSUES
-
-    o  The Makefile hierarchy and build mechanism is still not a round thing:
-
-       1. The config vs. Configure scripts
-          It's the same nasty situation as for Apache with APACI vs.
-          src/Configure. It confuses.
-          Suggestion: Merge Configure and config into a single configure
-                      script with a Autoconf style interface ;-) and remove
-                      Configure and config. Or even let us use GNU Autoconf
-                      itself. Then we can avoid a lot of those platform checks
-                      which are currently in Configure.
-
-    o  Support for Shared Libraries has to be added at least
-       for the major Unix platforms. The details we can rip from the stuff
-       Ralf has done for the Apache src/Configure script. Ben wants the
-       solution to be really simple.
-
-       Status: Ralf will look how we can easily incorporate the
-               compiler PIC and linker DSO flags from Apache
-               into the OpenSSL Configure script.
-
-               Ulf: +1 for using GNU autoconf and libtool (but not automake,
-                    which apparently is not flexible enough to generate
-                    libcrypto)
-
-  WISHES
-
-    o  Add variants of DH_generate_parameters() and BN_generate_prime() [etc?]
-       where the callback function can request that the function be aborted.
-       [Gregory Stark <ghstark@pobox.com>, <rayyang2000@yahoo.com>]
-
-    o  SRP in TLS.
-       [wished by:
-        Dj <derek@yo.net>, Tom Wu <tom@arcot.com>,
-        Tom Holroyd <tomh@po.crl.go.jp>]
-
-       See http://search.ietf.org/internet-drafts/draft-ietf-tls-srp-00.txt
-       as well as http://www-cs-students.stanford.edu/~tjw/srp/.
-
-       Tom Holroyd tells us there is a SRP patch for OpenSSH at
-       http://members.tripod.com/professor_tom/archives/, that could
-       be useful.

TABLE

@@ -810,7 +810,7 @@ $multilib     =
 $cc           = cc
 $cflags       = -q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
 $unistd       = 
-$thread_cflag = -qthreaded
+$thread_cflag = -qthreaded -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR
@@ -903,7 +903,7 @@ $multilib     =
 $cc           = cc
 $cflags       = -q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
 $unistd       = 
-$thread_cflag = -qthreaded
+$thread_cflag = -qthreaded -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
@@ -1287,7 +1287,7 @@ $bf_obj       =
 $md5_obj      = md5-x86_64.o
 $sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
 $cast_obj     = 
-$rc4_obj      = rc4-x86_64.o
+$rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
@@ -1426,6 +1426,68 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
+*** debug-VC-WIN64A
+$cc           = cl
+$cflags       = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$unistd       = 
+$thread_cflag = 
+$sys_id       = WIN64A
+$lflags       = 
+$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = bn_asm.o x86_64-mont.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$perlasm_scheme = auto
+$dso_scheme   = win32
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
+*** debug-VC-WIN64I
+$cc           = cl
+$cflags       = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$unistd       = 
+$thread_cflag = 
+$sys_id       = WIN64I
+$lflags       = 
+$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
+$cpuid_obj    = ia64cpuid.o
+$bn_obj       = ia64.o
+$des_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
+$bf_obj       = 
+$md5_obj      = md5-ia64.o
+$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$cmll_obj     = 
+$perlasm_scheme = ias
+$dso_scheme   = win32
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** debug-ben
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG_UNUSED -O2 -pedantic -Wall -Wshadow -Werror -pipe
@@ -1488,6 +1550,37 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
+*** debug-ben-debug-64
+$cc           = gcc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=strict-aliasing -Wno-error=uninitialized -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$unistd       = 
+$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
+$sys_id       = 
+$lflags       = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$perlasm_scheme = elf
+$dso_scheme   = dlfcn
+$shared_target= bsd-gcc-shared
+$shared_cflag = -fPIC
+$shared_ldflag = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** debug-ben-no-opt
 $cc           = gcc
 $cflags       = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3
@@ -1614,34 +1707,34 @@ $multilib     =
 
 *** debug-bodo
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = 
+$lflags       = -ldl
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
-$cpuid_obj    = x86cpuid.o
+$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o
-$des_obj      = des-586.o crypt586.o
+$des_obj      = 
-$aes_obj      = aes-586.o
+$aes_obj      = aes-x86_64.o
-$bf_obj       = bf-586.o
+$bf_obj       = 
-$md5_obj      = md5-586.o
+$md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
-$cast_obj     = cast-586.o
+$cast_obj     = 
-$rc4_obj      = rc4-586.o
+$rc4_obj      = rc4-x86_64.o
-$rmd160_obj   = rmd-586.o
+$rmd160_obj   = 
-$rc5_obj      = rc5-586.o
+$rc5_obj      = 
-$wp_obj       = wp_block.o wp-mmx.o
+$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
 $perlasm_scheme = elf
-$dso_scheme   = 
+$dso_scheme   = dlfcn
-$shared_target= 
+$shared_target= linux-shared
-$shared_cflag = 
+$shared_cflag = -fPIC
-$shared_ldflag = 
+$shared_ldflag = -m64
-$shared_extension = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = 
+$multilib     = 64
 
 *** debug-darwin-i386-cc
 $cc           = cc
@@ -1769,7 +1862,7 @@ $multilib     =
 
 *** debug-levitte-linux-elf
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -ggdb -g3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -1800,7 +1893,7 @@ $multilib     =
 
 *** debug-levitte-linux-elf-extreme
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -1831,7 +1924,7 @@ $multilib     =
 
 *** debug-levitte-linux-noasm
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -1862,7 +1955,7 @@ $multilib     =
 
 *** debug-levitte-linux-noasm-extreme
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2420,7 +2513,7 @@ $multilib     =
 
 *** debug-vos-gcc
 $cc           = gcc
-$cflags       = -O0 -g -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
+$cflags       = -O0 -g -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = VOS
@@ -4801,7 +4894,7 @@ $shared_target= solaris-shared
 $shared_cflag = -KPIC
 $shared_ldflag = -xarch=v9 -G -dy -z text
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = /usr/ccs/bin/ar rs
+$ranlib       = 
 $arflags      = 
 $multilib     = /64
 
@@ -5241,7 +5334,7 @@ $multilib     =
 
 *** vos-gcc
 $cc           = gcc
-$cflags       = -O3 -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
+$cflags       = -O3 -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = VOS

VMS/install-vms.com

@@ -0,0 +1,67 @@
+$! install-vms.com -- Installs the files in a given directory tree
+$!
+$! Author: Richard Levitte <richard@levitte.org>
+$! Time of creation: 23-MAY-1998 19:22
+$!
+$! P1	root of the directory tree
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$ on error then goto tidy
+$ on control_c then goto tidy
+$!
+$ if p1 .eqs. ""
+$ then
+$   write sys$output "First argument missing."
+$   write sys$output -
+     "Should be the directory where you want things installed."
+$   exit
+$ endif
+$
+$ if (f$getsyi( "cpu") .lt. 128)
+$ then
+$   arch = "VAX"
+$ else
+$   arch = f$edit( f$getsyi( "arch_name"), "upcase")
+$   if (arch .eqs. "") then arch = "UNK"
+$ endif
+$
+$ root = f$parse( P1, "[]A.;0", , , "SYNTAX_ONLY, NO_CONCEAL")- "A.;0"
+$ root_dev = f$parse( root, , , "device", "syntax_only")
+$ root_dir = f$parse( root, , , "directory", "syntax_only") - -
+   "[000000." - "][" - "[" - "]"
+$ root = root_dev + "[" + root_dir
+$
+$ define /nolog wrk_sslroot 'root'.] /translation_attributes = concealed
+$ define /nolog wrk_sslinclude wrk_sslroot:[include]
+$
+$ if f$parse( "wrk_sslroot:[000000]") .eqs. "" then -
+   create /directory /log wrk_sslroot:[000000]
+$ if f$parse( "wrk_sslinclude:") .eqs. "" then -
+   create /directory /log wrk_sslinclude:
+$ if f$parse( "wrk_sslroot:[vms]") .eqs. "" then -
+   create /directory /log wrk_sslroot:[vms]
+$!
+$ copy /log /protection = world:re openssl_startup.com wrk_sslroot:[vms]
+$ copy /log /protection = world:re openssl_undo.com wrk_sslroot:[vms]
+$ copy /log /protection = world:re openssl_utils.com wrk_sslroot:[vms]
+$!
+$ tidy:
+$!
+$ call deass wrk_sslroot
+$ call deass wrk_sslinclude
+$!
+$ exit
+$!
+$ deass: subroutine
+$ if (f$trnlnm( p1, "LNM$PROCESS") .nes. "")
+$ then
+$   deassign /process 'p1'
+$ endif
+$ endsubroutine
+$!

VMS/install.com

@@ -1,79 +0,0 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! Time of creation: 23-MAY-1998 19:22
-$!
-$! P1	root of the directory tree
-$!
-$	IF P1 .EQS. ""
-$	THEN
-$	    WRITE SYS$OUTPUT "First argument missing."
-$	    WRITE SYS$OUTPUT "Should be the directory where you want things installed."
-$	    EXIT
-$	ENDIF
-$
-$	IF (F$GETSYI("CPU").LT.128)
-$	THEN
-$	    ARCH := VAX
-$	ELSE
-$	    ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
-$	    IF (ARCH .EQS. "") THEN ARCH = "UNK"
-$	ENDIF
-$
-$	ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
-$	ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
-$	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
-		   - "[000000." - "][" - "[" - "]"
-$	ROOT = ROOT_DEV + "[" + ROOT_DIR
-$
-$	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$	DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]
-$
-$	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$	IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLINCLUDE:
-$	IF F$PARSE("WRK_SSLROOT:[VMS]") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[VMS]
-$
-$	IF F$SEARCH("WRK_SSLINCLUDE:vms_idhacks.h") .NES. "" THEN -
-	   DELETE WRK_SSLINCLUDE:vms_idhacks.h;*
-$
-$	OPEN/WRITE SF WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
-$	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM")," created."
-$	WRITE SF "$! Startup file for Openssl"
-$	WRITE SF "$!"
-$	WRITE SF "$! Do not edit this file, as it will be regenerated during next installation."
-$	WRITE SF "$! Instead, add or change SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"
-$	WRITE SF "$!"
-$	WRITE SF "$! P1	a qualifier to DEFINE.  For example ""/SYSTEM"" to get the logical names"
-$	WRITE SF "$!	defined in the system logical name table."
-$	WRITE SF "$!"
-$	WRITE SF "$	IF (F$GETSYI(""CPU"").LT.128)"
-$	WRITE SF "$	THEN"
-$	WRITE SF "$	    ARCH := VAX"
-$	WRITE SF "$	ELSE"
-$	WRITE SF "$	    ARCH = F$EDIT( F$GETSYI( ""ARCH_NAME""), ""UPCASE"")"
-$	WRITE SF "$	    IF (ARCH .EQS. """") THEN ARCH = ""UNK"""
-$	WRITE SF "$	ENDIF"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLROOT		",ROOT,".] /TRANS=CONC"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLLIB		SSLROOT:['ARCH'_LIB]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLINCLUDE	SSLROOT:[INCLUDE]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLEXE		SSLROOT:['ARCH'_EXE]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLCERTS	SSLROOT:[CERTS]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLPRIVATE	SSLROOT:[PRIVATE]"
-$	WRITE SF "$"
-$	WRITE SF "$!	This is program can include <openssl/{foo}.h>"
-$	WRITE SF "$	DEFINE/NOLOG'P1	OPENSSL		SSLINCLUDE:"
-$	WRITE SF "$"
-$	WRITE SF "$	IF F$SEARCH(""SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"") .NES."""" THEN -"
-$	WRITE SF "	   @SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"
-$	WRITE SF "$"
-$	WRITE SF "$	EXIT"
-$	CLOSE SF
-$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
-$
-$	COPY OPENSSL_UTILS.COM WRK_SSLROOT:[VMS]/LOG
-$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[VMS]OPENSSL_UTILS.COM
-$
-$	EXIT

VMS/mkshared.com

@@ -1,85 +1,166 @@
-$! MKSHARED.COM -- script to created shareable images on VMS
+$! MKSHARED.COM -- Create shareable images.
 $!
-$! No command line parameters.  This should be run at the start of the source
+$! P1: "64" for 64-bit pointers.
-$! tree (the same directory where one finds INSTALL.VMS).
 $!
-$! Input:	[.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB
+$! P2: Zlib object library path (optional).
-$!		[.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]LIBSSL.OLB
+$!
-$! Output:	[.xxx.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
+$! Input:	[.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]SSL_LIBCRYPTO[32].OLB
-$!		[.xxx.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
+$!		[.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]SSL_LIBSSL[32].OLB
+$!		[.CRYPTO.xxx]OPENSSLCONF.H
+$! Output:	[.xxx.EXE.CRYPTO]SSL_LIBCRYPTO_SHR[32].OPT,.MAP,.EXE
+$!		[.xxx.EXE.SSL]SSL_LIBSSL_SRH[32].OPT,.MAP,.EXE
 $!
 $! So far, tests have only been made on VMS for Alpha.  VAX will come in time.
 $! ===========================================================================
-$
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$! Save the original default device:[directory].
+$!
+$ def_orig = f$environment( "default")
+$ on error then goto tidy
+$ on control_c then goto tidy
+$!
+$! SET DEFAULT to the main kit directory.
+$!
+$ proc = f$environment("procedure")
+$ proc = f$parse( "A.;", proc)- "A.;"
+$ set default 'proc'
+$ set default [-]
+$!
 $! ----- Prepare info for processing: version number and file info
 $ gosub read_version_info
 $ if libver .eqs. ""
 $ then
 $   write sys$error "ERROR: Couldn't find any library version info..."
-$   exit
+$   go to tidy:
 $ endif
 $
-$ if (f$getsyi("cpu").lt.128)
+$ if (f$getsyi("cpu") .lt. 128)
 $ then
-$     arch := VAX
-$ else
-$     arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$     if (arch .eqs. "") then arch = "UNK"
-$ endif
-$
-$ if arch .nes. "VAX"
-$ then
-$   arch_vax = 0
-$   libid  = "Crypto"
-$   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.CRYPTO]"
-$   libolb = "''libdir'LIBCRYPTO.OLB"
-$   libopt = "''libdir'LIBCRYPTO.OPT"
-$   libmap = "''libdir'LIBCRYPTO.MAP"
-$   libgoal= "''libdir'LIBCRYPTO.EXE"
-$   libref = ""
-$   gosub create_nonvax_shr
-$   libid  = "SSL"
-$   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.SSL]"
-$   libolb = "''libdir'LIBSSL.OLB"
-$   libopt = "''libdir'LIBSSL.OPT"
-$   libmap = "''libdir'LIBSSL.MAP"
-$   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"
-$   gosub create_nonvax_shr
-$ else
 $   arch_vax = 1
+$   arch = "VAX"
+$ else
+$   arch_vax = 0
+$   arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$   if (arch .eqs. "") then arch = "UNK"
+$ endif
+$!
+$ archd = arch
+$ lib32 = "32"
+$ shr = "SHR32"
+$!
+$ if (p1 .nes. "")
+$ then
+$   if (p1 .eqs. "64")
+$   then
+$     archd = arch+ "_64"
+$     lib32 = ""
+$     shr = "SHR"
+$   else
+$     if (p1 .nes. "32")
+$     then
+$       write sys$output "Second argument invalid."
+$       write sys$output "It should be "32", "64", or nothing."
+$       exit
+$     endif
+$   endif
+$ endif
+$!
+$! ----- Prepare info for processing: disabled algorithms info
+$ gosub read_disabled_algorithms_info
+$!
+$ ZLIB = p2
+$ zlib_lib = ""
+$ if (ZLIB .nes. "")
+$ then
+$   file2 = f$parse( ZLIB, "libz.olb", , , "syntax_only")
+$   if (f$search( file2) .eqs. "")
+$   then
+$     write sys$output ""
+$     write sys$output "The Option ", ZLIB, " Is Invalid."
+$     write sys$output "    Can't find library: ''file2'"
+$     write sys$output ""
+$     goto tidy
+$   endif
+$   zlib_lib = ", ''file2' /library"
+$ endif
+$!
+$ if (arch_vax)
+$ then
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.CRYPTO]"
+$   libdir = "[.''ARCHD'.EXE.CRYPTO]"
-$   libmar = "''libdir'LIBCRYPTO.MAR"
+$   libmar = "''libdir'SSL_LIBCRYPTO_''shr'.MAR"
-$   libolb = "''libdir'LIBCRYPTO.OLB"
+$   libolb = "''libdir'SSL_LIBCRYPTO''lib32'.OLB"
-$   libopt = "''libdir'LIBCRYPTO.OPT"
+$   libopt = "''libdir'SSL_LIBCRYPTO_''shr'.OPT"
-$   libobj = "''libdir'LIBCRYPTO.OBJ"
+$   libobj = "''libdir'SSL_LIBCRYPTO_''shr'.OBJ"
-$   libmap = "''libdir'LIBCRYPTO.MAP"
+$   libmap = "''libdir'SSL_LIBCRYPTO_''shr'.MAP"
-$   libgoal= "''libdir'LIBCRYPTO.EXE"
+$   libgoal= "''libdir'SSL_LIBCRYPTO_''shr'.EXE"
 $   libref = ""
 $   libvec = "LIBCRYPTO"
-$   gosub create_vax_shr
+$   if f$search( libolb) .nes. "" then gosub create_vax_shr
 $   libtit = "SSL_TRANSFER_VECTOR"
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.SSL]"
+$   libdir = "[.''ARCHD'.EXE.SSL]"
-$   libmar = "''libdir'LIBSSL.MAR"
+$   libmar = "''libdir'SSL_LIBSSL_''shr'.MAR"
-$   libolb = "''libdir'LIBSSL.OLB"
+$   libolb = "''libdir'SSL_LIBSSL''lib32'.OLB"
-$   libopt = "''libdir'LIBSSL.OPT"
+$   libopt = "''libdir'SSL_LIBSSL_''shr'.OPT"
-$   libobj = "''libdir'LIBSSL.OBJ"
+$   libobj = "''libdir'SSL_LIBSSL_''shr'.OBJ"
-$   libmap = "''libdir'LIBSSL.MAP"
+$   libmap = "''libdir'SSL_LIBSSL_''shr'.MAP"
-$   libgoal= "''libdir'LIBSSL.EXE"
+$   libgoal= "''libdir'SSL_LIBSSL_''shr'.EXE"
-$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   libref = "[.''ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO_''shr'.EXE"
 $   libvec = "LIBSSL"
-$   gosub create_vax_shr
+$   if f$search( libolb) .nes. "" then gosub create_vax_shr
+$ else
+$   libid  = "Crypto"
+$   libnum = "[.UTIL]LIBEAY.NUM"
+$   libdir = "[.''ARCHD'.EXE.CRYPTO]"
+$   libolb = "''libdir'SSL_LIBCRYPTO''lib32'.OLB"
+$   libopt = "''libdir'SSL_LIBCRYPTO_''shr'.OPT"
+$   libmap = "''libdir'SSL_LIBCRYPTO_''shr'.MAP"
+$   libgoal= "''libdir'SSL_LIBCRYPTO_''shr'.EXE"
+$   libref = ""
+$   if f$search( libolb) .nes. "" then gosub create_nonvax_shr
+$   libid  = "SSL"
+$   libnum = "[.UTIL]SSLEAY.NUM"
+$   libdir = "[.''ARCHD'.EXE.SSL]"
+$   libolb = "''libdir'SSL_LIBSSL''lib32'.OLB"
+$   libopt = "''libdir'SSL_LIBSSL_''shr'.OPT"
+$   libmap = "''libdir'SSL_LIBSSL_''shr'.MAP"
+$   libgoal= "''libdir'SSL_LIBSSL_''shr'.EXE"
+$   libref = "[.''ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO_''shr'.EXE"
+$   if f$search( libolb) .nes. "" then gosub create_nonvax_shr
 $ endif
+$!
+$ tidy:
+$!
+$! Close any open files.
+$!
+$ if (f$trnlnm( "libnum", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close libnum
+$!
+$ if (f$trnlnm( "mar", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close mar
+$!
+$ if (f$trnlnm( "opt", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close opt
+$!
+$ if (f$trnlnm( "vf", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close vf
+$!
+$! Restore the original default device:[directory].
+$!
+$ set default 'def_orig'
 $ exit
 $
-$! ----- Soubroutines to build the shareable libraries
+$! ----- Subroutines to build the shareable libraries
 $! For each supported architecture, there's a main shareable library
 $! creator, which is called from the main code above.
 $! The creator will define a number of variables to tell the next levels of
@@ -111,9 +192,9 @@ $! ----- Subroutines for non-VAX
 $! -----
 $! The creator routine
 $ create_nonvax_shr:
-$   open/write opt 'libopt'
+$   open /write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
-$   write opt libolb,"/lib"
+$   write opt libolb, " /library"
 $   if libref .nes. "" then write opt libref,"/SHARE"
 $   write opt "SYMBOL_VECTOR=(-"
 $   libfirstentry := true
@@ -124,7 +205,8 @@ $   gosub read_func_num
 $   write opt ")"
 $   write opt "GSMATCH=",libvmatch,",",libver
 $   close opt
-$   link/map='libmap'/full/share='libgoal' 'libopt'/option
+$   link /map = 'libmap' /full /share = 'libgoal' 'libopt' /options -
+     'zlib_lib'
 $   return
 $
 $! The record writer routine
@@ -158,7 +240,7 @@ $! ----- Subroutines for VAX
 $! -----
 $! The creator routine
 $ create_vax_shr:
-$   open/write mar 'libmar'
+$   open /write mar 'libmar'
 $   type sys$input:/out=mar:
 ;
 ; Transfer vector for VAX shareable image
@@ -193,10 +275,10 @@ $!   libwriter := write_vax_vtransfer_entry
 $!   gosub read_func_num
 $   write mar "	.END"
 $   close mar
-$   open/write opt 'libopt'
+$   open /write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
 $   write opt libobj
-$   write opt libolb,"/lib"
+$   write opt libolb, " /library"
 $   if libref .nes. "" then write opt libref,"/SHARE"
 $   type sys$input:/out=opt:
 !
@@ -215,7 +297,8 @@ $   libwriter := write_vax_psect_attr
 $   gosub read_func_num
 $   close opt
 $   macro/obj='libobj' 'libmar'
-$   link/map='libmap'/full/share='libgoal' 'libopt'/option
+$   link /map = 'libmap' /full /share = 'libgoal' 'libopt' /options -
+     'zlib_lib'
 $   return
 $
 $! The record writer routine for VAX functions
@@ -237,9 +320,9 @@ $   return
 $
 $! ----- Common subroutines
 $! -----
-$! The .num file reader.  This one has great responsability.
+$! The .num file reader.  This one has great responsibility.
 $ read_func_num:
-$   open libnum 'libnum'
+$   open /read libnum 'libnum'
 $   goto read_nums
 $
 $ read_nums:
@@ -247,27 +330,30 @@ $   libentrynum=0
 $   liblastentry:=false
 $   entrycount=0
 $   loop:
-$     read/end=loop_end/err=loop_end libnum line
+$     read /end=loop_end /err=loop_end libnum line
-$     entrynum=f$int(f$element(1," ",f$edit(line,"COMPRESS,TRIM")))
+$     lin = f$edit( line, "COMPRESS,TRIM")
-$     entryinfo=f$element(2," ",f$edit(line,"COMPRESS,TRIM"))
+$!    Skip a "#" comment line.
-$     curentry=f$element(0," ",f$edit(line,"COMPRESS,TRIM"))
+$     if (f$extract( 0, 1, lin) .eqs. "#") then goto loop
-$     info_exist=f$element(0,":",entryinfo)
+$     entrynum = f$int(f$element( 1, " ", lin))
-$     info_platforms=","+f$element(1,":",entryinfo)+","
+$     entryinfo = f$element( 2, " ", lin)
-$     info_kind=f$element(2,":",entryinfo)
+$     curentry = f$element( 0, " ", lin)
-$     info_algorithms=","+f$element(3,":",entryinfo)+","
+$     info_exist = f$element( 0, ":", entryinfo)
+$     info_platforms = ","+ f$element(1, ":", entryinfo)+ ","
+$     info_kind = f$element( 2, ":", entryinfo)
+$     info_algorithms = ","+ f$element( 3, ":", entryinfo)+ ","
 $     if info_exist .eqs. "NOEXIST" then goto loop
 $     truesum = 0
 $     falsesum = 0
 $     negatives = 1
 $     plat_i = 0
 $     loop1:
-$       plat_entry = f$element(plat_i,",",info_platforms)
+$       plat_entry = f$element( plat_i, ",", info_platforms)
 $       plat_i = plat_i + 1
 $       if plat_entry .eqs. "" then goto loop1
 $       if plat_entry .nes. ","
 $       then
 $         if f$extract(0,1,plat_entry) .nes. "!" then negatives = 0
-$         if f$getsyi("CPU") .lt. 128
+$         if (arch_vax)
 $         then
 $           if plat_entry .eqs. "EXPORT_VAR_AS_FUNCTION" then -
 $             truesum = truesum + 1
@@ -276,6 +362,7 @@ $             falsesum = falsesum + 1
 $         endif
 $!
 $         if ((plat_entry .eqs. "VMS") .or. -
+            ((plat_entry .eqs. "ZLIB") .and. (ZLIB .nes. "")) .or. -
             (arch_vax .and. (plat_entry .eqs. "VMSVAX"))) then -
             truesum = truesum + 1
 $!
@@ -301,8 +388,7 @@ $	alg_i = alg_i + 1
 $       if alg_entry .eqs. "" then goto loop2
 $       if alg_entry .nes. ","
 $       then
-$         if alg_entry .eqs. "KRB5" then goto loop ! Special for now
+$	  if disabled_algorithms - ("," + alg_entry + ",") .nes disabled_algorithms then goto loop
-$	  if alg_entry .eqs. "STATIC_ENGINE" then goto loop ! Special for now
 $         if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop
 $	  goto loop2
 $       endif
@@ -345,7 +431,7 @@ $
 $! The version number reader
 $ read_version_info:
 $   libver = ""
-$   open/read vf [.CRYPTO]OPENSSLV.H
+$   open /read vf [.CRYPTO]OPENSSLV.H
 $   loop_rvi:
 $     read/err=endloop_rvi/end=endloop_rvi vf rvi_line
 $     if rvi_line - "SHLIB_VERSION_NUMBER """ .eqs. rvi_line then -
@@ -369,3 +455,22 @@ $     endif
 $   endloop_rvi:
 $   close vf
 $   return
+$
+$! The disabled algorithms reader
+$ read_disabled_algorithms_info:
+$   disabled_algorithms = ","
+$   open /read cf [.CRYPTO.'ARCH']OPENSSLCONF.H
+$   loop_rci:
+$     read/err=endloop_rci/end=endloop_rci cf rci_line
+$     rci_line = f$edit(rci_line,"TRIM,COMPRESS")
+$     rci_ei = 0
+$     if f$extract(0,9,rci_line) .eqs. "# define " then rci_ei = 2
+$     if f$extract(0,8,rci_line) .eqs. "#define " then rci_ei = 1
+$     if rci_ei .eq. 0 then goto loop_rci
+$     rci_e = f$element(rci_ei," ",rci_line)
+$     if f$extract(0,11,rci_e) .nes. "OPENSSL_NO_" then goto loop_rci
+$     disabled_algorithms = disabled_algorithms + f$extract(11,999,rci_e) + ","
+$     goto loop_rci
+$   endloop_rci:
+$   close cf
+$   return

VMS/openssl_startup.com

@@ -0,0 +1,108 @@
+$!
+$! Startup file for OpenSSL 1.x.
+$!
+$! 2011-03-05 SMS.
+$!
+$! This procedure must reside in the OpenSSL installation directory.
+$! It will fail if it is copied to a different location.
+$!
+$! P1  qualifier(s) for DEFINE.  For example, "/SYSTEM" to get the
+$!     logical names defined in the system logical name table.
+$!
+$! P2  "64", to use executables which were built with 64-bit pointers.
+$!
+$! Good (default) and bad status values.
+$!
+$ status =    %x00010001 ! RMS$_NORMAL, normal successful completion.
+$ rms_e_fnf = %x00018292 ! RMS$_FNF, file not found.
+$!
+$! Prepare for problems.
+$!
+$ orig_dev_dir = f$environment( "DEFAULT")
+$ on control_y then goto clean_up
+$ on error then goto clean_up
+$!
+$! Determine hardware architecture.
+$!
+$ if (f$getsyi( "cpu") .lt. 128)
+$ then
+$   arch_name = "VAX"
+$ else
+$   arch_name = f$edit( f$getsyi( "arch_name"), "upcase")
+$   if (arch_name .eqs. "") then arch_name = "UNK"
+$ endif
+$!
+$ if (p2 .eqs. "64")
+$ then
+$   arch_name_exe = arch_name+ "_64"
+$ else
+$   arch_name_exe = arch_name
+$ endif
+$!
+$! Derive the OpenSSL installation device:[directory] from the location
+$! of this command procedure.
+$!
+$ proc = f$environment( "procedure")
+$ proc_dev_dir = f$parse( "A.;", proc, , , "no_conceal") - "A.;"
+$ proc_dev = f$parse( proc_dev_dir, , , "device", "syntax_only")
+$ proc_dir = f$parse( proc_dev_dir, , , "directory", "syntax_only") - -
+   ".][000000"- "[000000."- "]["- "["- "]"
+$ proc_dev_dir = proc_dev+ "["+ proc_dir+ "]"
+$ set default 'proc_dev_dir'
+$ set default [-]
+$ ossl_dev_dir = f$environment( "default")
+$!
+$! Check existence of expected directories (to see if this procedure has
+$! been moved away from its proper place).
+$!
+$ if ((f$search( "certs.dir;1") .eqs. "") .or. -
+   (f$search( "include.dir;1") .eqs. "") .or. -
+   (f$search( "private.dir;1") .eqs. "") .or. -
+   (f$search( "vms.dir;1") .eqs. ""))
+$ then
+$    write sys$output -
+      "   Can't find expected common OpenSSL directories in:"
+$    write sys$output "   ''ossl_dev_dir'"
+$    status = rms_e_fnf
+$    goto clean_up
+$ endif
+$!
+$ if ((f$search( "''arch_name_exe'_exe.dir;1") .eqs. "") .or. -
+   (f$search( "''arch_name'_lib.dir;1") .eqs. ""))
+$ then
+$    write sys$output -
+      "   Can't find expected architecture-specific OpenSSL directories in:"
+$    write sys$output "   ''ossl_dev_dir'"
+$    status = rms_e_fnf
+$    goto clean_up
+$ endif
+$!
+$! All seems well (enough).  Define the OpenSSL logical names.
+$!
+$ ossl_root = ossl_dev_dir- "]"+ ".]"
+$ define /translation_attributes = concealed /nolog'p1 SSLROOT 'ossl_root'
+$ define /nolog 'p1' SSLCERTS     sslroot:[certs]
+$ define /nolog 'p1' SSLINCLUDE   sslroot:[include]
+$ define /nolog 'p1' SSLPRIVATE   sslroot:[private]
+$ define /nolog 'p1' SSLEXE       sslroot:['arch_name_exe'_exe]
+$ define /nolog 'p1' SSLLIB       sslroot:['arch_name'_lib]
+$!
+$! Defining OPENSSL lets a C program use "#include <openssl/{foo}.h>":
+$ define /nolog 'p1' OPENSSL      SSLINCLUDE:
+$!
+$! Run a site-specific procedure, if it exists.
+$!
+$ if f$search( "sslroot:[vms]openssl_systartup.com") .nes."" then -
+   @ sslroot:[vms]openssl_systartup.com
+$!
+$! Restore the original default dev:[dir] (if known).
+$!
+$ clean_up:
+$!
+$ if (f$type( orig_dev_dir) .nes. "")
+$ then
+$    set default 'orig_dev_dir'
+$ endif
+$!
+$ EXIT 'status'
+$!

VMS/openssl_undo.com

@@ -0,0 +1,20 @@
+$!
+$! Deassign OpenSSL logical names.
+$!
+$ call deass "OPENSSL" "''p1'"
+$ call deass "SSLCERTS" "''p1'"
+$ call deass "SSLEXE" "''p1'"
+$ call deass "SSLINCLUDE" "''p1'"
+$ call deass "SSLLIB" "''p1'"
+$ call deass "SSLPRIVATE" "''p1'"
+$ call deass "SSLROOT" "''p1'"
+$!
+$ exit
+$!
+$deass: subroutine
+$ if (f$trnlnm( p1) .nes. "")
+$ then
+$    deassign 'p2' 'p1'
+$ endif
+$ endsubroutine
+$!

apps/CA.com

@@ -37,14 +37,25 @@ $ VERIFY = openssl + " verify"
 $ X509   = openssl + " x509"
 $ PKCS12 = openssl + " pkcs12"
 $ echo   = "write sys$Output"
+$ RET = 1
 $!
-$ s = F$PARSE(F$ENVIRONMENT("DEFAULT"),"[]") - "].;"
+$! 2010-12-20 SMS.
-$ CATOP  := 's'.demoCA
+$! Use a concealed logical name to reduce command line lengths, to
-$ CAKEY  := ]cakey.pem
+$! avoid DCL errors on VAX:
-$ CACERT := ]cacert.pem
+$!     %DCL-W-TKNOVF, command element is too long - shorten
+$! (Path segments like "openssl-1_0_1-stable-SNAP-20101217" accumulate
+$! quickly.)
+$!
+$ CATOP = F$PARSE( F$ENVIRONMENT( "DEFAULT"), "[]")- "].;"+ ".demoCA.]"
+$ define /translation_attributes = concealed CATOP 'CATOP'
+$!
+$ on error then goto clean_up
+$ on control_y then goto clean_up
+$!
+$ CAKEY  = "CATOP:[private]cakey.pem"
+$ CACERT = "CATOP:[000000]cacert.pem"
 $
 $ __INPUT := SYS$COMMAND
-$ RET = 1
 $!
 $ i = 1
 $opt_loop:
@@ -55,7 +66,7 @@ $
 $ IF (prog_opt .EQS. "?" .OR. prog_opt .EQS. "-h" .OR. prog_opt .EQS. "-help") 
 $ THEN
 $   echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" 
-$   exit
+$   goto clean_up
 $ ENDIF
 $!
 $ IF (prog_opt .EQS. "-input")
@@ -69,7 +80,7 @@ $!
 $ IF (prog_opt .EQS. "-newcert")
 $ THEN
 $   ! Create a certificate.
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   REQ -new -x509 -keyout newreq.pem -out newreq.pem 'DAYS'
 $   RET=$STATUS
 $   echo "Certificate (and private key) is in newreq.pem"
@@ -79,7 +90,7 @@ $!
 $ IF (prog_opt .EQS. "-newreq")
 $ THEN
 $   ! Create a certificate request
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   REQ -new -keyout newreq.pem -out newreq.pem 'DAYS'
 $   RET=$STATUS
 $   echo "Request (and private key) is in newreq.pem"
@@ -90,41 +101,40 @@ $ IF (prog_opt .EQS. "-newca")
 $ THEN
 $   ! If explicitly asked for or it doesn't exist then setup the directory
 $   ! structure that Eric likes to manage things.
-$   IF F$SEARCH(CATOP+"]serial.") .EQS. ""
+$   IF F$SEARCH( "CATOP:[000000]serial.") .EQS. ""
 $   THEN
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP']
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[000000]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.certs]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[certs]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.crl]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[crl]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.newcerts]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[newcerts]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.private]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[private]
 $
-$     OPEN   /WRITE ser_file 'CATOP']serial. 
+$     OPEN /WRITE ser_file CATOP:[000000]serial. 
 $     WRITE ser_file "01"
 $     CLOSE ser_file
-$     APPEND/NEW NL: 'CATOP']index.txt
+$     APPEND /NEW_VERSION NL: CATOP:[000000]index.txt
 $
 $     ! The following is to make sure access() doesn't get confused.  It
 $     ! really needs one file in the directory to give correct answers...
-$     COPY NLA0: 'CATOP'.certs].;
+$     COPY NLA0: CATOP:[certs].;
-$     COPY NLA0: 'CATOP'.crl].;
+$     COPY NLA0: CATOP:[crl].;
-$     COPY NLA0: 'CATOP'.newcerts].;
+$     COPY NLA0: CATOP:[newcerts].;
-$     COPY NLA0: 'CATOP'.private].;
+$     COPY NLA0: CATOP:[private].;
 $   ENDIF
 $!
-$   IF F$SEARCH(CATOP+".private"+CAKEY) .EQS. ""
+$   IF F$SEARCH( CAKEY) .EQS. ""
 $   THEN
 $     READ '__INPUT' FILE -
-	   /PROMPT="CA certificate filename (or enter to create)"
+       /PROMPT="CA certificate filename (or enter to create): "
 $     IF (FILE .NES. "") .AND. (F$SEARCH(FILE) .NES. "")
 $     THEN
-$       COPY 'FILE' 'CATOP'.private'CAKEY'
+$       COPY 'FILE' 'CAKEY'
-$	RET=$STATUS
+$       RET=$STATUS
 $     ELSE
 $       echo "Making CA certificate ..."
-$       DEFINE/USER SYS$INPUT '__INPUT'
+$       DEFINE /USER_MODE SYS$INPUT '__INPUT'
-$       REQ -new -x509 -keyout 'CATOP'.private'CAKEY' -
+$       REQ -new -x509 -keyout 'CAKEY' -out 'CACERT' 'DAYS'
-		       -out 'CATOP''CACERT' 'DAYS'
+$       RET=$STATUS
-$	RET=$STATUS
 $     ENDIF
 $   ENDIF
 $   GOTO opt_loop_continue
@@ -135,16 +145,16 @@ $ THEN
 $   i = i + 1
 $   cname = P'i'
 $   IF cname .EQS. "" THEN cname = "My certificate"
-$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CATOP''CACERT -
+$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CACERT' -
-	   -out newcert.p12 -export -name "''cname'"
+     -out newcert.p12 -export -name "''cname'"
 $   RET=$STATUS
-$   exit RET
+$   goto clean_up
 $ ENDIF
 $!
 $ IF (prog_opt .EQS. "-xsign")
 $ THEN
 $!
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -infiles newreq.pem
 $   RET=$STATUS
 $   GOTO opt_loop_continue
@@ -153,7 +163,7 @@ $!
 $ IF ((prog_opt .EQS. "-sign") .OR. (prog_opt .EQS. "-signreq"))
 $ THEN
 $!   
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -out newcert.pem -infiles newreq.pem
 $   RET=$STATUS
 $   type newcert.pem
@@ -165,9 +175,9 @@ $ IF (prog_opt .EQS. "-signcert")
 $  THEN
 $!   
 $   echo "Cert passphrase will be requested twice - bug?"
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -out newcert.pem -infiles tmp.pem
 y
 y
@@ -182,17 +192,17 @@ $!
 $   i = i + 1
 $   IF (p'i' .EQS. "")
 $   THEN
-$     DEFINE/USER SYS$INPUT '__INPUT'
+$     DEFINE /USER_MODE SYS$INPUT '__INPUT'
-$     VERIFY "-CAfile" 'CATOP''CACERT' newcert.pem
+$     VERIFY "-CAfile" 'CACERT' newcert.pem
 $   ELSE
 $     j = i
 $    verify_opt_loop:
 $     IF j .GT. 8 THEN GOTO verify_opt_loop_end
 $     IF p'j' .NES. ""
 $     THEN 
-$       DEFINE/USER SYS$INPUT '__INPUT'
+$       DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $       __tmp = p'j'
-$       VERIFY "-CAfile" 'CATOP''CACERT' '__tmp'
+$       VERIFY "-CAfile" 'CACERT' '__tmp'
 $       tmp=$STATUS
 $       IF tmp .NE. 0 THEN RET=tmp
 $     ENDIF
@@ -208,8 +218,8 @@ $ IF (prog_opt .NES. "")
 $ THEN
 $!   
 $   echo "Unknown argument ''prog_opt'"
-$   
+$   RET = 3
-$   EXIT 3
+$   goto clean_up
 $ ENDIF
 $
 $opt_loop_continue:
@@ -217,4 +227,10 @@ $ i = i + 1
 $ GOTO opt_loop
 $
 $opt_loop_end:
+$!
+$clean_up:
+$!
+$ if f$trnlnm( "CATOP", "LNM$PROCESS") .nes. "" then -
+   deassign /process CATOP
+$!
 $ EXIT 'RET'

apps/Makefile

@@ -94,6 +94,9 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
 sreq.o: req.c 
 	$(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
 
+openssl-vms.cnf: openssl.cnf
+	$(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf
+
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -127,12 +130,12 @@ links:
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
-depend:
+update: openssl-vms.cnf local_depend
-	@if [ -z "$(THIS)" ]; then \
+
-	    $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
+depend: local_depend
-	else \
+	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-	    $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
+local_depend:
-	fi
+	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
 
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

apps/app_rand.c

@@ -115,104 +115,106 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
-
 static int seeded = 0;
 static int egdsocket = 0;
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
-	{
+{
-	int consider_randfile = (file == NULL);
+    int consider_randfile = (file == NULL);
-	char buffer[200];
+    char buffer[200];
 
 #ifdef OPENSSL_SYS_WINDOWS
-	BIO_printf(bio_e,"Loading 'screen' into random state -");
+    BIO_printf(bio_e, "Loading 'screen' into random state -");
-	BIO_flush(bio_e);
+    BIO_flush(bio_e);
-	RAND_screen();
+    RAND_screen();
-	BIO_printf(bio_e," done\n");
+    BIO_printf(bio_e, " done\n");
 #endif
 
-	if (file == NULL)
+    if (file == NULL)
-		file = RAND_file_name(buffer, sizeof buffer);
+        file = RAND_file_name(buffer, sizeof buffer);
-	else if (RAND_egd(file) > 0)
+    else if (RAND_egd(file) > 0) {
-		{
+        /*
-		/* we try if the given filename is an EGD socket.
+         * we try if the given filename is an EGD socket. if it is, we don't
-		   if it is, we don't write anything back to the file. */
+         * write anything back to the file.
-		egdsocket = 1;
+         */
-		return 1;
+        egdsocket = 1;
-		}
+        return 1;
-	if (file == NULL || !RAND_load_file(file, -1))
+    }
-		{
+    if (file == NULL || !RAND_load_file(file, -1)) {
-		if (RAND_status() == 0)
+        if (RAND_status() == 0) {
-			{
+            if (!dont_warn) {
-			if (!dont_warn)
+                BIO_printf(bio_e, "unable to load 'random state'\n");
-				{
+                BIO_printf(bio_e,
-				BIO_printf(bio_e,"unable to load 'random state'\n");
+                           "This means that the random number generator has not been seeded\n");
-				BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
+                BIO_printf(bio_e, "with much random data.\n");
-				BIO_printf(bio_e,"with much random data.\n");
+                if (consider_randfile) { /* explanation does not apply when a
-				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
+                                          * file is explicitly named */
-					{
+                    BIO_printf(bio_e,
-					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
+                               "Consider setting the RANDFILE environment variable to point at a file that\n");
-					BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
+                    BIO_printf(bio_e,
-					}
+                               "'random' data can be kept in (the file will be overwritten).\n");
-				}
+                }
-			return 0;
+            }
-			}
+            return 0;
-		}
+        }
-	seeded = 1;
+    }
-	return 1;
+    seeded = 1;
-	}
+    return 1;
+}
 
 long app_RAND_load_files(char *name)
-	{
+{
-	char *p,*n;
+    char *p, *n;
-	int last;
+    int last;
-	long tot=0;
+    long tot = 0;
-	int egd;
+    int egd;
 
-	for (;;)
+    for (;;) {
-		{
+        last = 0;
-		last=0;
+        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
-		for (p=name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++);
+        if (*p == '\0')
-		if (*p == '\0') last=1;
+            last = 1;
-		*p='\0';
+        *p = '\0';
-		n=name;
+        n = name;
-		name=p+1;
+        name = p + 1;
-		if (*n == '\0') break;
+        if (*n == '\0')
+            break;
 
-		egd=RAND_egd(n);
+        egd = RAND_egd(n);
-		if (egd > 0)
+        if (egd > 0)
-			tot+=egd;
+            tot += egd;
-		else
+        else
-			tot+=RAND_load_file(n,-1);
+            tot += RAND_load_file(n, -1);
-		if (last) break;
+        if (last)
-		}
+            break;
-	if (tot > 512)
+    }
-		app_RAND_allow_write_file();
+    if (tot > 512)
-	return(tot);
+        app_RAND_allow_write_file();
-	}
+    return (tot);
+}
 
 int app_RAND_write_file(const char *file, BIO *bio_e)
-	{
+{
-	char buffer[200];
+    char buffer[200];
 
-	if (egdsocket || !seeded)
+    if (egdsocket || !seeded)
-		/* If we did not manage to read the seed file,
+        /*
-		 * we should not write a low-entropy seed file back --
+         * If we did not manage to read the seed file, we should not write a
-		 * it would suppress a crucial warning the next time
+         * low-entropy seed file back -- it would suppress a crucial warning
-		 * we want to use it. */
+         * the next time we want to use it.
-		return 0;
+         */
+        return 0;
 
-	if (file == NULL)
+    if (file == NULL)
-		file = RAND_file_name(buffer, sizeof buffer);
+        file = RAND_file_name(buffer, sizeof buffer);
-	if (file == NULL || !RAND_write_file(file))
+    if (file == NULL || !RAND_write_file(file)) {
-		{
+        BIO_printf(bio_e, "unable to write 'random state'\n");
-		BIO_printf(bio_e,"unable to write 'random state'\n");
+        return 0;
-		return 0;
+    }
-		}
+    return 1;
-	return 1;
+}
-	}
 
 void app_RAND_allow_write_file(void)
-	{
+{
-	seeded = 1;
+    seeded = 1;
-	}
+}

apps/apps.h

@@ -110,120 +110,117 @@
  */
 
 #ifndef HEADER_APPS_H
-#define HEADER_APPS_H
+# define HEADER_APPS_H
 
-#include "e_os.h"
+# include "e_os.h"
 
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/lhash.h>
+# include <openssl/lhash.h>
-#include <openssl/conf.h>
+# include <openssl/conf.h>
-#include <openssl/txt_db.h>
+# include <openssl/txt_db.h>
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+#  include <openssl/engine.h>
-#endif
+# endif
-#ifndef OPENSSL_NO_OCSP
+# ifndef OPENSSL_NO_OCSP
-#include <openssl/ocsp.h>
+#  include <openssl/ocsp.h>
-#endif
+# endif
-#include <openssl/ossl_typ.h>
+# include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
-/* When `file' is NULL, use defaults.
+/*
- * `bio_e' is for error messages. */
+ * When `file' is NULL, use defaults. `bio_e' is for error messages.
+ */
 void app_RAND_allow_write_file(void);
 long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                        * separated by LIST_SEPARATOR_CHAR
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-#ifndef MONOLITH
+# ifndef MONOLITH
 
-#define MAIN(a,v)	main(a,v)
+#  define MAIN(a,v)       main(a,v)
 
-#ifndef NON_MAIN
+#  ifndef NON_MAIN
-CONF *config=NULL;
+CONF *config = NULL;
-BIO *bio_err=NULL;
+BIO *bio_err = NULL;
-#else
+#  else
 extern CONF *config;
 extern BIO *bio_err;
-#endif
+#  endif
 
-#else
+# else
 
-#define MAIN(a,v)	PROG(a,v)
+#  define MAIN(a,v)       PROG(a,v)
 extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_err;
 
-#endif
+# endif
 
-#ifndef OPENSSL_SYS_NETWARE
+# ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
+#  include <signal.h>
-#endif
+# endif
 
-#ifdef SIGPIPE
+# ifdef SIGPIPE
-#define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
+#  define do_pipe_sig()   signal(SIGPIPE,SIG_IGN)
-#else
+# else
-#define do_pipe_sig()
+#  define do_pipe_sig()
-#endif
+# endif
 
-#ifdef OPENSSL_NO_COMP
+# ifdef OPENSSL_NO_COMP
-#define zlib_cleanup() 
+#  define zlib_cleanup()
-#else
+# else
-#define zlib_cleanup() COMP_zlib_cleanup()
+#  define zlib_cleanup() COMP_zlib_cleanup()
-#endif
+# endif
 
-#if defined(MONOLITH) && !defined(OPENSSL_C)
+# if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup() \
-		do_pipe_sig()
+                do_pipe_sig()
 #  define apps_shutdown()
-#else
+# else
 #  ifndef OPENSSL_NO_ENGINE
-#    define apps_startup() \
+#   define apps_startup() \
-			do { do_pipe_sig(); CRYPTO_malloc_init(); \
+                        do { do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+                        ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
+                        ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
-#    define apps_shutdown() \
+#   define apps_shutdown() \
-			do { CONF_modules_unload(1); destroy_ui_method(); \
+                        do { CONF_modules_unload(1); destroy_ui_method(); \
-			OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \
+                        OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \
-			CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
+                        CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
-			ERR_free_strings(); zlib_cleanup();} while(0)
+                        ERR_free_strings(); zlib_cleanup();} while(0)
 #  else
-#    define apps_startup() \
+#   define apps_startup() \
-			do { do_pipe_sig(); CRYPTO_malloc_init(); \
+                        do { do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+                        ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			setup_ui_method(); } while(0)
+                        setup_ui_method(); } while(0)
-#    define apps_shutdown() \
+#   define apps_shutdown() \
-			do { CONF_modules_unload(1); destroy_ui_method(); \
+                        do { CONF_modules_unload(1); destroy_ui_method(); \
-			OBJ_cleanup(); EVP_cleanup(); \
+                        OBJ_cleanup(); EVP_cleanup(); \
-			CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
+                        CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
-			ERR_free_strings(); zlib_cleanup(); } while(0)
+                        ERR_free_strings(); zlib_cleanup(); } while(0)
 #  endif
-#endif
+# endif
 
-#ifdef OPENSSL_SYSNAME_WIN32
+# ifdef OPENSSL_SYSNAME_WIN32
 #  define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
-#else
+# else
 #  define openssl_fdset(a,b) FD_SET(a, b)
-#endif
+# endif
 
+typedef struct args_st {
+    char **data;
+    int count;
+} ARGS;
 
-typedef struct args_st
+# define PW_MIN_LENGTH 4
-	{
+typedef struct pw_cb_data {
-	char **data;
+    const void *password;
-	int count;
+    const char *prompt_info;
-	} ARGS;
+} PW_CB_DATA;
 
-#define PW_MIN_LENGTH 4
+int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data);
-typedef struct pw_cb_data
-	{
-	const void *password;
-	const char *prompt_info;
-	} PW_CB_DATA;
-
-int password_callback(char *buf, int bufsiz, int verify,
-	PW_CB_DATA *cb_data);
 
 int setup_ui_method(void);
 void destroy_ui_method(void);
@@ -231,12 +228,13 @@ void destroy_ui_method(void);
 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
 int str2fmt(char *s);
-void program_name(char *in,char *out,int size);
+void program_name(char *in, char *out, int size);
-int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);
+int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]);
-#ifdef HEADER_X509_H
+# ifdef HEADER_X509_H
 int dump_cert_text(BIO *out, X509 *x);
-void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
+void print_name(BIO *out, const char *title, X509_NAME *nm,
-#endif
+                unsigned long lflags);
+# endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
 int set_ext_copy(int *copy_type, const char *arg);
@@ -244,117 +242,120 @@ int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
 int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 int add_oid_section(BIO *err, CONF *conf);
 X509 *load_cert(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *cert_descrip);
+                const char *pass, ENGINE *e, const char *cert_descrip);
 EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
-	const char *pass, ENGINE *e, const char *key_descrip);
+                   const char *pass, ENGINE *e, const char *key_descrip);
 EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
-	const char *pass, ENGINE *e, const char *key_descrip);
+                      const char *pass, ENGINE *e, const char *key_descrip);
 STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *cert_descrip);
+                           const char *pass, ENGINE *e,
+                           const char *cert_descrip);
 STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *cert_descrip);
+                              const char *pass, ENGINE *e,
+                              const char *cert_descrip);
 X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
-#endif
+# endif
 
-#ifndef OPENSSL_NO_OCSP
+# ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
-			char *host, char *path, char *port, int use_ssl,
+                                 char *host, char *path, char *port,
-			STACK_OF(CONF_VALUE) *headers,
+                                 int use_ssl, STACK_OF(CONF_VALUE) *headers,
-			int req_timeout);
+                                 int req_timeout);
-#endif
+# endif
 
 int load_config(BIO *err, CONF *cnf);
 char *make_config_name(void);
 
 /* Functions defined in ca.c and also used in ocsp.c */
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-			ASN1_GENERALIZEDTIME **pinvtm, const char *str);
+                   ASN1_GENERALIZEDTIME **pinvtm, const char *str);
 
-#define DB_type         0
+# define DB_type         0
-#define DB_exp_date     1
+# define DB_exp_date     1
-#define DB_rev_date     2
+# define DB_rev_date     2
-#define DB_serial       3       /* index - unique */
+# define DB_serial       3      /* index - unique */
-#define DB_file         4       
+# define DB_file         4
-#define DB_name         5       /* index - unique when active and not disabled */
+# define DB_name         5      /* index - unique when active and not
-#define DB_NUMBER       6
+                                 * disabled */
+# define DB_NUMBER       6
 
-#define DB_TYPE_REV	'R'
+# define DB_TYPE_REV     'R'
-#define DB_TYPE_EXP	'E'
+# define DB_TYPE_EXP     'E'
-#define DB_TYPE_VAL	'V'
+# define DB_TYPE_VAL     'V'
 
-typedef struct db_attr_st
+typedef struct db_attr_st {
-	{
+    int unique_subject;
-	int unique_subject;
+} DB_ATTR;
-	} DB_ATTR;
+typedef struct ca_db_st {
-typedef struct ca_db_st
+    DB_ATTR attributes;
-	{
+    TXT_DB *db;
-	DB_ATTR attributes;
+} CA_DB;
-	TXT_DB *db;
-	} CA_DB;
 
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
-int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
+                ASN1_INTEGER **retai);
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
-int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
+int rotate_index(const char *dbfile, const char *new_suffix,
+                 const char *old_suffix);
 void free_index(CA_DB *db);
-#define index_name_cmp_noconst(a, b) \
+# define index_name_cmp_noconst(a, b) \
-	index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
+        index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
-	(const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
+        (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
 int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(char *str, long chtype, int multirdn);
 int args_verify(char ***pargs, int *pargc,
-			int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
+                int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
 void policies_print(BIO *out, X509_STORE_CTX *ctx);
 int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
-			const char *algname, ENGINE *e, int do_param);
+                 const char *algname, ENGINE *e, int do_param);
-#ifndef OPENSSL_NO_PSK
+# ifndef OPENSSL_NO_PSK
 extern char *psk_key;
-#endif
+# endif
-#ifndef OPENSSL_NO_JPAKE
+# ifndef OPENSSL_NO_JPAKE
 void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
-#endif
+# endif
 
-#define FORMAT_UNDEF    0
+# define FORMAT_UNDEF    0
-#define FORMAT_ASN1     1
+# define FORMAT_ASN1     1
-#define FORMAT_TEXT     2
+# define FORMAT_TEXT     2
-#define FORMAT_PEM      3
+# define FORMAT_PEM      3
-#define FORMAT_NETSCAPE 4
+# define FORMAT_NETSCAPE 4
-#define FORMAT_PKCS12   5
+# define FORMAT_PKCS12   5
-#define FORMAT_SMIME    6
+# define FORMAT_SMIME    6
-#define FORMAT_ENGINE   7
+# define FORMAT_ENGINE   7
-#define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
+# define FORMAT_IISSGC   8      /* XXX this stupid macro helps us to avoid
-				 * adding yet another param to load_*key() */
+                                 * adding yet another param to load_*key() */
-#define FORMAT_PEMRSA	9	/* PEM RSAPubicKey format */
+# define FORMAT_PEMRSA   9      /* PEM RSAPubicKey format */
-#define FORMAT_ASN1RSA	10	/* DER RSAPubicKey format */
+# define FORMAT_ASN1RSA  10     /* DER RSAPubicKey format */
-#define FORMAT_MSBLOB	11	/* MS Key blob format */
+# define FORMAT_MSBLOB   11     /* MS Key blob format */
-#define FORMAT_PVK	12	/* MS PVK file format */
+# define FORMAT_PVK      12     /* MS PVK file format */
 
-#define EXT_COPY_NONE	0
+# define EXT_COPY_NONE   0
-#define EXT_COPY_ADD	1
+# define EXT_COPY_ADD    1
-#define EXT_COPY_ALL	2
+# define EXT_COPY_ALL    2
 
-#define NETSCAPE_CERT_HDR	"certificate"
+# define NETSCAPE_CERT_HDR       "certificate"
 
-#define APP_PASS_LEN	1024
+# define APP_PASS_LEN    1024
 
-#define SERIAL_RAND_BITS	64
+# define SERIAL_RAND_BITS        64
 
 int app_isdir(const char *);
-int raw_read_stdin(void *,int);
+int raw_read_stdin(void *, int);
-int raw_write_stdout(const void *,int);
+int raw_write_stdout(const void *, int);
 
-#define TM_START	0
+# define TM_START        0
-#define TM_STOP		1
+# define TM_STOP         1
-double app_tminterval (int stop,int usertime);
+double app_tminterval(int stop, int usertime);
 #endif

apps/asn1pars.c

@@ -56,8 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-/* A nice addition from Dr Stephen Henson <steve@openssl.org> to 
+/*
- * add the -strparse option which parses nested binary structures
+ * A nice addition from Dr Stephen Henson <steve@openssl.org> to add the
+ * -strparse option which parses nested binary structures
  */
 
 #include <stdio.h>
@@ -69,376 +70,361 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
- * -in arg	- input file - default stdin
+ * -inform arg  - input format - default PEM (DER or PEM)
- * -i		- indent the details by depth
+ * -in arg      - input file - default stdin
- * -offset	- where in the file to start
+ * -i           - indent the details by depth
- * -length	- how many bytes to use
+ * -offset      - where in the file to start
- * -oid file	- extra oid description file
+ * -length      - how many bytes to use
+ * -oid file    - extra oid description file
  */
 
 #undef PROG
-#define PROG	asn1parse_main
+#define PROG    asn1parse_main
 
 int MAIN(int, char **);
 
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,badops=0,offset=0,ret=1,j;
+    int i, badops = 0, offset = 0, ret = 1, j;
-	unsigned int length=0;
+    unsigned int length = 0;
-	long num,tmplen;
+    long num, tmplen;
-	BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
+    BIO *in = NULL, *out = NULL, *b64 = NULL, *derout = NULL;
-	int informat,indent=0, noout = 0, dump = 0;
+    int informat, indent = 0, noout = 0, dump = 0;
-	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
+    char *infile = NULL, *str = NULL, *prog, *oidfile = NULL, *derfile = NULL;
-	char *genstr=NULL, *genconf=NULL;
+    char *genstr = NULL, *genconf = NULL;
-	unsigned char *tmpbuf;
+    unsigned char *tmpbuf;
-	const unsigned char *ctmpbuf;
+    const unsigned char *ctmpbuf;
-	BUF_MEM *buf=NULL;
+    BUF_MEM *buf = NULL;
-	STACK_OF(OPENSSL_STRING) *osk=NULL;
+    STACK_OF(OPENSSL_STRING) *osk = NULL;
-	ASN1_TYPE *at=NULL;
+    ASN1_TYPE *at = NULL;
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	if ((osk=sk_OPENSSL_STRING_new_null()) == NULL)
+    if ((osk = sk_OPENSSL_STRING_new_null()) == NULL) {
-		{
+        BIO_printf(bio_err, "Memory allocation failure\n");
-		BIO_printf(bio_err,"Memory allocation failure\n");
+        goto end;
-		goto end;
+    }
-		}
+    while (argc >= 1) {
-	while (argc >= 1)
+        if (strcmp(*argv, "-inform") == 0) {
-		{
+            if (--argc < 1)
-		if 	(strcmp(*argv,"-inform") == 0)
+                goto bad;
-			{
+            informat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			informat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            derfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-i") == 0) {
-			{
+            indent = 1;
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-noout") == 0)
-			derfile= *(++argv);
+            noout = 1;
-			}
+        else if (strcmp(*argv, "-oid") == 0) {
-		else if (strcmp(*argv,"-i") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			indent=1;
+            oidfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-offset") == 0) {
-		else if (strcmp(*argv,"-noout") == 0) noout = 1;
+            if (--argc < 1)
-		else if (strcmp(*argv,"-oid") == 0)
+                goto bad;
-			{
+            offset = atoi(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-length") == 0) {
-			oidfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-offset") == 0)
+            length = atoi(*(++argv));
-			{
+            if (length == 0)
-			if (--argc < 1) goto bad;
+                goto bad;
-			offset= atoi(*(++argv));
+        } else if (strcmp(*argv, "-dump") == 0) {
-			}
+            dump = -1;
-		else if (strcmp(*argv,"-length") == 0)
+        } else if (strcmp(*argv, "-dlimit") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			length= atoi(*(++argv));
+            dump = atoi(*(++argv));
-			if (length == 0) goto bad;
+            if (dump <= 0)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-dump") == 0)
+        } else if (strcmp(*argv, "-strparse") == 0) {
-			{
+            if (--argc < 1)
-			dump= -1;
+                goto bad;
-			}
+            sk_OPENSSL_STRING_push(osk, *(++argv));
-		else if (strcmp(*argv,"-dlimit") == 0)
+        } else if (strcmp(*argv, "-genstr") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			dump= atoi(*(++argv));
+            genstr = *(++argv);
-			if (dump <= 0) goto bad;
+        } else if (strcmp(*argv, "-genconf") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-strparse") == 0)
+                goto bad;
-			{
+            genconf = *(++argv);
-			if (--argc < 1) goto bad;
+        } else {
-			sk_OPENSSL_STRING_push(osk,*(++argv));
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			}
+            badops = 1;
-		else if (strcmp(*argv,"-genstr") == 0)
+            break;
-			{
+        }
-			if (--argc < 1) goto bad;
+        argc--;
-			genstr= *(++argv);
+        argv++;
-			}
+    }
-		else if (strcmp(*argv,"-genconf") == 0)
-			{
-			if (--argc < 1) goto bad;
-			genconf= *(++argv);
-			}
-		else
-			{
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
+                   " -out arg      output file (output format is always DER\n");
-		BIO_printf(bio_err," -noout arg    don't produce any output\n");
+        BIO_printf(bio_err, " -noout arg    don't produce any output\n");
-		BIO_printf(bio_err," -offset arg   offset into file\n");
+        BIO_printf(bio_err, " -offset arg   offset into file\n");
-		BIO_printf(bio_err," -length arg   length of section in file\n");
+        BIO_printf(bio_err, " -length arg   length of section in file\n");
-		BIO_printf(bio_err," -i            indent entries\n");
+        BIO_printf(bio_err, " -i            indent entries\n");
-		BIO_printf(bio_err," -dump         dump unknown data in hex form\n");
+        BIO_printf(bio_err, " -dump         dump unknown data in hex form\n");
-		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
+                   " -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
-		BIO_printf(bio_err," -strparse offset\n");
+        BIO_printf(bio_err, " -oid file     file of extra oid definitions\n");
-		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
+        BIO_printf(bio_err, " -strparse offset\n");
-		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
+                   "               a series of these can be used to 'dig' into multiple\n");
-		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
+        BIO_printf(bio_err, "               ASN1 blob wrappings\n");
-		goto end;
+        BIO_printf(bio_err,
-		}
+                   " -genstr str   string to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
+                   " -genconf file file to generate ASN1 structure from\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-	BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	out = BIO_push(tmpbio, out);
+        out = BIO_push(tmpbio, out);
-	}
+    }
 #endif
 
-	if (oidfile != NULL)
+    if (oidfile != NULL) {
-		{
+        if (BIO_read_filename(in, oidfile) <= 0) {
-		if (BIO_read_filename(in,oidfile) <= 0)
+            BIO_printf(bio_err, "problems opening %s\n", oidfile);
-			{
+            ERR_print_errors(bio_err);
-			BIO_printf(bio_err,"problems opening %s\n",oidfile);
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+        OBJ_create_objects(in);
-			}
+    }
-		OBJ_create_objects(in);
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
-		}
 
-	if (derfile) {
+    if (derfile) {
-		if(!(derout = BIO_new_file(derfile, "wb"))) {
+        if (!(derout = BIO_new_file(derfile, "wb"))) {
-			BIO_printf(bio_err,"problems opening %s\n",derfile);
+            BIO_printf(bio_err, "problems opening %s\n", derfile);
-			ERR_print_errors(bio_err);
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-	}
+    }
 
-	if ((buf=BUF_MEM_new()) == NULL) goto end;
+    if ((buf = BUF_MEM_new()) == NULL)
-	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
+        goto end;
+    if (!BUF_MEM_grow(buf, BUFSIZ * 8))
+        goto end;               /* Pre-allocate :-) */
 
-	if (genstr || genconf)
+    if (genstr || genconf) {
-		{
+        num = do_generate(bio_err, genstr, genconf, buf);
-		num = do_generate(bio_err, genstr, genconf, buf);
+        if (num < 0) {
-		if (num < 0)
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+    }
-			}
-		}
 
-	else
+    else {
-		{
 
-		if (informat == FORMAT_PEM)
+        if (informat == FORMAT_PEM) {
-			{
+            BIO *tmp;
-			BIO *tmp;
 
-			if ((b64=BIO_new(BIO_f_base64())) == NULL)
+            if ((b64 = BIO_new(BIO_f_base64())) == NULL)
-				goto end;
+                goto end;
-			BIO_push(b64,in);
+            BIO_push(b64, in);
-			tmp=in;
+            tmp = in;
-			in=b64;
+            in = b64;
-			b64=tmp;
+            b64 = tmp;
-			}
+        }
 
-		num=0;
+        num = 0;
-		for (;;)
+        for (;;) {
-			{
+            if (!BUF_MEM_grow(buf, (int)num + BUFSIZ))
-			if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
+                goto end;
-			i=BIO_read(in,&(buf->data[num]),BUFSIZ);
+            i = BIO_read(in, &(buf->data[num]), BUFSIZ);
-			if (i <= 0) break;
+            if (i <= 0)
-			num+=i;
+                break;
-			}
+            num += i;
-		}
+        }
-	str=buf->data;
+    }
+    str = buf->data;
 
-	/* If any structs to parse go through in sequence */
+    /* If any structs to parse go through in sequence */
 
-	if (sk_OPENSSL_STRING_num(osk))
+    if (sk_OPENSSL_STRING_num(osk)) {
-		{
+        tmpbuf = (unsigned char *)str;
-		tmpbuf=(unsigned char *)str;
+        tmplen = num;
-		tmplen=num;
+        for (i = 0; i < sk_OPENSSL_STRING_num(osk); i++) {
-		for (i=0; i<sk_OPENSSL_STRING_num(osk); i++)
+            ASN1_TYPE *atmp;
-			{
+            int typ;
-			ASN1_TYPE *atmp;
+            j = atoi(sk_OPENSSL_STRING_value(osk, i));
-			int typ;
+            if (j == 0) {
-			j=atoi(sk_OPENSSL_STRING_value(osk,i));
+                BIO_printf(bio_err, "'%s' is an invalid number\n",
-			if (j == 0)
+                           sk_OPENSSL_STRING_value(osk, i));
-				{
+                continue;
-				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_OPENSSL_STRING_value(osk,i));
+            }
-				continue;
+            tmpbuf += j;
-				}
+            tmplen -= j;
-			tmpbuf+=j;
+            atmp = at;
-			tmplen-=j;
+            ctmpbuf = tmpbuf;
-			atmp = at;
+            at = d2i_ASN1_TYPE(NULL, &ctmpbuf, tmplen);
-			ctmpbuf = tmpbuf;
+            ASN1_TYPE_free(atmp);
-			at = d2i_ASN1_TYPE(NULL,&ctmpbuf,tmplen);
+            if (!at) {
-			ASN1_TYPE_free(atmp);
+                BIO_printf(bio_err, "Error parsing structure\n");
-			if(!at)
+                ERR_print_errors(bio_err);
-				{
+                goto end;
-				BIO_printf(bio_err,"Error parsing structure\n");
+            }
-				ERR_print_errors(bio_err);
+            typ = ASN1_TYPE_get(at);
-				goto end;
+            if ((typ == V_ASN1_OBJECT)
-				}
+                || (typ == V_ASN1_BOOLEAN)
-			typ = ASN1_TYPE_get(at);
+                || (typ == V_ASN1_NULL)) {
-			if ((typ == V_ASN1_OBJECT)
+                BIO_printf(bio_err, "Can't parse %s type\n", ASN1_tag2str(typ));
-				|| (typ == V_ASN1_NULL))
+                ERR_print_errors(bio_err);
-				{
+                goto end;
-				BIO_printf(bio_err, "Can't parse %s type\n",
+            }
-					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
+            /* hmm... this is a little evil but it works */
-				ERR_print_errors(bio_err);
+            tmpbuf = at->value.asn1_string->data;
-				goto end;
+            tmplen = at->value.asn1_string->length;
-				}
+        }
-			/* hmm... this is a little evil but it works */
+        str = (char *)tmpbuf;
-			tmpbuf=at->value.asn1_string->data;
+        num = tmplen;
-			tmplen=at->value.asn1_string->length;
+    }
-			}
-		str=(char *)tmpbuf;
-		num=tmplen;
-		}
 
-	if (offset >= num)
+    if (offset >= num) {
-		{
+        BIO_printf(bio_err, "Error: offset too large\n");
-		BIO_printf(bio_err, "Error: offset too large\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	num -= offset;
+    num -= offset;
 
-	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
+    if ((length == 0) || ((long)length > num))
-	if(derout) {
+        length = (unsigned int)num;
-		if(BIO_write(derout, str + offset, length) != (int)length) {
+    if (derout) {
-			BIO_printf(bio_err, "Error writing output\n");
+        if (BIO_write(derout, str + offset, length) != (int)length) {
-			ERR_print_errors(bio_err);
+            BIO_printf(bio_err, "Error writing output\n");
-			goto end;
+            ERR_print_errors(bio_err);
-		}
+            goto end;
-	}
+        }
-	if (!noout &&
+    }
-	    !ASN1_parse_dump(out,(unsigned char *)&(str[offset]),length,
+    if (!noout &&
-		    indent,dump))
+        !ASN1_parse_dump(out, (unsigned char *)&(str[offset]), length,
-		{
+                         indent, dump)) {
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-		}
+    }
-	ret=0;
+    ret = 0;
-end:
+ end:
-	BIO_free(derout);
+    BIO_free(derout);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (b64 != NULL) BIO_free(b64);
+    if (out != NULL)
-	if (ret != 0)
+        BIO_free_all(out);
-		ERR_print_errors(bio_err);
+    if (b64 != NULL)
-	if (buf != NULL) BUF_MEM_free(buf);
+        BIO_free(b64);
-	if (at != NULL) ASN1_TYPE_free(at);
+    if (ret != 0)
-	if (osk != NULL) sk_OPENSSL_STRING_free(osk);
+        ERR_print_errors(bio_err);
-	OBJ_cleanup();
+    if (buf != NULL)
-	apps_shutdown();
+        BUF_MEM_free(buf);
-	OPENSSL_EXIT(ret);
+    if (at != NULL)
-	}
+        ASN1_TYPE_free(at);
+    if (osk != NULL)
+        sk_OPENSSL_STRING_free(osk);
+    OBJ_cleanup();
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
-	{
+{
-	CONF *cnf = NULL;
+    CONF *cnf = NULL;
-	int len;
+    int len;
-	long errline;
+    long errline;
-	unsigned char *p;
+    unsigned char *p;
-	ASN1_TYPE *atyp = NULL;
+    ASN1_TYPE *atyp = NULL;
 
-	if (genconf)
+    if (genconf) {
-		{
+        cnf = NCONF_new(NULL);
-		cnf = NCONF_new(NULL);
+        if (!NCONF_load(cnf, genconf, &errline))
-		if (!NCONF_load(cnf, genconf, &errline))
+            goto conferr;
-			goto conferr;
+        if (!genstr)
-		if (!genstr)
+            genstr = NCONF_get_string(cnf, "default", "asn1");
-			genstr = NCONF_get_string(cnf, "default", "asn1");
+        if (!genstr) {
-		if (!genstr)
+            BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
-			{
+            goto err;
-			BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
+        }
-			goto err;
+    }
-			}
-		}
 
-	atyp = ASN1_generate_nconf(genstr, cnf);
+    atyp = ASN1_generate_nconf(genstr, cnf);
-	NCONF_free(cnf);
+    NCONF_free(cnf);
+    cnf = NULL;
 
-	if (!atyp)
+    if (!atyp)
-		return -1;
+        return -1;
 
-	len = i2d_ASN1_TYPE(atyp, NULL);
+    len = i2d_ASN1_TYPE(atyp, NULL);
 
-	if (len <= 0)
+    if (len <= 0)
-		goto err;
+        goto err;
 
-	if (!BUF_MEM_grow(buf,len))
+    if (!BUF_MEM_grow(buf, len))
-		goto err;
+        goto err;
 
-	p=(unsigned char *)buf->data;
+    p = (unsigned char *)buf->data;
 
-	i2d_ASN1_TYPE(atyp, &p);
+    i2d_ASN1_TYPE(atyp, &p);
 
-	ASN1_TYPE_free(atyp);
+    ASN1_TYPE_free(atyp);
-	return len;
+    return len;
 
-	conferr:
+ conferr:
 
-	if (errline > 0)
+    if (errline > 0)
-		BIO_printf(bio, "Error on line %ld of config file '%s'\n",
+        BIO_printf(bio, "Error on line %ld of config file '%s'\n",
-							errline, genconf);
+                   errline, genconf);
-	else
+    else
-		BIO_printf(bio, "Error loading config file '%s'\n", genconf);
+        BIO_printf(bio, "Error loading config file '%s'\n", genconf);
 
-	err:
+ err:
-	NCONF_free(cnf);
+    NCONF_free(cnf);
-	ASN1_TYPE_free(atyp);
+    ASN1_TYPE_free(atyp);
 
-	return -1;
+    return -1;
 
-	}
+}

apps/ciphers.c

@@ -60,172 +60,166 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
+# define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #undef PROG
-#define PROG	ciphers_main
+#define PROG    ciphers_main
 
-static const char *ciphers_usage[]={
+static const char *ciphers_usage[] = {
-"usage: ciphers args\n",
+    "usage: ciphers args\n",
-" -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
+    " -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
-" -V          - even more verbose\n",
+    " -V          - even more verbose\n",
-" -ssl2       - SSL2 mode\n",
+    " -ssl2       - SSL2 mode\n",
-" -ssl3       - SSL3 mode\n",
+    " -ssl3       - SSL3 mode\n",
-" -tls1       - TLS1 mode\n",
+    " -tls1       - TLS1 mode\n",
-NULL
+    NULL
 };
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int ret=1,i;
+    int ret = 1, i;
-	int verbose=0,Verbose=0;
+    int verbose = 0, Verbose = 0;
-	const char **pp;
+    const char **pp;
-	const char *p;
+    const char *p;
-	int badops=0;
+    int badops = 0;
-	SSL_CTX *ctx=NULL;
+    SSL_CTX *ctx = NULL;
-	SSL *ssl=NULL;
+    SSL *ssl = NULL;
-	char *ciphers=NULL;
+    char *ciphers = NULL;
-	const SSL_METHOD *meth=NULL;
+    const SSL_METHOD *meth = NULL;
-	STACK_OF(SSL_CIPHER) *sk;
+    STACK_OF(SSL_CIPHER) *sk;
-	char buf[512];
+    char buf[512];
-	BIO *STDout=NULL;
+    BIO *STDout = NULL;
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
+    meth = SSLv23_server_method();
-	meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
-	meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
-	meth=SSLv2_server_method();
-#endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-	STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
+    STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	STDout = BIO_push(tmpbio, STDout);
+        STDout = BIO_push(tmpbio, STDout);
-	}
+    }
 #endif
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-v") == 0)
-		if (strcmp(*argv,"-v") == 0)
+            verbose = 1;
-			verbose=1;
+        else if (strcmp(*argv, "-V") == 0)
-		else if (strcmp(*argv,"-V") == 0)
+            verbose = Verbose = 1;
-			verbose=Verbose=1;
 #ifndef OPENSSL_NO_SSL2
-		else if (strcmp(*argv,"-ssl2") == 0)
+        else if (strcmp(*argv, "-ssl2") == 0)
-			meth=SSLv2_client_method();
+            meth = SSLv2_client_method();
 #endif
 #ifndef OPENSSL_NO_SSL3
-		else if (strcmp(*argv,"-ssl3") == 0)
+        else if (strcmp(*argv, "-ssl3") == 0)
-			meth=SSLv3_client_method();
+            meth = SSLv3_client_method();
 #endif
 #ifndef OPENSSL_NO_TLS1
-		else if (strcmp(*argv,"-tls1") == 0)
+        else if (strcmp(*argv, "-tls1") == 0)
-			meth=TLSv1_client_method();
+            meth = TLSv1_client_method();
 #endif
-		else if ((strncmp(*argv,"-h",2) == 0) ||
+        else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
-			 (strcmp(*argv,"-?") == 0))
+            badops = 1;
-			{
+            break;
-			badops=1;
+        } else {
-			break;
+            ciphers = *argv;
-			}
+        }
-		else
+        argc--;
-			{
+        argv++;
-			ciphers= *argv;
+    }
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+        for (pp = ciphers_usage; (*pp != NULL); pp++)
-		for (pp=ciphers_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	OpenSSL_add_ssl_algorithms();
+    OpenSSL_add_ssl_algorithms();
 
-	ctx=SSL_CTX_new(meth);
+    ctx = SSL_CTX_new(meth);
-	if (ctx == NULL) goto err;
+    if (ctx == NULL)
-	if (ciphers != NULL) {
+        goto err;
-		if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
+    if (ciphers != NULL) {
-			BIO_printf(bio_err, "Error in cipher list\n");
+        if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
-			goto err;
+            BIO_printf(bio_err, "Error in cipher list\n");
-		}
+            goto err;
-	}
+        }
-	ssl=SSL_new(ctx);
+    }
-	if (ssl == NULL) goto err;
+    ssl = SSL_new(ctx);
+    if (ssl == NULL)
+        goto err;
 
+    if (!verbose) {
+        for (i = 0;; i++) {
+            p = SSL_get_cipher_list(ssl, i);
+            if (p == NULL)
+                break;
+            if (i != 0)
+                BIO_printf(STDout, ":");
+            BIO_printf(STDout, "%s", p);
+        }
+        BIO_printf(STDout, "\n");
+    } else {                    /* verbose */
 
-	if (!verbose)
+        sk = SSL_get_ciphers(ssl);
-		{
-		for (i=0; ; i++)
-			{
-			p=SSL_get_cipher_list(ssl,i);
-			if (p == NULL) break;
-			if (i != 0) BIO_printf(STDout,":");
-			BIO_printf(STDout,"%s",p);
-			}
-		BIO_printf(STDout,"\n");
-		}
-	else /* verbose */
-		{
-		sk=SSL_get_ciphers(ssl);
 
-		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
+        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
-			{
+            SSL_CIPHER *c;
-			SSL_CIPHER *c;
 
-			c = sk_SSL_CIPHER_value(sk,i);
+            c = sk_SSL_CIPHER_value(sk, i);
 
-			if (Verbose)
+            if (Verbose) {
-				{
+                unsigned long id = c->id;
-				unsigned long id = c->id;
+                int id0 = (int)(id >> 24);
-				int id0 = (int)(id >> 24);
+                int id1 = (int)((id >> 16) & 0xffL);
-				int id1 = (int)((id >> 16) & 0xffL);
+                int id2 = (int)((id >> 8) & 0xffL);
-				int id2 = (int)((id >> 8) & 0xffL);
+                int id3 = (int)(id & 0xffL);
-				int id3 = (int)(id & 0xffL);
 
-				if ((id & 0xff000000L) == 0x02000000L)
+                if ((id & 0xff000000L) == 0x02000000L) {
-					BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */
+                    /* SSL2 cipher */
-				else if ((id & 0xff000000L) == 0x03000000L)
+                    BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1,
-					BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */
+                               id2, id3);
-				else
+                } else if ((id & 0xff000000L) == 0x03000000L) {
-					BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
+                    /* SSL3 cipher */
-				}
+                    BIO_printf(STDout, "          0x%02X,0x%02X - ", id2,
+                               id3);
+                } else {
+                    /* whatever */
+                    BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0,
+                               id1, id2, id3);
+                }
+            }
 
-			BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
+            BIO_puts(STDout, SSL_CIPHER_description(c, buf, sizeof buf));
-			}
+        }
-		}
+    }
-
-	ret=0;
-	if (0)
-		{
-err:
-		SSL_load_error_strings();
-		ERR_print_errors(bio_err);
-		}
-end:
-	if (ctx != NULL) SSL_CTX_free(ctx);
-	if (ssl != NULL) SSL_free(ssl);
-	if (STDout != NULL) BIO_free_all(STDout);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 
+    ret = 0;
+    if (0) {
+ err:
+        SSL_load_error_strings();
+        ERR_print_errors(bio_err);
+    }
+ end:
+    if (ctx != NULL)
+        SSL_CTX_free(ctx);
+    if (ssl != NULL)
+        SSL_free(ssl);
+    if (STDout != NULL)
+        BIO_free_all(STDout);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}

apps/crl.c

@@ -67,380 +67,368 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	crl_main
+#define PROG    crl_main
 
 #undef POSTFIX
-#define	POSTFIX	".rvk"
+#define POSTFIX ".rvk"
 
-static const char *crl_usage[]={
+static const char *crl_usage[] = {
-"usage: crl args\n",
+    "usage: crl args\n",
-"\n",
+    "\n",
-" -inform arg     - input format - default PEM (DER or PEM)\n",
+    " -inform arg     - input format - default PEM (DER or PEM)\n",
-" -outform arg    - output format - default PEM\n",
+    " -outform arg    - output format - default PEM\n",
-" -text           - print out a text format version\n",
+    " -text           - print out a text format version\n",
-" -in arg         - input file - default stdin\n",
+    " -in arg         - input file - default stdin\n",
-" -out arg        - output file - default stdout\n",
+    " -out arg        - output file - default stdout\n",
-" -hash           - print hash value\n",
+    " -hash           - print hash value\n",
-" -fingerprint    - print the crl fingerprint\n",
+#ifndef OPENSSL_NO_MD5
-" -issuer         - print issuer DN\n",
+    " -hash_old       - print old-style (MD5) hash value\n",
-" -lastupdate     - lastUpdate field\n",
+#endif
-" -nextupdate     - nextUpdate field\n",
+    " -fingerprint    - print the crl fingerprint\n",
-" -crlnumber      - print CRL number\n",
+    " -issuer         - print issuer DN\n",
-" -noout          - no CRL output\n",
+    " -lastupdate     - lastUpdate field\n",
-" -CAfile  name   - verify CRL using certificates in file \"name\"\n",
+    " -nextupdate     - nextUpdate field\n",
-" -CApath  dir    - verify CRL using certificates in \"dir\"\n",
+    " -crlnumber      - print CRL number\n",
-" -nameopt arg    - various certificate name options\n",
+    " -noout          - no CRL output\n",
-NULL
+    " -CAfile  name   - verify CRL using certificates in file \"name\"\n",
+    " -CApath  dir    - verify CRL using certificates in \"dir\"\n",
+    " -nameopt arg    - various certificate name options\n",
+    NULL
 };
 
 static X509_CRL *load_crl(char *file, int format);
-static BIO *bio_out=NULL;
+static BIO *bio_out = NULL;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	unsigned long nmflag = 0;
+    unsigned long nmflag = 0;
-	X509_CRL *x=NULL;
+    X509_CRL *x = NULL;
-	char *CAfile = NULL, *CApath = NULL;
+    char *CAfile = NULL, *CApath = NULL;
-	int ret=1,i,num,badops=0;
+    int ret = 1, i, num, badops = 0;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile=NULL,*outfile=NULL;
+    char *infile = NULL, *outfile = NULL;
-	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
+    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout =
-	int fingerprint = 0, crlnumber = 0;
+        0, text = 0;
-	const char **pp;
+#ifndef OPENSSL_NO_MD5
-	X509_STORE *store = NULL;
+    int hash_old = 0;
-	X509_STORE_CTX ctx;
-	X509_LOOKUP *lookup = NULL;
-	X509_OBJECT xobj;
-	EVP_PKEY *pkey;
-	int do_ver = 0;
-	const EVP_MD *md_alg,*digest=EVP_sha1();
-
-	apps_startup();
-
-	if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-
-	if (!load_config(bio_err, NULL))
-		goto end;
-
-	if (bio_out == NULL)
-		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
-			{
-			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-			{
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			bio_out = BIO_push(tmpbio, bio_out);
-			}
 #endif
-			}
+    int fingerprint = 0, crlnumber = 0;
+    const char **pp;
+    X509_STORE *store = NULL;
+    X509_STORE_CTX ctx;
+    X509_LOOKUP *lookup = NULL;
+    X509_OBJECT xobj;
+    EVP_PKEY *pkey;
+    int do_ver = 0;
+    const EVP_MD *md_alg, *digest = EVP_sha1();
 
-	informat=FORMAT_PEM;
+    apps_startup();
-	outformat=FORMAT_PEM;
 
-	argc--;
+    if (bio_err == NULL)
-	argv++;
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-	num=0;
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-	while (argc >= 1)
+
-		{
+    if (!load_config(bio_err, NULL))
+        goto end;
+
+    if (bio_out == NULL)
+        if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
+            BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+            {
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                bio_out = BIO_push(tmpbio, bio_out);
+            }
+#endif
+        }
+
+    informat = FORMAT_PEM;
+    outformat = FORMAT_PEM;
+
+    argc--;
+    argv++;
+    num = 0;
+    while (argc >= 1) {
 #ifdef undef
-		if	(strcmp(*argv,"-p") == 0)
+        if (strcmp(*argv, "-p") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
+            if (!args_from_file(++argv, Nargc, Nargv)) {
-			}
+                goto end;
+            }
+        */}
 #endif
-		if 	(strcmp(*argv,"-inform") == 0)
+        if (strcmp(*argv, "-inform") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			informat=str2fmt(*(++argv));
+            informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            outformat = str2fmt(*(++argv));
-			outformat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-in") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-in") == 0)
+                goto bad;
-			{
+            infile = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-out") == 0) {
-			infile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-out") == 0)
+            outfile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-CApath") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			outfile= *(++argv);
+                goto bad;
-			}
+            CApath = *(++argv);
-		else if (strcmp(*argv,"-CApath") == 0)
+            do_ver = 1;
-			{
+        } else if (strcmp(*argv, "-CAfile") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			CApath = *(++argv);
+                goto bad;
-			do_ver = 1;
+            CAfile = *(++argv);
-			}
+            do_ver = 1;
-		else if (strcmp(*argv,"-CAfile") == 0)
+        } else if (strcmp(*argv, "-verify") == 0)
-			{
+            do_ver = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-text") == 0)
-			CAfile = *(++argv);
+            text = 1;
-			do_ver = 1;
+        else if (strcmp(*argv, "-hash") == 0)
-			}
+            hash = ++num;
-		else if (strcmp(*argv,"-verify") == 0)
+#ifndef OPENSSL_NO_MD5
-			do_ver = 1;
+        else if (strcmp(*argv, "-hash_old") == 0)
-		else if (strcmp(*argv,"-text") == 0)
+            hash_old = ++num;
-			text = 1;
+#endif
-		else if (strcmp(*argv,"-hash") == 0)
+        else if (strcmp(*argv, "-nameopt") == 0) {
-			hash= ++num;
+            if (--argc < 1)
-		else if (strcmp(*argv,"-nameopt") == 0)
+                goto bad;
-			{
+            if (!set_name_ex(&nmflag, *(++argv)))
-			if (--argc < 1) goto bad;
+                goto bad;
-			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
+        } else if (strcmp(*argv, "-issuer") == 0)
-			}
+            issuer = ++num;
-		else if (strcmp(*argv,"-issuer") == 0)
+        else if (strcmp(*argv, "-lastupdate") == 0)
-			issuer= ++num;
+            lastupdate = ++num;
-		else if (strcmp(*argv,"-lastupdate") == 0)
+        else if (strcmp(*argv, "-nextupdate") == 0)
-			lastupdate= ++num;
+            nextupdate = ++num;
-		else if (strcmp(*argv,"-nextupdate") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			nextupdate= ++num;
+            noout = ++num;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-fingerprint") == 0)
-			noout= ++num;
+            fingerprint = ++num;
-		else if (strcmp(*argv,"-fingerprint") == 0)
+        else if (strcmp(*argv, "-crlnumber") == 0)
-			fingerprint= ++num;
+            crlnumber = ++num;
-		else if (strcmp(*argv,"-crlnumber") == 0)
+        else if ((md_alg = EVP_get_digestbyname(*argv + 1))) {
-			crlnumber= ++num;
+            /* ok */
-		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
+            digest = md_alg;
-			{
+        } else {
-			/* ok */
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			digest=md_alg;
+            badops = 1;
-			}
+            break;
-		else
+        }
-			{
+        argc--;
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+        argv++;
-			badops=1;
+    }
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        for (pp = crl_usage; (*pp != NULL); pp++)
-		for (pp=crl_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	x=load_crl(infile,informat);
+    x = load_crl(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
+        goto end;
+    }
 
-	if(do_ver) {
+    if (do_ver) {
-		store = X509_STORE_new();
+        store = X509_STORE_new();
-		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
+        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
-		if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
+            goto end;
-			X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+        if (!X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM))
+            X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 
-		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
+        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
-		if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM))
+            goto end;
-			X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
+        if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM))
-		ERR_clear_error();
+            X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
+        ERR_clear_error();
 
-		if(!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
+        if (!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error initialising X509 store\n");
-				"Error initialising X509 store\n");
+            goto end;
-			goto end;
+        }
-		}
 
-		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
+        i = X509_STORE_get_by_subject(&ctx, X509_LU_X509,
-					X509_CRL_get_issuer(x), &xobj);
+                                      X509_CRL_get_issuer(x), &xobj);
-		if(i <= 0) {
+        if (i <= 0) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
-				"Error getting CRL issuer certificate\n");
+            goto end;
-			goto end;
+        }
-		}
+        pkey = X509_get_pubkey(xobj.data.x509);
-		pkey = X509_get_pubkey(xobj.data.x509);
+        X509_OBJECT_free_contents(&xobj);
-		X509_OBJECT_free_contents(&xobj);
+        if (!pkey) {
-		if(!pkey) {
+            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
-			BIO_printf(bio_err,
+            goto end;
-				"Error getting CRL issuer public key\n");
+        }
-			goto end;
+        i = X509_CRL_verify(x, pkey);
-		}
+        EVP_PKEY_free(pkey);
-		i = X509_CRL_verify(x, pkey);
+        if (i < 0)
-		EVP_PKEY_free(pkey);
+            goto end;
-		if(i < 0) goto end;
+        if (i == 0)
-		if(i == 0) BIO_printf(bio_err, "verify failure\n");
+            BIO_printf(bio_err, "verify failure\n");
-		else BIO_printf(bio_err, "verify OK\n");
+        else
-	}
+            BIO_printf(bio_err, "verify OK\n");
+    }
 
-	if (num)
+    if (num) {
-		{
+        for (i = 1; i <= num; i++) {
-		for (i=1; i<=num; i++)
+            if (issuer == i) {
-			{
+                print_name(bio_out, "issuer=", X509_CRL_get_issuer(x),
-			if (issuer == i)
+                           nmflag);
-				{
+            }
-				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
+            if (crlnumber == i) {
-				}
+                ASN1_INTEGER *crlnum;
-			if (crlnumber == i)
+                crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number, NULL, NULL);
-				{
+                BIO_printf(bio_out, "crlNumber=");
-				ASN1_INTEGER *crlnum;
+                if (crlnum) {
-				crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number,
+                    i2a_ASN1_INTEGER(bio_out, crlnum);
-							      NULL, NULL);
+                    ASN1_INTEGER_free(crlnum);
-				BIO_printf(bio_out,"crlNumber=");
+                } else
-				if (crlnum)
+                    BIO_puts(bio_out, "<NONE>");
-					{
+                BIO_printf(bio_out, "\n");
-					i2a_ASN1_INTEGER(bio_out, crlnum);
+            }
-					ASN1_INTEGER_free(crlnum);
+            if (hash == i) {
-					}
+                BIO_printf(bio_out, "%08lx\n",
-				else
+                           X509_NAME_hash(X509_CRL_get_issuer(x)));
-					BIO_puts(bio_out, "<NONE>");
+            }
-				BIO_printf(bio_out,"\n");
+#ifndef OPENSSL_NO_MD5
-				}
+            if (hash_old == i) {
-			if (hash == i)
+                BIO_printf(bio_out, "%08lx\n",
-				{
+                           X509_NAME_hash_old(X509_CRL_get_issuer(x)));
-				BIO_printf(bio_out,"%08lx\n",
+            }
-					X509_NAME_hash(X509_CRL_get_issuer(x)));
+#endif
-				}
+            if (lastupdate == i) {
-			if (lastupdate == i)
+                BIO_printf(bio_out, "lastUpdate=");
-				{
+                ASN1_TIME_print(bio_out, X509_CRL_get_lastUpdate(x));
-				BIO_printf(bio_out,"lastUpdate=");
+                BIO_printf(bio_out, "\n");
-				ASN1_TIME_print(bio_out,
+            }
-						X509_CRL_get_lastUpdate(x));
+            if (nextupdate == i) {
-				BIO_printf(bio_out,"\n");
+                BIO_printf(bio_out, "nextUpdate=");
-				}
+                if (X509_CRL_get_nextUpdate(x))
-			if (nextupdate == i)
+                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
-				{
+                else
-				BIO_printf(bio_out,"nextUpdate=");
+                    BIO_printf(bio_out, "NONE");
-				if (X509_CRL_get_nextUpdate(x)) 
+                BIO_printf(bio_out, "\n");
-					ASN1_TIME_print(bio_out,
+            }
-						X509_CRL_get_nextUpdate(x));
+            if (fingerprint == i) {
-				else
+                int j;
-					BIO_printf(bio_out,"NONE");
+                unsigned int n;
-				BIO_printf(bio_out,"\n");
+                unsigned char md[EVP_MAX_MD_SIZE];
-				}
-			if (fingerprint == i)
-				{
-				int j;
-				unsigned int n;
-				unsigned char md[EVP_MAX_MD_SIZE];
 
-				if (!X509_CRL_digest(x,digest,md,&n))
+                if (!X509_CRL_digest(x, digest, md, &n)) {
-					{
+                    BIO_printf(bio_err, "out of memory\n");
-					BIO_printf(bio_err,"out of memory\n");
+                    goto end;
-					goto end;
+                }
-					}
+                BIO_printf(bio_out, "%s Fingerprint=",
-				BIO_printf(bio_out,"%s Fingerprint=",
+                           OBJ_nid2sn(EVP_MD_type(digest)));
-						OBJ_nid2sn(EVP_MD_type(digest)));
+                for (j = 0; j < (int)n; j++) {
-				for (j=0; j<(int)n; j++)
+                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
-					{
+                               ? '\n' : ':');
-					BIO_printf(bio_out,"%02X%c",md[j],
+                }
-						(j+1 == (int)n)
+            }
-						?'\n':':');
+        }
-					}
+    }
-				}
-			}
-		}
 
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            goto end;
-			{
+        }
-			perror(outfile);
+    }
-			goto end;
-			}
-		}
 
-	if (text) X509_CRL_print(out, x);
+    if (text)
+        X509_CRL_print(out, x);
 
-	if (noout) 
+    if (noout) {
-		{
+        ret = 0;
-		ret = 0;
+        goto end;
-		goto end;
+    }
-		}
 
-	if 	(outformat == FORMAT_ASN1)
+    if (outformat == FORMAT_ASN1)
-		i=(int)i2d_X509_CRL_bio(out,x);
+        i = (int)i2d_X509_CRL_bio(out, x);
-	else if (outformat == FORMAT_PEM)
+    else if (outformat == FORMAT_PEM)
-		i=PEM_write_bio_X509_CRL(out,x);
+        i = PEM_write_bio_X509_CRL(out, x);
-	else	
+    else {
-		{
+        BIO_printf(bio_err, "bad output format specified for outfile\n");
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+        goto end;
-		goto end;
+    }
-		}
+    if (!i) {
-	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
+        BIO_printf(bio_err, "unable to write CRL\n");
-	ret=0;
+        goto end;
-end:
+    }
-	BIO_free_all(out);
+    ret = 0;
-	BIO_free_all(bio_out);
+ end:
-	bio_out=NULL;
+    BIO_free_all(out);
-	X509_CRL_free(x);
+    BIO_free_all(bio_out);
-	if(store) {
+    bio_out = NULL;
-		X509_STORE_CTX_cleanup(&ctx);
+    X509_CRL_free(x);
-		X509_STORE_free(store);
+    if (store) {
-	}
+        X509_STORE_CTX_cleanup(&ctx);
-	apps_shutdown();
+        X509_STORE_free(store);
-	OPENSSL_EXIT(ret);
+    }
-	}
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static X509_CRL *load_crl(char *infile, int format)
-	{
+{
-	X509_CRL *x=NULL;
+    X509_CRL *x = NULL;
-	BIO *in=NULL;
+    BIO *in = NULL;
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	if (in == NULL)
+    if (in == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (format == FORMAT_ASN1)
-		}
+        x = d2i_X509_CRL_bio(in, NULL);
-	if 	(format == FORMAT_ASN1)
+    else if (format == FORMAT_PEM)
-		x=d2i_X509_CRL_bio(in,NULL);
+        x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
-	else if (format == FORMAT_PEM)
+    else {
-		x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
+        BIO_printf(bio_err, "bad input format specified for input crl\n");
-	else	{
+        goto end;
-		BIO_printf(bio_err,"bad input format specified for input crl\n");
+    }
-		goto end;
+    if (x == NULL) {
-		}
+        BIO_printf(bio_err, "unable to load CRL\n");
-	if (x == NULL)
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		BIO_printf(bio_err,"unable to load CRL\n");
+    }
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	
-end:
-	BIO_free(in);
-	return(x);
-	}
 
+ end:
+    BIO_free(in);
+    return (x);
+}

apps/crl2p7.c

@@ -56,9 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-/* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
+/*
- * and donated 'to the cause' along with lots and lots of other fixes to
+ * This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu> and
- * the library. */
+ * donated 'to the cause' along with lots and lots of other fixes to the
+ * library.
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -73,265 +75,260 @@
 
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
-#define PROG	crl2pkcs7_main
+#define PROG    crl2pkcs7_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,badops=0;
+    int i, badops = 0;
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile,*outfile,*prog,*certfile;
+    char *infile, *outfile, *prog, *certfile;
-	PKCS7 *p7 = NULL;
+    PKCS7 *p7 = NULL;
-	PKCS7_SIGNED *p7s = NULL;
+    PKCS7_SIGNED *p7s = NULL;
-	X509_CRL *crl=NULL;
+    X509_CRL *crl = NULL;
-	STACK_OF(OPENSSL_STRING) *certflst=NULL;
+    STACK_OF(OPENSSL_STRING) *certflst = NULL;
-	STACK_OF(X509_CRL) *crl_stack=NULL;
+    STACK_OF(X509_CRL) *crl_stack = NULL;
-	STACK_OF(X509) *cert_stack=NULL;
+    STACK_OF(X509) *cert_stack = NULL;
-	int ret=1,nocrl=0;
+    int ret = 1, nocrl = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-nocrl") == 0) {
-			if (--argc < 1) goto bad;
+            nocrl = 1;
-			infile= *(++argv);
+        } else if (strcmp(*argv, "-out") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-nocrl") == 0)
+                goto bad;
-			{
+            outfile = *(++argv);
-			nocrl=1;
+        } else if (strcmp(*argv, "-certfile") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-out") == 0)
+                goto bad;
-			{
+            if (!certflst)
-			if (--argc < 1) goto bad;
+                certflst = sk_OPENSSL_STRING_new_null();
-			outfile= *(++argv);
+            if (!certflst)
-			}
+                goto end;
-		else if (strcmp(*argv,"-certfile") == 0)
+            if (!sk_OPENSSL_STRING_push(certflst, *(++argv))) {
-			{
+                sk_OPENSSL_STRING_free(certflst);
-			if (--argc < 1) goto bad;
+                goto end;
-			if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
+            }
-			sk_OPENSSL_STRING_push(certflst,*(++argv));
+        } else {
-			}
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else
+            badops = 1;
-			{
+            break;
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+        }
-			badops=1;
+        argc--;
-			break;
+        argv++;
-			}
+    }
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg    input format - DER or PEM\n");
-		BIO_printf(bio_err," -inform arg    input format - DER or PEM\n");
+        BIO_printf(bio_err, " -outform arg   output format - DER or PEM\n");
-		BIO_printf(bio_err," -outform arg   output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg        input file\n");
-		BIO_printf(bio_err," -in arg        input file\n");
+        BIO_printf(bio_err, " -out arg       output file\n");
-		BIO_printf(bio_err," -out arg       output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
+                   " -certfile arg  certificates file of chain to a trusted CA\n");
-		BIO_printf(bio_err,"                (can be used more than once)\n");
+        BIO_printf(bio_err, "                (can be used more than once)\n");
-		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
+        BIO_printf(bio_err,
-		ret = 1;
+                   " -nocrl         no crl to load, just certs from '-certfile'\n");
-		goto end;
+        ret = 1;
-		}
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (!nocrl)
+    if (!nocrl) {
-		{
+        if (infile == NULL)
-		if (infile == NULL)
+            BIO_set_fp(in, stdin, BIO_NOCLOSE);
-			BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        else {
-		else
+            if (BIO_read_filename(in, infile) <= 0) {
-			{
+                perror(infile);
-			if (BIO_read_filename(in,infile) <= 0)
+                goto end;
-				{
+            }
-				perror(infile);
+        }
-				goto end;
-				}
-			}
 
-		if 	(informat == FORMAT_ASN1)
+        if (informat == FORMAT_ASN1)
-			crl=d2i_X509_CRL_bio(in,NULL);
+            crl = d2i_X509_CRL_bio(in, NULL);
-		else if (informat == FORMAT_PEM)
+        else if (informat == FORMAT_PEM)
-			crl=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
+            crl = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
-		else	{
+        else {
-			BIO_printf(bio_err,"bad input format specified for input crl\n");
+            BIO_printf(bio_err, "bad input format specified for input crl\n");
-			goto end;
+            goto end;
-			}
+        }
-		if (crl == NULL)
+        if (crl == NULL) {
-			{
+            BIO_printf(bio_err, "unable to load CRL\n");
-			BIO_printf(bio_err,"unable to load CRL\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
+    }
-		}
 
-	if ((p7=PKCS7_new()) == NULL) goto end;
+    if ((p7 = PKCS7_new()) == NULL)
-	if ((p7s=PKCS7_SIGNED_new()) == NULL) goto end;
+        goto end;
-	p7->type=OBJ_nid2obj(NID_pkcs7_signed);
+    if ((p7s = PKCS7_SIGNED_new()) == NULL)
-	p7->d.sign=p7s;
+        goto end;
-	p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
+    p7->type = OBJ_nid2obj(NID_pkcs7_signed);
+    p7->d.sign = p7s;
+    p7s->contents->type = OBJ_nid2obj(NID_pkcs7_data);
 
-	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
+    if (!ASN1_INTEGER_set(p7s->version, 1))
-	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
+        goto end;
-	p7s->crl=crl_stack;
+    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
-	if (crl != NULL)
+        goto end;
-		{
+    p7s->crl = crl_stack;
-		sk_X509_CRL_push(crl_stack,crl);
+    if (crl != NULL) {
-		crl=NULL; /* now part of p7 for OPENSSL_freeing */
+        sk_X509_CRL_push(crl_stack, crl);
-		}
+        crl = NULL;             /* now part of p7 for OPENSSL_freeing */
+    }
 
-	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
+    if ((cert_stack = sk_X509_new_null()) == NULL)
-	p7s->cert=cert_stack;
+        goto end;
+    p7s->cert = cert_stack;
 
-	if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+    if (certflst)
-		certfile = sk_OPENSSL_STRING_value(certflst, i);
+        for (i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
-		if (add_certs_from_file(cert_stack,certfile) < 0)
+            certfile = sk_OPENSSL_STRING_value(certflst, i);
-			{
+            if (add_certs_from_file(cert_stack, certfile) < 0) {
-			BIO_printf(bio_err, "error loading certificates\n");
+                BIO_printf(bio_err, "error loading certificates\n");
-			ERR_print_errors(bio_err);
+                ERR_print_errors(bio_err);
-			goto end;
+                goto end;
-			}
+            }
-	}
+        }
 
-	sk_OPENSSL_STRING_free(certflst);
+    sk_OPENSSL_STRING_free(certflst);
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            goto end;
-			{
+        }
-			perror(outfile);
+    }
-			goto end;
-			}
-		}
 
-	if 	(outformat == FORMAT_ASN1)
+    if (outformat == FORMAT_ASN1)
-		i=i2d_PKCS7_bio(out,p7);
+        i = i2d_PKCS7_bio(out, p7);
-	else if (outformat == FORMAT_PEM)
+    else if (outformat == FORMAT_PEM)
-		i=PEM_write_bio_PKCS7(out,p7);
+        i = PEM_write_bio_PKCS7(out, p7);
-	else	{
+    else {
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+        BIO_printf(bio_err, "bad output format specified for outfile\n");
-		goto end;
+        goto end;
-		}
+    }
-	if (!i)
+    if (!i) {
-		{
+        BIO_printf(bio_err, "unable to write pkcs7 object\n");
-		BIO_printf(bio_err,"unable to write pkcs7 object\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    ret = 0;
-	ret=0;
+ end:
-end:
+    if (in != NULL)
-	if (in != NULL) BIO_free(in);
+        BIO_free(in);
-	if (out != NULL) BIO_free_all(out);
+    if (out != NULL)
-	if (p7 != NULL) PKCS7_free(p7);
+        BIO_free_all(out);
-	if (crl != NULL) X509_CRL_free(crl);
+    if (p7 != NULL)
+        PKCS7_free(p7);
+    if (crl != NULL)
+        X509_CRL_free(crl);
 
-	apps_shutdown();
+    apps_shutdown();
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
-	}
+}
 
-/*
+/*-
  *----------------------------------------------------------------------
  * int add_certs_from_file
  *
- *	Read a list of certificates to be checked from a file.
+ *      Read a list of certificates to be checked from a file.
  *
  * Results:
- *	number of certs added if successful, -1 if not.
+ *      number of certs added if successful, -1 if not.
  *----------------------------------------------------------------------
  */
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
-	{
+{
-	BIO *in=NULL;
+    BIO *in = NULL;
-	int count=0;
+    int count = 0;
-	int ret= -1;
+    int ret = -1;
-	STACK_OF(X509_INFO) *sk=NULL;
+    STACK_OF(X509_INFO) *sk = NULL;
-	X509_INFO *xi;
+    X509_INFO *xi;
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
+    if ((in == NULL) || (BIO_read_filename(in, certfile) <= 0)) {
-		{
+        BIO_printf(bio_err, "error opening the file, %s\n", certfile);
-		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
+        goto end;
-		goto end;
+    }
-		}
 
-	/* This loads from a file, a stack of x509/crl/pkey sets */
+    /* This loads from a file, a stack of x509/crl/pkey sets */
-	sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
+    sk = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
-	if (sk == NULL) {
+    if (sk == NULL) {
-		BIO_printf(bio_err,"error reading the file, %s\n",certfile);
+        BIO_printf(bio_err, "error reading the file, %s\n", certfile);
-		goto end;
+        goto end;
-	}
+    }
 
-	/* scan over it and pull out the CRL's */
+    /* scan over it and pull out the CRL's */
-	while (sk_X509_INFO_num(sk))
+    while (sk_X509_INFO_num(sk)) {
-		{
+        xi = sk_X509_INFO_shift(sk);
-		xi=sk_X509_INFO_shift(sk);
+        if (xi->x509 != NULL) {
-		if (xi->x509 != NULL)
+            sk_X509_push(stack, xi->x509);
-			{
+            xi->x509 = NULL;
-			sk_X509_push(stack,xi->x509);
+            count++;
-			xi->x509=NULL;
+        }
-			count++;
+        X509_INFO_free(xi);
-			}
+    }
-		X509_INFO_free(xi);
-		}
-
-	ret=count;
-end:
- 	/* never need to OPENSSL_free x */
-	if (in != NULL) BIO_free(in);
-	if (sk != NULL) sk_X509_INFO_free(sk);
-	return(ret);
-	}
 
+    ret = count;
+ end:
+    /* never need to OPENSSL_free x */
+    if (in != NULL)
+        BIO_free(in);
+    if (sk != NULL)
+        sk_X509_INFO_free(sk);
+    return (ret);
+}

apps/dh.c

@@ -57,28 +57,29 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <time.h>
+# include <time.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dh.h>
+# include <openssl/dh.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#undef PROG
+# undef PROG
-#define PROG	dh_main
+# define PROG    dh_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
- * -check	- check the parameters are ok
+ * -check       - check the parameters are ok
  * -noout
  * -text
  * -C
@@ -87,269 +88,250 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	DH *dh=NULL;
+    DH *dh = NULL;
-	int i,badops=0,text=0;
+    int i, badops = 0, text = 0;
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat,check=0,noout=0,C=0,ret=1;
+    int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
-	char *infile,*outfile,*prog;
+    char *infile, *outfile, *prog;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine;
+    char *engine;
-#endif
+# endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	engine=NULL;
+    engine = NULL;
-#endif
+# endif
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        }
-			{
+# ifndef OPENSSL_NO_ENGINE
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-engine") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#ifndef OPENSSL_NO_ENGINE
+            engine = *(++argv);
-		else if (strcmp(*argv,"-engine") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-check") == 0)
-			engine= *(++argv);
+            check = 1;
-			}
+        else if (strcmp(*argv, "-text") == 0)
-#endif
+            text = 1;
-		else if (strcmp(*argv,"-check") == 0)
+        else if (strcmp(*argv, "-C") == 0)
-			check=1;
+            C = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			text=1;
+            noout = 1;
-		else if (strcmp(*argv,"-C") == 0)
+        else {
-			C=1;
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else if (strcmp(*argv,"-noout") == 0)
+            badops = 1;
-			noout=1;
+            break;
-		else
+        }
-			{
+        argc--;
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+        argv++;
-			badops=1;
+    }
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
+                   " -outform arg  output format - one of DER PEM\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-		BIO_printf(bio_err," -check        check the DH parameters\n");
+        BIO_printf(bio_err, " -check        check the DH parameters\n");
-		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -C            Output C code\n");
+                   " -text         print a text form of the DH parameters\n");
-		BIO_printf(bio_err," -noout        no output\n");
+        BIO_printf(bio_err, " -C            Output C code\n");
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err, " -noout        no output\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+# ifndef OPENSSL_NO_ENGINE
-#endif
+        BIO_printf(bio_err,
-		goto end;
+                   " -engine e     use engine e, possibly a hardware device.\n");
-		}
+# endif
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (outfile == NULL) {
-		}
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-	if (outfile == NULL)
+# ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-#ifdef OPENSSL_SYS_VMS
+            out = BIO_push(tmpbio, out);
-		{
+        }
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+# endif
-		out = BIO_push(tmpbio, out);
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-#endif
+            perror(outfile);
-		}
+            goto end;
-	else
+        }
-		{
+    }
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	if	(informat == FORMAT_ASN1)
+    if (informat == FORMAT_ASN1)
-		dh=d2i_DHparams_bio(in,NULL);
+        dh = d2i_DHparams_bio(in, NULL);
-	else if (informat == FORMAT_PEM)
+    else if (informat == FORMAT_PEM)
-		dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
+        dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
-	else
+    else {
-		{
+        BIO_printf(bio_err, "bad input format specified\n");
-		BIO_printf(bio_err,"bad input format specified\n");
+        goto end;
-		goto end;
+    }
-		}
+    if (dh == NULL) {
-	if (dh == NULL)
+        BIO_printf(bio_err, "unable to load DH parameters\n");
-		{
+        ERR_print_errors(bio_err);
-		BIO_printf(bio_err,"unable to load DH parameters\n");
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
-		}
 
+    if (text) {
+        DHparams_print(out, dh);
+# ifdef undef
+        printf("p=");
+        BN_print(stdout, dh->p);
+        printf("\ng=");
+        BN_print(stdout, dh->g);
+        printf("\n");
+        if (dh->length != 0)
+            printf("recommended private length=%ld\n", dh->length);
+# endif
+    }
 
+    if (check) {
+        if (!DH_check(dh, &i)) {
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+        if (i & DH_CHECK_P_NOT_PRIME)
+            printf("p value is not prime\n");
+        if (i & DH_CHECK_P_NOT_SAFE_PRIME)
+            printf("p value is not a safe prime\n");
+        if (i & DH_UNABLE_TO_CHECK_GENERATOR)
+            printf("unable to check the generator value\n");
+        if (i & DH_NOT_SUITABLE_GENERATOR)
+            printf("the g value is not a generator\n");
+        if (i == 0)
+            printf("DH parameters appear to be ok.\n");
+    }
+    if (C) {
+        unsigned char *data;
+        int len, l, bits;
 
-	if (text)
+        len = BN_num_bytes(dh->p);
-		{
+        bits = BN_num_bits(dh->p);
-		DHparams_print(out,dh);
+        data = (unsigned char *)OPENSSL_malloc(len);
-#ifdef undef
+        if (data == NULL) {
-		printf("p=");
+            perror("OPENSSL_malloc");
-		BN_print(stdout,dh->p);
+            goto end;
-		printf("\ng=");
+        }
-		BN_print(stdout,dh->g);
+        l = BN_bn2bin(dh->p, data);
-		printf("\n");
+        printf("static unsigned char dh%d_p[]={", bits);
-		if (dh->length != 0)
+        for (i = 0; i < l; i++) {
-			printf("recommended private length=%ld\n",dh->length);
+            if ((i % 12) == 0)
-#endif
+                printf("\n\t");
-		}
+            printf("0x%02X,", data[i]);
+        }
+        printf("\n\t};\n");
 
-	if (check)
+        l = BN_bn2bin(dh->g, data);
-		{
+        printf("static unsigned char dh%d_g[]={", bits);
-		if (!DH_check(dh,&i))
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			ERR_print_errors(bio_err);
+                printf("\n\t");
-			goto end;
+            printf("0x%02X,", data[i]);
-			}
+        }
-		if (i & DH_CHECK_P_NOT_PRIME)
+        printf("\n\t};\n\n");
-			printf("p value is not prime\n");
-		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
-			printf("p value is not a safe prime\n");
-		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
-			printf("unable to check the generator value\n");
-		if (i & DH_NOT_SUITABLE_GENERATOR)
-			printf("the g value is not a generator\n");
-		if (i == 0)
-			printf("DH parameters appear to be ok.\n");
-		}
-	if (C)
-		{
-		unsigned char *data;
-		int len,l,bits;
 
-		len=BN_num_bytes(dh->p);
+        printf("DH *get_dh%d()\n\t{\n", bits);
-		bits=BN_num_bits(dh->p);
+        printf("\tDH *dh;\n\n");
-		data=(unsigned char *)OPENSSL_malloc(len);
+        printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
-		if (data == NULL)
+        printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
-			{
+               bits, bits);
-			perror("OPENSSL_malloc");
+        printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
-			goto end;
+               bits, bits);
-			}
+        printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
-		l=BN_bn2bin(dh->p,data);
+        printf("\t\treturn(NULL);\n");
-		printf("static unsigned char dh%d_p[]={",bits);
+        printf("\treturn(dh);\n\t}\n");
-		for (i=0; i<l; i++)
+        OPENSSL_free(data);
-			{
+    }
-			if ((i%12) == 0) printf("\n\t");
-			printf("0x%02X,",data[i]);
-			}
-		printf("\n\t};\n");
 
-		l=BN_bn2bin(dh->g,data);
+    if (!noout) {
-		printf("static unsigned char dh%d_g[]={",bits);
+        if (outformat == FORMAT_ASN1)
-		for (i=0; i<l; i++)
+            i = i2d_DHparams_bio(out, dh);
-			{
+        else if (outformat == FORMAT_PEM)
-			if ((i%12) == 0) printf("\n\t");
+            i = PEM_write_bio_DHparams(out, dh);
-			printf("0x%02X,",data[i]);
+        else {
-			}
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-		printf("\n\t};\n\n");
+            goto end;
-
+        }
-		printf("DH *get_dh%d()\n\t{\n",bits);
+        if (!i) {
-		printf("\tDH *dh;\n\n");
+            BIO_printf(bio_err, "unable to write DH parameters\n");
-		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
+            ERR_print_errors(bio_err);
-		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
+            goto end;
-			bits,bits);
+        }
-		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
+    }
-			bits,bits);
+    ret = 0;
-		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
+ end:
-		printf("\t\treturn(NULL);\n");
+    if (in != NULL)
-		printf("\treturn(dh);\n\t}\n");
+        BIO_free(in);
-		OPENSSL_free(data);
+    if (out != NULL)
-		}
+        BIO_free_all(out);
-
+    if (dh != NULL)
-
+        DH_free(dh);
-	if (!noout)
+    apps_shutdown();
-		{
+    OPENSSL_EXIT(ret);
-		if 	(outformat == FORMAT_ASN1)
+}
-			i=i2d_DHparams_bio(out,dh);
+#else                           /* !OPENSSL_NO_DH */
-		else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_DHparams(out,dh);
-		else	{
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
-			goto end;
-			}
-		if (!i)
-			{
-			BIO_printf(bio_err,"unable to write DH parameters\n");
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		}
-	ret=0;
-end:
-	if (in != NULL) BIO_free(in);
-	if (out != NULL) BIO_free_all(out);
-	if (dh != NULL) DH_free(dh);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
-#else /* !OPENSSL_NO_DH */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/dhparam.c

@@ -109,35 +109,36 @@
  *
  */
 
-#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <time.h>
+# include <time.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dh.h>
+# include <openssl/dh.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
+#  include <openssl/dsa.h>
-#endif
+# endif
 
-#undef PROG
+# undef PROG
-#define PROG	dhparam_main
+# define PROG    dhparam_main
 
-#define DEFBITS	512
+# define DEFBITS 512
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  * -dsaparam  - read or generate DSA parameters, convert to DH
- * -check	- check the parameters are ok
+ * -check       - check the parameters are ok
  * -noout
  * -text
  * -C
@@ -148,413 +149,395 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	DH *dh=NULL;
+    DH *dh = NULL;
-	int i,badops=0,text=0;
+    int i, badops = 0, text = 0;
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-	int dsaparam=0;
+    int dsaparam = 0;
-#endif
+# endif
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat,check=0,noout=0,C=0,ret=1;
+    int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
-	char *infile,*outfile,*prog;
+    char *infile, *outfile, *prog;
-	char *inrand=NULL;
+    char *inrand = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
-	int num = 0, g = 0;
+    int num = 0, g = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        }
-			{
+# ifndef OPENSSL_NO_ENGINE
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-engine") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#ifndef OPENSSL_NO_ENGINE
+            engine = *(++argv);
-		else if (strcmp(*argv,"-engine") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-check") == 0)
-			engine= *(++argv);
+            check = 1;
-			}
+        else if (strcmp(*argv, "-text") == 0)
-#endif
+            text = 1;
-		else if (strcmp(*argv,"-check") == 0)
+# ifndef OPENSSL_NO_DSA
-			check=1;
+        else if (strcmp(*argv, "-dsaparam") == 0)
-		else if (strcmp(*argv,"-text") == 0)
+            dsaparam = 1;
-			text=1;
+# endif
-#ifndef OPENSSL_NO_DSA
+        else if (strcmp(*argv, "-C") == 0)
-		else if (strcmp(*argv,"-dsaparam") == 0)
+            C = 1;
-			dsaparam=1;
+        else if (strcmp(*argv, "-noout") == 0)
-#endif
+            noout = 1;
-		else if (strcmp(*argv,"-C") == 0)
+        else if (strcmp(*argv, "-2") == 0)
-			C=1;
+            g = 2;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-5") == 0)
-			noout=1;
+            g = 5;
-		else if (strcmp(*argv,"-2") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			g=2;
+            if (--argc < 1)
-		else if (strcmp(*argv,"-5") == 0)
+                goto bad;
-			g=5;
+            inrand = *(++argv);
-		else if (strcmp(*argv,"-rand") == 0)
+        } else if (((sscanf(*argv, "%d", &num) == 0) || (num <= 0)))
-			{
+            goto bad;
-			if (--argc < 1) goto bad;
+        argv++;
-			inrand= *(++argv);
+        argc--;
-			}
+    }
-		else if (((sscanf(*argv,"%d",&num) == 0) || (num <= 0)))
-			goto bad;
-		argv++;
-		argc--;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] [numbits]\n", prog);
-		BIO_printf(bio_err,"%s [options] [numbits]\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
+                   " -outform arg  output format - one of DER PEM\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
+        BIO_printf(bio_err,
-#endif
+                   " -dsaparam     read or generate DSA parameters, convert to DH\n");
-		BIO_printf(bio_err," -check        check the DH parameters\n");
+# endif
-		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
+        BIO_printf(bio_err, " -check        check the DH parameters\n");
-		BIO_printf(bio_err," -C            Output C code\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
+                   " -text         print a text form of the DH parameters\n");
-		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
+        BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_ENGINE
+                   " -2            generate parameters using  2 as the generator value\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
-#endif
+                   " -5            generate parameters using  5 as the generator value\n");
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
+                   " numbits       number of bits in to generate (default 512)\n");
-		BIO_printf(bio_err,"               the random number generator\n");
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -noout        no output\n");
+        BIO_printf(bio_err,
-		goto end;
+                   " -engine e     use engine e, possibly a hardware device.\n");
-		}
+# endif
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "               - load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, "               the random number generator\n");
+        BIO_printf(bio_err, " -noout        no output\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if (g && !num)
+    if (g && !num)
-		num = DEFBITS;
+        num = DEFBITS;
 
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-	if (dsaparam)
+    if (dsaparam) {
-		{
+        if (g) {
-		if (g)
+            BIO_printf(bio_err,
-			{
+                       "generator may not be chosen for DSA parameters\n");
-			BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n");
+            goto end;
-			goto end;
+        }
-			}
+    } else
-		}
+# endif
-	else
+    {
-#endif
+        /* DH parameters */
-		{
+        if (num && !g)
-		/* DH parameters */
+            g = 2;
-		if (num && !g)
+    }
-			g = 2;
-		}
 
-	if(num) {
+    if (num) {
 
-		BN_GENCB cb;
+        BN_GENCB cb;
-		BN_GENCB_set(&cb, dh_cb, bio_err);
+        BN_GENCB_set(&cb, dh_cb, bio_err);
-		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+        if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
-			{
+            BIO_printf(bio_err,
-			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                       "warning, not much extra random data, consider using the -rand option\n");
-			}
+        }
-		if (inrand != NULL)
+        if (inrand != NULL)
-			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-				app_RAND_load_files(inrand));
+                       app_RAND_load_files(inrand));
 
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-		if (dsaparam)
+        if (dsaparam) {
-			{
+            DSA *dsa = DSA_new();
-			DSA *dsa = DSA_new();
 
-			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
+            BIO_printf(bio_err,
-			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
+                       "Generating DSA parameters, %d bit long prime\n", num);
-						NULL, 0, NULL, NULL, &cb))
+            if (!dsa
-				{
+                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
-				if(dsa) DSA_free(dsa);
+                                               &cb)) {
-				ERR_print_errors(bio_err);
+                if (dsa)
-				goto end;
+                    DSA_free(dsa);
-				}
+                ERR_print_errors(bio_err);
+                goto end;
+            }
 
-			dh = DSA_dup_DH(dsa);
+            dh = DSA_dup_DH(dsa);
-			DSA_free(dsa);
+            DSA_free(dsa);
-			if (dh == NULL)
+            if (dh == NULL) {
-				{
+                ERR_print_errors(bio_err);
-				ERR_print_errors(bio_err);
+                goto end;
-				goto end;
+            }
-				}
+        } else
-			}
+# endif
-		else
+        {
-#endif
+            dh = DH_new();
-			{
+            BIO_printf(bio_err,
-			dh = DH_new();
+                       "Generating DH parameters, %d bit long safe prime, generator %d\n",
-			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
+                       num, g);
-			BIO_printf(bio_err,"This is going to take a long time\n");
+            BIO_printf(bio_err, "This is going to take a long time\n");
-			if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
+            if (!dh || !DH_generate_parameters_ex(dh, num, g, &cb)) {
-				{
+                ERR_print_errors(bio_err);
-				if(dh) DH_free(dh);
+                goto end;
-				ERR_print_errors(bio_err);
+            }
-				goto end;
+        }
-				}
-			}
 
-		app_RAND_write_file(NULL, bio_err);
+        app_RAND_write_file(NULL, bio_err);
-	} else {
+    } else {
 
-		in=BIO_new(BIO_s_file());
+        in = BIO_new(BIO_s_file());
-		if (in == NULL)
+        if (in == NULL) {
-			{
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
+        if (infile == NULL)
-		if (infile == NULL)
+            BIO_set_fp(in, stdin, BIO_NOCLOSE);
-			BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        else {
-		else
+            if (BIO_read_filename(in, infile) <= 0) {
-			{
+                perror(infile);
-			if (BIO_read_filename(in,infile) <= 0)
+                goto end;
-				{
+            }
-				perror(infile);
+        }
-				goto end;
-				}
-			}
 
-		if	(informat != FORMAT_ASN1 && informat != FORMAT_PEM)
+        if (informat != FORMAT_ASN1 && informat != FORMAT_PEM) {
-			{
+            BIO_printf(bio_err, "bad input format specified\n");
-			BIO_printf(bio_err,"bad input format specified\n");
+            goto end;
-			goto end;
+        }
-			}
+# ifndef OPENSSL_NO_DSA
+        if (dsaparam) {
+            DSA *dsa;
 
-#ifndef OPENSSL_NO_DSA
+            if (informat == FORMAT_ASN1)
-		if (dsaparam)
+                dsa = d2i_DSAparams_bio(in, NULL);
-			{
+            else                /* informat == FORMAT_PEM */
-			DSA *dsa;
+                dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
 
-			if (informat == FORMAT_ASN1)
+            if (dsa == NULL) {
-				dsa=d2i_DSAparams_bio(in,NULL);
+                BIO_printf(bio_err, "unable to load DSA parameters\n");
-			else /* informat == FORMAT_PEM */
+                ERR_print_errors(bio_err);
-				dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
+                goto end;
+            }
 
-			if (dsa == NULL)
+            dh = DSA_dup_DH(dsa);
-				{
+            DSA_free(dsa);
-				BIO_printf(bio_err,"unable to load DSA parameters\n");
+            if (dh == NULL) {
-				ERR_print_errors(bio_err);
+                ERR_print_errors(bio_err);
-				goto end;
+                goto end;
-				}
+            }
+        } else
+# endif
+        {
+            if (informat == FORMAT_ASN1)
+                dh = d2i_DHparams_bio(in, NULL);
+            else                /* informat == FORMAT_PEM */
+                dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 
-			dh = DSA_dup_DH(dsa);
+            if (dh == NULL) {
-			DSA_free(dsa);
+                BIO_printf(bio_err, "unable to load DH parameters\n");
-			if (dh == NULL)
+                ERR_print_errors(bio_err);
-				{
+                goto end;
-				ERR_print_errors(bio_err);
+            }
-				goto end;
+        }
-				}
-			}
-		else
-#endif
-			{
-			if (informat == FORMAT_ASN1)
-				dh=d2i_DHparams_bio(in,NULL);
-			else /* informat == FORMAT_PEM */
-				dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
 
-			if (dh == NULL)
+        /* dh != NULL */
-				{
+    }
-				BIO_printf(bio_err,"unable to load DH parameters\n");
-				ERR_print_errors(bio_err);
-				goto end;
-				}
-			}
 
-		/* dh != NULL */
+    out = BIO_new(BIO_s_file());
-	}
+    if (out == NULL) {
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+    if (outfile == NULL) {
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
+        {
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
+        }
+# endif
+    } else {
+        if (BIO_write_filename(out, outfile) <= 0) {
+            perror(outfile);
+            goto end;
+        }
+    }
 
-	out=BIO_new(BIO_s_file());
+    if (text) {
-	if (out == NULL)
+        DHparams_print(out, dh);
-		{
+    }
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	if (outfile == NULL)
-		{
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-		{
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
-		}
-#endif
-		}
-	else
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
+    if (check) {
+        if (!DH_check(dh, &i)) {
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+        if (i & DH_CHECK_P_NOT_PRIME)
+            printf("p value is not prime\n");
+        if (i & DH_CHECK_P_NOT_SAFE_PRIME)
+            printf("p value is not a safe prime\n");
+        if (i & DH_UNABLE_TO_CHECK_GENERATOR)
+            printf("unable to check the generator value\n");
+        if (i & DH_NOT_SUITABLE_GENERATOR)
+            printf("the g value is not a generator\n");
+        if (i == 0)
+            printf("DH parameters appear to be ok.\n");
+    }
+    if (C) {
+        unsigned char *data;
+        int len, l, bits;
 
-	if (text)
+        len = BN_num_bytes(dh->p);
-		{
+        bits = BN_num_bits(dh->p);
-		DHparams_print(out,dh);
+        data = (unsigned char *)OPENSSL_malloc(len);
-		}
+        if (data == NULL) {
+            perror("OPENSSL_malloc");
+            goto end;
+        }
+        printf("#ifndef HEADER_DH_H\n"
+               "#include <openssl/dh.h>\n" "#endif\n");
+        printf("DH *get_dh%d()\n\t{\n", bits);
 
-	if (check)
+        l = BN_bn2bin(dh->p, data);
-		{
+        printf("\tstatic unsigned char dh%d_p[]={", bits);
-		if (!DH_check(dh,&i))
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			ERR_print_errors(bio_err);
+                printf("\n\t\t");
-			goto end;
+            printf("0x%02X,", data[i]);
-			}
+        }
-		if (i & DH_CHECK_P_NOT_PRIME)
+        printf("\n\t\t};\n");
-			printf("p value is not prime\n");
-		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
-			printf("p value is not a safe prime\n");
-		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
-			printf("unable to check the generator value\n");
-		if (i & DH_NOT_SUITABLE_GENERATOR)
-			printf("the g value is not a generator\n");
-		if (i == 0)
-			printf("DH parameters appear to be ok.\n");
-		}
-	if (C)
-		{
-		unsigned char *data;
-		int len,l,bits;
 
-		len=BN_num_bytes(dh->p);
+        l = BN_bn2bin(dh->g, data);
-		bits=BN_num_bits(dh->p);
+        printf("\tstatic unsigned char dh%d_g[]={", bits);
-		data=(unsigned char *)OPENSSL_malloc(len);
+        for (i = 0; i < l; i++) {
-		if (data == NULL)
+            if ((i % 12) == 0)
-			{
+                printf("\n\t\t");
-			perror("OPENSSL_malloc");
+            printf("0x%02X,", data[i]);
-			goto end;
+        }
-			}
+        printf("\n\t\t};\n");
-		printf("#ifndef HEADER_DH_H\n"
-		       "#include <openssl/dh.h>\n"
-		       "#endif\n");
-		printf("DH *get_dh%d()\n\t{\n",bits);
 
-		l=BN_bn2bin(dh->p,data);
+        printf("\tDH *dh;\n\n");
-		printf("\tstatic unsigned char dh%d_p[]={",bits);
+        printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
-		for (i=0; i<l; i++)
+        printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
-			{
+               bits, bits);
-			if ((i%12) == 0) printf("\n\t\t");
+        printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
-			printf("0x%02X,",data[i]);
+               bits, bits);
-			}
+        printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
-		printf("\n\t\t};\n");
+        printf("\t\t{ DH_free(dh); return(NULL); }\n");
+        if (dh->length)
+            printf("\tdh->length = %ld;\n", dh->length);
+        printf("\treturn(dh);\n\t}\n");
+        OPENSSL_free(data);
+    }
 
-		l=BN_bn2bin(dh->g,data);
+    if (!noout) {
-		printf("\tstatic unsigned char dh%d_g[]={",bits);
+        if (outformat == FORMAT_ASN1)
-		for (i=0; i<l; i++)
+            i = i2d_DHparams_bio(out, dh);
-			{
+        else if (outformat == FORMAT_PEM)
-			if ((i%12) == 0) printf("\n\t\t");
+            i = PEM_write_bio_DHparams(out, dh);
-			printf("0x%02X,",data[i]);
+        else {
-			}
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-		printf("\n\t\t};\n");
+            goto end;
-
+        }
-		printf("\tDH *dh;\n\n");
+        if (!i) {
-		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
+            BIO_printf(bio_err, "unable to write DH parameters\n");
-		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
+            ERR_print_errors(bio_err);
-			bits,bits);
+            goto end;
-		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
+        }
-			bits,bits);
+    }
-		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
+    ret = 0;
-		printf("\t\t{ DH_free(dh); return(NULL); }\n");
+ end:
-		if (dh->length)
+    if (in != NULL)
-			printf("\tdh->length = %ld;\n", dh->length);
+        BIO_free(in);
-		printf("\treturn(dh);\n\t}\n");
+    if (out != NULL)
-		OPENSSL_free(data);
+        BIO_free_all(out);
-		}
+    if (dh != NULL)
-
+        DH_free(dh);
-
+    apps_shutdown();
-	if (!noout)
+    OPENSSL_EXIT(ret);
-		{
+}
-		if 	(outformat == FORMAT_ASN1)
-			i=i2d_DHparams_bio(out,dh);
-		else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_DHparams(out,dh);
-		else	{
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
-			goto end;
-			}
-		if (!i)
-			{
-			BIO_printf(bio_err,"unable to write DH parameters\n");
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		}
-	ret=0;
-end:
-	if (in != NULL) BIO_free(in);
-	if (out != NULL) BIO_free_all(out);
-	if (dh != NULL) DH_free(dh);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-	return 1;
+    (void)BIO_flush(cb->arg);
-	}
+# ifdef LINT
+    p = n;
+# endif
+    return 1;
+}
 
-#else /* !OPENSSL_NO_DH */
+#else                           /* !OPENSSL_NO_DH */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/dsa.c

@@ -56,321 +56,319 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <string.h>
+# include <string.h>
-#include <time.h>
+# include <time.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/dsa.h>
+# include <openssl/dsa.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
 
-#undef PROG
+# undef PROG
-#define PROG	dsa_main
+# define PROG    dsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
- * -des		- encrypt output if PEM format with DES in cbc mode
+ * -des         - encrypt output if PEM format with DES in cbc mode
- * -des3	- encrypt output if PEM format
+ * -des3        - encrypt output if PEM format
- * -idea	- encrypt output if PEM format
+ * -idea        - encrypt output if PEM format
- * -aes128	- encrypt output if PEM format
+ * -aes128      - encrypt output if PEM format
- * -aes192	- encrypt output if PEM format
+ * -aes192      - encrypt output if PEM format
- * -aes256	- encrypt output if PEM format
+ * -aes256      - encrypt output if PEM format
  * -camellia128 - encrypt output if PEM format
  * -camellia192 - encrypt output if PEM format
  * -camellia256 - encrypt output if PEM format
  * -seed        - encrypt output if PEM format
- * -text	- print a text version
+ * -text        - print a text version
- * -modulus	- print the DSA public key
+ * -modulus     - print the DSA public key
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int ret=1;
+    int ret = 1;
-	DSA *dsa=NULL;
+    DSA *dsa = NULL;
-	int i,badops=0;
+    int i, badops = 0;
-	const EVP_CIPHER *enc=NULL;
+    const EVP_CIPHER *enc = NULL;
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat,text=0,noout=0;
+    int informat, outformat, text = 0, noout = 0;
-	int pubin = 0, pubout = 0;
+    int pubin = 0, pubout = 0;
-	char *infile,*outfile,*prog;
+    char *infile, *outfile, *prog;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine;
+    char *engine;
-#endif
+# endif
-	char *passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	char *passin = NULL, *passout = NULL;
+    char *passin = NULL, *passout = NULL;
-	int modulus=0;
+    int modulus = 0;
 
-	int pvk_encr = 2;
+    int pvk_encr = 2;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	engine=NULL;
+    engine = NULL;
-#endif
+# endif
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-passin") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargin= *(++argv);
+        }
-			}
+# ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-passout") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			passargout= *(++argv);
+            engine = *(++argv);
-			}
+        }
-#ifndef OPENSSL_NO_ENGINE
+# endif
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-pvk-strong") == 0)
-			{
+            pvk_encr = 2;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-pvk-weak") == 0)
-			engine= *(++argv);
+            pvk_encr = 1;
-			}
+        else if (strcmp(*argv, "-pvk-none") == 0)
-#endif
+            pvk_encr = 0;
-		else if (strcmp(*argv,"-pvk-strong") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			pvk_encr=2;
+            noout = 1;
-		else if (strcmp(*argv,"-pvk-weak") == 0)
+        else if (strcmp(*argv, "-text") == 0)
-			pvk_encr=1;
+            text = 1;
-		else if (strcmp(*argv,"-pvk-none") == 0)
+        else if (strcmp(*argv, "-modulus") == 0)
-			pvk_encr=0;
+            modulus = 1;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-pubin") == 0)
-			noout=1;
+            pubin = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if (strcmp(*argv, "-pubout") == 0)
-			text=1;
+            pubout = 1;
-		else if (strcmp(*argv,"-modulus") == 0)
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			modulus=1;
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else if (strcmp(*argv,"-pubin") == 0)
+            badops = 1;
-			pubin=1;
+            break;
-		else if (strcmp(*argv,"-pubout") == 0)
+        }
-			pubout=1;
+        argc--;
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+        argv++;
-			{
+    }
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg     input format - DER or PEM\n");
-		BIO_printf(bio_err," -inform arg     input format - DER or PEM\n");
+        BIO_printf(bio_err, " -outform arg    output format - DER or PEM\n");
-		BIO_printf(bio_err," -outform arg    output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg         input file\n");
-		BIO_printf(bio_err," -in arg         input file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
+                   " -passin arg     input file pass phrase source\n");
-		BIO_printf(bio_err," -out arg        output file\n");
+        BIO_printf(bio_err, " -out arg        output file\n");
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_ENGINE
+                   " -passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+# ifndef OPENSSL_NO_ENGINE
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
+                   " -engine e       use engine e, possibly a hardware device.\n");
-		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+# endif
-#ifndef OPENSSL_NO_IDEA
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+                   " -des            encrypt PEM output with cbc des\n");
-#endif
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_AES
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+# ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
-#endif
+                   " -idea           encrypt PEM output with cbc idea\n");
-#ifndef OPENSSL_NO_CAMELLIA
+# endif
-		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+# ifndef OPENSSL_NO_AES
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-#endif
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_SEED
+                   "                 encrypt PEM output with cbc aes\n");
-		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
+# endif
-#endif
+# ifndef OPENSSL_NO_CAMELLIA
-		BIO_printf(bio_err," -text           print the key in text\n");
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-		BIO_printf(bio_err," -noout          don't print key out\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -modulus        print the DSA public value\n");
+                   "                 encrypt PEM output with cbc camellia\n");
-		goto end;
+# endif
-		}
+# ifndef OPENSSL_NO_SEED
+        BIO_printf(bio_err,
+                   " -seed           encrypt PEM output with cbc seed\n");
+# endif
+        BIO_printf(bio_err, " -text           print the key in text\n");
+        BIO_printf(bio_err, " -noout          don't print key out\n");
+        BIO_printf(bio_err, " -modulus        print the DSA public value\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		BIO_printf(bio_err, "Error getting passwords\n");
+        BIO_printf(bio_err, "Error getting passwords\n");
-		goto end;
+        goto end;
-	}
+    }
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
-		}
 
-	BIO_printf(bio_err,"read DSA key\n");
+    BIO_printf(bio_err, "read DSA key\n");
 
-		{
+    {
-		EVP_PKEY	*pkey;
+        EVP_PKEY *pkey;
 
-		if (pubin)
+        if (pubin)
-			pkey = load_pubkey(bio_err, infile, informat, 1,
+            pkey = load_pubkey(bio_err, infile, informat, 1,
-				passin, e, "Public Key");
+                               passin, e, "Public Key");
-		else
+        else
-			pkey = load_key(bio_err, infile, informat, 1,
+            pkey = load_key(bio_err, infile, informat, 1,
-				passin, e, "Private Key");
+                            passin, e, "Private Key");
 
-		if (pkey)
+        if (pkey) {
-			{
+            dsa = EVP_PKEY_get1_DSA(pkey);
-			dsa = EVP_PKEY_get1_DSA(pkey);
+            EVP_PKEY_free(pkey);
-			EVP_PKEY_free(pkey);
+        }
-			}
+    }
-		}
+    if (dsa == NULL) {
-	if (dsa == NULL)
+        BIO_printf(bio_err, "unable to load Key\n");
-		{
+        ERR_print_errors(bio_err);
-		BIO_printf(bio_err,"unable to load Key\n");
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-		{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-		out = BIO_push(tmpbio, out);
+        }
-		}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto end;
-		if (BIO_write_filename(out,outfile) <= 0)
+        }
-			{
+    }
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	if (text) 
+    if (text)
-		if (!DSA_print(out,dsa,0))
+        if (!DSA_print(out, dsa, 0)) {
-			{
+            perror(outfile);
-			perror(outfile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
 
-	if (modulus)
+    if (modulus) {
-		{
+        fprintf(stdout, "Public Key=");
-		fprintf(stdout,"Public Key=");
+        BN_print(out, dsa->pub_key);
-		BN_print(out,dsa->pub_key);
+        fprintf(stdout, "\n");
-		fprintf(stdout,"\n");
+    }
-		}
 
-	if (noout) goto end;
+    if (noout)
-	BIO_printf(bio_err,"writing DSA key\n");
+        goto end;
-	if 	(outformat == FORMAT_ASN1) {
+    BIO_printf(bio_err, "writing DSA key\n");
-		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
+    if (outformat == FORMAT_ASN1) {
-		else i=i2d_DSAPrivateKey_bio(out,dsa);
+        if (pubin || pubout)
-	} else if (outformat == FORMAT_PEM) {
+            i = i2d_DSA_PUBKEY_bio(out, dsa);
-		if(pubin || pubout)
+        else
-			i=PEM_write_bio_DSA_PUBKEY(out,dsa);
+            i = i2d_DSAPrivateKey_bio(out, dsa);
-		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
+    } else if (outformat == FORMAT_PEM) {
-							NULL,0,NULL, passout);
+        if (pubin || pubout)
-#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
+            i = PEM_write_bio_DSA_PUBKEY(out, dsa);
-	} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
+        else
-		EVP_PKEY *pk;
+            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
-		pk = EVP_PKEY_new();
+                                            NULL, 0, NULL, passout);
-		EVP_PKEY_set1_DSA(pk, dsa);
+# if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
-		if (outformat == FORMAT_PVK)
+    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
-			i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
+        EVP_PKEY *pk;
-		else if (pubin || pubout)
+        pk = EVP_PKEY_new();
-			i = i2b_PublicKey_bio(out, pk);
+        EVP_PKEY_set1_DSA(pk, dsa);
-		else
+        if (outformat == FORMAT_PVK)
-			i = i2b_PrivateKey_bio(out, pk);
+            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
-		EVP_PKEY_free(pk);
+        else if (pubin || pubout)
-#endif
+            i = i2b_PublicKey_bio(out, pk);
-	} else {
+        else
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+            i = i2b_PrivateKey_bio(out, pk);
-		goto end;
+        EVP_PKEY_free(pk);
-		}
+# endif
-	if (i <= 0)
+    } else {
-		{
+        BIO_printf(bio_err, "bad output format specified for outfile\n");
-		BIO_printf(bio_err,"unable to write private key\n");
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		}
+    if (i <= 0) {
-	else
+        BIO_printf(bio_err, "unable to write private key\n");
-		ret=0;
+        ERR_print_errors(bio_err);
-end:
+    } else
-	if(in != NULL) BIO_free(in);
+        ret = 0;
-	if(out != NULL) BIO_free_all(out);
+ end:
-	if(dsa != NULL) DSA_free(dsa);
+    if (in != NULL)
-	if(passin) OPENSSL_free(passin);
+        BIO_free(in);
-	if(passout) OPENSSL_free(passout);
+    if (out != NULL)
-	apps_shutdown();
+        BIO_free_all(out);
-	OPENSSL_EXIT(ret);
+    if (dsa != NULL)
-	}
+        DSA_free(dsa);
-#else /* !OPENSSL_NO_DSA */
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
+#else                           /* !OPENSSL_NO_DSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/dsaparam.c

@@ -56,34 +56,37 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+/*
- * deprecated functions for openssl-internal code */
+ * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code
+ */
 #ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
+# undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_DSA
-#include <assert.h>
+# include <assert.h>
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <time.h>
+# include <time.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dsa.h>
+# include <openssl/dsa.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#undef PROG
+# undef PROG
-#define PROG	dsaparam_main
+# define PROG    dsaparam_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  * -noout
  * -text
  * -C
@@ -94,386 +97,368 @@
  *  #endif
  */
 
-#ifdef GENCB_TEST
+# ifdef GENCB_TEST
 
 static int stop_keygen_flag = 0;
 
 static void timebomb_sigalarm(int foo)
-	{
+{
-	stop_keygen_flag = 1;
+    stop_keygen_flag = 1;
-	}
+}
 
-#endif
+# endif
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	DSA *dsa=NULL;
+    DSA *dsa = NULL;
-	int i,badops=0,text=0;
+    int i, badops = 0, text = 0;
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat,noout=0,C=0,ret=1;
+    int informat, outformat, noout = 0, C = 0, ret = 1;
-	char *infile,*outfile,*prog,*inrand=NULL;
+    char *infile, *outfile, *prog, *inrand = NULL;
-	int numbits= -1,num,genkey=0;
+    int numbits = -1, num, genkey = 0;
-	int need_rand=0;
+    int need_rand = 0;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
-#ifdef GENCB_TEST
+# ifdef GENCB_TEST
-	int timebomb=0;
+    int timebomb = 0;
-#endif
+# endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        }
-			{
+# ifndef OPENSSL_NO_ENGINE
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-engine") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#ifndef OPENSSL_NO_ENGINE
+            engine = *(++argv);
-		else if(strcmp(*argv, "-engine") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+# ifdef GENCB_TEST
-			engine = *(++argv);
+        else if (strcmp(*argv, "-timebomb") == 0) {
-			}
+            if (--argc < 1)
-#endif
+                goto bad;
-#ifdef GENCB_TEST
+            timebomb = atoi(*(++argv));
-		else if(strcmp(*argv, "-timebomb") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-text") == 0)
-			timebomb = atoi(*(++argv));
+            text = 1;
-			}
+        else if (strcmp(*argv, "-C") == 0)
-#endif
+            C = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if (strcmp(*argv, "-genkey") == 0) {
-			text=1;
+            genkey = 1;
-		else if (strcmp(*argv,"-C") == 0)
+            need_rand = 1;
-			C=1;
+        } else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-genkey") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			genkey=1;
+            inrand = *(++argv);
-			need_rand=1;
+            need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-rand") == 0)
+            noout = 1;
-			{
+        else if (sscanf(*argv, "%d", &num) == 1) {
-			if (--argc < 1) goto bad;
+            /* generate a key */
-			inrand= *(++argv);
+            numbits = num;
-			need_rand=1;
+            need_rand = 1;
-			}
+        } else {
-		else if (strcmp(*argv,"-noout") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			noout=1;
+            badops = 1;
-		else if (sscanf(*argv,"%d",&num) == 1)
+            break;
-			{
+        }
-			/* generate a key */
+        argc--;
-			numbits=num;
+        argv++;
-			need_rand=1;
+    }
-			}
-		else
-			{
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] [bits] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - DER or PEM\n");
-		BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
+        BIO_printf(bio_err, " -outform arg  output format - DER or PEM\n");
-		BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err, " -text         print as text\n");
-		BIO_printf(bio_err," -text         print as text\n");
+        BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," -C            Output C code\n");
+        BIO_printf(bio_err, " -noout        no output\n");
-		BIO_printf(bio_err," -noout        no output\n");
+        BIO_printf(bio_err, " -genkey       generate a DSA key\n");
-		BIO_printf(bio_err," -genkey       generate a DSA key\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -rand         files to use for random number input\n");
+                   " -rand         files to use for random number input\n");
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
-#endif
+                   " -engine e     use engine e, possibly a hardware device.\n");
-#ifdef GENCB_TEST
+# endif
-		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
+# ifdef GENCB_TEST
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
+                   " -timebomb n   interrupt keygen after <n> seconds\n");
-		goto end;
+# endif
-		}
+        BIO_printf(bio_err,
+                   " number        number of bits to use for generating private key\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (outfile == NULL) {
-		}
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-	if (outfile == NULL)
+# ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-#ifdef OPENSSL_SYS_VMS
+            out = BIO_push(tmpbio, out);
-		{
+        }
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+# endif
-		out = BIO_push(tmpbio, out);
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-#endif
+            perror(outfile);
-		}
+            goto end;
-	else
+        }
-		{
+    }
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if (need_rand)
+    if (need_rand) {
-		{
+        app_RAND_load_file(NULL, bio_err, (inrand != NULL));
-		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+        if (inrand != NULL)
-		if (inrand != NULL)
+            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                       app_RAND_load_files(inrand));
-				app_RAND_load_files(inrand));
+    }
-		}
 
-	if (numbits > 0)
+    if (numbits > 0) {
-		{
+        BN_GENCB cb;
-		BN_GENCB cb;
+        BN_GENCB_set(&cb, dsa_cb, bio_err);
-		BN_GENCB_set(&cb, dsa_cb, bio_err);
+        assert(need_rand);
-		assert(need_rand);
+        dsa = DSA_new();
-		dsa = DSA_new();
+        if (!dsa) {
-		if(!dsa)
+            BIO_printf(bio_err, "Error allocating DSA object\n");
-			{
+            goto end;
-			BIO_printf(bio_err,"Error allocating DSA object\n");
+        }
-			goto end;
+        BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
-			}
+                   num);
-		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
+        BIO_printf(bio_err, "This could take some time\n");
-	        BIO_printf(bio_err,"This could take some time\n");
+# ifdef GENCB_TEST
-#ifdef GENCB_TEST
+        if (timebomb > 0) {
-		if(timebomb > 0)
+            struct sigaction act;
-	{
+            act.sa_handler = timebomb_sigalarm;
-		struct sigaction act;
+            act.sa_flags = 0;
-		act.sa_handler = timebomb_sigalarm;
+            BIO_printf(bio_err,
-		act.sa_flags = 0;
+                       "(though I'll stop it if not done within %d secs)\n",
-		BIO_printf(bio_err,"(though I'll stop it if not done within %d secs)\n",
+                       timebomb);
-				timebomb);
+            if (sigaction(SIGALRM, &act, NULL) != 0) {
-		if(sigaction(SIGALRM, &act, NULL) != 0)
+                BIO_printf(bio_err, "Error, couldn't set SIGALRM handler\n");
-			{
+                goto end;
-			BIO_printf(bio_err,"Error, couldn't set SIGALRM handler\n");
+            }
-			goto end;
+            alarm(timebomb);
-			}
+        }
-		alarm(timebomb);
+# endif
-	}
+        if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, &cb)) {
-#endif
+# ifdef GENCB_TEST
-	        if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
+            if (stop_keygen_flag) {
-			{
+                BIO_printf(bio_err, "DSA key generation time-stopped\n");
-#ifdef GENCB_TEST
+                /* This is an asked-for behaviour! */
-			if(stop_keygen_flag)
+                ret = 0;
-				{
+                goto end;
-				BIO_printf(bio_err,"DSA key generation time-stopped\n");
+            }
-				/* This is an asked-for behaviour! */
+# endif
-				ret = 0;
+            BIO_printf(bio_err, "Error, DSA key generation failed\n");
-				goto end;
+            goto end;
-				}
+        }
-#endif
+    } else if (informat == FORMAT_ASN1)
-			BIO_printf(bio_err,"Error, DSA key generation failed\n");
+        dsa = d2i_DSAparams_bio(in, NULL);
-			goto end;
+    else if (informat == FORMAT_PEM)
-			}
+        dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
-		}
+    else {
-	else if	(informat == FORMAT_ASN1)
+        BIO_printf(bio_err, "bad input format specified\n");
-		dsa=d2i_DSAparams_bio(in,NULL);
+        goto end;
-	else if (informat == FORMAT_PEM)
+    }
-		dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
+    if (dsa == NULL) {
-	else
+        BIO_printf(bio_err, "unable to load DSA parameters\n");
-		{
+        ERR_print_errors(bio_err);
-		BIO_printf(bio_err,"bad input format specified\n");
+        goto end;
-		goto end;
+    }
-		}
-	if (dsa == NULL)
-		{
-		BIO_printf(bio_err,"unable to load DSA parameters\n");
-		ERR_print_errors(bio_err);
-		goto end;
-		}
 
-	if (text)
+    if (text) {
-		{
+        DSAparams_print(out, dsa);
-		DSAparams_print(out,dsa);
+    }
-		}
 
-	if (C)
+    if (C) {
-		{
+        unsigned char *data;
-		unsigned char *data;
+        int l, len, bits_p;
-		int l,len,bits_p;
 
-		len=BN_num_bytes(dsa->p);
+        len = BN_num_bytes(dsa->p);
-		bits_p=BN_num_bits(dsa->p);
+        bits_p = BN_num_bits(dsa->p);
-		data=(unsigned char *)OPENSSL_malloc(len+20);
+        data = (unsigned char *)OPENSSL_malloc(len + 20);
-		if (data == NULL)
+        if (data == NULL) {
-			{
+            perror("OPENSSL_malloc");
-			perror("OPENSSL_malloc");
+            goto end;
-			goto end;
+        }
-			}
+        l = BN_bn2bin(dsa->p, data);
-		l=BN_bn2bin(dsa->p,data);
+        printf("static unsigned char dsa%d_p[]={", bits_p);
-		printf("static unsigned char dsa%d_p[]={",bits_p);
+        for (i = 0; i < l; i++) {
-		for (i=0; i<l; i++)
+            if ((i % 12) == 0)
-			{
+                printf("\n\t");
-			if ((i%12) == 0) printf("\n\t");
+            printf("0x%02X,", data[i]);
-			printf("0x%02X,",data[i]);
+        }
-			}
+        printf("\n\t};\n");
-		printf("\n\t};\n");
 
-		l=BN_bn2bin(dsa->q,data);
+        l = BN_bn2bin(dsa->q, data);
-		printf("static unsigned char dsa%d_q[]={",bits_p);
+        printf("static unsigned char dsa%d_q[]={", bits_p);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
-			printf("0x%02X,",data[i]);
+            printf("0x%02X,", data[i]);
-			}
+        }
-		printf("\n\t};\n");
+        printf("\n\t};\n");
 
-		l=BN_bn2bin(dsa->g,data);
+        l = BN_bn2bin(dsa->g, data);
-		printf("static unsigned char dsa%d_g[]={",bits_p);
+        printf("static unsigned char dsa%d_g[]={", bits_p);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
-			printf("0x%02X,",data[i]);
+            printf("0x%02X,", data[i]);
-			}
+        }
-		printf("\n\t};\n\n");
+        printf("\n\t};\n\n");
 
-		printf("DSA *get_dsa%d()\n\t{\n",bits_p);
+        printf("DSA *get_dsa%d()\n\t{\n", bits_p);
-		printf("\tDSA *dsa;\n\n");
+        printf("\tDSA *dsa;\n\n");
-		printf("\tif ((dsa=DSA_new()) == NULL) return(NULL);\n");
+        printf("\tif ((dsa=DSA_new()) == NULL) return(NULL);\n");
-		printf("\tdsa->p=BN_bin2bn(dsa%d_p,sizeof(dsa%d_p),NULL);\n",
+        printf("\tdsa->p=BN_bin2bn(dsa%d_p,sizeof(dsa%d_p),NULL);\n",
-			bits_p,bits_p);
+               bits_p, bits_p);
-		printf("\tdsa->q=BN_bin2bn(dsa%d_q,sizeof(dsa%d_q),NULL);\n",
+        printf("\tdsa->q=BN_bin2bn(dsa%d_q,sizeof(dsa%d_q),NULL);\n",
-			bits_p,bits_p);
+               bits_p, bits_p);
-		printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
+        printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
-			bits_p,bits_p);
+               bits_p, bits_p);
-		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
+        printf
-		printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
+            ("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
-		printf("\treturn(dsa);\n\t}\n");
+        printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
-		}
+        printf("\treturn(dsa);\n\t}\n");
+    }
 
+    if (!noout) {
+        if (outformat == FORMAT_ASN1)
+            i = i2d_DSAparams_bio(out, dsa);
+        else if (outformat == FORMAT_PEM)
+            i = PEM_write_bio_DSAparams(out, dsa);
+        else {
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
+            goto end;
+        }
+        if (!i) {
+            BIO_printf(bio_err, "unable to write DSA parameters\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    }
+    if (genkey) {
+        DSA *dsakey;
 
-	if (!noout)
+        assert(need_rand);
-		{
+        if ((dsakey = DSAparams_dup(dsa)) == NULL)
-		if 	(outformat == FORMAT_ASN1)
+            goto end;
-			i=i2d_DSAparams_bio(out,dsa);
+        if (!DSA_generate_key(dsakey))
-		else if (outformat == FORMAT_PEM)
+            goto end;
-			i=PEM_write_bio_DSAparams(out,dsa);
+        if (outformat == FORMAT_ASN1)
-		else	{
+            i = i2d_DSAPrivateKey_bio(out, dsakey);
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+        else if (outformat == FORMAT_PEM)
-			goto end;
+            i = PEM_write_bio_DSAPrivateKey(out, dsakey, NULL, NULL, 0, NULL,
-			}
+                                            NULL);
-		if (!i)
+        else {
-			{
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-			BIO_printf(bio_err,"unable to write DSA parameters\n");
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+        DSA_free(dsakey);
-			}
+    }
-		}
+    if (need_rand)
-	if (genkey)
+        app_RAND_write_file(NULL, bio_err);
-		{
+    ret = 0;
-		DSA *dsakey;
+ end:
-
+    if (in != NULL)
-		assert(need_rand);
+        BIO_free(in);
-		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
+    if (out != NULL)
-		if (!DSA_generate_key(dsakey)) goto end;
+        BIO_free_all(out);
-		if 	(outformat == FORMAT_ASN1)
+    if (dsa != NULL)
-			i=i2d_DSAPrivateKey_bio(out,dsakey);
+        DSA_free(dsa);
-		else if (outformat == FORMAT_PEM)
+    apps_shutdown();
-			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
+    OPENSSL_EXIT(ret);
-		else	{
+}
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
-			goto end;
-			}
-		DSA_free(dsakey);
-		}
-	if (need_rand)
-		app_RAND_write_file(NULL, bio_err);
-	ret=0;
-end:
-	if (in != NULL) BIO_free(in);
-	if (out != NULL) BIO_free_all(out);
-	if (dsa != NULL) DSA_free(dsa);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-#ifdef GENCB_TEST
+    (void)BIO_flush(cb->arg);
-	if(stop_keygen_flag)
+# ifdef LINT
-		return 0;
+    p = n;
-#endif
+# endif
-	return 1;
+# ifdef GENCB_TEST
-	}
+    if (stop_keygen_flag)
-#else /* !OPENSSL_NO_DSA */
+        return 0;
+# endif
+    return 1;
+}
+#else                           /* !OPENSSL_NO_DSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/ec.c

@@ -58,19 +58,20 @@
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#undef PROG
+# undef PROG
-#define PROG	ec_main
+# define PROG    ec_main
 
-/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg    - input format - default PEM (one of DER, NET or PEM)
  * -outform arg   - output format - default PEM
  * -in arg        - input file - default stdin
  * -out arg       - output file - default stdout
@@ -85,322 +86,280 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-	int 	ret = 1;
+    int ret = 1;
-	EC_KEY 	*eckey = NULL;
+    EC_KEY *eckey = NULL;
-	const EC_GROUP *group;
+    const EC_GROUP *group;
-	int 	i, badops = 0;
+    int i, badops = 0;
-	const EVP_CIPHER *enc = NULL;
+    const EVP_CIPHER *enc = NULL;
-	BIO 	*in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int 	informat, outformat, text=0, noout=0;
+    int informat, outformat, text = 0, noout = 0;
-	int  	pubin = 0, pubout = 0, param_out = 0;
+    int pubin = 0, pubout = 0, param_out = 0;
-	char 	*infile, *outfile, *prog, *engine;
+    char *infile, *outfile, *prog, *engine;
-	char 	*passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	char 	*passin = NULL, *passout = NULL;
+    char *passin = NULL, *passout = NULL;
-	point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
+    point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
-	int	new_form = 0;
+    int new_form = 0;
-	int	asn1_flag = OPENSSL_EC_NAMED_CURVE;
+    int asn1_flag = OPENSSL_EC_NAMED_CURVE;
-	int 	new_asn1_flag = 0;
+    int new_asn1_flag = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	engine = NULL;
+    engine = NULL;
-	infile = NULL;
+    infile = NULL;
-	outfile = NULL;
+    outfile = NULL;
-	informat = FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat = FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog = argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if (strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-passin") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargin= *(++argv);
+        } else if (strcmp(*argv, "-engine") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-passout") == 0)
+                goto bad;
-			{
+            engine = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-noout") == 0)
-			passargout= *(++argv);
+            noout = 1;
-			}
+        else if (strcmp(*argv, "-text") == 0)
-		else if (strcmp(*argv, "-engine") == 0)
+            text = 1;
-			{
+        else if (strcmp(*argv, "-conv_form") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			engine= *(++argv);
+                goto bad;
-			}
+            ++argv;
-		else if (strcmp(*argv, "-noout") == 0)
+            new_form = 1;
-			noout = 1;
+            if (strcmp(*argv, "compressed") == 0)
-		else if (strcmp(*argv, "-text") == 0)
+                form = POINT_CONVERSION_COMPRESSED;
-			text = 1;
+            else if (strcmp(*argv, "uncompressed") == 0)
-		else if (strcmp(*argv, "-conv_form") == 0)
+                form = POINT_CONVERSION_UNCOMPRESSED;
-			{
+            else if (strcmp(*argv, "hybrid") == 0)
-			if (--argc < 1)
+                form = POINT_CONVERSION_HYBRID;
-				goto bad;
+            else
-			++argv;
+                goto bad;
-			new_form = 1;
+        } else if (strcmp(*argv, "-param_enc") == 0) {
-			if (strcmp(*argv, "compressed") == 0)
+            if (--argc < 1)
-				form = POINT_CONVERSION_COMPRESSED;
+                goto bad;
-			else if (strcmp(*argv, "uncompressed") == 0)
+            ++argv;
-				form = POINT_CONVERSION_UNCOMPRESSED;
+            new_asn1_flag = 1;
-			else if (strcmp(*argv, "hybrid") == 0)
+            if (strcmp(*argv, "named_curve") == 0)
-				form = POINT_CONVERSION_HYBRID;
+                asn1_flag = OPENSSL_EC_NAMED_CURVE;
-			else
+            else if (strcmp(*argv, "explicit") == 0)
-				goto bad;
+                asn1_flag = 0;
-			}
+            else
-		else if (strcmp(*argv, "-param_enc") == 0)
+                goto bad;
-			{
+        } else if (strcmp(*argv, "-param_out") == 0)
-			if (--argc < 1)
+            param_out = 1;
-				goto bad;
+        else if (strcmp(*argv, "-pubin") == 0)
-			++argv;
+            pubin = 1;
-			new_asn1_flag = 1;
+        else if (strcmp(*argv, "-pubout") == 0)
-			if (strcmp(*argv, "named_curve") == 0)
+            pubout = 1;
-				asn1_flag = OPENSSL_EC_NAMED_CURVE;
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			else if (strcmp(*argv, "explicit") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-				asn1_flag = 0;
+            badops = 1;
-			else
+            break;
-				goto bad;
+        }
-			}
+        argc--;
-		else if (strcmp(*argv, "-param_out") == 0)
+        argv++;
-			param_out = 1;
+    }
-		else if (strcmp(*argv, "-pubin") == 0)
-			pubin=1;
-		else if (strcmp(*argv, "-pubout") == 0)
-			pubout=1;
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
-			{
-			BIO_printf(bio_err, "unknown option %s\n", *argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, " -inform arg     input format - "
-		BIO_printf(bio_err, " -inform arg     input format - "
+                   "DER or PEM\n");
-				"DER or PEM\n");
+        BIO_printf(bio_err, " -outform arg    output format - "
-		BIO_printf(bio_err, " -outform arg    output format - "
+                   "DER or PEM\n");
-				"DER or PEM\n");
+        BIO_printf(bio_err, " -in arg         input file\n");
-		BIO_printf(bio_err, " -in arg         input file\n");
+        BIO_printf(bio_err, " -passin arg     input file pass "
-		BIO_printf(bio_err, " -passin arg     input file pass "
+                   "phrase source\n");
-				"phrase source\n");
+        BIO_printf(bio_err, " -out arg        output file\n");
-		BIO_printf(bio_err, " -out arg        output file\n");
+        BIO_printf(bio_err, " -passout arg    output file pass "
-		BIO_printf(bio_err, " -passout arg    output file pass "
+                   "phrase source\n");
-				"phrase source\n");
+        BIO_printf(bio_err, " -engine e       use engine e, "
-		BIO_printf(bio_err, " -engine e       use engine e, "
+                   "possibly a hardware device.\n");
-				"possibly a hardware device.\n");
+        BIO_printf(bio_err, " -des            encrypt PEM output, "
-		BIO_printf(bio_err, " -des            encrypt PEM output, "
+                   "instead of 'des' every other \n"
-				"instead of 'des' every other \n"
+                   "                 cipher "
-				"                 cipher "
+                   "supported by OpenSSL can be used\n");
-				"supported by OpenSSL can be used\n");
+        BIO_printf(bio_err, " -text           print the key\n");
-		BIO_printf(bio_err, " -text           print the key\n");
+        BIO_printf(bio_err, " -noout          don't print key out\n");
-		BIO_printf(bio_err, " -noout          don't print key out\n");
+        BIO_printf(bio_err, " -param_out      print the elliptic "
-		BIO_printf(bio_err, " -param_out      print the elliptic "
+                   "curve parameters\n");
-				"curve parameters\n");
+        BIO_printf(bio_err, " -conv_form arg  specifies the "
-		BIO_printf(bio_err, " -conv_form arg  specifies the "
+                   "point conversion form \n");
-				"point conversion form \n");
+        BIO_printf(bio_err, "                 possible values:"
-		BIO_printf(bio_err, "                 possible values:"
+                   " compressed\n");
-				" compressed\n");
+        BIO_printf(bio_err, "                                 "
-		BIO_printf(bio_err, "                                 "
+                   " uncompressed (default)\n");
-				" uncompressed (default)\n");
+        BIO_printf(bio_err, "                                  " " hybrid\n");
-		BIO_printf(bio_err, "                                  "
+        BIO_printf(bio_err, " -param_enc arg  specifies the way"
-				" hybrid\n");
+                   " the ec parameters are encoded\n");
-		BIO_printf(bio_err, " -param_enc arg  specifies the way"
+        BIO_printf(bio_err, "                 in the asn1 der " "encoding\n");
-				" the ec parameters are encoded\n");
+        BIO_printf(bio_err, "                 possible values:"
-		BIO_printf(bio_err, "                 in the asn1 der "
+                   " named_curve (default)\n");
-				"encoding\n");
+        BIO_printf(bio_err, "                                  "
-		BIO_printf(bio_err, "                 possible values:"
+                   "explicit\n");
-				" named_curve (default)\n");
+        goto end;
-		BIO_printf(bio_err,"                                  "
+    }
-				"explicit\n");
-		goto end;
-		}
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
+        BIO_printf(bio_err, "Error getting passwords\n");
-		BIO_printf(bio_err, "Error getting passwords\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	in = BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out = BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in, stdin, BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in, infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
-		}
 
-	BIO_printf(bio_err, "read EC key\n");
+    BIO_printf(bio_err, "read EC key\n");
-	if (informat == FORMAT_ASN1) 
+    if (informat == FORMAT_ASN1) {
-		{
+        if (pubin)
-		if (pubin) 
+            eckey = d2i_EC_PUBKEY_bio(in, NULL);
-			eckey = d2i_EC_PUBKEY_bio(in, NULL);
+        else
-		else 
+            eckey = d2i_ECPrivateKey_bio(in, NULL);
-			eckey = d2i_ECPrivateKey_bio(in, NULL);
+    } else if (informat == FORMAT_PEM) {
-		} 
+        if (pubin)
-	else if (informat == FORMAT_PEM) 
+            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
-		{
+        else
-		if (pubin) 
+            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
-			eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
+    } else {
-				NULL);
+        BIO_printf(bio_err, "bad input format specified for key\n");
-		else 
+        goto end;
-			eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
+    }
-				passin);
+    if (eckey == NULL) {
-		} 
+        BIO_printf(bio_err, "unable to load Key\n");
-	else
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		BIO_printf(bio_err, "bad input format specified for key\n");
+    }
-		goto end;
-		}
-	if (eckey == NULL)
-		{
-		BIO_printf(bio_err,"unable to load Key\n");
-		ERR_print_errors(bio_err);
-		goto end;
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out, stdout, BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-			{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-			out = BIO_push(tmpbio, out);
+        }
-			}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto end;
-		if (BIO_write_filename(out, outfile) <= 0)
+        }
-			{
+    }
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	group = EC_KEY_get0_group(eckey);
+    group = EC_KEY_get0_group(eckey);
 
-	if (new_form)
+    if (new_form)
-		EC_KEY_set_conv_form(eckey, form);
+        EC_KEY_set_conv_form(eckey, form);
 
-	if (new_asn1_flag)
+    if (new_asn1_flag)
-		EC_KEY_set_asn1_flag(eckey, asn1_flag);
+        EC_KEY_set_asn1_flag(eckey, asn1_flag);
 
-	if (text) 
+    if (text)
-		if (!EC_KEY_print(out, eckey, 0))
+        if (!EC_KEY_print(out, eckey, 0)) {
-			{
+            perror(outfile);
-			perror(outfile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
 
-	if (noout) 
+    if (noout) {
-		{
+        ret = 0;
-		ret = 0;
+        goto end;
-		goto end;
+    }
-		}
 
-	BIO_printf(bio_err, "writing EC key\n");
+    BIO_printf(bio_err, "writing EC key\n");
-	if (outformat == FORMAT_ASN1) 
+    if (outformat == FORMAT_ASN1) {
-		{
+        if (param_out)
-		if (param_out)
+            i = i2d_ECPKParameters_bio(out, group);
-			i = i2d_ECPKParameters_bio(out, group);
+        else if (pubin || pubout)
-		else if (pubin || pubout) 
+            i = i2d_EC_PUBKEY_bio(out, eckey);
-			i = i2d_EC_PUBKEY_bio(out, eckey);
+        else
-		else 
+            i = i2d_ECPrivateKey_bio(out, eckey);
-			i = i2d_ECPrivateKey_bio(out, eckey);
+    } else if (outformat == FORMAT_PEM) {
-		} 
+        if (param_out)
-	else if (outformat == FORMAT_PEM) 
+            i = PEM_write_bio_ECPKParameters(out, group);
-		{
+        else if (pubin || pubout)
-		if (param_out)
+            i = PEM_write_bio_EC_PUBKEY(out, eckey);
-			i = PEM_write_bio_ECPKParameters(out, group);
+        else
-		else if (pubin || pubout)
+            i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
-			i = PEM_write_bio_EC_PUBKEY(out, eckey);
+                                           NULL, 0, NULL, passout);
-		else 
+    } else {
-			i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
+        BIO_printf(bio_err, "bad output format specified for " "outfile\n");
-						NULL, 0, NULL, passout);
+        goto end;
-		} 
+    }
-	else 
-		{
-		BIO_printf(bio_err, "bad output format specified for "
-			"outfile\n");
-		goto end;
-		}
 
-	if (!i)
+    if (!i) {
-		{
+        BIO_printf(bio_err, "unable to write private key\n");
-		BIO_printf(bio_err, "unable to write private key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+    } else
-		}
+        ret = 0;
-	else
+ end:
-		ret=0;
+    if (in)
-end:
+        BIO_free(in);
-	if (in)
+    if (out)
-		BIO_free(in);
+        BIO_free_all(out);
-	if (out)
+    if (eckey)
-		BIO_free_all(out);
+        EC_KEY_free(eckey);
-	if (eckey)
+    if (passin)
-		EC_KEY_free(eckey);
+        OPENSSL_free(passin);
-	if (passin)
+    if (passout)
-		OPENSSL_free(passin);
+        OPENSSL_free(passout);
-	if (passout)
+    apps_shutdown();
-		OPENSSL_free(passout);
+    OPENSSL_EXIT(ret);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
 }
-#else /* !OPENSSL_NO_EC */
+#else                           /* !OPENSSL_NO_EC */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/engine.c

@@ -1,6 +1,7 @@
 /* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
+/*
- * project 2000.
+ * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+ * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -56,494 +57,461 @@
  *
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
+# define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+# include <openssl/engine.h>
-#include <openssl/ssl.h>
+# include <openssl/ssl.h>
 
-#undef PROG
+# undef PROG
-#define PROG	engine_main
+# define PROG    engine_main
 
-static const char *engine_usage[]={
+static const char *engine_usage[] = {
-"usage: engine opts [engine ...]\n",
+    "usage: engine opts [engine ...]\n",
-" -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
+    " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
-"               -vv will additionally display each command's description\n",
+    "               -vv will additionally display each command's description\n",
-"               -vvv will also add the input flags for each command\n",
+    "               -vvv will also add the input flags for each command\n",
-"               -vvvv will also show internal input flags\n",
+    "               -vvvv will also show internal input flags\n",
-" -c          - for each engine, also list the capabilities\n",
+    " -c          - for each engine, also list the capabilities\n",
-" -t[t]       - for each engine, check that they are really available\n",
+    " -t[t]       - for each engine, check that they are really available\n",
-"               -tt will display error trace for unavailable engines\n",
+    "               -tt will display error trace for unavailable engines\n",
-" -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
+    " -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
-"               to load it (if -t is used)\n",
+    "               to load it (if -t is used)\n",
-" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
+    " -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
-"               (only used if -t is also provided)\n",
+    "               (only used if -t is also provided)\n",
-" NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
+    " NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
-" line, or all supported ENGINEs if none are specified.\n",
+    " line, or all supported ENGINEs if none are specified.\n",
-" Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
+    " Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
-" argument \"/lib/libdriver.so\".\n",
+    " argument \"/lib/libdriver.so\".\n",
-NULL
+    NULL
 };
 
 static void identity(char *ptr)
-	{
+{
-	return;
+    return;
-	}
+}
 
 static int append_buf(char **buf, const char *s, int *size, int step)
-	{
+{
-	int l = strlen(s);
+    int l = strlen(s);
 
-	if (*buf == NULL)
+    if (*buf == NULL) {
-		{
+        *size = step;
-		*size = step;
+        *buf = OPENSSL_malloc(*size);
-		*buf = OPENSSL_malloc(*size);
+        if (*buf == NULL)
-		if (*buf == NULL)
+            return 0;
-			return 0;
+        **buf = '\0';
-		**buf = '\0';
+    }
-		}
 
-	if (**buf != '\0')
+    if (**buf != '\0')
-		l += 2;		/* ", " */
+        l += 2;                 /* ", " */
 
-	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
+    if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
-		{
+        *size += step;
-		*size += step;
+        *buf = OPENSSL_realloc(*buf, *size);
-		*buf = OPENSSL_realloc(*buf, *size);
+    }
-		}
 
-	if (*buf == NULL)
+    if (*buf == NULL)
-		return 0;
+        return 0;
 
-	if (**buf != '\0')
+    if (**buf != '\0')
-		BUF_strlcat(*buf, ", ", *size);
+        BUF_strlcat(*buf, ", ", *size);
-	BUF_strlcat(*buf, s, *size);
+    BUF_strlcat(*buf, s, *size);
 
-	return 1;
+    return 1;
-	}
+}
 
 static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
-	{
+{
-	int started = 0, err = 0;
+    int started = 0, err = 0;
-	/* Indent before displaying input flags */
+    /* Indent before displaying input flags */
-	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
+    BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-	if(flags == 0)
+    if (flags == 0) {
-		{
+        BIO_printf(bio_out, "<no flags>\n");
-		BIO_printf(bio_out, "<no flags>\n");
+        return 1;
-		return 1;
+    }
-		}
+    /*
-        /* If the object is internal, mark it in a way that shows instead of
+     * If the object is internal, mark it in a way that shows instead of
-         * having it part of all the other flags, even if it really is. */
+     * having it part of all the other flags, even if it really is.
-	if(flags & ENGINE_CMD_FLAG_INTERNAL)
+     */
-		{
+    if (flags & ENGINE_CMD_FLAG_INTERNAL) {
-		BIO_printf(bio_out, "[Internal] ");
+        BIO_printf(bio_out, "[Internal] ");
-		}
+    }
 
-	if(flags & ENGINE_CMD_FLAG_NUMERIC)
+    if (flags & ENGINE_CMD_FLAG_NUMERIC) {
-		{
+        BIO_printf(bio_out, "NUMERIC");
-		BIO_printf(bio_out, "NUMERIC");
+        started = 1;
-		started = 1;
+    }
-		}
+    /*
-	/* Now we check that no combinations of the mutually exclusive NUMERIC,
+     * Now we check that no combinations of the mutually exclusive NUMERIC,
-	 * STRING, and NO_INPUT flags have been used. Future flags that can be
+     * STRING, and NO_INPUT flags have been used. Future flags that can be
-	 * OR'd together with these would need to added after these to preserve
+     * OR'd together with these would need to added after these to preserve
-	 * the testing logic. */
+     * the testing logic.
-	if(flags & ENGINE_CMD_FLAG_STRING)
+     */
-		{
+    if (flags & ENGINE_CMD_FLAG_STRING) {
-		if(started)
+        if (started) {
-			{
+            BIO_printf(bio_out, "|");
-			BIO_printf(bio_out, "|");
+            err = 1;
-			err = 1;
+        }
-			}
+        BIO_printf(bio_out, "STRING");
-		BIO_printf(bio_out, "STRING");
+        started = 1;
-		started = 1;
+    }
-		}
+    if (flags & ENGINE_CMD_FLAG_NO_INPUT) {
-	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
+        if (started) {
-		{
+            BIO_printf(bio_out, "|");
-		if(started)
+            err = 1;
-			{
+        }
-			BIO_printf(bio_out, "|");
+        BIO_printf(bio_out, "NO_INPUT");
-			err = 1;
+        started = 1;
-			}
+    }
-		BIO_printf(bio_out, "NO_INPUT");
+    /* Check for unknown flags */
-		started = 1;
+    flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
-		}
+        ~ENGINE_CMD_FLAG_STRING &
-	/* Check for unknown flags */
+        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
-	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
+    if (flags) {
-			~ENGINE_CMD_FLAG_STRING &
+        if (started)
-			~ENGINE_CMD_FLAG_NO_INPUT &
+            BIO_printf(bio_out, "|");
-			~ENGINE_CMD_FLAG_INTERNAL;
+        BIO_printf(bio_out, "<0x%04X>", flags);
-	if(flags)
+    }
-		{
+    if (err)
-		if(started) BIO_printf(bio_out, "|");
+        BIO_printf(bio_out, "  <illegal flags!>");
-		BIO_printf(bio_out, "<0x%04X>", flags);
+    BIO_printf(bio_out, "\n");
-		}
+    return 1;
-	if(err)
+}
-		BIO_printf(bio_out, "  <illegal flags!>");
-	BIO_printf(bio_out, "\n");
-	return 1;
-	}
 
-static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
+static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
-	{
+                        const char *indent)
-	static const int line_wrap = 78;
+{
-	int num;
+    static const int line_wrap = 78;
-	int ret = 0;
+    int num;
-	char *name = NULL;
+    int ret = 0;
-	char *desc = NULL;
+    char *name = NULL;
-	int flags;
+    char *desc = NULL;
-	int xpos = 0;
+    int flags;
-	STACK_OF(OPENSSL_STRING) *cmds = NULL;
+    int xpos = 0;
-	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
+    STACK_OF(OPENSSL_STRING) *cmds = NULL;
-			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
+    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
-					0, NULL, NULL)) <= 0))
+        ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-		{
+                            0, NULL, NULL)) <= 0)) {
-#if 0
+# if 0
-		BIO_printf(bio_out, "%s<no control commands>\n", indent);
+        BIO_printf(bio_out, "%s<no control commands>\n", indent);
-#endif
+# endif
-		return 1;
+        return 1;
-		}
+    }
 
-	cmds = sk_OPENSSL_STRING_new_null();
+    cmds = sk_OPENSSL_STRING_new_null();
 
-	if(!cmds)
+    if (!cmds)
-		goto err;
+        goto err;
-	do {
+    do {
-		int len;
+        int len;
-		/* Get the command input flags */
+        /* Get the command input flags */
-		if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
+        if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
-					NULL, NULL)) < 0)
+                                 NULL, NULL)) < 0)
-			goto err;
+            goto err;
-                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
+        if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4) {
-                        {
+            /* Get the command name */
-                        /* Get the command name */
+            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
-                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
+                                   NULL, NULL)) <= 0)
-                                NULL, NULL)) <= 0)
+                goto err;
-                                goto err;
+            if ((name = OPENSSL_malloc(len + 1)) == NULL)
-                        if((name = OPENSSL_malloc(len + 1)) == NULL)
+                goto err;
-                                goto err;
+            if (ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
-                        if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
+                            NULL) <= 0)
+                goto err;
+            /* Get the command description */
+            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
+                                   NULL, NULL)) < 0)
+                goto err;
+            if (len > 0) {
+                if ((desc = OPENSSL_malloc(len + 1)) == NULL)
+                    goto err;
+                if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
                                 NULL) <= 0)
-                                goto err;
+                    goto err;
-                        /* Get the command description */
+            }
-                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
+            /* Now decide on the output */
-                                NULL, NULL)) < 0)
+            if (xpos == 0)
-                                goto err;
+                /* Do an indent */
-                        if(len > 0)
+                xpos = BIO_puts(bio_out, indent);
-                                {
+            else
-                                if((desc = OPENSSL_malloc(len + 1)) == NULL)
+                /* Otherwise prepend a ", " */
-                                        goto err;
+                xpos += BIO_printf(bio_out, ", ");
-                                if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
+            if (verbose == 1) {
-                                        NULL) <= 0)
+                /*
-                                        goto err;
+                 * We're just listing names, comma-delimited
-                                }
+                 */
-                        /* Now decide on the output */
+                if ((xpos > (int)strlen(indent)) &&
-                        if(xpos == 0)
+                    (xpos + (int)strlen(name) > line_wrap)) {
-                                /* Do an indent */
+                    BIO_printf(bio_out, "\n");
-                                xpos = BIO_puts(bio_out, indent);
+                    xpos = BIO_puts(bio_out, indent);
-                        else
+                }
-                                /* Otherwise prepend a ", " */
+                xpos += BIO_printf(bio_out, "%s", name);
-                                xpos += BIO_printf(bio_out, ", ");
+            } else {
-                        if(verbose == 1)
+                /* We're listing names plus descriptions */
-                                {
+                BIO_printf(bio_out, "%s: %s\n", name,
-                                /* We're just listing names, comma-delimited */
+                           (desc == NULL) ? "<no description>" : desc);
-                                if((xpos > (int)strlen(indent)) &&
+                /* ... and sometimes input flags */
-					(xpos + (int)strlen(name) > line_wrap))
+                if ((verbose >= 3) && !util_flags(bio_out, flags, indent))
-                                        {
+                    goto err;
-                                        BIO_printf(bio_out, "\n");
+                xpos = 0;
-                                        xpos = BIO_puts(bio_out, indent);
+            }
-                                        }
+        }
-                                xpos += BIO_printf(bio_out, "%s", name);
+        OPENSSL_free(name);
-                                }
+        name = NULL;
-                        else
+        if (desc) {
-                                {
+            OPENSSL_free(desc);
-                                /* We're listing names plus descriptions */
+            desc = NULL;
-                                BIO_printf(bio_out, "%s: %s\n", name,
+        }
-                                        (desc == NULL) ? "<no description>" : desc);
+        /* Move to the next command */
-                                /* ... and sometimes input flags */
+        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
-                                if((verbose >= 3) && !util_flags(bio_out, flags,
+    } while (num > 0);
-                                        indent))
+    if (xpos > 0)
-                                        goto err;
+        BIO_printf(bio_out, "\n");
-                                xpos = 0;
+    ret = 1;
-                                }
+ err:
-                        }
+    if (cmds)
-		OPENSSL_free(name); name = NULL;
+        sk_OPENSSL_STRING_pop_free(cmds, identity);
-		if(desc) { OPENSSL_free(desc); desc = NULL; }
+    if (name)
-		/* Move to the next command */
+        OPENSSL_free(name);
-		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
+    if (desc)
-					num, NULL, NULL);
+        OPENSSL_free(desc);
-		} while(num > 0);
+    return ret;
-	if(xpos > 0)
+}
-		BIO_printf(bio_out, "\n");
-	ret = 1;
-err:
-	if(cmds) sk_OPENSSL_STRING_pop_free(cmds, identity);
-	if(name) OPENSSL_free(name);
-	if(desc) OPENSSL_free(desc);
-	return ret;
-	}
 
 static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
-			BIO *bio_out, const char *indent)
+                         BIO *bio_out, const char *indent)
-	{
+{
-	int loop, res, num = sk_OPENSSL_STRING_num(cmds);
+    int loop, res, num = sk_OPENSSL_STRING_num(cmds);
 
-	if(num < 0)
+    if (num < 0) {
-		{
+        BIO_printf(bio_out, "[Error]: internal stack error\n");
-		BIO_printf(bio_out, "[Error]: internal stack error\n");
+        return;
-		return;
+    }
-		}
+    for (loop = 0; loop < num; loop++) {
-	for(loop = 0; loop < num; loop++)
+        char buf[256];
-		{
+        const char *cmd, *arg;
-		char buf[256];
+        cmd = sk_OPENSSL_STRING_value(cmds, loop);
-		const char *cmd, *arg;
+        res = 1;                /* assume success */
-		cmd = sk_OPENSSL_STRING_value(cmds, loop);
+        /* Check if this command has no ":arg" */
-		res = 1; /* assume success */
+        if ((arg = strstr(cmd, ":")) == NULL) {
-		/* Check if this command has no ":arg" */
+            if (!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
-		if((arg = strstr(cmd, ":")) == NULL)
+                res = 0;
-			{
+        } else {
-			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
+            if ((int)(arg - cmd) > 254) {
-				res = 0;
+                BIO_printf(bio_out, "[Error]: command name too long\n");
-			}
+                return;
-		else
+            }
-			{
+            memcpy(buf, cmd, (int)(arg - cmd));
-			if((int)(arg - cmd) > 254)
+            buf[arg - cmd] = '\0';
-				{
+            arg++;              /* Move past the ":" */
-				BIO_printf(bio_out,"[Error]: command name too long\n");
+            /* Call the command with the argument */
-				return;
+            if (!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
-				}
+                res = 0;
-			memcpy(buf, cmd, (int)(arg - cmd));
+        }
-			buf[arg-cmd] = '\0';
+        if (res)
-			arg++; /* Move past the ":" */
+            BIO_printf(bio_out, "[Success]: %s\n", cmd);
-			/* Call the command with the argument */
+        else {
-			if(!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
+            BIO_printf(bio_out, "[Failure]: %s\n", cmd);
-				res = 0;
+            ERR_print_errors(bio_out);
-			}
+        }
-		if(res)
+    }
-			BIO_printf(bio_out, "[Success]: %s\n", cmd);
+}
-		else
-			{
-			BIO_printf(bio_out, "[Failure]: %s\n", cmd);
-			ERR_print_errors(bio_out);
-			}
-		}
-	}
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int ret=1,i;
+    int ret = 1, i;
-	const char **pp;
+    const char **pp;
-	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
+    int verbose = 0, list_cap = 0, test_avail = 0, test_avail_noise = 0;
-	ENGINE *e;
+    ENGINE *e;
-	STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
+    STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
-	STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
+    STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
-	STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
+    STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
-	int badops=1;
+    int badops = 1;
-	BIO *bio_out=NULL;
+    BIO *bio_out = NULL;
-	const char *indent = "     ";
+    const char *indent = "     ";
 
-	apps_startup();
+    apps_startup();
-	SSL_load_error_strings();
+    SSL_load_error_strings();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
-	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+    bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+# ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	bio_out = BIO_push(tmpbio, bio_out);
+        bio_out = BIO_push(tmpbio, bio_out);
-	}
+    }
-#endif
+# endif
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strncmp(*argv, "-v", 2) == 0) {
-		if (strncmp(*argv,"-v",2) == 0)
+            if (strspn(*argv + 1, "v") < strlen(*argv + 1))
-			{
+                goto skip_arg_loop;
-			if(strspn(*argv + 1, "v") < strlen(*argv + 1))
+            if ((verbose = strlen(*argv + 1)) > 4)
-				goto skip_arg_loop;
+                goto skip_arg_loop;
-			if((verbose=strlen(*argv + 1)) > 4)
+        } else if (strcmp(*argv, "-c") == 0)
-				goto skip_arg_loop;
+            list_cap = 1;
-			}
+        else if (strncmp(*argv, "-t", 2) == 0) {
-		else if (strcmp(*argv,"-c") == 0)
+            test_avail = 1;
-			list_cap=1;
+            if (strspn(*argv + 1, "t") < strlen(*argv + 1))
-		else if (strncmp(*argv,"-t",2) == 0)
+                goto skip_arg_loop;
-			{
+            if ((test_avail_noise = strlen(*argv + 1) - 1) > 1)
-			test_avail=1;
+                goto skip_arg_loop;
-			if(strspn(*argv + 1, "t") < strlen(*argv + 1))
+        } else if (strcmp(*argv, "-pre") == 0) {
-				goto skip_arg_loop;
+            argc--;
-			if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
+            argv++;
-				goto skip_arg_loop;
+            if (argc == 0)
-			}
+                goto skip_arg_loop;
-		else if (strcmp(*argv,"-pre") == 0)
+            sk_OPENSSL_STRING_push(pre_cmds, *argv);
-			{
+        } else if (strcmp(*argv, "-post") == 0) {
-			argc--; argv++;
+            argc--;
-			if (argc == 0)
+            argv++;
-				goto skip_arg_loop;
+            if (argc == 0)
-			sk_OPENSSL_STRING_push(pre_cmds,*argv);
+                goto skip_arg_loop;
-			}
+            sk_OPENSSL_STRING_push(post_cmds, *argv);
-		else if (strcmp(*argv,"-post") == 0)
+        } else if ((strncmp(*argv, "-h", 2) == 0) ||
-			{
+                   (strcmp(*argv, "-?") == 0))
-			argc--; argv++;
+            goto skip_arg_loop;
-			if (argc == 0)
+        else
-				goto skip_arg_loop;
+            sk_OPENSSL_STRING_push(engines, *argv);
-			sk_OPENSSL_STRING_push(post_cmds,*argv);
+        argc--;
-			}
+        argv++;
-		else if ((strncmp(*argv,"-h",2) == 0) ||
+    }
-				(strcmp(*argv,"-?") == 0))
+    /* Looks like everything went OK */
-			goto skip_arg_loop;
+    badops = 0;
-		else
+ skip_arg_loop:
-			sk_OPENSSL_STRING_push(engines,*argv);
-		argc--;
-		argv++;
-		}
-	/* Looks like everything went OK */
-	badops = 0;
-skip_arg_loop:
 
-	if (badops)
+    if (badops) {
-		{
+        for (pp = engine_usage; (*pp != NULL); pp++)
-		for (pp=engine_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (sk_OPENSSL_STRING_num(engines) == 0)
+    if (sk_OPENSSL_STRING_num(engines) == 0) {
-		{
+        for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) {
-		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
+            sk_OPENSSL_STRING_push(engines, (char *)ENGINE_get_id(e));
-			{
+        }
-			sk_OPENSSL_STRING_push(engines,(char *)ENGINE_get_id(e));
+    }
-			}
-		}
 
-	for (i=0; i<sk_OPENSSL_STRING_num(engines); i++)
+    for (i = 0; i < sk_OPENSSL_STRING_num(engines); i++) {
-		{
+        const char *id = sk_OPENSSL_STRING_value(engines, i);
-		const char *id = sk_OPENSSL_STRING_value(engines,i);
+        if ((e = ENGINE_by_id(id)) != NULL) {
-		if ((e = ENGINE_by_id(id)) != NULL)
+            const char *name = ENGINE_get_name(e);
-			{
+            /*
-			const char *name = ENGINE_get_name(e);
+             * Do "id" first, then "name". Easier to auto-parse.
-			/* Do "id" first, then "name". Easier to auto-parse. */
+             */
-			BIO_printf(bio_out, "(%s) %s\n", id, name);
+            BIO_printf(bio_out, "(%s) %s\n", id, name);
-			util_do_cmds(e, pre_cmds, bio_out, indent);
+            util_do_cmds(e, pre_cmds, bio_out, indent);
-			if (strcmp(ENGINE_get_id(e), id) != 0)
+            if (strcmp(ENGINE_get_id(e), id) != 0) {
-				{
+                BIO_printf(bio_out, "Loaded: (%s) %s\n",
-				BIO_printf(bio_out, "Loaded: (%s) %s\n",
+                           ENGINE_get_id(e), ENGINE_get_name(e));
-					ENGINE_get_id(e), ENGINE_get_name(e));
+            }
-				}
+            if (list_cap) {
-			if (list_cap)
+                int cap_size = 256;
-				{
+                char *cap_buf = NULL;
-				int cap_size = 256;
+                int k, n;
-				char *cap_buf = NULL;
+                const int *nids;
-				int k,n;
+                ENGINE_CIPHERS_PTR fn_c;
-				const int *nids;
+                ENGINE_DIGESTS_PTR fn_d;
-				ENGINE_CIPHERS_PTR fn_c;
+                ENGINE_PKEY_METHS_PTR fn_pk;
-				ENGINE_DIGESTS_PTR fn_d;
-				ENGINE_PKEY_METHS_PTR fn_pk;
 
-				if (ENGINE_get_RSA(e) != NULL
+                if (ENGINE_get_RSA(e) != NULL
-					&& !append_buf(&cap_buf, "RSA",
+                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
-						&cap_size, 256))
+                    goto end;
-					goto end;
+                if (ENGINE_get_DSA(e) != NULL
-				if (ENGINE_get_DSA(e) != NULL
+                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
-					&& !append_buf(&cap_buf, "DSA",
+                    goto end;
-						&cap_size, 256))
+                if (ENGINE_get_DH(e) != NULL
-					goto end;
+                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
-				if (ENGINE_get_DH(e) != NULL
+                    goto end;
-					&& !append_buf(&cap_buf, "DH",
+                if (ENGINE_get_RAND(e) != NULL
-						&cap_size, 256))
+                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
-					goto end;
+                    goto end;
-				if (ENGINE_get_RAND(e) != NULL
-					&& !append_buf(&cap_buf, "RAND",
-						&cap_size, 256))
-					goto end;
 
-				fn_c = ENGINE_get_ciphers(e);
+                fn_c = ENGINE_get_ciphers(e);
-				if(!fn_c) goto skip_ciphers;
+                if (!fn_c)
-				n = fn_c(e, NULL, &nids, 0);
+                    goto skip_ciphers;
-				for(k=0 ; k < n ; ++k)
+                n = fn_c(e, NULL, &nids, 0);
-					if(!append_buf(&cap_buf,
+                for (k = 0; k < n; ++k)
-						       OBJ_nid2sn(nids[k]),
+                    if (!append_buf(&cap_buf,
-						       &cap_size, 256))
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						goto end;
+                        goto end;
 
-skip_ciphers:
+ skip_ciphers:
-				fn_d = ENGINE_get_digests(e);
+                fn_d = ENGINE_get_digests(e);
-				if(!fn_d) goto skip_digests;
+                if (!fn_d)
-				n = fn_d(e, NULL, &nids, 0);
+                    goto skip_digests;
-				for(k=0 ; k < n ; ++k)
+                n = fn_d(e, NULL, &nids, 0);
-					if(!append_buf(&cap_buf,
+                for (k = 0; k < n; ++k)
-						       OBJ_nid2sn(nids[k]),
+                    if (!append_buf(&cap_buf,
-						       &cap_size, 256))
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						goto end;
+                        goto end;
 
-skip_digests:
+ skip_digests:
-				fn_pk = ENGINE_get_pkey_meths(e);
+                fn_pk = ENGINE_get_pkey_meths(e);
-				if(!fn_pk) goto skip_pmeths;
+                if (!fn_pk)
-				n = fn_pk(e, NULL, &nids, 0);
+                    goto skip_pmeths;
-				for(k=0 ; k < n ; ++k)
+                n = fn_pk(e, NULL, &nids, 0);
-					if(!append_buf(&cap_buf,
+                for (k = 0; k < n; ++k)
-						       OBJ_nid2sn(nids[k]),
+                    if (!append_buf(&cap_buf,
-						       &cap_size, 256))
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						goto end;
+                        goto end;
-skip_pmeths:
+ skip_pmeths:
-				if (cap_buf && (*cap_buf != '\0'))
+                if (cap_buf && (*cap_buf != '\0'))
-					BIO_printf(bio_out, " [%s]\n", cap_buf);
+                    BIO_printf(bio_out, " [%s]\n", cap_buf);
 
-				OPENSSL_free(cap_buf);
+                OPENSSL_free(cap_buf);
-				}
+            }
-			if(test_avail)
+            if (test_avail) {
-				{
+                BIO_printf(bio_out, "%s", indent);
-				BIO_printf(bio_out, "%s", indent);
+                if (ENGINE_init(e)) {
-				if (ENGINE_init(e))
+                    BIO_printf(bio_out, "[ available ]\n");
-					{
+                    util_do_cmds(e, post_cmds, bio_out, indent);
-					BIO_printf(bio_out, "[ available ]\n");
+                    ENGINE_finish(e);
-					util_do_cmds(e, post_cmds, bio_out, indent);
+                } else {
-					ENGINE_finish(e);
+                    BIO_printf(bio_out, "[ unavailable ]\n");
-					}
+                    if (test_avail_noise)
-				else
+                        ERR_print_errors_fp(stdout);
-					{
+                    ERR_clear_error();
-					BIO_printf(bio_out, "[ unavailable ]\n");
+                }
-					if(test_avail_noise)
+            }
-						ERR_print_errors_fp(stdout);
+            if ((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
-					ERR_clear_error();
+                goto end;
-					}
+            ENGINE_free(e);
-				}
+        } else
-			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
+            ERR_print_errors(bio_err);
-				goto end;
+    }
-			ENGINE_free(e);
-			}
-		else
-			ERR_print_errors(bio_err);
-		}
 
-	ret=0;
+    ret = 0;
-end:
+ end:
 
-	ERR_print_errors(bio_err);
+    ERR_print_errors(bio_err);
-	sk_OPENSSL_STRING_pop_free(engines, identity);
+    sk_OPENSSL_STRING_pop_free(engines, identity);
-	sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
+    sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
-	sk_OPENSSL_STRING_pop_free(post_cmds, identity);
+    sk_OPENSSL_STRING_pop_free(post_cmds, identity);
-	if (bio_out != NULL) BIO_free_all(bio_out);
+    if (bio_out != NULL)
-	apps_shutdown();
+        BIO_free_all(bio_out);
-	OPENSSL_EXIT(ret);
+    apps_shutdown();
-	}
+    OPENSSL_EXIT(ret);
+}
 #else
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/errstr.c

@@ -66,63 +66,56 @@
 #include <openssl/ssl.h>
 
 #undef PROG
-#define PROG	errstr_main
+#define PROG    errstr_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,ret=0;
+    int i, ret = 0;
-	char buf[256];
+    char buf[256];
-	unsigned long l;
+    unsigned long l;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	SSL_load_error_strings();
+    SSL_load_error_strings();
 
-	if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
+    if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
-		{
+        BIO *out = NULL;
-		BIO *out=NULL;
 
-		out=BIO_new(BIO_s_file());
+        out = BIO_new(BIO_s_file());
-		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
+        if ((out != NULL) && BIO_set_fp(out, stdout, BIO_NOCLOSE)) {
-			{
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+                out = BIO_push(tmpbio, out);
-			}
+            }
 #endif
-			lh_ERR_STRING_DATA_node_stats_bio(
+            lh_ERR_STRING_DATA_node_stats_bio(ERR_get_string_table(), out);
-						  ERR_get_string_table(), out);
+            lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(), out);
-			lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(),
+            lh_ERR_STRING_DATA_node_usage_stats_bio(ERR_get_string_table(),
-						     out);
+                                                    out);
-			lh_ERR_STRING_DATA_node_usage_stats_bio(
+        }
-						    ERR_get_string_table(),out);
+        if (out != NULL)
-			}
+            BIO_free_all(out);
-		if (out != NULL) BIO_free_all(out);
+        argc--;
-		argc--;
+        argv++;
-		argv++;
+    }
-		}
 
-	for (i=1; i<argc; i++)
+    for (i = 1; i < argc; i++) {
-		{
+        if (sscanf(argv[i], "%lx", &l)) {
-		if (sscanf(argv[i],"%lx",&l))
+            ERR_error_string_n(l, buf, sizeof buf);
-			{
+            printf("%s\n", buf);
-			ERR_error_string_n(l, buf, sizeof buf);
+        } else {
-			printf("%s\n",buf);
+            printf("%s: bad error code\n", argv[i]);
-			}
+            printf("usage: errstr [-stats] <errno> ...\n");
-		else
+            ret++;
-			{
+        }
-			printf("%s: bad error code\n",argv[i]);
+    }
-			printf("usage: errstr [-stats] <errno> ...\n");
+    apps_shutdown();
-			ret++;
+    OPENSSL_EXIT(ret);
-			}
+}
-		}
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}

apps/gendh.c

@@ -58,184 +58,191 @@
  */
 
 #include <openssl/opensslconf.h>
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+/*
- * deprecated functions for openssl-internal code */
+ * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code
+ */
 #ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
+# undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_DH
-#include <stdio.h>
+# include <stdio.h>
-#include <string.h>
+# include <string.h>
-#include <sys/types.h>
+# include <sys/types.h>
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/rand.h>
+# include <openssl/rand.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dh.h>
+# include <openssl/dh.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#define DEFBITS	512
+# define DEFBITS 512
-#undef PROG
+# undef PROG
-#define PROG gendh_main
+# define PROG gendh_main
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	BN_GENCB cb;
+    BN_GENCB cb;
-	DH *dh=NULL;
+    DH *dh = NULL;
-	int ret=1,num=DEFBITS;
+    int ret = 1, num = DEFBITS;
-	int g=2;
+    int g = 2;
-	char *outfile=NULL;
+    char *outfile = NULL;
-	char *inrand=NULL;
+    char *inrand = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
-	BIO *out=NULL;
+    BIO *out = NULL;
 
-	apps_startup();
+    apps_startup();
 
-	BN_GENCB_set(&cb, dh_cb, bio_err);
+    BN_GENCB_set(&cb, dh_cb, bio_err);
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	argv++;
+    argv++;
-	argc--;
+    argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-2") == 0)
-		else if (strcmp(*argv,"-2") == 0)
+            g = 2;
-			g=2;
+/*-     else if (strcmp(*argv,"-3") == 0)
-	/*	else if (strcmp(*argv,"-3") == 0)
+                g=3; */
-			g=3; */
+        else if (strcmp(*argv, "-5") == 0)
-		else if (strcmp(*argv,"-5") == 0)
+            g = 5;
-			g=5;
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv,"-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            engine = *(++argv);
-			engine= *(++argv);
+        }
-			}
+# endif
-#endif
+        else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            inrand = *(++argv);
-			inrand= *(++argv);
+        } else
-			}
+            break;
-		else
+        argv++;
-			break;
+        argc--;
-		argv++;
+    }
-		argc--;
+    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
-		}
+ bad:
-	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
+        BIO_printf(bio_err, "usage: gendh [args] [numbits]\n");
-		{
+        BIO_printf(bio_err, " -out file - output the key to 'file\n");
-bad:
+        BIO_printf(bio_err, " -2        - use 2 as the generator value\n");
-		BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
+        /*
-		BIO_printf(bio_err," -out file - output the key to 'file\n");
+         * BIO_printf(bio_err," -3 - use 3 as the generator value\n");
-		BIO_printf(bio_err," -2        - use 2 as the generator value\n");
+         */
-	/*	BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
+        BIO_printf(bio_err, " -5        - use 5 as the generator value\n");
-		BIO_printf(bio_err," -5        - use 5 as the generator value\n");
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+                   " -engine e - use engine e, possibly a hardware device.\n");
-#endif
+# endif
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
+                   LIST_SEPARATOR_CHAR);
-		BIO_printf(bio_err,"             the random number generator\n");
+        BIO_printf(bio_err,
-		goto end;
+                   "           - load the file (or the files in the directory) into\n");
-		}
+        BIO_printf(bio_err, "             the random number generator\n");
+        goto end;
+    }
+# ifndef OPENSSL_NO_ENGINE
+    setup_engine(bio_err, engine, 0);
+# endif
 
-#ifndef OPENSSL_NO_ENGINE
+    out = BIO_new(BIO_s_file());
-        setup_engine(bio_err, engine, 0);
+    if (out == NULL) {
-#endif
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	out=BIO_new(BIO_s_file());
+    if (outfile == NULL) {
-	if (out == NULL)
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		{
+# ifdef OPENSSL_SYS_VMS
-		ERR_print_errors(bio_err);
+        {
-		goto end;
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		}
+            out = BIO_push(tmpbio, out);
+        }
+# endif
+    } else {
+        if (BIO_write_filename(out, outfile) <= 0) {
+            perror(outfile);
+            goto end;
+        }
+    }
 
-	if (outfile == NULL)
+    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
-		{
+        BIO_printf(bio_err,
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+                   "warning, not much extra random data, consider using the -rand option\n");
-#ifdef OPENSSL_SYS_VMS
+    }
-		{
+    if (inrand != NULL)
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-		out = BIO_push(tmpbio, out);
+                   app_RAND_load_files(inrand));
-		}
-#endif
-		}
-	else
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+    BIO_printf(bio_err,
-		{
+               "Generating DH parameters, %d bit long safe prime, generator %d\n",
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+               num, g);
-		}
+    BIO_printf(bio_err, "This is going to take a long time\n");
-	if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
-			app_RAND_load_files(inrand));
 
-	BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
+    if (((dh = DH_new()) == NULL)
-	BIO_printf(bio_err,"This is going to take a long time\n");
+        || !DH_generate_parameters_ex(dh, num, g, &cb))
+        goto end;
 
-	if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, &cb))
+    app_RAND_write_file(NULL, bio_err);
-		goto end;
 
-	app_RAND_write_file(NULL, bio_err);
+    if (!PEM_write_bio_DHparams(out, dh))
-
+        goto end;
-	if (!PEM_write_bio_DHparams(out,dh))
+    ret = 0;
-		goto end;
+ end:
-	ret=0;
+    if (ret != 0)
-end:
+        ERR_print_errors(bio_err);
-	if (ret != 0)
+    if (out != NULL)
-		ERR_print_errors(bio_err);
+        BIO_free_all(out);
-	if (out != NULL) BIO_free_all(out);
+    if (dh != NULL)
-	if (dh != NULL) DH_free(dh);
+        DH_free(dh);
-	apps_shutdown();
+    apps_shutdown();
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
-	}
+}
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-	return 1;
+    (void)BIO_flush(cb->arg);
-	}
+# ifdef LINT
-#else /* !OPENSSL_NO_DH */
+    p = n;
+# endif
+    return 1;
+}
+#else                           /* !OPENSSL_NO_DH */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/gendsa.c

@@ -56,230 +56,232 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-#include <stdio.h>
+# include <stdio.h>
-#include <string.h>
+# include <string.h>
-#include <sys/types.h>
+# include <sys/types.h>
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dsa.h>
+# include <openssl/dsa.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#define DEFBITS	512
+# define DEFBITS 512
-#undef PROG
+# undef PROG
-#define PROG gendsa_main
+# define PROG gendsa_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	DSA *dsa=NULL;
+    DSA *dsa = NULL;
-	int ret=1;
+    int ret = 1;
-	char *outfile=NULL;
+    char *outfile = NULL;
-	char *inrand=NULL,*dsaparams=NULL;
+    char *inrand = NULL, *dsaparams = NULL;
-	char *passargout = NULL, *passout = NULL;
+    char *passargout = NULL, *passout = NULL;
-	BIO *out=NULL,*in=NULL;
+    BIO *out = NULL, *in = NULL;
-	const EVP_CIPHER *enc=NULL;
+    const EVP_CIPHER *enc = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	argv++;
+    argv++;
-	argc--;
+    argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargout= *(++argv);
+        }
-			}
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv,"-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            engine = *(++argv);
-			engine= *(++argv);
+        }
-			}
+# endif
-#endif
+        else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            inrand = *(++argv);
-			inrand= *(++argv);
+        } else if (strcmp(*argv, "-") == 0)
-			}
+            goto bad;
-		else if (strcmp(*argv,"-") == 0)
+# ifndef OPENSSL_NO_DES
-			goto bad;
+        else if (strcmp(*argv, "-des") == 0)
-#ifndef OPENSSL_NO_DES
+            enc = EVP_des_cbc();
-		else if (strcmp(*argv,"-des") == 0)
+        else if (strcmp(*argv, "-des3") == 0)
-			enc=EVP_des_cbc();
+            enc = EVP_des_ede3_cbc();
-		else if (strcmp(*argv,"-des3") == 0)
+# endif
-			enc=EVP_des_ede3_cbc();
+# ifndef OPENSSL_NO_IDEA
-#endif
+        else if (strcmp(*argv, "-idea") == 0)
-#ifndef OPENSSL_NO_IDEA
+            enc = EVP_idea_cbc();
-		else if (strcmp(*argv,"-idea") == 0)
+# endif
-			enc=EVP_idea_cbc();
+# ifndef OPENSSL_NO_SEED
-#endif
+        else if (strcmp(*argv, "-seed") == 0)
-#ifndef OPENSSL_NO_SEED
+            enc = EVP_seed_cbc();
-		else if (strcmp(*argv,"-seed") == 0)
+# endif
-			enc=EVP_seed_cbc();
+# ifndef OPENSSL_NO_AES
-#endif
+        else if (strcmp(*argv, "-aes128") == 0)
-#ifndef OPENSSL_NO_AES
+            enc = EVP_aes_128_cbc();
-		else if (strcmp(*argv,"-aes128") == 0)
+        else if (strcmp(*argv, "-aes192") == 0)
-			enc=EVP_aes_128_cbc();
+            enc = EVP_aes_192_cbc();
-		else if (strcmp(*argv,"-aes192") == 0)
+        else if (strcmp(*argv, "-aes256") == 0)
-			enc=EVP_aes_192_cbc();
+            enc = EVP_aes_256_cbc();
-		else if (strcmp(*argv,"-aes256") == 0)
+# endif
-			enc=EVP_aes_256_cbc();
+# ifndef OPENSSL_NO_CAMELLIA
-#endif
+        else if (strcmp(*argv, "-camellia128") == 0)
-#ifndef OPENSSL_NO_CAMELLIA
+            enc = EVP_camellia_128_cbc();
-		else if (strcmp(*argv,"-camellia128") == 0)
+        else if (strcmp(*argv, "-camellia192") == 0)
-			enc=EVP_camellia_128_cbc();
+            enc = EVP_camellia_192_cbc();
-		else if (strcmp(*argv,"-camellia192") == 0)
+        else if (strcmp(*argv, "-camellia256") == 0)
-			enc=EVP_camellia_192_cbc();
+            enc = EVP_camellia_256_cbc();
-		else if (strcmp(*argv,"-camellia256") == 0)
+# endif
-			enc=EVP_camellia_256_cbc();
+        else if (**argv != '-' && dsaparams == NULL) {
-#endif
+            dsaparams = *argv;
-		else if (**argv != '-' && dsaparams == NULL)
+        } else
-			{
+            goto bad;
-			dsaparams = *argv;
+        argv++;
-			}
+        argc--;
-		else
+    }
-			goto bad;
-		argv++;
-		argc--;
-		}
 
-	if (dsaparams == NULL)
+    if (dsaparams == NULL) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "usage: gendsa [args] dsaparam-file\n");
-		BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
+        BIO_printf(bio_err, " -out file - output the key to 'file'\n");
-		BIO_printf(bio_err," -out file - output the key to 'file'\n");
+# ifndef OPENSSL_NO_DES
-#ifndef OPENSSL_NO_DES
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
+                   " -des      - encrypt the generated key with DES in cbc mode\n");
-		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+        BIO_printf(bio_err,
-#endif
+                   " -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-#ifndef OPENSSL_NO_IDEA
+# endif
-		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+# ifndef OPENSSL_NO_IDEA
-#endif
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_SEED
+                   " -idea     - encrypt the generated key with IDEA in cbc mode\n");
-		BIO_printf(bio_err," -seed\n");
+# endif
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
+# ifndef OPENSSL_NO_SEED
-#endif
+        BIO_printf(bio_err, " -seed\n");
-#ifndef OPENSSL_NO_AES
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+                   "                 encrypt PEM output with cbc seed\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+# endif
-#endif
+# ifndef OPENSSL_NO_AES
-#ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+                   "                 encrypt PEM output with cbc aes\n");
-#endif
+# endif
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_CAMELLIA
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+                   "                 encrypt PEM output with cbc camellia\n");
-		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
+# endif
-		BIO_printf(bio_err,"             the random number generator\n");
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," dsaparam-file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
+                   " -engine e - use engine e, possibly a hardware device.\n");
-		goto end;
+# endif
-		}
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "           - load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, "             the random number generator\n");
+        BIO_printf(bio_err, " dsaparam-file\n");
+        BIO_printf(bio_err,
+                   "           - a DSA parameter file as generated by the dsaparam command\n");
+        goto end;
+    }
+# ifndef OPENSSL_NO_ENGINE
+    setup_engine(bio_err, engine, 0);
+# endif
 
-#ifndef OPENSSL_NO_ENGINE
+    if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
-        setup_engine(bio_err, engine, 0);
+        BIO_printf(bio_err, "Error getting password\n");
-#endif
+        goto end;
+    }
 
-	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+    in = BIO_new(BIO_s_file());
-		BIO_printf(bio_err, "Error getting password\n");
+    if (!(BIO_read_filename(in, dsaparams))) {
-		goto end;
+        perror(dsaparams);
-	}
+        goto end;
+    }
 
+    if ((dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL)) == NULL) {
+        BIO_printf(bio_err, "unable to load DSA parameter file\n");
+        goto end;
+    }
+    BIO_free(in);
+    in = NULL;
 
-	in=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (!(BIO_read_filename(in,dsaparams)))
+    if (out == NULL)
-		{
+        goto end;
-		perror(dsaparams);
-		goto end;
-		}
 
-	if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_printf(bio_err,"unable to load DSA parameter file\n");
+# ifdef OPENSSL_SYS_VMS
-		goto end;
+        {
-		}
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	BIO_free(in);
+            out = BIO_push(tmpbio, out);
-	in = NULL;
+        }
+# endif
+    } else {
+        if (BIO_write_filename(out, outfile) <= 0) {
+            perror(outfile);
+            goto end;
+        }
+    }
 
-	out=BIO_new(BIO_s_file());
+    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
-	if (out == NULL) goto end;
+        BIO_printf(bio_err,
+                   "warning, not much extra random data, consider using the -rand option\n");
+    }
+    if (inrand != NULL)
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+                   app_RAND_load_files(inrand));
 
-	if (outfile == NULL)
+    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
-		{
+    if (!DSA_generate_key(dsa))
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+        goto end;
-#ifdef OPENSSL_SYS_VMS
-		{
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
-		}
-#endif
-		}
-	else
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+    app_RAND_write_file(NULL, bio_err);
-		{
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
-		}
-	if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
-			app_RAND_load_files(inrand));
 
-	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
+    if (!PEM_write_bio_DSAPrivateKey(out, dsa, enc, NULL, 0, NULL, passout))
-							BN_num_bits(dsa->p));
+        goto end;
-	if (!DSA_generate_key(dsa)) goto end;
+    ret = 0;
-
+ end:
-	app_RAND_write_file(NULL, bio_err);
+    if (ret != 0)
-
+        ERR_print_errors(bio_err);
-	if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL, passout))
+    if (in != NULL)
-		goto end;
+        BIO_free(in);
-	ret=0;
+    if (out != NULL)
-end:
+        BIO_free_all(out);
-	if (ret != 0)
+    if (dsa != NULL)
-		ERR_print_errors(bio_err);
+        DSA_free(dsa);
-	if (in != NULL) BIO_free(in);
+    if (passout)
-	if (out != NULL) BIO_free_all(out);
+        OPENSSL_free(passout);
-	if (dsa != NULL) DSA_free(dsa);
+    apps_shutdown();
-	if(passout) OPENSSL_free(passout);
+    OPENSSL_EXIT(ret);
-	apps_shutdown();
+}
-	OPENSSL_EXIT(ret);
+#else                           /* !OPENSSL_NO_DSA */
-	}
-#else /* !OPENSSL_NO_DSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/genpkey.c

@@ -1,6 +1,7 @@
 /* apps/genpkey.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -62,11 +63,11 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+# include <openssl/engine.h>
 #endif
 
 static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
-				const char *file, ENGINE *e);
+                            const char *file, ENGINE *e);
 static int genpkey_cb(EVP_PKEY_CTX *ctx);
 
 #define PROG genpkey_main
@@ -74,367 +75,331 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	char **args, *outfile = NULL;
+    char **args, *outfile = NULL;
-	char *passarg = NULL;
+    char *passarg = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	const EVP_CIPHER *cipher = NULL;
+    const EVP_CIPHER *cipher = NULL;
-	int outformat;
+    int outformat;
-	int text = 0;
+    int text = 0;
-	EVP_PKEY *pkey=NULL;
+    EVP_PKEY *pkey = NULL;
-	EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY_CTX *ctx = NULL;
-	char *pass = NULL;
+    char *pass = NULL;
-	int badarg = 0;
+    int badarg = 0;
-	int ret = 1, rv;
+    int ret = 1, rv;
 
-	int do_param = 0;
+    int do_param = 0;
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	args = argv + 1;
+    args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-outform")) {
-		if (!strcmp(*args,"-outform"))
+            if (args[1]) {
-			{
+                args++;
-			if (args[1])
+                outformat = str2fmt(*args);
-				{
+            } else
-				args++;
+                badarg = 1;
-				outformat=str2fmt(*args);
+        } else if (!strcmp(*args, "-pass")) {
-				}
+            if (!args[1])
-			else badarg = 1;
+                goto bad;
-			}
+            passarg = *(++args);
-		else if (!strcmp(*args,"-pass"))
+        }
-			{
-			if (!args[1]) goto bad;
-			passarg= *(++args);
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (!args[1])
-			if (!args[1])
+                goto bad;
-				goto bad;
+            e = setup_engine(bio_err, *(++args), 0);
-        		e = setup_engine(bio_err, *(++args), 0);
+        }
-			}
 #endif
-		else if (!strcmp (*args, "-paramfile"))
+        else if (!strcmp(*args, "-paramfile")) {
-			{
+            if (!args[1])
-			if (!args[1])
+                goto bad;
-				goto bad;
+            args++;
-			args++;
+            if (do_param == 1)
-			if (do_param == 1)
+                goto bad;
-				goto bad;
+            if (!init_keygen_file(bio_err, &ctx, *args, e))
-			if (!init_keygen_file(bio_err, &ctx, *args, e))
+                goto end;
-				goto end;
+        } else if (!strcmp(*args, "-out")) {
-			}
+            if (args[1]) {
-		else if (!strcmp (*args, "-out"))
+                args++;
-			{
+                outfile = *args;
-			if (args[1])
+            } else
-				{
+                badarg = 1;
-				args++;
+        } else if (strcmp(*args, "-algorithm") == 0) {
-				outfile = *args;
+            if (!args[1])
-				}
+                goto bad;
-			else badarg = 1;
+            if (!init_gen_str(bio_err, &ctx, *(++args), e, do_param))
-			}
+                goto end;
-		else if (strcmp(*args,"-algorithm") == 0)
+        } else if (strcmp(*args, "-pkeyopt") == 0) {
-			{
+            if (!args[1])
-			if (!args[1])
+                goto bad;
-				goto bad;
+            if (!ctx) {
-			if (!init_gen_str(bio_err, &ctx, *(++args),e, do_param))
+                BIO_puts(bio_err, "No keytype specified\n");
-				goto end;
+                goto bad;
-			}
+            } else if (pkey_ctrl_string(ctx, *(++args)) <= 0) {
-		else if (strcmp(*args,"-pkeyopt") == 0)
+                BIO_puts(bio_err, "parameter setting error\n");
-			{
+                ERR_print_errors(bio_err);
-			if (!args[1])
+                goto end;
-				goto bad;
+            }
-			if (!ctx)
+        } else if (strcmp(*args, "-genparam") == 0) {
-				{
+            if (ctx)
-				BIO_puts(bio_err, "No keytype specified\n");
+                goto bad;
-				goto bad;
+            do_param = 1;
-				}
+        } else if (strcmp(*args, "-text") == 0)
-			else if (pkey_ctrl_string(ctx, *(++args)) <= 0)
+            text = 1;
-				{
+        else {
-				BIO_puts(bio_err, "parameter setting error\n");
+            cipher = EVP_get_cipherbyname(*args + 1);
-				ERR_print_errors(bio_err);
+            if (!cipher) {
-				goto end;
+                BIO_printf(bio_err, "Unknown cipher %s\n", *args + 1);
-				}
+                badarg = 1;
-			}
+            }
-		else if (strcmp(*args,"-genparam") == 0)
+            if (do_param == 1)
-			{
+                badarg = 1;
-			if (ctx)
+        }
-				goto bad;
+        args++;
-			do_param = 1;
+    }
-			}
-		else if (strcmp(*args,"-text") == 0)
-			text=1;
-		else
-			{
-			cipher = EVP_get_cipherbyname(*args + 1);
-			if (!cipher)
-				{
-				BIO_printf(bio_err, "Unknown cipher %s\n",
-								*args + 1);
-				badarg = 1;
-				}
-			if (do_param == 1)
-				badarg = 1;
-			}
-		args++;
-		}
 
-	if (!ctx)
+    if (!ctx)
-		badarg = 1;
+        badarg = 1;
 
-	if (badarg)
+    if (badarg) {
-		{
+ bad:
-		bad:
+        BIO_printf(bio_err, "Usage: genpkey [options]\n");
-		BIO_printf(bio_err, "Usage: genpkey [options]\n");
+        BIO_printf(bio_err, "where options may be\n");
-		BIO_printf(bio_err, "where options may be\n");
+        BIO_printf(bio_err, "-out file          output file\n");
-		BIO_printf(bio_err, "-out file          output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-outform X         output format (DER or PEM)\n");
+                   "-outform X         output format (DER or PEM)\n");
-		BIO_printf(bio_err, "-pass arg          output file pass phrase source\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-<cipher>          use cipher <cipher> to encrypt the key\n");
+                   "-pass arg          output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-<cipher>          use cipher <cipher> to encrypt the key\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e          use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e          use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, "-paramfile file    parameters file\n");
+        BIO_printf(bio_err, "-paramfile file    parameters file\n");
-		BIO_printf(bio_err, "-algorithm alg     the public key algorithm\n");
+        BIO_printf(bio_err, "-algorithm alg     the public key algorithm\n");
-		BIO_printf(bio_err, "-pkeyopt opt:value set the public key algorithm option <opt>\n"
+        BIO_printf(bio_err,
-				            "                   to value <value>\n");
+                   "-pkeyopt opt:value set the public key algorithm option <opt>\n"
-		BIO_printf(bio_err, "-genparam          generate parameters, not key\n");
+                   "                   to value <value>\n");
-		BIO_printf(bio_err, "-text              print the in text\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "NB: options order may be important!  See the manual page.\n");
+                   "-genparam          generate parameters, not key\n");
-		goto end;
+        BIO_printf(bio_err, "-text              print the in text\n");
-		}
+        BIO_printf(bio_err,
+                   "NB: options order may be important!  See the manual page.\n");
+        goto end;
+    }
 
-	if (!app_passwd(bio_err, passarg, NULL, &pass, NULL))
+    if (!app_passwd(bio_err, passarg, NULL, &pass, NULL)) {
-		{
+        BIO_puts(bio_err, "Error getting password\n");
-		BIO_puts(bio_err, "Error getting password\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
+            goto end;
-			BIO_printf(bio_err,
+        }
-				 "Can't open output file %s\n", outfile);
+    } else {
-			goto end;
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-			}
-		}
-	else
-		{
-		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+        {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-			}
+        }
 #endif
-		}
+    }
 
-	EVP_PKEY_CTX_set_cb(ctx, genpkey_cb);
+    EVP_PKEY_CTX_set_cb(ctx, genpkey_cb);
-	EVP_PKEY_CTX_set_app_data(ctx, bio_err);
+    EVP_PKEY_CTX_set_app_data(ctx, bio_err);
 
-	if (do_param)
+    if (do_param) {
-		{
+        if (EVP_PKEY_paramgen(ctx, &pkey) <= 0) {
-		if (EVP_PKEY_paramgen(ctx, &pkey) <= 0)
+            BIO_puts(bio_err, "Error generating parameters\n");
-			{
+            ERR_print_errors(bio_err);
-			BIO_puts(bio_err, "Error generating parameters\n");
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+    } else {
-			}
+        if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
-		}
+            BIO_puts(bio_err, "Error generating key\n");
-	else
+            ERR_print_errors(bio_err);
-		{
+            goto end;
-		if (EVP_PKEY_keygen(ctx, &pkey) <= 0)
+        }
-			{
+    }
-			BIO_puts(bio_err, "Error generating key\n");
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		}
 
-	if (do_param)
+    if (do_param)
-		rv = PEM_write_bio_Parameters(out, pkey);
+        rv = PEM_write_bio_Parameters(out, pkey);
-	else if (outformat == FORMAT_PEM) 
+    else if (outformat == FORMAT_PEM)
-		rv = PEM_write_bio_PrivateKey(out, pkey, cipher, NULL, 0,
+        rv = PEM_write_bio_PrivateKey(out, pkey, cipher, NULL, 0, NULL, pass);
-								NULL, pass);
+    else if (outformat == FORMAT_ASN1)
-	else if (outformat == FORMAT_ASN1)
+        rv = i2d_PrivateKey_bio(out, pkey);
-		rv = i2d_PrivateKey_bio(out, pkey);
+    else {
-	else
+        BIO_printf(bio_err, "Bad format specified for key\n");
-		{
+        goto end;
-		BIO_printf(bio_err, "Bad format specified for key\n");
+    }
-		goto end;
-		}
 
-	if (rv <= 0)
+    if (rv <= 0) {
-		{
+        BIO_puts(bio_err, "Error writing key\n");
-		BIO_puts(bio_err, "Error writing key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+    }
-		}
 
-	if (text)
+    if (text) {
-		{
+        if (do_param)
-		if (do_param)
+            rv = EVP_PKEY_print_params(out, pkey, 0, NULL);
-			rv = EVP_PKEY_print_params(out, pkey, 0, NULL);
+        else
-		else
+            rv = EVP_PKEY_print_private(out, pkey, 0, NULL);
-			rv = EVP_PKEY_print_private(out, pkey, 0, NULL);
 
-		if (rv <= 0)
+        if (rv <= 0) {
-			{
+            BIO_puts(bio_err, "Error printing key\n");
-			BIO_puts(bio_err, "Error printing key\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+        }
-			}
+    }
-		}
 
-	ret = 0;
+    ret = 0;
 
-	end:
+ end:
-	if (pkey)
+    if (pkey)
-		EVP_PKEY_free(pkey);
+        EVP_PKEY_free(pkey);
-	if (ctx)
+    if (ctx)
-		EVP_PKEY_CTX_free(ctx);
+        EVP_PKEY_CTX_free(ctx);
-	if (out)
+    if (out)
-		BIO_free_all(out);
+        BIO_free_all(out);
-	BIO_free(in);
+    BIO_free(in);
-	if (pass)
+    if (pass)
-		OPENSSL_free(pass);
+        OPENSSL_free(pass);
 
-	return ret;
+    return ret;
-	}
+}
 
 static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
-				const char *file, ENGINE *e)
+                            const char *file, ENGINE *e)
-	{
+{
-	BIO *pbio;
+    BIO *pbio;
-	EVP_PKEY *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
-	EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY_CTX *ctx = NULL;
-	if (*pctx)
+    if (*pctx) {
-		{
+        BIO_puts(err, "Parameters already set!\n");
-		BIO_puts(err, "Parameters already set!\n");
+        return 0;
-		return 0;
+    }
-		}
 
-	pbio = BIO_new_file(file, "r");
+    pbio = BIO_new_file(file, "r");
-	if (!pbio)
+    if (!pbio) {
-		{
+        BIO_printf(err, "Can't open parameter file %s\n", file);
-		BIO_printf(err, "Can't open parameter file %s\n", file);
+        return 0;
-		return 0;
+    }
-		}
 
-	pkey = PEM_read_bio_Parameters(pbio, NULL);
+    pkey = PEM_read_bio_Parameters(pbio, NULL);
-	BIO_free(pbio);
+    BIO_free(pbio);
 
-	if (!pkey)
+    if (!pkey) {
-		{
+        BIO_printf(bio_err, "Error reading parameter file %s\n", file);
-		BIO_printf(bio_err, "Error reading parameter file %s\n", file);
+        return 0;
-		return 0;
+    }
-		}
 
-	ctx = EVP_PKEY_CTX_new(pkey, e);
+    ctx = EVP_PKEY_CTX_new(pkey, e);
-	if (!ctx)
+    if (!ctx)
-		goto err;
+        goto err;
-	if (EVP_PKEY_keygen_init(ctx) <= 0)
+    if (EVP_PKEY_keygen_init(ctx) <= 0)
-		goto err;
+        goto err;
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
-	*pctx = ctx;
+    *pctx = ctx;
-	return 1;
+    return 1;
 
-	err:
+ err:
-	BIO_puts(err, "Error initializing context\n");
+    BIO_puts(err, "Error initializing context\n");
-	ERR_print_errors(err);
+    ERR_print_errors(err);
-	if (ctx)
+    if (ctx)
-		EVP_PKEY_CTX_free(ctx);
+        EVP_PKEY_CTX_free(ctx);
-	if (pkey)
+    if (pkey)
-		EVP_PKEY_free(pkey);
+        EVP_PKEY_free(pkey);
-	return 0;
+    return 0;
 
-	}
+}
 
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
-			const char *algname, ENGINE *e, int do_param)
+                 const char *algname, ENGINE *e, int do_param)
-	{
+{
-	EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY_CTX *ctx = NULL;
-	const EVP_PKEY_ASN1_METHOD *ameth;
+    const EVP_PKEY_ASN1_METHOD *ameth;
-	ENGINE *tmpeng = NULL;
+    ENGINE *tmpeng = NULL;
-	int pkey_id;
+    int pkey_id;
 
-	if (*pctx)
+    if (*pctx) {
-		{
+        BIO_puts(err, "Algorithm already set!\n");
-		BIO_puts(err, "Algorithm already set!\n");
+        return 0;
-		return 0;
+    }
-		}
 
-	ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
+    ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
 
 #ifndef OPENSSL_NO_ENGINE
-	if (!ameth && e)
+    if (!ameth && e)
-		ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
+        ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
 #endif
 
-	if (!ameth)
+    if (!ameth) {
-		{
+        BIO_printf(bio_err, "Algorithm %s not found\n", algname);
-		BIO_printf(bio_err, "Algorithm %s not found\n", algname);
+        return 0;
-		return 0;
+    }
-		}
 
-	ERR_clear_error();
+    ERR_clear_error();
 
-	EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
+    EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
 #ifndef OPENSSL_NO_ENGINE
-	if (tmpeng)
+    if (tmpeng)
-		ENGINE_finish(tmpeng);
+        ENGINE_finish(tmpeng);
 #endif
-	ctx = EVP_PKEY_CTX_new_id(pkey_id, e);
+    ctx = EVP_PKEY_CTX_new_id(pkey_id, e);
 
-	if (!ctx)
+    if (!ctx)
-		goto err;
+        goto err;
-	if (do_param)
+    if (do_param) {
-		{
+        if (EVP_PKEY_paramgen_init(ctx) <= 0)
-		if (EVP_PKEY_paramgen_init(ctx) <= 0)
+            goto err;
-			goto err;
+    } else {
-		}
+        if (EVP_PKEY_keygen_init(ctx) <= 0)
-	else
+            goto err;
-		{
+    }
-		if (EVP_PKEY_keygen_init(ctx) <= 0)
-			goto err;
-		}
 
-	*pctx = ctx;
+    *pctx = ctx;
-	return 1;
+    return 1;
 
-	err:
+ err:
-	BIO_printf(err, "Error initializing %s context\n", algname);
+    BIO_printf(err, "Error initializing %s context\n", algname);
-	ERR_print_errors(err);
+    ERR_print_errors(err);
-	if (ctx)
+    if (ctx)
-		EVP_PKEY_CTX_free(ctx);
+        EVP_PKEY_CTX_free(ctx);
-	return 0;
+    return 0;
 
-	}
+}
 
 static int genpkey_cb(EVP_PKEY_CTX *ctx)
-	{
+{
-	char c='*';
+    char c = '*';
-	BIO *b = EVP_PKEY_CTX_get_app_data(ctx);
+    BIO *b = EVP_PKEY_CTX_get_app_data(ctx);
-	int p;
+    int p;
-	p = EVP_PKEY_CTX_get_keygen_info(ctx, 0);
+    p = EVP_PKEY_CTX_get_keygen_info(ctx, 0);
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(b,&c,1);
+    if (p == 2)
-	(void)BIO_flush(b);
+        c = '*';
+    if (p == 3)
+        c = '\n';
+    BIO_write(b, &c, 1);
+    (void)BIO_flush(b);
 #ifdef LINT
-	p=n;
+    p = n;
 #endif
-	return 1;
+    return 1;
-	}
+}

apps/genrsa.c

@@ -57,279 +57,294 @@
  */
 
 #include <openssl/opensslconf.h>
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+/*
- * deprecated functions for openssl-internal code */
+ * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code
+ */
 #ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
+# undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_RSA
-#include <stdio.h>
+# include <stdio.h>
-#include <string.h>
+# include <string.h>
-#include <sys/types.h>
+# include <sys/types.h>
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/rsa.h>
+# include <openssl/rsa.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/rand.h>
+# include <openssl/rand.h>
 
-#define DEFBITS	512
+# define DEFBITS 512
-#undef PROG
+# undef PROG
-#define PROG genrsa_main
+# define PROG genrsa_main
 
 static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	BN_GENCB cb;
+    BN_GENCB cb;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-#endif
+# endif
-	int ret=1;
+    int ret = 1;
-	int i,num=DEFBITS;
+    int i, num = DEFBITS;
-	long l;
+    long l;
-	const EVP_CIPHER *enc=NULL;
+    const EVP_CIPHER *enc = NULL;
-	unsigned long f4=RSA_F4;
+    unsigned long f4 = RSA_F4;
-	char *outfile=NULL;
+    char *outfile = NULL;
-	char *passargout = NULL, *passout = NULL;
+    char *passargout = NULL, *passout = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
-	char *inrand=NULL;
+    char *inrand = NULL;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	BIGNUM *bn = BN_new();
+    BIGNUM *bn = BN_new();
-	RSA *rsa = NULL;
+    RSA *rsa = NULL;
 
-	if(!bn) goto err;
+    if (!bn)
+        goto err;
 
-	apps_startup();
+    apps_startup();
-	BN_GENCB_set(&cb, genrsa_cb, bio_err);
+    BN_GENCB_set(&cb, genrsa_cb, bio_err);
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto err;
+        goto err;
-	if ((out=BIO_new(BIO_s_file())) == NULL)
+    if ((out = BIO_new(BIO_s_file())) == NULL) {
-		{
+        BIO_printf(bio_err, "unable to create BIO for output\n");
-		BIO_printf(bio_err,"unable to create BIO for output\n");
+        goto err;
-		goto err;
+    }
-		}
 
-	argv++;
+    argv++;
-	argc--;
+    argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-3") == 0)
-		else if (strcmp(*argv,"-3") == 0)
+            f4 = 3;
-			f4=3;
+        else if (strcmp(*argv, "-F4") == 0 || strcmp(*argv, "-f4") == 0)
-		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
+            f4 = RSA_F4;
-			f4=RSA_F4;
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv,"-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            engine = *(++argv);
-			engine= *(++argv);
+        }
-			}
+# endif
-#endif
+        else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            inrand = *(++argv);
-			inrand= *(++argv);
+        }
-			}
+# ifndef OPENSSL_NO_DES
-#ifndef OPENSSL_NO_DES
+        else if (strcmp(*argv, "-des") == 0)
-		else if (strcmp(*argv,"-des") == 0)
+            enc = EVP_des_cbc();
-			enc=EVP_des_cbc();
+        else if (strcmp(*argv, "-des3") == 0)
-		else if (strcmp(*argv,"-des3") == 0)
+            enc = EVP_des_ede3_cbc();
-			enc=EVP_des_ede3_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_IDEA
-#ifndef OPENSSL_NO_IDEA
+        else if (strcmp(*argv, "-idea") == 0)
-		else if (strcmp(*argv,"-idea") == 0)
+            enc = EVP_idea_cbc();
-			enc=EVP_idea_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_SEED
-#ifndef OPENSSL_NO_SEED
+        else if (strcmp(*argv, "-seed") == 0)
-		else if (strcmp(*argv,"-seed") == 0)
+            enc = EVP_seed_cbc();
-			enc=EVP_seed_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_AES
-#ifndef OPENSSL_NO_AES
+        else if (strcmp(*argv, "-aes128") == 0)
-		else if (strcmp(*argv,"-aes128") == 0)
+            enc = EVP_aes_128_cbc();
-			enc=EVP_aes_128_cbc();
+        else if (strcmp(*argv, "-aes192") == 0)
-		else if (strcmp(*argv,"-aes192") == 0)
+            enc = EVP_aes_192_cbc();
-			enc=EVP_aes_192_cbc();
+        else if (strcmp(*argv, "-aes256") == 0)
-		else if (strcmp(*argv,"-aes256") == 0)
+            enc = EVP_aes_256_cbc();
-			enc=EVP_aes_256_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_CAMELLIA
-#ifndef OPENSSL_NO_CAMELLIA
+        else if (strcmp(*argv, "-camellia128") == 0)
-		else if (strcmp(*argv,"-camellia128") == 0)
+            enc = EVP_camellia_128_cbc();
-			enc=EVP_camellia_128_cbc();
+        else if (strcmp(*argv, "-camellia192") == 0)
-		else if (strcmp(*argv,"-camellia192") == 0)
+            enc = EVP_camellia_192_cbc();
-			enc=EVP_camellia_192_cbc();
+        else if (strcmp(*argv, "-camellia256") == 0)
-		else if (strcmp(*argv,"-camellia256") == 0)
+            enc = EVP_camellia_256_cbc();
-			enc=EVP_camellia_256_cbc();
+# endif
-#endif
+        else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargout= *(++argv);
+        } else
-			}
+            break;
-		else
+        argv++;
-			break;
+        argc--;
-		argv++;
+    }
-		argc--;
+    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
-		}
+ bad:
-	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
+        BIO_printf(bio_err, "usage: genrsa [args] [numbits]\n");
-		{
+        BIO_printf(bio_err,
-bad:
+                   " -des            encrypt the generated key with DES in cbc mode\n");
-		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
+                   " -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+# ifndef OPENSSL_NO_IDEA
-#ifndef OPENSSL_NO_IDEA
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
+                   " -idea           encrypt the generated key with IDEA in cbc mode\n");
-#endif
+# endif
-#ifndef OPENSSL_NO_SEED
+# ifndef OPENSSL_NO_SEED
-		BIO_printf(bio_err," -seed\n");
+        BIO_printf(bio_err, " -seed\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
+        BIO_printf(bio_err,
-#endif
+                   "                 encrypt PEM output with cbc seed\n");
-#ifndef OPENSSL_NO_AES
+# endif
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+# ifndef OPENSSL_NO_AES
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-#endif
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_CAMELLIA
+                   "                 encrypt PEM output with cbc aes\n");
-		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+# endif
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+# ifndef OPENSSL_NO_CAMELLIA
-#endif
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-		BIO_printf(bio_err," -out file       output the key to 'file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+                   "                 encrypt PEM output with cbc camellia\n");
-		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
+# endif
-		BIO_printf(bio_err," -3              use 3 for the E value\n");
+        BIO_printf(bio_err, " -out file       output the key to 'file\n");
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+                   " -passout arg    output file pass phrase source\n");
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+                   " -f4             use F4 (0x10001) for the E value\n");
-		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, " -3              use 3 for the E value\n");
-		BIO_printf(bio_err,"                 the random number generator\n");
+# ifndef OPENSSL_NO_ENGINE
-		goto err;
+        BIO_printf(bio_err,
-		}
+                   " -engine e       use engine e, possibly a hardware device.\n");
+# endif
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "                 load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, "                 the random number generator\n");
+        goto err;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+    if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
-		BIO_printf(bio_err, "Error getting password\n");
+        BIO_printf(bio_err, "Error getting password\n");
-		goto err;
+        goto err;
-	}
+    }
+# ifndef OPENSSL_NO_ENGINE
+    e = setup_engine(bio_err, engine, 0);
+# endif
 
-#ifndef OPENSSL_NO_ENGINE
+    if (outfile == NULL) {
-        e = setup_engine(bio_err, engine, 0);
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-#endif
+# ifdef OPENSSL_SYS_VMS
+        {
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
+        }
+# endif
+    } else {
+        if (BIO_write_filename(out, outfile) <= 0) {
+            perror(outfile);
+            goto err;
+        }
+    }
 
-	if (outfile == NULL)
+    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
-		{
+        && !RAND_status()) {
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+        BIO_printf(bio_err,
-#ifdef OPENSSL_SYS_VMS
+                   "warning, not much extra random data, consider using the -rand option\n");
-		{
+    }
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+    if (inrand != NULL)
-		out = BIO_push(tmpbio, out);
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-		}
+                   app_RAND_load_files(inrand));
-#endif
-		}
-	else
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto err;
-			}
-		}
 
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
+    BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
-		&& !RAND_status())
+               num);
-		{
+# ifdef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+    rsa = RSA_new();
-		}
+# else
-	if (inrand != NULL)
+    rsa = RSA_new_method(e);
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+# endif
-			app_RAND_load_files(inrand));
+    if (!rsa)
+        goto err;
 
-	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
+    if (!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
-		num);
+        goto err;
-#ifdef OPENSSL_NO_ENGINE
-	rsa = RSA_new();
-#else
-	rsa = RSA_new_method(e);
-#endif
-	if (!rsa)
-		goto err;
 
-	if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+    app_RAND_write_file(NULL, bio_err);
-		goto err;
 
-	app_RAND_write_file(NULL, bio_err);
+    /*
+     * We need to do the following for when the base number size is < long,
+     * esp windows 3.1 :-(.
+     */
+    l = 0L;
+    for (i = 0; i < rsa->e->top; i++) {
+# ifndef SIXTY_FOUR_BIT
+        l <<= BN_BITS4;
+        l <<= BN_BITS4;
+# endif
+        l += rsa->e->d[i];
+    }
+    BIO_printf(bio_err, "e is %ld (0x%lX)\n", l, l);
+    {
+        PW_CB_DATA cb_data;
+        cb_data.password = passout;
+        cb_data.prompt_info = outfile;
+        if (!PEM_write_bio_RSAPrivateKey(out, rsa, enc, NULL, 0,
+                                         (pem_password_cb *)password_callback,
+                                         &cb_data))
+            goto err;
+    }
 
-	/* We need to do the following for when the base number size is <
+    ret = 0;
-	 * long, esp windows 3.1 :-(. */
+ err:
-	l=0L;
+    if (bn)
-	for (i=0; i<rsa->e->top; i++)
+        BN_free(bn);
-		{
+    if (rsa)
-#ifndef SIXTY_FOUR_BIT
+        RSA_free(rsa);
-		l<<=BN_BITS4;
+    if (out)
-		l<<=BN_BITS4;
+        BIO_free_all(out);
-#endif
+    if (passout)
-		l+=rsa->e->d[i];
+        OPENSSL_free(passout);
-		}
+    if (ret != 0)
-	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
+        ERR_print_errors(bio_err);
-	{
+    apps_shutdown();
-	PW_CB_DATA cb_data;
+    OPENSSL_EXIT(ret);
-	cb_data.password = passout;
+}
-	cb_data.prompt_info = outfile;
-	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
-		(pem_password_cb *)password_callback,&cb_data))
-		goto err;
-	}
-
-	ret=0;
-err:
-	if (bn) BN_free(bn);
-	if (rsa) RSA_free(rsa);
-	if (out) BIO_free_all(out);
-	if(passout) OPENSSL_free(passout);
-	if (ret != 0)
-		ERR_print_errors(bio_err);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 
 static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-	return 1;
+    (void)BIO_flush(cb->arg);
-	}
+# ifdef LINT
-#else /* !OPENSSL_NO_RSA */
+    p = n;
+# endif
+    return 1;
+}
+#else                           /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/install-apps.com

@@ -0,0 +1,107 @@
+$! INSTALL.COM -- Installs the files in a given directory tree
+$!
+$! Author: Richard Levitte <richard@levitte.org>
+$! Time of creation: 22-MAY-1998 10:13
+$!
+$! P1  root of the directory tree
+$! P2  "64" for 64-bit pointers.
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$ on error then goto tidy
+$ on control_c then goto tidy
+$!
+$ if (p1 .eqs. "")
+$ then
+$   write sys$output "First argument missing."
+$   write sys$output -
+     "It should be the directory where you want things installed."
+$   exit
+$ endif
+$!
+$ if (f$getsyi("cpu") .lt. 128)
+$ then
+$   arch = "VAX"
+$ else
+$   arch = f$edit( f$getsyi( "arch_name"), "upcase")
+$   if (arch .eqs. "") then arch = "UNK"
+$ endif
+$!
+$ archd = arch
+$!
+$ if (p2 .nes. "")
+$ then
+$   if (p2 .eqs. "64")
+$   then
+$     archd = arch+ "_64"
+$   else
+$     if (p2 .nes. "32")
+$     then
+$       write sys$output "Second argument invalid."
+$       write sys$output "It should be "32", "64", or nothing."
+$       exit
+$     endif
+$   endif
+$ endif
+$!
+$ root = f$parse( p1, "[]A.;0", , , "syntax_only, no_conceal") - "A.;0"
+$ root_dev = f$parse(root,,,"device","syntax_only")
+$ root_dir = f$parse(root,,,"directory","syntax_only") - -
+   "[000000." - "][" - "[" - "]"
+$ root = root_dev + "[" + root_dir
+$!
+$ define /nolog wrk_sslroot 'root'.] /trans=conc
+$ define /nolog wrk_sslxexe wrk_sslroot:['archd'_exe]
+$!
+$ if f$parse("wrk_sslroot:[000000]") .eqs. "" then -
+   create /directory /log wrk_sslroot:[000000]
+$ if f$parse("wrk_sslxexe:") .eqs. "" then -
+   create /directory /log wrk_sslxexe:
+$!
+$ exe := openssl
+$!
+$ exe_dir := [-.'archd'.exe.apps]
+$!
+$! Executables.
+$!
+$ i = 0
+$ loop_exe:
+$   e = f$edit(f$element( i, ",", exe), "trim")
+$   i = i + 1
+$   if e .eqs. "," then goto loop_exe_end
+$   set noon
+$   file = exe_dir+ e+ ".exe"
+$   if f$search( file) .nes. ""
+$   then
+$     copy /protection = w:re 'file' wrk_sslxexe: /log
+$   endif
+$   set on
+$ goto loop_exe
+$ loop_exe_end:
+$!
+$! Miscellaneous.
+$!
+$ set noon
+$ copy /protection = w:re ca.com wrk_sslxexe:ca.com /log
+$ copy /protection = w:re openssl-vms.cnf wrk_sslroot:[000000]openssl.cnf /log
+$ set on
+$!
+$ tidy:
+$!
+$ call deass wrk_sslroot
+$ call deass wrk_sslxexe
+$!
+$ exit
+$!
+$ deass: subroutine
+$ if (f$trnlnm( p1, "LNM$PROCESS") .nes. "")
+$ then
+$   deassign /process 'p1'
+$ endif
+$ endsubroutine
+$!

apps/install.com

@@ -1,65 +0,0 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! Time of creation: 22-MAY-1998 10:13
-$!
-$! P1	root of the directory tree
-$!
-$
-$	IF P1 .EQS. ""
-$	THEN
-$	    WRITE SYS$OUTPUT "First argument missing."
-$	    WRITE SYS$OUTPUT -
-		  "Should be the directory where you want things installed."
-$	    EXIT
-$	ENDIF
-$
-$	IF (F$GETSYI("CPU").LT.128)
-$	THEN
-$	    ARCH := VAX
-$	ELSE
-$	    ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
-$	    IF (ARCH .EQS. "") THEN ARCH = "UNK"
-$	ENDIF
-$
-$	ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
-$	ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
-$	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
-		   - "[000000." - "][" - "[" - "]"
-$	ROOT = ROOT_DEV + "[" + ROOT_DIR
-$
-$	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$	DEFINE/NOLOG WRK_SSLEXE WRK_SSLROOT:['ARCH'_EXE]
-$
-$	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$	IF F$PARSE("WRK_SSLEXE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLEXE:
-$
-$	EXE := openssl
-$
-$	EXE_DIR := [-.'ARCH'.EXE.APPS]
-$
-$	I = 0
-$ LOOP_EXE: 
-$	E = F$EDIT(F$ELEMENT(I, ",", EXE),"TRIM")
-$	I = I + 1
-$	IF E .EQS. "," THEN GOTO LOOP_EXE_END
-$	SET NOON
-$	IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""
-$	THEN
-$	  COPY 'EXE_DIR''E'.EXE WRK_SSLEXE:'E'.EXE/log
-$	  SET FILE/PROT=W:RE WRK_SSLEXE:'E'.EXE
-$	ENDIF
-$	SET ON
-$	GOTO LOOP_EXE
-$ LOOP_EXE_END:
-$
-$	SET NOON
-$	COPY CA.COM WRK_SSLEXE:CA.COM/LOG
-$	SET FILE/PROT=W:RE WRK_SSLEXE:CA.COM
-$	COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
-$	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL.CNF
-$	SET ON
-$
-$	EXIT

apps/makeapps.com

@@ -39,11 +39,35 @@ $!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 $!
 $!  P5, if defined, sets a choice of programs to compile.
 $!
+$!  P6, if defined, specifies the C pointer size.  Ignored on VAX.
+$!      ("64=ARGV" gives more efficient code with HP C V7.3 or newer.)
+$!      Supported values are:
+$!
+$!      ""       Compile with default (/NOPOINTER_SIZE)
+$!      32       Compile with /POINTER_SIZE=32 (SHORT)
+$!      64       Compile with /POINTER_SIZE=64[=ARGV] (LONG[=ARGV])
+$!               (Automatically select ARGV if compiler supports it.)
+$!      64=      Compile with /POINTER_SIZE=64 (LONG).
+$!      64=ARGV  Compile with /POINTER_SIZE=64=ARGV (LONG=ARGV).
+$!
+$!  P7, if defined, specifies a directory where ZLIB files (zlib.h,
+$!  libz.olb) may be found.  Optionally, a non-default object library
+$!  name may be included ("dev:[dir]libz_64.olb", for example).
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$ on control_c then goto exit
 $!
 $! Define A TCP/IP Library That We Will Need To Link To.
 $! (That Is, If We Need To Link To One.)
 $!
 $ TCPIP_LIB = ""
+$ ZLIB_LIB = ""
 $!
 $! Check What Architecture We Are Using.
 $!
@@ -67,37 +91,53 @@ $! End The Architecture Check.
 $!
 $ ENDIF
 $!
+$ ARCHD = ARCH
+$ LIB32 = "32"
+$ OPT_FILE = ""
+$ POINTER_SIZE = ""
+$!
 $! Define what programs should be compiled
 $!
 $ PROGRAMS := OPENSSL
 $!
-$! Define The CRYPTO Library.
-$!
-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
-$!
-$! Define The SSL Library.
-$!
-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
-$!
-$! Define The OBJ Directory.
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]
-$!
-$! Define The EXE Directory.
-$!
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]
-$!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
 $ GOSUB CHECK_OPTIONS
 $!
+$! Define The CRYPTO Library.
+$!
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO'LIB32'.OLB
+$!
+$! Define The SSL Library.
+$!
+$ SSL_LIB := SYS$DISK:[-.'ARCHD'.EXE.SSL]SSL_LIBSSL'LIB32'.OLB
+$!
+$! Define The OBJ and EXE Directories.
+$!
+$ OBJ_DIR := SYS$DISK:[-.'ARCHD'.OBJ.APPS]
+$ EXE_DIR := SYS$DISK:[-.'ARCHD'.EXE.APPS]
+$!
+$! Specify the destination directory in any /MAP option.
+$!
+$ if (LINKMAP .eqs. "MAP")
+$ then
+$   LINKMAP = LINKMAP+ "=''EXE_DIR'"
+$ endif
+$!
+$! Add the location prefix to the linker options file name.
+$!
+$ if (OPT_FILE .nes. "")
+$ then
+$   OPT_FILE = EXE_DIR+ OPT_FILE
+$ endif
+$!
 $! Initialise logical names and such
 $!
 $ GOSUB INITIALISE
 $!
 $! Tell The User What Kind of Machine We Run On.
 $!
-$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
+$ WRITE SYS$OUTPUT "Host system architecture: ''ARCHD'"
 $!
 $! Check To See If The OBJ Directory Exists.
 $!
@@ -145,6 +185,9 @@ $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
 	      	"S_TIME,APPS,S_CB,S_SOCKET,APP_RAND,VERSION,SESS_ID,"+-
 	      	"CIPHERS,NSEQ,PKCS12,PKCS8,PKEY,PKEYPARAM,PKEYUTL,"+ -
 	      	"SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS"
+$!
+$ LIB_OPENSSL = LIB_OPENSSL+ ",VMS_DECC_INIT"
+$!
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"
@@ -202,7 +245,7 @@ $   LIB_COUNTER = -1
 $!
 $!  Create a .OPT file for the object files
 $!
-$   OPEN/WRITE OBJECTS 'EXE_DIR''CURRENT_APP'.OPT
+$   OPEN /WRITE OBJECTS 'EXE_DIR''CURRENT_APP'.OPT
 $!
 $!  Top Of The File Loop.
 $!
@@ -289,34 +332,18 @@ $   GOTO NEXT_APP
 $ ENDIF
 $!
 $! Link The Program.
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
 $!
 $ ON WARNING THEN GOTO NEXT_APP
 $!
-$ IF (TCPIP_LIB.NES."")
-$ THEN
-$!
 $! Don't Link With The RSAREF Routines And TCP/IP Library.
 $!
-$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
+$ LINK /'DEBUGGER' /'LINKMAP' /'TRACEBACK' /EXE='EXE_FILE' -
-	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
+  'EXE_DIR''CURRENT_APP'.OPT /OPTIONS, -
-        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+  'SSL_LIB' /LIBRARY, -
-        'TCPIP_LIB','OPT_FILE'/OPTION
+  'CRYPTO_LIB' /LIBRARY -
-$!
+  'TCPIP_LIB' -
-$! Else...
+  'ZLIB_LIB' -
-$!
+  ,'OPT_FILE' /OPTIONS
-$ ELSE
-$!
-$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
-$!
-$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
-        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
-        'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$ ENDIF
 $!
 $! Go Back And Do It Again.
 $!
@@ -351,7 +378,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable VAX C Runtime Library.
 !
 SYS$SHARE:VAXCRTL.EXE/SHARE
@@ -380,7 +407,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable C Runtime Library.
 !
 GNU_CC:[000000]GCCLIB/LIBRARY
@@ -415,7 +442,7 @@ $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable DEC C Runtime Library.
 !
 SYS$SHARE:DECC$SHR.EXE/SHARE
@@ -430,7 +457,7 @@ $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File For non-VAX To Link Agianst 
+! Default System Options File For non-VAX To Link Against 
 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
@@ -514,14 +541,15 @@ $!
 $ IF (P1.EQS."NODEBUG")
 $ THEN
 $!
-$!   P1 Is NODEBUG, So Compile Without Debugger Information.
+$!  P1 Is NODEBUG, So Compile Without Debugger Information.
 $!
-$    DEBUGGER  = "NODEBUG"
+$   DEBUGGER  = "NODEBUG"
-$    TRACEBACK = "NOTRACEBACK" 
+$   LINKMAP = "NOMAP"
-$    GCC_OPTIMIZE = "OPTIMIZE"
+$   TRACEBACK = "NOTRACEBACK" 
-$    CC_OPTIMIZE = "OPTIMIZE"
+$   GCC_OPTIMIZE = "OPTIMIZE"
-$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
+$   CC_OPTIMIZE = "OPTIMIZE"
-$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
+$   WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
+$   WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
 $!
 $! Else...
 $!
@@ -535,6 +563,7 @@ $!
 $!    Compile With Debugger Information.
 $!
 $     DEBUGGER  = "DEBUG"
+$     LINKMAP = "MAP"
 $     TRACEBACK = "TRACEBACK"
 $     GCC_OPTIMIZE = "NOOPTIMIZE"
 $     CC_OPTIMIZE = "NOOPTIMIZE"
@@ -542,7 +571,7 @@ $     WRITE SYS$OUTPUT "Debugger Information Will Be Produced During Compile."
 $     WRITE SYS$OUTPUT "Compiling Without Compiler Optimization."
 $   ELSE
 $!
-$!    Tell The User Entered An Invalid Option..
+$!    Tell The User Entered An Invalid Option.
 $!
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
@@ -563,6 +592,87 @@ $! End The P1 Check.
 $!
 $ ENDIF
 $!
+$! Check P6 (POINTER_SIZE).
+$!
+$ IF (P6 .NES. "") .AND. (ARCH .NES. "VAX")
+$ THEN
+$!
+$   IF (P6 .EQS. "32")
+$   THEN
+$     POINTER_SIZE = " /POINTER_SIZE=32"
+$   ELSE
+$     POINTER_SIZE = F$EDIT( P6, "COLLAPSE, UPCASE")
+$     IF ((POINTER_SIZE .EQS. "64") .OR. -
+       (POINTER_SIZE .EQS. "64=") .OR. -
+       (POINTER_SIZE .EQS. "64=ARGV"))
+$     THEN
+$       ARCHD = ARCH+ "_64"
+$       LIB32 = ""
+$       IF (F$EXTRACT( 2, 1, POINTER_SIZE) .EQS. "=")
+$       THEN
+$!        Explicit user choice: "64" or "64=ARGV".
+$         IF (POINTER_SIZE .EQS. "64=") THEN POINTER_SIZE = "64"
+$       ELSE
+$         SET NOON
+$         DEFINE /USER_MODE SYS$OUTPUT NL:
+$         DEFINE /USER_MODE SYS$ERROR NL:
+$         CC /NOLIST /NOOBJECT /POINTER_SIZE=64=ARGV NL:
+$         IF ($STATUS .AND. %X0FFF0000) .EQ. %X00030000
+$         THEN
+$           ! If we got here, it means DCL complained like this:
+$           ! %DCL-W-NOVALU, value not allowed - remove value specification
+$           !  \64=\
+$           !
+$           ! If the compiler was run, logicals defined in /USER would
+$           ! have been deassigned automatically.  However, when DCL
+$           ! complains, they aren't, so we do it here (it might be
+$           ! unnecessary, but just in case there will be another error
+$           ! message further on that we don't want to miss)
+$           DEASSIGN /USER_MODE SYS$ERROR
+$           DEASSIGN /USER_MODE SYS$OUTPUT
+$         ELSE
+$           POINTER_SIZE = POINTER_SIZE + "=ARGV"
+$         ENDIF
+$         SET ON
+$       ENDIF
+$       POINTER_SIZE = " /POINTER_SIZE=''POINTER_SIZE'"
+$!
+$     ELSE
+$!
+$!      Tell The User Entered An Invalid Option.
+$!
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ", P6, -
+         " Is Invalid.  The Valid Options Are:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT -
+         "    """"  :  Compile with default (short) pointers."
+$       WRITE SYS$OUTPUT -
+         "    32  :  Compile with 32-bit (short) pointers."
+$       WRITE SYS$OUTPUT -
+         "    64       :  Compile with 64-bit (long) pointers (auto ARGV)."
+$       WRITE SYS$OUTPUT -
+         "    64=      :  Compile with 64-bit (long) pointers (no ARGV)."
+$       WRITE SYS$OUTPUT -
+         "    64=ARGV  :  Compile with 64-bit (long) pointers (ARGV)."
+$       WRITE SYS$OUTPUT ""
+$! 
+$!      Time To EXIT.
+$!
+$       EXIT
+$!
+$     ENDIF
+$!
+$   ENDIF
+$!
+$! End The P6 (POINTER_SIZE) Check.
+$!
+$ ENDIF
+$!
+$! Set basic C compiler /INCLUDE directories.
+$!
+$ CC_INCLUDES = "SYS$DISK:[-],SYS$DISK:[-.CRYPTO]"
+$!
 $! Check To See If P2 Is Blank.
 $!
 $ IF (P2.EQS."")
@@ -663,11 +773,67 @@ $ CCDEFS = "MONOLITH"
 $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
 $ CCEXTRAFLAGS = ""
 $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
-$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
+$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
-$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
+$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. ""
-	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
+$ THEN
+$     IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + ","
+$     CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS
+$ ENDIF
 $!
-$!  Check To See If The User Entered A Valid Paramter.
+$! Check To See If We Have A ZLIB Option.
+$!
+$ ZLIB = P7
+$ IF (ZLIB .NES. "")
+$ THEN
+$!
+$!  Check for expected ZLIB files.
+$!
+$   err = 0
+$   file1 = f$parse( "zlib.h", ZLIB, , , "SYNTAX_ONLY")
+$   if (f$search( file1) .eqs. "")
+$   then
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "The Option ", ZLIB, " Is Invalid."
+$     WRITE SYS$OUTPUT "    Can't find header: ''file1'"
+$     err = 1
+$   endif
+$   file1 = f$parse( "A.;", ZLIB)- "A.;"
+$!
+$   file2 = f$parse( ZLIB, "libz.olb", , , "SYNTAX_ONLY")
+$   if (f$search( file2) .eqs. "")
+$   then
+$     if (err .eq. 0)
+$     then
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ", ZLIB, " Is Invalid."
+$     endif
+$     WRITE SYS$OUTPUT "    Can't find library: ''file2'"
+$     WRITE SYS$OUTPUT ""
+$     err = err+ 2
+$   endif
+$   if (err .eq. 1)
+$   then
+$     WRITE SYS$OUTPUT ""
+$   endif
+$!
+$   if (err .ne. 0)
+$   then
+$     EXIT
+$   endif
+$!
+$   CCDEFS = """ZLIB=1"", "+ CCDEFS
+$   CC_INCLUDES = CC_INCLUDES+ ", "+ file1
+$   ZLIB_LIB = ", ''file2' /library"
+$!
+$!  Print info
+$!
+$   WRITE SYS$OUTPUT "ZLIB library spec: ", file2
+$!
+$! End The ZLIB Check.
+$!
+$ ENDIF
+$!
+$!  Check To See If The User Entered A Valid Parameter.
 $!
 $ IF (P2.EQS."VAXC").OR.(P2.EQS."DECC").OR.(P2.EQS."GNUC")
 $ THEN
@@ -690,13 +856,13 @@ $!
 $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
 	 THEN CC = "CC/DECC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
+$     CC = CC + " /''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=RELAXED"+ -
-           "/NOLIST/PREFIX=ALL" + -
+       "''POINTER_SIZE' /NOLIST /PREFIX=ALL" + -
-	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+       " /INCLUDE=(''CC_INCLUDES') " + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -724,7 +890,7 @@ $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
 $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+	   "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -733,7 +899,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -756,11 +922,11 @@ $!    Use GNU C...
 $!
 $     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC
 $     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+	   "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!
@@ -802,7 +968,7 @@ $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT /OPTIONS"
 $!
 $!    Done with SOCKETSHR
 $!
@@ -828,13 +994,13 @@ $   THEN
 $!
 $!    Set the library to use UCX.
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT /OPTIONS"
 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
+$       TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT /OPTIONS"
 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
+	  TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT /OPTIONS"
 $     ENDIF
 $!
 $!    Done with UCX
@@ -848,7 +1014,7 @@ $   THEN
 $!
 $!    Set the library to use TCPIP.
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT /OPTIONS"
 $!
 $!    Done with TCPIP
 $!
@@ -873,7 +1039,7 @@ $   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P3'"
 $!
 $!  Print info
 $!
-$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
+$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB- ","
 $!
 $!  Else The User Entered An Invalid Argument.
 $!
@@ -901,15 +1067,27 @@ $! Finish up the definition of CC.
 $!
 $ IF COMPILER .EQS. "DECC"
 $ THEN
+$!  Not all compiler versions support MAYLOSEDATA3.
+$   OPT_TEST = "MAYLOSEDATA3"
+$   DEFINE /USER_MODE SYS$ERROR NL:
+$   DEFINE /USER_MODE SYS$OUTPUT NL:
+$   'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT -
+      /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL:
+$   IF ($SEVERITY)
+$   THEN
+$     IF CCDISABLEWARNINGS .NES. "" THEN -
+        CCDISABLEWARNINGS = CCDISABLEWARNINGS+ ","
+$     CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST
+$   ENDIF
 $   IF CCDISABLEWARNINGS .NES. ""
 $   THEN
-$     CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
+$     CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
 $   ENDIF
 $ ELSE
 $   CCDISABLEWARNINGS = ""
 $ ENDIF
-$ CC2 = CC + "/DEFINE=(" + CCDEFS + ",_POSIX_C_SOURCE)" + CCDISABLEWARNINGS
+$ CC2 = CC + " /DEFINE=(" + CCDEFS + ",_POSIX_C_SOURCE)" + CCDISABLEWARNINGS
-$ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
+$ CC = CC + " /DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $! Show user the result
 $!
@@ -975,7 +1153,7 @@ $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $! Set up the logical name OPENSSL to point at the include directory
 $!
-$ DEFINE OPENSSL/NOLOG '__INCLUDE'
+$ DEFINE OPENSSL /NOLOG '__INCLUDE'
 $!
 $! Done
 $!
@@ -983,15 +1161,24 @@ $ RETURN
 $!
 $ CLEANUP:
 $!
-$! Restore the logical name OPENSSL if it had a value
+$! Restore the saved logical name OPENSSL, if it had a value.
 $!
-$ IF __SAVE_OPENSSL .EQS. ""
+$ if (f$type( __SAVE_OPENSSL) .nes. "")
-$ THEN
+$ then
-$   DEASSIGN OPENSSL
+$   IF __SAVE_OPENSSL .EQS. ""
-$ ELSE
+$   THEN
-$   DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL'
+$     DEASSIGN OPENSSL
-$ ENDIF
+$   ELSE
+$     DEFINE /NOLOG OPENSSL '__SAVE_OPENSSL'
+$   ENDIF
+$ endif
+$!
+$! Close any open files.
+$!
+$ if (f$trnlnm( "objects", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close objects
 $!
 $! Done
 $!
 $ RETURN
+$!

apps/nseq.c

@@ -1,6 +1,7 @@
 /* nseq.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 1999.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -69,99 +70,101 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-	char **args, *infile = NULL, *outfile = NULL;
+    char **args, *infile = NULL, *outfile = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int toseq = 0;
+    int toseq = 0;
-	X509 *x509 = NULL;
+    X509 *x509 = NULL;
-	NETSCAPE_CERT_SEQUENCE *seq = NULL;
+    NETSCAPE_CERT_SEQUENCE *seq = NULL;
-	int i, ret = 1;
+    int i, ret = 1;
-	int badarg = 0;
+    int badarg = 0;
-	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
-	ERR_load_crypto_strings();
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-	args = argv + 1;
+    ERR_load_crypto_strings();
-	while (!badarg && *args && *args[0] == '-') {
+    args = argv + 1;
-		if (!strcmp (*args, "-toseq")) toseq = 1;
+    while (!badarg && *args && *args[0] == '-') {
-		else if (!strcmp (*args, "-in")) {
+        if (!strcmp(*args, "-toseq"))
-			if (args[1]) {
+            toseq = 1;
-				args++;
+        else if (!strcmp(*args, "-in")) {
-				infile = *args;
+            if (args[1]) {
-			} else badarg = 1;
+                args++;
-		} else if (!strcmp (*args, "-out")) {
+                infile = *args;
-			if (args[1]) {
+            } else
-				args++;
+                badarg = 1;
-				outfile = *args;
+        } else if (!strcmp(*args, "-out")) {
-			} else badarg = 1;
+            if (args[1]) {
-		} else badarg = 1;
+                args++;
-		args++;
+                outfile = *args;
-	}
+            } else
+                badarg = 1;
+        } else
+            badarg = 1;
+        args++;
+    }
 
-	if (badarg) {
+    if (badarg) {
-		BIO_printf (bio_err, "Netscape certificate sequence utility\n");
+        BIO_printf(bio_err, "Netscape certificate sequence utility\n");
-		BIO_printf (bio_err, "Usage nseq [options]\n");
+        BIO_printf(bio_err, "Usage nseq [options]\n");
-		BIO_printf (bio_err, "where options are\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf (bio_err, "-in file  input file\n");
+        BIO_printf(bio_err, "-in file  input file\n");
-		BIO_printf (bio_err, "-out file output file\n");
+        BIO_printf(bio_err, "-out file output file\n");
-		BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
+        BIO_printf(bio_err, "-toseq    output NS Sequence file\n");
-		OPENSSL_EXIT(1);
+        OPENSSL_EXIT(1);
-	}
+    }
 
-	if (infile) {
+    if (infile) {
-		if (!(in = BIO_new_file (infile, "r"))) {
+        if (!(in = BIO_new_file(infile, "r"))) {
-			BIO_printf (bio_err,
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-				 "Can't open input file %s\n", infile);
+            goto end;
-			goto end;
+        }
-		}
+    } else
-	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if (outfile) {
+    if (outfile) {
-		if (!(out = BIO_new_file (outfile, "w"))) {
+        if (!(out = BIO_new_file(outfile, "w"))) {
-			BIO_printf (bio_err,
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-				 "Can't open output file %s\n", outfile);
+            goto end;
-			goto end;
+        }
-		}
+    } else {
-	} else {
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-	}
+    }
-	if (toseq) {
+    if (toseq) {
-		seq = NETSCAPE_CERT_SEQUENCE_new();
+        seq = NETSCAPE_CERT_SEQUENCE_new();
-		seq->certs = sk_X509_new_null();
+        seq->certs = sk_X509_new_null();
-		while((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) 
+        while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL)))
-		    sk_X509_push(seq->certs,x509);
+            sk_X509_push(seq->certs, x509);
 
-		if(!sk_X509_num(seq->certs))
+        if (!sk_X509_num(seq->certs)) {
-		{
+            BIO_printf(bio_err, "Error reading certs file %s\n", infile);
-			BIO_printf (bio_err, "Error reading certs file %s\n", infile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-		}
+        PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
-		PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
+        ret = 0;
-		ret = 0;
+        goto end;
-		goto end;
+    }
-	}
 
-	if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL))) {
+    if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL))) {
-		BIO_printf (bio_err, "Error reading sequence file %s\n", infile);
+        BIO_printf(bio_err, "Error reading sequence file %s\n", infile);
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	for(i = 0; i < sk_X509_num(seq->certs); i++) {
+    for (i = 0; i < sk_X509_num(seq->certs); i++) {
-		x509 = sk_X509_value(seq->certs, i);
+        x509 = sk_X509_value(seq->certs, i);
-		dump_cert_text(out, x509);
+        dump_cert_text(out, x509);
-		PEM_write_bio_X509(out, x509);
+        PEM_write_bio_X509(out, x509);
-	}
+    }
-	ret = 0;
+    ret = 0;
-end:
+ end:
-	BIO_free(in);
+    BIO_free(in);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	NETSCAPE_CERT_SEQUENCE_free(seq);
+    NETSCAPE_CERT_SEQUENCE_free(seq);
 
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
 }
-

apps/openssl-vms.cnf

@@ -145,7 +145,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (eg, YOUR name)
+commonName			= Common Name (e.g. server FQDN or YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address

apps/openssl.cnf

@@ -145,7 +145,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (eg, YOUR name)
+commonName			= Common Name (e.g. server FQDN or YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address

apps/passwd.c

@@ -6,44 +6,44 @@
 
 #if !defined(OPENSSL_NO_DES) || !defined(NO_MD5CRYPT_1)
 
-#include <assert.h>
+# include <assert.h>
-#include <string.h>
+# include <string.h>
 
-#include "apps.h"
+# include "apps.h"
 
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/rand.h>
+# include <openssl/rand.h>
-#ifndef OPENSSL_NO_DES
+# ifndef OPENSSL_NO_DES
-# include <openssl/des.h>
+#  include <openssl/des.h>
-#endif
+# endif
-#ifndef NO_MD5CRYPT_1
+# ifndef NO_MD5CRYPT_1
-# include <openssl/md5.h>
+#  include <openssl/md5.h>
-#endif
+# endif
 
+# undef PROG
+# define PROG passwd_main
 
-#undef PROG
+static unsigned const char cov_2char[64] = {
-#define PROG passwd_main
+    /* from crypto/des/fcrypt.c */
-
+    0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
-
+    0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x43, 0x44,
-static unsigned const char cov_2char[64]={
+    0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C,
-	/* from crypto/des/fcrypt.c */
+    0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54,
-	0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
+    0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x61, 0x62,
-	0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,
+    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A,
-	0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,
+    0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72,
-	0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,
+    0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
-	0x55,0x56,0x57,0x58,0x59,0x5A,0x61,0x62,
-	0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,
-	0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,
-	0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A
 };
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-	char *passwd, BIO *out, int quiet, int table, int reverse,
+                     char *passwd, BIO *out, int quiet, int table,
-	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
+                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+                     int useapr1);
 
-/* -crypt        - standard Unix password algorithm (default)
+/*-
+ * -crypt        - standard Unix password algorithm (default)
  * -1            - MD5-based password algorithm
  * -apr1         - MD5-based password algorithm, Apache variant
  * -salt string  - salt
@@ -58,455 +58,437 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int ret = 1;
+    int ret = 1;
-	char *infile = NULL;
+    char *infile = NULL;
-	int in_stdin = 0;
+    int in_stdin = 0;
-	int in_noverify = 0;
+    int in_noverify = 0;
-	char *salt = NULL, *passwd = NULL, **passwds = NULL;
+    char *salt = NULL, *passwd = NULL, **passwds = NULL;
-	char *salt_malloc = NULL, *passwd_malloc = NULL;
+    char *salt_malloc = NULL, *passwd_malloc = NULL;
-	size_t passwd_malloc_size = 0;
+    size_t passwd_malloc_size = 0;
-	int pw_source_defined = 0;
+    int pw_source_defined = 0;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int i, badopt, opt_done;
+    int i, badopt, opt_done;
-	int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
+    int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
-	int usecrypt = 0, use1 = 0, useapr1 = 0;
+    int usecrypt = 0, use1 = 0, useapr1 = 0;
-	size_t pw_maxlen = 0;
+    size_t pw_maxlen = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto err;
+        goto err;
-	out = BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL)
-		goto err;
+        goto err;
-	BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
+    BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-#ifdef OPENSSL_SYS_VMS
+# ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	out = BIO_push(tmpbio, out);
+        out = BIO_push(tmpbio, out);
-	}
+    }
-#endif
+# endif
 
-	badopt = 0, opt_done = 0;
+    badopt = 0, opt_done = 0;
-	i = 0;
+    i = 0;
-	while (!badopt && !opt_done && argv[++i] != NULL)
+    while (!badopt && !opt_done && argv[++i] != NULL) {
-		{
+        if (strcmp(argv[i], "-crypt") == 0)
-		if (strcmp(argv[i], "-crypt") == 0)
+            usecrypt = 1;
-			usecrypt = 1;
+        else if (strcmp(argv[i], "-1") == 0)
-		else if (strcmp(argv[i], "-1") == 0)
+            use1 = 1;
-			use1 = 1;
+        else if (strcmp(argv[i], "-apr1") == 0)
-		else if (strcmp(argv[i], "-apr1") == 0)
+            useapr1 = 1;
-			useapr1 = 1;
+        else if (strcmp(argv[i], "-salt") == 0) {
-		else if (strcmp(argv[i], "-salt") == 0)
+            if ((argv[i + 1] != NULL) && (salt == NULL)) {
-			{
+                passed_salt = 1;
-			if ((argv[i+1] != NULL) && (salt == NULL))
+                salt = argv[++i];
-				{
+            } else
-				passed_salt = 1;
+                badopt = 1;
-				salt = argv[++i];
+        } else if (strcmp(argv[i], "-in") == 0) {
-				}
+            if ((argv[i + 1] != NULL) && !pw_source_defined) {
-			else
+                pw_source_defined = 1;
-				badopt = 1;
+                infile = argv[++i];
-			}
+            } else
-		else if (strcmp(argv[i], "-in") == 0)
+                badopt = 1;
-			{
+        } else if (strcmp(argv[i], "-stdin") == 0) {
-			if ((argv[i+1] != NULL) && !pw_source_defined)
+            if (!pw_source_defined) {
-				{
+                pw_source_defined = 1;
-				pw_source_defined = 1;
+                in_stdin = 1;
-				infile = argv[++i];
+            } else
-				}
+                badopt = 1;
-			else
+        } else if (strcmp(argv[i], "-noverify") == 0)
-				badopt = 1;
+            in_noverify = 1;
-			}
+        else if (strcmp(argv[i], "-quiet") == 0)
-		else if (strcmp(argv[i], "-stdin") == 0)
+            quiet = 1;
-			{
+        else if (strcmp(argv[i], "-table") == 0)
-			if (!pw_source_defined)
+            table = 1;
-				{
+        else if (strcmp(argv[i], "-reverse") == 0)
-				pw_source_defined = 1;
+            reverse = 1;
-				in_stdin = 1;
+        else if (argv[i][0] == '-')
-				}
+            badopt = 1;
-			else
+        else if (!pw_source_defined)
-				badopt = 1;
+            /* non-option arguments, use as passwords */
-			}
+        {
-		else if (strcmp(argv[i], "-noverify") == 0)
+            pw_source_defined = 1;
-			in_noverify = 1;
+            passwds = &argv[i];
-		else if (strcmp(argv[i], "-quiet") == 0)
+            opt_done = 1;
-			quiet = 1;
+        } else
-		else if (strcmp(argv[i], "-table") == 0)
+            badopt = 1;
-			table = 1;
+    }
-		else if (strcmp(argv[i], "-reverse") == 0)
-			reverse = 1;
-		else if (argv[i][0] == '-')
-			badopt = 1;
-		else if (!pw_source_defined)
-			/* non-option arguments, use as passwords */
-			{
-			pw_source_defined = 1;
-			passwds = &argv[i];
-			opt_done = 1;
-			}
-		else
-			badopt = 1;
-		}
 
-	if (!usecrypt && !use1 && !useapr1) /* use default */
+    if (!usecrypt && !use1 && !useapr1) /* use default */
-		usecrypt = 1;
+        usecrypt = 1;
-	if (usecrypt + use1 + useapr1 > 1) /* conflict */
+    if (usecrypt + use1 + useapr1 > 1) /* conflict */
-		badopt = 1;
+        badopt = 1;
 
-	/* reject unsupported algorithms */
+    /* reject unsupported algorithms */
-#ifdef OPENSSL_NO_DES
+# ifdef OPENSSL_NO_DES
-	if (usecrypt) badopt = 1;
+    if (usecrypt)
-#endif
+        badopt = 1;
-#ifdef NO_MD5CRYPT_1
+# endif
-	if (use1 || useapr1) badopt = 1;
+# ifdef NO_MD5CRYPT_1
-#endif
+    if (use1 || useapr1)
+        badopt = 1;
+# endif
 
-	if (badopt) 
+    if (badopt) {
-		{
+        BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
-		BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+# ifndef OPENSSL_NO_DES
-#ifndef OPENSSL_NO_DES
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
+                   "-crypt             standard Unix password algorithm (default)\n");
-#endif
+# endif
-#ifndef NO_MD5CRYPT_1
+# ifndef NO_MD5CRYPT_1
-		BIO_printf(bio_err, "-1                 MD5-based password algorithm\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-apr1              MD5-based password algorithm, Apache variant\n");
+                   "-1                 MD5-based password algorithm\n");
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-salt string       use provided salt\n");
+                   "-apr1              MD5-based password algorithm, Apache variant\n");
-		BIO_printf(bio_err, "-in file           read passwords from file\n");
+# endif
-		BIO_printf(bio_err, "-stdin             read passwords from stdin\n");
+        BIO_printf(bio_err, "-salt string       use provided salt\n");
-		BIO_printf(bio_err, "-noverify          never verify when reading password from terminal\n");
+        BIO_printf(bio_err, "-in file           read passwords from file\n");
-		BIO_printf(bio_err, "-quiet             no warnings\n");
+        BIO_printf(bio_err, "-stdin             read passwords from stdin\n");
-		BIO_printf(bio_err, "-table             format output as table\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-reverse           switch table columns\n");
+                   "-noverify          never verify when reading password from terminal\n");
+        BIO_printf(bio_err, "-quiet             no warnings\n");
+        BIO_printf(bio_err, "-table             format output as table\n");
+        BIO_printf(bio_err, "-reverse           switch table columns\n");
 
-		goto err;
+        goto err;
-		}
+    }
 
-	if ((infile != NULL) || in_stdin)
+    if ((infile != NULL) || in_stdin) {
-		{
+        in = BIO_new(BIO_s_file());
-		in = BIO_new(BIO_s_file());
+        if (in == NULL)
-		if (in == NULL)
+            goto err;
-			goto err;
+        if (infile != NULL) {
-		if (infile != NULL)
+            assert(in_stdin == 0);
-			{
+            if (BIO_read_filename(in, infile) <= 0)
-			assert(in_stdin == 0);
+                goto err;
-			if (BIO_read_filename(in, infile) <= 0)
+        } else {
-				goto err;
+            assert(in_stdin);
-			}
+            BIO_set_fp(in, stdin, BIO_NOCLOSE);
-		else
+        }
-			{
+    }
-			assert(in_stdin);
-			BIO_set_fp(in, stdin, BIO_NOCLOSE);
-			}
-		}
 
-	if (usecrypt)
+    if (usecrypt)
-		pw_maxlen = 8;
+        pw_maxlen = 8;
-	else if (use1 || useapr1)
+    else if (use1 || useapr1)
-		pw_maxlen = 256; /* arbitrary limit, should be enough for most passwords */
+        pw_maxlen = 256;        /* arbitrary limit, should be enough for most
+                                 * passwords */
 
-	if (passwds == NULL)
+    if (passwds == NULL) {
-		{
+        /* no passwords on the command line */
-		/* no passwords on the command line */
 
-		passwd_malloc_size = pw_maxlen + 2;
+        passwd_malloc_size = pw_maxlen + 2;
-		/* longer than necessary so that we can warn about truncation */
+        /*
-		passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size);
+         * longer than necessary so that we can warn about truncation
-		if (passwd_malloc == NULL)
+         */
-			goto err;
+        passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size);
-		}
+        if (passwd_malloc == NULL)
+            goto err;
+    }
 
-	if ((in == NULL) && (passwds == NULL))
+    if ((in == NULL) && (passwds == NULL)) {
-		{
+        /* build a null-terminated list */
-		/* build a null-terminated list */
+        static char *passwds_static[2] = { NULL, NULL };
-		static char *passwds_static[2] = {NULL, NULL};
 
-		passwds = passwds_static;
+        passwds = passwds_static;
-		if (in == NULL)
+        if (in == NULL)
-			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
+            if (EVP_read_pw_string
-				goto err;
+                (passwd_malloc, passwd_malloc_size, "Password: ",
-		passwds[0] = passwd_malloc;
+                 !(passed_salt || in_noverify)) != 0)
-		}
+                goto err;
+        passwds[0] = passwd_malloc;
+    }
 
-	if (in == NULL)
+    if (in == NULL) {
-		{
+        assert(passwds != NULL);
-		assert(passwds != NULL);
+        assert(*passwds != NULL);
-		assert(*passwds != NULL);
 
-		do /* loop over list of passwords */
+        do {                    /* loop over list of passwords */
-			{
+            passwd = *passwds++;
-			passwd = *passwds++;
+            if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-			if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
+                           quiet, table, reverse, pw_maxlen, usecrypt, use1,
-				quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
+                           useapr1))
-				goto err;
+                goto err;
-			}
+        }
-		while (*passwds != NULL);
+        while (*passwds != NULL);
-		}
+    } else
-	else
+        /* in != NULL */
-		/* in != NULL */
+    {
-		{
+        int done;
-		int done;
 
-		assert (passwd != NULL);
+        assert(passwd != NULL);
-		do
+        do {
-			{
+            int r = BIO_gets(in, passwd, pw_maxlen + 1);
-			int r = BIO_gets(in, passwd, pw_maxlen + 1);
+            if (r > 0) {
-			if (r > 0)
+                char *c = (strchr(passwd, '\n'));
-				{
+                if (c != NULL)
-				char *c = (strchr(passwd, '\n')) ;
+                    *c = 0;     /* truncate at newline */
-				if (c != NULL)
+                else {
-					*c = 0; /* truncate at newline */
+                    /* ignore rest of line */
-				else
+                    char trash[BUFSIZ];
-					{
+                    do
-					/* ignore rest of line */
+                        r = BIO_gets(in, trash, sizeof trash);
-					char trash[BUFSIZ];
+                    while ((r > 0) && (!strchr(trash, '\n')));
-					do
+                }
-						r = BIO_gets(in, trash, sizeof trash);
-					while ((r > 0) && (!strchr(trash, '\n')));
-					}
 
-				if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
+                if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-					quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
+                               quiet, table, reverse, pw_maxlen, usecrypt,
-					goto err;
+                               use1, useapr1))
-				}
+                    goto err;
-			done = (r <= 0);
+            }
-			}
+            done = (r <= 0);
-		while (!done);
+        }
-		}
+        while (!done);
-	ret = 0;
+    }
+    ret = 0;
 
-err:
+ err:
-	ERR_print_errors(bio_err);
+    ERR_print_errors(bio_err);
-	if (salt_malloc)
+    if (salt_malloc)
-		OPENSSL_free(salt_malloc);
+        OPENSSL_free(salt_malloc);
-	if (passwd_malloc)
+    if (passwd_malloc)
-		OPENSSL_free(passwd_malloc);
+        OPENSSL_free(passwd_malloc);
-	if (in)
+    if (in)
-		BIO_free(in);
+        BIO_free(in);
-	if (out)
+    if (out)
-		BIO_free_all(out);
+        BIO_free_all(out);
-	apps_shutdown();
+    apps_shutdown();
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
-	}
+}
 
-
+# ifndef NO_MD5CRYPT_1
-#ifndef NO_MD5CRYPT_1
+/*
-/* MD5-based password algorithm (should probably be available as a library
+ * MD5-based password algorithm (should probably be available as a library
- * function; then the static buffer would not be acceptable).
+ * function; then the static buffer would not be acceptable). For magic
- * For magic string "1", this should be compatible to the MD5-based BSD
+ * string "1", this should be compatible to the MD5-based BSD password
- * password algorithm.
+ * algorithm. For 'magic' string "apr1", this is compatible to the MD5-based
- * For 'magic' string "apr1", this is compatible to the MD5-based Apache
+ * Apache password algorithm. (Apparently, the Apache password algorithm is
- * password algorithm.
+ * identical except that the 'magic' string was changed -- the laziest
- * (Apparently, the Apache password algorithm is identical except that the
+ * application of the NIH principle I've ever encountered.)
- * 'magic' string was changed -- the laziest application of the NIH principle
- * I've ever encountered.)
  */
 static char *md5crypt(const char *passwd, const char *magic, const char *salt)
-	{
+{
-	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
+    /* "$apr1$..salt..$.......md5hash..........\0" */
-	unsigned char buf[MD5_DIGEST_LENGTH];
+    static char out_buf[6 + 9 + 24 + 2];
-	char *salt_out;
+    unsigned char buf[MD5_DIGEST_LENGTH];
-	int n;
+    char *salt_out;
-	unsigned int i;
+    int n;
-	EVP_MD_CTX md,md2;
+    unsigned int i;
-	size_t passwd_len, salt_len;
+    EVP_MD_CTX md, md2;
+    size_t passwd_len, salt_len;
 
-	passwd_len = strlen(passwd);
+    passwd_len = strlen(passwd);
-	out_buf[0] = '$';
+    out_buf[0] = '$';
-	out_buf[1] = 0;
+    out_buf[1] = 0;
-	assert(strlen(magic) <= 4); /* "1" or "apr1" */
+    assert(strlen(magic) <= 4); /* "1" or "apr1" */
-	strncat(out_buf, magic, 4);
+    strncat(out_buf, magic, 4);
-	strncat(out_buf, "$", 1);
+    strncat(out_buf, "$", 1);
-	strncat(out_buf, salt, 8);
+    strncat(out_buf, salt, 8);
-	assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */
+    assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */
-	salt_out = out_buf + 2 + strlen(magic);
+    salt_out = out_buf + 2 + strlen(magic);
-	salt_len = strlen(salt_out);
+    salt_len = strlen(salt_out);
-	assert(salt_len <= 8);
+    assert(salt_len <= 8);
 
-	EVP_MD_CTX_init(&md);
+    EVP_MD_CTX_init(&md);
-	EVP_DigestInit_ex(&md,EVP_md5(), NULL);
+    EVP_DigestInit_ex(&md, EVP_md5(), NULL);
-	EVP_DigestUpdate(&md, passwd, passwd_len);
+    EVP_DigestUpdate(&md, passwd, passwd_len);
-	EVP_DigestUpdate(&md, "$", 1);
+    EVP_DigestUpdate(&md, "$", 1);
-	EVP_DigestUpdate(&md, magic, strlen(magic));
+    EVP_DigestUpdate(&md, magic, strlen(magic));
-	EVP_DigestUpdate(&md, "$", 1);
+    EVP_DigestUpdate(&md, "$", 1);
-	EVP_DigestUpdate(&md, salt_out, salt_len);
+    EVP_DigestUpdate(&md, salt_out, salt_len);
 
-	EVP_MD_CTX_init(&md2);
+    EVP_MD_CTX_init(&md2);
-	EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
+    EVP_DigestInit_ex(&md2, EVP_md5(), NULL);
-	EVP_DigestUpdate(&md2, passwd, passwd_len);
+    EVP_DigestUpdate(&md2, passwd, passwd_len);
-	EVP_DigestUpdate(&md2, salt_out, salt_len);
+    EVP_DigestUpdate(&md2, salt_out, salt_len);
-	EVP_DigestUpdate(&md2, passwd, passwd_len);
+    EVP_DigestUpdate(&md2, passwd, passwd_len);
-	EVP_DigestFinal_ex(&md2, buf, NULL);
+    EVP_DigestFinal_ex(&md2, buf, NULL);
 
-	for (i = passwd_len; i > sizeof buf; i -= sizeof buf)
+    for (i = passwd_len; i > sizeof buf; i -= sizeof buf)
-		EVP_DigestUpdate(&md, buf, sizeof buf);
+        EVP_DigestUpdate(&md, buf, sizeof buf);
-	EVP_DigestUpdate(&md, buf, i);
+    EVP_DigestUpdate(&md, buf, i);
 
-	n = passwd_len;
+    n = passwd_len;
-	while (n)
+    while (n) {
-		{
+        EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
-		EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
+        n >>= 1;
-		n >>= 1;
+    }
-		}
+    EVP_DigestFinal_ex(&md, buf, NULL);
-	EVP_DigestFinal_ex(&md, buf, NULL);
 
-	for (i = 0; i < 1000; i++)
+    for (i = 0; i < 1000; i++) {
-		{
+        EVP_DigestInit_ex(&md2, EVP_md5(), NULL);
-		EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
+        EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *)passwd : buf,
-		EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *) passwd : buf,
+                         (i & 1) ? passwd_len : sizeof buf);
-		                       (i & 1) ? passwd_len : sizeof buf);
+        if (i % 3)
-		if (i % 3)
+            EVP_DigestUpdate(&md2, salt_out, salt_len);
-			EVP_DigestUpdate(&md2, salt_out, salt_len);
+        if (i % 7)
-		if (i % 7)
+            EVP_DigestUpdate(&md2, passwd, passwd_len);
-			EVP_DigestUpdate(&md2, passwd, passwd_len);
+        EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *)passwd,
-		EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *) passwd,
+                         (i & 1) ? sizeof buf : passwd_len);
-		                       (i & 1) ? sizeof buf : passwd_len);
+        EVP_DigestFinal_ex(&md2, buf, NULL);
-		EVP_DigestFinal_ex(&md2, buf, NULL);
+    }
-		}
+    EVP_MD_CTX_cleanup(&md2);
-	EVP_MD_CTX_cleanup(&md2);
 
-	 {
+    {
-		/* transform buf into output string */
+        /* transform buf into output string */
 
-		unsigned char buf_perm[sizeof buf];
+        unsigned char buf_perm[sizeof buf];
-		int dest, source;
+        int dest, source;
-		char *output;
+        char *output;
 
-		/* silly output permutation */
+        /* silly output permutation */
-		for (dest = 0, source = 0; dest < 14; dest++, source = (source + 6) % 17)
+        for (dest = 0, source = 0; dest < 14;
-			buf_perm[dest] = buf[source];
+             dest++, source = (source + 6) % 17)
-		buf_perm[14] = buf[5];
+            buf_perm[dest] = buf[source];
-		buf_perm[15] = buf[11];
+        buf_perm[14] = buf[5];
-#ifndef PEDANTIC /* Unfortunately, this generates a "no effect" warning */
+        buf_perm[15] = buf[11];
-		assert(16 == sizeof buf_perm);
+#  ifndef PEDANTIC              /* Unfortunately, this generates a "no
-#endif
+                                 * effect" warning */
+        assert(16 == sizeof buf_perm);
+#  endif
 
-		output = salt_out + salt_len;
+        output = salt_out + salt_len;
-		assert(output == out_buf + strlen(out_buf));
+        assert(output == out_buf + strlen(out_buf));
 
-		*output++ = '$';
+        *output++ = '$';
 
-		for (i = 0; i < 15; i += 3)
+        for (i = 0; i < 15; i += 3) {
-			{
+            *output++ = cov_2char[buf_perm[i + 2] & 0x3f];
-			*output++ = cov_2char[buf_perm[i+2] & 0x3f];
+            *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) |
-			*output++ = cov_2char[((buf_perm[i+1] & 0xf) << 2) |
+                                  (buf_perm[i + 2] >> 6)];
-				                  (buf_perm[i+2] >> 6)];
+            *output++ = cov_2char[((buf_perm[i] & 3) << 4) |
-			*output++ = cov_2char[((buf_perm[i] & 3) << 4) |
+                                  (buf_perm[i + 1] >> 4)];
-				                  (buf_perm[i+1] >> 4)];
+            *output++ = cov_2char[buf_perm[i] >> 2];
-			*output++ = cov_2char[buf_perm[i] >> 2];
+        }
-			}
+        assert(i == 15);
-		assert(i == 15);
+        *output++ = cov_2char[buf_perm[i] & 0x3f];
-		*output++ = cov_2char[buf_perm[i] & 0x3f];
+        *output++ = cov_2char[buf_perm[i] >> 6];
-		*output++ = cov_2char[buf_perm[i] >> 6];
+        *output = 0;
-		*output = 0;
+        assert(strlen(out_buf) < sizeof(out_buf));
-		assert(strlen(out_buf) < sizeof(out_buf));
+    }
-	 }
+    EVP_MD_CTX_cleanup(&md);
-	EVP_MD_CTX_cleanup(&md);
-
-	return out_buf;
-	}
-#endif
 
+    return out_buf;
+}
+# endif
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-	char *passwd, BIO *out,	int quiet, int table, int reverse,
+                     char *passwd, BIO *out, int quiet, int table,
-	size_t pw_maxlen, int usecrypt, int use1, int useapr1)
+                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
-	{
+                     int useapr1)
-	char *hash = NULL;
+{
+    char *hash = NULL;
 
-	assert(salt_p != NULL);
+    assert(salt_p != NULL);
-	assert(salt_malloc_p != NULL);
+    assert(salt_malloc_p != NULL);
 
-	/* first make sure we have a salt */
+    /* first make sure we have a salt */
-	if (!passed_salt)
+    if (!passed_salt) {
-		{
+# ifndef OPENSSL_NO_DES
-#ifndef OPENSSL_NO_DES
+        if (usecrypt) {
-		if (usecrypt)
+            if (*salt_malloc_p == NULL) {
-			{
+                *salt_p = *salt_malloc_p = OPENSSL_malloc(3);
-			if (*salt_malloc_p == NULL)
+                if (*salt_malloc_p == NULL)
-				{
+                    goto err;
-				*salt_p = *salt_malloc_p = OPENSSL_malloc(3);
+            }
-				if (*salt_malloc_p == NULL)
+            if (RAND_pseudo_bytes((unsigned char *)*salt_p, 2) < 0)
-					goto err;
+                goto err;
-				}
+            (*salt_p)[0] = cov_2char[(*salt_p)[0] & 0x3f]; /* 6 bits */
-			if (RAND_pseudo_bytes((unsigned char *)*salt_p, 2) < 0)
+            (*salt_p)[1] = cov_2char[(*salt_p)[1] & 0x3f]; /* 6 bits */
-				goto err;
+            (*salt_p)[2] = 0;
-			(*salt_p)[0] = cov_2char[(*salt_p)[0] & 0x3f]; /* 6 bits */
+#  ifdef CHARSET_EBCDIC
-			(*salt_p)[1] = cov_2char[(*salt_p)[1] & 0x3f]; /* 6 bits */
+            ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert back
-			(*salt_p)[2] = 0;
+                                                * to ASCII */
-#ifdef CHARSET_EBCDIC
+#  endif
-			ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert
+        }
-			                                    * back to ASCII */
+# endif                         /* !OPENSSL_NO_DES */
-#endif
-			}
-#endif /* !OPENSSL_NO_DES */
 
-#ifndef NO_MD5CRYPT_1
+# ifndef NO_MD5CRYPT_1
-		if (use1 || useapr1)
+        if (use1 || useapr1) {
-			{
+            int i;
-			int i;
 
-			if (*salt_malloc_p == NULL)
+            if (*salt_malloc_p == NULL) {
-				{
+                *salt_p = *salt_malloc_p = OPENSSL_malloc(9);
-				*salt_p = *salt_malloc_p = OPENSSL_malloc(9);
+                if (*salt_malloc_p == NULL)
-				if (*salt_malloc_p == NULL)
+                    goto err;
-					goto err;
+            }
-				}
+            if (RAND_pseudo_bytes((unsigned char *)*salt_p, 8) < 0)
-			if (RAND_pseudo_bytes((unsigned char *)*salt_p, 8) < 0)
+                goto err;
-				goto err;
 
-			for (i = 0; i < 8; i++)
+            for (i = 0; i < 8; i++)
-				(*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
+                (*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
-			(*salt_p)[8] = 0;
+            (*salt_p)[8] = 0;
-			}
+        }
-#endif /* !NO_MD5CRYPT_1 */
+# endif                         /* !NO_MD5CRYPT_1 */
-		}
+    }
 
-	assert(*salt_p != NULL);
+    assert(*salt_p != NULL);
 
-	/* truncate password if necessary */
+    /* truncate password if necessary */
-	if ((strlen(passwd) > pw_maxlen))
+    if ((strlen(passwd) > pw_maxlen)) {
-		{
+        if (!quiet)
-		if (!quiet)
+            /*
-			/* XXX: really we should know how to print a size_t, not cast it */
+             * XXX: really we should know how to print a size_t, not cast it
-			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", (unsigned)pw_maxlen);
+             */
-		passwd[pw_maxlen] = 0;
+            BIO_printf(bio_err,
-		}
+                       "Warning: truncating password to %u characters\n",
-	assert(strlen(passwd) <= pw_maxlen);
+                       (unsigned)pw_maxlen);
+        passwd[pw_maxlen] = 0;
+    }
+    assert(strlen(passwd) <= pw_maxlen);
 
-	/* now compute password hash */
+    /* now compute password hash */
-#ifndef OPENSSL_NO_DES
+# ifndef OPENSSL_NO_DES
-	if (usecrypt)
+    if (usecrypt)
-		hash = DES_crypt(passwd, *salt_p);
+        hash = DES_crypt(passwd, *salt_p);
-#endif
+# endif
-#ifndef NO_MD5CRYPT_1
+# ifndef NO_MD5CRYPT_1
-	if (use1 || useapr1)
+    if (use1 || useapr1)
-		hash = md5crypt(passwd, (use1 ? "1" : "apr1"), *salt_p);
+        hash = md5crypt(passwd, (use1 ? "1" : "apr1"), *salt_p);
-#endif
+# endif
-	assert(hash != NULL);
+    assert(hash != NULL);
 
-	if (table && !reverse)
+    if (table && !reverse)
-		BIO_printf(out, "%s\t%s\n", passwd, hash);
+        BIO_printf(out, "%s\t%s\n", passwd, hash);
-	else if (table && reverse)
+    else if (table && reverse)
-		BIO_printf(out, "%s\t%s\n", hash, passwd);
+        BIO_printf(out, "%s\t%s\n", hash, passwd);
-	else
+    else
-		BIO_printf(out, "%s\n", hash);
+        BIO_printf(out, "%s\n", hash);
-	return 1;
+    return 1;
 
-err:
+ err:
-	return 0;
+    return 0;
-	}
+}
 #else
 
 int MAIN(int argc, char **argv)
-	{
+{
-	fputs("Program not available.\n", stderr)
+    fputs("Program not available.\n", stderr)
-	OPENSSL_EXIT(1);
+        OPENSSL_EXIT(1);
-	}
+}
 #endif

apps/pkcs7.c

@@ -69,252 +69,240 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	pkcs7_main
+#define PROG    pkcs7_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  * -print_certs
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	PKCS7 *p7=NULL;
+    PKCS7 *p7 = NULL;
-	int i,badops=0;
+    int i, badops = 0;
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile,*outfile,*prog;
+    char *infile, *outfile, *prog;
-	int print_certs=0,text=0,noout=0,p7_print=0;
+    int print_certs = 0, text = 0, noout = 0, p7_print = 0;
-	int ret=1;
+    int ret = 1;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-noout") == 0)
-			{
+            noout = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-text") == 0)
-			outfile= *(++argv);
+            text = 1;
-			}
+        else if (strcmp(*argv, "-print") == 0)
-		else if (strcmp(*argv,"-noout") == 0)
+            p7_print = 1;
-			noout=1;
+        else if (strcmp(*argv, "-print_certs") == 0)
-		else if (strcmp(*argv,"-text") == 0)
+            print_certs = 1;
-			text=1;
-		else if (strcmp(*argv,"-print") == 0)
-			p7_print=1;
-		else if (strcmp(*argv,"-print_certs") == 0)
-			print_certs=1;
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			engine= *(++argv);
+            engine = *(++argv);
-			}
+        }
 #endif
-		else
+        else {
-			{
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+            badops = 1;
-			badops=1;
+            break;
-			break;
+        }
-			}
+        argc--;
-		argc--;
+        argv++;
-		argv++;
+    }
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - DER or PEM\n");
-		BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
+        BIO_printf(bio_err, " -outform arg  output format - DER or PEM\n");
-		BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
+                   " -print_certs  print any certs or crl in the input\n");
-		BIO_printf(bio_err," -text         print full details of certificates\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -noout        don't output encoded data\n");
+                   " -text         print full details of certificates\n");
+        BIO_printf(bio_err, " -noout        don't output encoded data\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
-		ret = 1;
+        ret = 1;
-		goto end;
+        goto end;
-		}
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
+    }
+
+    if (infile == NULL)
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+    else {
+        if (BIO_read_filename(in, infile) <= 0)
+            if (in == NULL) {
+                perror(infile);
                 goto end;
-                }
+            }
+    }
 
-	if (infile == NULL)
+    if (informat == FORMAT_ASN1)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        p7 = d2i_PKCS7_bio(in, NULL);
-	else
+    else if (informat == FORMAT_PEM)
-		{
+        p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);
-		if (BIO_read_filename(in,infile) <= 0)
+    else {
-		if (in == NULL)
+        BIO_printf(bio_err, "bad input format specified for pkcs7 object\n");
-			{
+        goto end;
-			perror(infile);
+    }
-			goto end;
+    if (p7 == NULL) {
-			}
+        BIO_printf(bio_err, "unable to load PKCS7 object\n");
-		}
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	if	(informat == FORMAT_ASN1)
+    if (outfile == NULL) {
-		p7=d2i_PKCS7_bio(in,NULL);
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-	else if (informat == FORMAT_PEM)
-		p7=PEM_read_bio_PKCS7(in,NULL,NULL,NULL);
-	else
-		{
-		BIO_printf(bio_err,"bad input format specified for pkcs7 object\n");
-		goto end;
-		}
-	if (p7 == NULL)
-		{
-		BIO_printf(bio_err,"unable to load PKCS7 object\n");
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-
-	if (outfile == NULL)
-		{
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            goto end;
-			{
+        }
-			perror(outfile);
+    }
-			goto end;
-			}
-		}
 
-	if (p7_print)
+    if (p7_print)
-		PKCS7_print_ctx(out, p7, 0, NULL);
+        PKCS7_print_ctx(out, p7, 0, NULL);
 
-	if (print_certs)
+    if (print_certs) {
-		{
+        STACK_OF(X509) *certs = NULL;
-		STACK_OF(X509) *certs=NULL;
+        STACK_OF(X509_CRL) *crls = NULL;
-		STACK_OF(X509_CRL) *crls=NULL;
 
-		i=OBJ_obj2nid(p7->type);
+        i = OBJ_obj2nid(p7->type);
-		switch (i)
+        switch (i) {
-			{
+        case NID_pkcs7_signed:
-		case NID_pkcs7_signed:
+            certs = p7->d.sign->cert;
-			certs=p7->d.sign->cert;
+            crls = p7->d.sign->crl;
-			crls=p7->d.sign->crl;
+            break;
-			break;
+        case NID_pkcs7_signedAndEnveloped:
-		case NID_pkcs7_signedAndEnveloped:
+            certs = p7->d.signed_and_enveloped->cert;
-			certs=p7->d.signed_and_enveloped->cert;
+            crls = p7->d.signed_and_enveloped->crl;
-			crls=p7->d.signed_and_enveloped->crl;
+            break;
-			break;
+        default:
-		default:
+            break;
-			break;
+        }
-			}
 
-		if (certs != NULL)
+        if (certs != NULL) {
-			{
+            X509 *x;
-			X509 *x;
 
-			for (i=0; i<sk_X509_num(certs); i++)
+            for (i = 0; i < sk_X509_num(certs); i++) {
-				{
+                x = sk_X509_value(certs, i);
-				x=sk_X509_value(certs,i);
+                if (text)
-				if(text) X509_print(out, x);
+                    X509_print(out, x);
-				else dump_cert_text(out, x);
+                else
+                    dump_cert_text(out, x);
 
-				if(!noout) PEM_write_bio_X509(out,x);
+                if (!noout)
-				BIO_puts(out,"\n");
+                    PEM_write_bio_X509(out, x);
-				}
+                BIO_puts(out, "\n");
-			}
+            }
-		if (crls != NULL)
+        }
-			{
+        if (crls != NULL) {
-			X509_CRL *crl;
+            X509_CRL *crl;
 
-			for (i=0; i<sk_X509_CRL_num(crls); i++)
+            for (i = 0; i < sk_X509_CRL_num(crls); i++) {
-				{
+                crl = sk_X509_CRL_value(crls, i);
-				crl=sk_X509_CRL_value(crls,i);
 
-				X509_CRL_print(out, crl);
+                X509_CRL_print(out, crl);
 
-				if(!noout)PEM_write_bio_X509_CRL(out,crl);
+                if (!noout)
-				BIO_puts(out,"\n");
+                    PEM_write_bio_X509_CRL(out, crl);
-				}
+                BIO_puts(out, "\n");
-			}
+            }
+        }
 
-		ret=0;
+        ret = 0;
-		goto end;
+        goto end;
-		}
+    }
 
-	if(!noout) {
+    if (!noout) {
-		if 	(outformat == FORMAT_ASN1)
+        if (outformat == FORMAT_ASN1)
-			i=i2d_PKCS7_bio(out,p7);
+            i = i2d_PKCS7_bio(out, p7);
-		else if (outformat == FORMAT_PEM)
+        else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_PKCS7(out,p7);
+            i = PEM_write_bio_PKCS7(out, p7);
-		else	{
+        else {
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-			goto end;
+            goto end;
-			}
+        }
 
-		if (!i)
+        if (!i) {
-			{
+            BIO_printf(bio_err, "unable to write pkcs7 object\n");
-			BIO_printf(bio_err,"unable to write pkcs7 object\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
+    }
-	}
+    ret = 0;
-	ret=0;
+ end:
-end:
+    if (p7 != NULL)
-	if (p7 != NULL) PKCS7_free(p7);
+        PKCS7_free(p7);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	apps_shutdown();
+    if (out != NULL)
-	OPENSSL_EXIT(ret);
+        BIO_free_all(out);
-	}
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}

apps/pkcs8.c

@@ -1,6 +1,7 @@
 /* pkcs8.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 1999-2004.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999-2004.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -68,372 +69,324 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	char **args, *infile = NULL, *outfile = NULL;
+    char **args, *infile = NULL, *outfile = NULL;
-	char *passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int topk8 = 0;
+    int topk8 = 0;
-	int pbe_nid = -1;
+    int pbe_nid = -1;
-	const EVP_CIPHER *cipher = NULL;
+    const EVP_CIPHER *cipher = NULL;
-	int iter = PKCS12_DEFAULT_ITER;
+    int iter = PKCS12_DEFAULT_ITER;
-	int informat, outformat;
+    int informat, outformat;
-	int p8_broken = PKCS8_OK;
+    int p8_broken = PKCS8_OK;
-	int nocrypt = 0;
+    int nocrypt = 0;
-	X509_SIG *p8 = NULL;
+    X509_SIG *p8 = NULL;
-	PKCS8_PRIV_KEY_INFO *p8inf = NULL;
+    PKCS8_PRIV_KEY_INFO *p8inf = NULL;
-	EVP_PKEY *pkey=NULL;
+    EVP_PKEY *pkey = NULL;
-	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
+    char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
-	int badarg = 0;
+    int badarg = 0;
-	int ret = 1;
+    int ret = 1;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	args = argv + 1;
+    args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-v2")) {
-		if (!strcmp(*args,"-v2"))
+            if (args[1]) {
-			{
+                args++;
-			if (args[1])
+                cipher = EVP_get_cipherbyname(*args);
-				{
+                if (!cipher) {
-				args++;
+                    BIO_printf(bio_err, "Unknown cipher %s\n", *args);
-				cipher=EVP_get_cipherbyname(*args);
+                    badarg = 1;
-				if (!cipher)
+                }
-					{
+            } else
-					BIO_printf(bio_err,
+                badarg = 1;
-						 "Unknown cipher %s\n", *args);
+        } else if (!strcmp(*args, "-v1")) {
-					badarg = 1;
+            if (args[1]) {
-					}
+                args++;
-				}
+                pbe_nid = OBJ_txt2nid(*args);
-			else
+                if (pbe_nid == NID_undef) {
-				badarg = 1;
+                    BIO_printf(bio_err, "Unknown PBE algorithm %s\n", *args);
-			}
+                    badarg = 1;
-		else if (!strcmp(*args,"-v1"))
+                }
-			{
+            } else
-			if (args[1])
+                badarg = 1;
-				{
+        } else if (!strcmp(*args, "-inform")) {
-				args++;
+            if (args[1]) {
-				pbe_nid=OBJ_txt2nid(*args);
+                args++;
-				if (pbe_nid == NID_undef)
+                informat = str2fmt(*args);
-					{
+            } else
-					BIO_printf(bio_err,
+                badarg = 1;
-						 "Unknown PBE algorithm %s\n", *args);
+        } else if (!strcmp(*args, "-outform")) {
-					badarg = 1;
+            if (args[1]) {
-					}
+                args++;
-				}
+                outformat = str2fmt(*args);
-			else
+            } else
-				badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-topk8"))
-		else if (!strcmp(*args,"-inform"))
+            topk8 = 1;
-			{
+        else if (!strcmp(*args, "-noiter"))
-			if (args[1])
+            iter = 1;
-				{
+        else if (!strcmp(*args, "-nocrypt"))
-				args++;
+            nocrypt = 1;
-				informat=str2fmt(*args);
+        else if (!strcmp(*args, "-nooct"))
-				}
+            p8_broken = PKCS8_NO_OCTET;
-			else badarg = 1;
+        else if (!strcmp(*args, "-nsdb"))
-			}
+            p8_broken = PKCS8_NS_DB;
-		else if (!strcmp(*args,"-outform"))
+        else if (!strcmp(*args, "-embed"))
-			{
+            p8_broken = PKCS8_EMBEDDED_PARAM;
-			if (args[1])
+        else if (!strcmp(*args, "-passin")) {
-				{
+            if (!args[1])
-				args++;
+                goto bad;
-				outformat=str2fmt(*args);
+            passargin = *(++args);
-				}
+        } else if (!strcmp(*args, "-passout")) {
-			else badarg = 1;
+            if (!args[1])
-			}
+                goto bad;
-		else if (!strcmp (*args, "-topk8"))
+            passargout = *(++args);
-			topk8 = 1;
+        }
-		else if (!strcmp (*args, "-noiter"))
-			iter = 1;
-		else if (!strcmp (*args, "-nocrypt"))
-			nocrypt = 1;
-		else if (!strcmp (*args, "-nooct"))
-			p8_broken = PKCS8_NO_OCTET;
-		else if (!strcmp (*args, "-nsdb"))
-			p8_broken = PKCS8_NS_DB;
-		else if (!strcmp (*args, "-embed"))
-			p8_broken = PKCS8_EMBEDDED_PARAM;
-		else if (!strcmp(*args,"-passin"))
-			{
-			if (!args[1]) goto bad;
-			passargin= *(++args);
-			}
-		else if (!strcmp(*args,"-passout"))
-			{
-			if (!args[1]) goto bad;
-			passargout= *(++args);
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (!args[1])
-			if (!args[1]) goto bad;
+                goto bad;
-			engine= *(++args);
+            engine = *(++args);
-			}
+        }
 #endif
-		else if (!strcmp (*args, "-in"))
+        else if (!strcmp(*args, "-in")) {
-			{
+            if (args[1]) {
-			if (args[1])
+                args++;
-				{
+                infile = *args;
-				args++;
+            } else
-				infile = *args;
+                badarg = 1;
-				}
+        } else if (!strcmp(*args, "-out")) {
-			else badarg = 1;
+            if (args[1]) {
-			}
+                args++;
-		else if (!strcmp (*args, "-out"))
+                outfile = *args;
-			{
+            } else
-			if (args[1])
+                badarg = 1;
-				{
+        } else
-				args++;
+            badarg = 1;
-				outfile = *args;
+        args++;
-				}
+    }
-			else badarg = 1;
-			}
-		else badarg = 1;
-		args++;
-		}
 
-	if (badarg)
+    if (badarg) {
-		{
+ bad:
-		bad:
+        BIO_printf(bio_err, "Usage pkcs8 [options]\n");
-		BIO_printf(bio_err, "Usage pkcs8 [options]\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, "-in file        input file\n");
-		BIO_printf(bio_err, "-in file        input file\n");
+        BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-		BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
+                   "-passin arg     input file pass phrase source\n");
-		BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
+        BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
-		BIO_printf(bio_err, "-out file       output file\n");
+        BIO_printf(bio_err, "-out file       output file\n");
-		BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
+                   "-passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
+        BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
-		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
+                   "-nooct          use (nonstandard) no octet format\n");
-		BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
+                   "-embed          use (nonstandard) embedded DSA parameters format\n");
-		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
+                   "-nsdb           use (nonstandard) DSA Netscape DB format\n");
+        BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
+        BIO_printf(bio_err,
+                   "-nocrypt        use or expect unencrypted private key\n");
+        BIO_printf(bio_err,
+                   "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
+        BIO_printf(bio_err,
+                   "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
-		goto end;
+        goto end;
-		}
+    }
-
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
+        BIO_printf(bio_err, "Error getting passwords\n");
-		BIO_printf(bio_err, "Error getting passwords\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	if ((pbe_nid == -1) && !cipher)
+    if ((pbe_nid == -1) && !cipher)
-		pbe_nid = NID_pbeWithMD5AndDES_CBC;
+        pbe_nid = NID_pbeWithMD5AndDES_CBC;
 
-	if (infile)
+    if (infile) {
-		{
+        if (!(in = BIO_new_file(infile, "rb"))) {
-		if (!(in = BIO_new_file(infile, "rb")))
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-			{
+            goto end;
-			BIO_printf(bio_err,
+        }
-				 "Can't open input file %s\n", infile);
+    } else
-			goto end;
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
-			}
-		}
-	else
-		in = BIO_new_fp (stdin, BIO_NOCLOSE);
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
+            goto end;
-			BIO_printf(bio_err,
+        }
-				 "Can't open output file %s\n", outfile);
+    } else {
-			goto end;
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-			}
-		}
-	else
-		{
-		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+        {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-			}
+        }
 #endif
-		}
+    }
-	if (topk8)
+    if (topk8) {
-		{
+        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
-		pkey = load_key(bio_err, infile, informat, 1,
+        if (!pkey)
-			passin, e, "key");
+            goto end;
-		if (!pkey)
+        if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-			goto end;
+            BIO_printf(bio_err, "Error converting key\n");
-		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			BIO_printf(bio_err, "Error converting key\n");
+        }
-			ERR_print_errors(bio_err);
+        if (nocrypt) {
-			goto end;
+            if (outformat == FORMAT_PEM)
-			}
+                PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
-		if (nocrypt)
+            else if (outformat == FORMAT_ASN1)
-			{
+                i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
-			if (outformat == FORMAT_PEM) 
+            else {
-				PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
+                BIO_printf(bio_err, "Bad format specified for key\n");
-			else if (outformat == FORMAT_ASN1)
+                goto end;
-				i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
+            }
-			else
+        } else {
-				{
+            if (passout)
-				BIO_printf(bio_err, "Bad format specified for key\n");
+                p8pass = passout;
-				goto end;
+            else {
-				}
+                p8pass = pass;
-			}
+                if (EVP_read_pw_string
-		else
+                    (pass, sizeof pass, "Enter Encryption Password:", 1))
-			{
+                    goto end;
-			if (passout)
+            }
-				p8pass = passout;
+            app_RAND_load_file(NULL, bio_err, 0);
-			else
+            if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
-				{
+                                     p8pass, strlen(p8pass),
-				p8pass = pass;
+                                     NULL, 0, iter, p8inf))) {
-				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
+                BIO_printf(bio_err, "Error encrypting key\n");
-					goto end;
+                ERR_print_errors(bio_err);
-				}
+                goto end;
-			app_RAND_load_file(NULL, bio_err, 0);
+            }
-			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
+            app_RAND_write_file(NULL, bio_err);
-					p8pass, strlen(p8pass),
+            if (outformat == FORMAT_PEM)
-					NULL, 0, iter, p8inf)))
+                PEM_write_bio_PKCS8(out, p8);
-				{
+            else if (outformat == FORMAT_ASN1)
-				BIO_printf(bio_err, "Error encrypting key\n");
+                i2d_PKCS8_bio(out, p8);
-				ERR_print_errors(bio_err);
+            else {
-				goto end;
+                BIO_printf(bio_err, "Bad format specified for key\n");
-				}
+                goto end;
-			app_RAND_write_file(NULL, bio_err);
+            }
-			if (outformat == FORMAT_PEM) 
+        }
-				PEM_write_bio_PKCS8(out, p8);
-			else if (outformat == FORMAT_ASN1)
-				i2d_PKCS8_bio(out, p8);
-			else
-				{
-				BIO_printf(bio_err, "Bad format specified for key\n");
-				goto end;
-				}
-			}
 
-		ret = 0;
+        ret = 0;
-		goto end;
+        goto end;
-		}
+    }
 
-	if (nocrypt)
+    if (nocrypt) {
-		{
+        if (informat == FORMAT_PEM)
-		if (informat == FORMAT_PEM) 
+            p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in, NULL, NULL, NULL);
-			p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL);
+        else if (informat == FORMAT_ASN1)
-		else if (informat == FORMAT_ASN1)
+            p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
-			p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
+        else {
-		else
+            BIO_printf(bio_err, "Bad format specified for key\n");
-			{
+            goto end;
-			BIO_printf(bio_err, "Bad format specified for key\n");
+        }
-			goto end;
+    } else {
-			}
+        if (informat == FORMAT_PEM)
-		}
+            p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
-	else
+        else if (informat == FORMAT_ASN1)
-		{
+            p8 = d2i_PKCS8_bio(in, NULL);
-		if (informat == FORMAT_PEM) 
+        else {
-			p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
+            BIO_printf(bio_err, "Bad format specified for key\n");
-		else if (informat == FORMAT_ASN1)
+            goto end;
-			p8 = d2i_PKCS8_bio(in, NULL);
+        }
-		else
-			{
-			BIO_printf(bio_err, "Bad format specified for key\n");
-			goto end;
-			}
 
-		if (!p8)
+        if (!p8) {
-			{
+            BIO_printf(bio_err, "Error reading key\n");
-			BIO_printf (bio_err, "Error reading key\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
+        if (passin)
-		if (passin)
+            p8pass = passin;
-			p8pass = passin;
+        else {
-		else
+            p8pass = pass;
-			{
+            EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
-			p8pass = pass;
+        }
-			EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
+        p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
-			}
+    }
-		p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
-		}
 
-	if (!p8inf)
+    if (!p8inf) {
-		{
+        BIO_printf(bio_err, "Error decrypting key\n");
-		BIO_printf(bio_err, "Error decrypting key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (!(pkey = EVP_PKCS82PKEY(p8inf)))
+    if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-		{
+        BIO_printf(bio_err, "Error converting key\n");
-		BIO_printf(bio_err, "Error converting key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (p8inf->broken)
+    if (p8inf->broken) {
-		{
+        BIO_printf(bio_err, "Warning: broken key encoding: ");
-		BIO_printf(bio_err, "Warning: broken key encoding: ");
+        switch (p8inf->broken) {
-		switch (p8inf->broken)
+        case PKCS8_NO_OCTET:
-			{
+            BIO_printf(bio_err, "No Octet String in PrivateKey\n");
-			case PKCS8_NO_OCTET:
+            break;
-			BIO_printf(bio_err, "No Octet String in PrivateKey\n");
-			break;
 
-			case PKCS8_EMBEDDED_PARAM:
+        case PKCS8_EMBEDDED_PARAM:
-			BIO_printf(bio_err, "DSA parameters included in PrivateKey\n");
+            BIO_printf(bio_err, "DSA parameters included in PrivateKey\n");
-			break;
+            break;
 
-			case PKCS8_NS_DB:
+        case PKCS8_NS_DB:
-			BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
+            BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
-			break;
+            break;
 
-			case PKCS8_NEG_PRIVKEY:
+        case PKCS8_NEG_PRIVKEY:
-			BIO_printf(bio_err, "DSA private key value is negative\n");
+            BIO_printf(bio_err, "DSA private key value is negative\n");
-			break;
+            break;
 
-			default:
+        default:
-			BIO_printf(bio_err, "Unknown broken type\n");
+            BIO_printf(bio_err, "Unknown broken type\n");
-			break;
+            break;
-		}
+        }
-	}
+    }
 
-	if (outformat == FORMAT_PEM) 
+    if (outformat == FORMAT_PEM)
-		PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
+        PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
-	else if (outformat == FORMAT_ASN1)
+    else if (outformat == FORMAT_ASN1)
-		i2d_PrivateKey_bio(out, pkey);
+        i2d_PrivateKey_bio(out, pkey);
-	else
+    else {
-		{
+        BIO_printf(bio_err, "Bad format specified for key\n");
-		BIO_printf(bio_err, "Bad format specified for key\n");
+        goto end;
-			goto end;
+    }
-		}
+    ret = 0;
-	ret = 0;
 
-	end:
+ end:
-	X509_SIG_free(p8);
+    X509_SIG_free(p8);
-	PKCS8_PRIV_KEY_INFO_free(p8inf);
+    PKCS8_PRIV_KEY_INFO_free(p8inf);
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	BIO_free(in);
+    BIO_free(in);
-	if (passin)
+    if (passin)
-		OPENSSL_free(passin);
+        OPENSSL_free(passin);
-	if (passout)
+    if (passout)
-		OPENSSL_free(passout);
+        OPENSSL_free(passout);
 
-	return ret;
+    return ret;
-	}
+}

apps/pkey.c

@@ -1,6 +1,7 @@
 /* apps/pkey.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -67,218 +68,184 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	char **args, *infile = NULL, *outfile = NULL;
+    char **args, *infile = NULL, *outfile = NULL;
-	char *passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	const EVP_CIPHER *cipher = NULL;
+    const EVP_CIPHER *cipher = NULL;
-	int informat, outformat;
+    int informat, outformat;
-	int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0;
+    int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0;
-	EVP_PKEY *pkey=NULL;
+    EVP_PKEY *pkey = NULL;
-	char *passin = NULL, *passout = NULL;
+    char *passin = NULL, *passout = NULL;
-	int badarg = 0;
+    int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
-	int ret = 1;
+    int ret = 1;
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	args = argv + 1;
+    args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-inform")) {
-		if (!strcmp(*args,"-inform"))
+            if (args[1]) {
-			{
+                args++;
-			if (args[1])
+                informat = str2fmt(*args);
-				{
+            } else
-				args++;
+                badarg = 1;
-				informat=str2fmt(*args);
+        } else if (!strcmp(*args, "-outform")) {
-				}
+            if (args[1]) {
-			else badarg = 1;
+                args++;
-			}
+                outformat = str2fmt(*args);
-		else if (!strcmp(*args,"-outform"))
+            } else
-			{
+                badarg = 1;
-			if (args[1])
+        } else if (!strcmp(*args, "-passin")) {
-				{
+            if (!args[1])
-				args++;
+                goto bad;
-				outformat=str2fmt(*args);
+            passargin = *(++args);
-				}
+        } else if (!strcmp(*args, "-passout")) {
-			else badarg = 1;
+            if (!args[1])
-			}
+                goto bad;
-		else if (!strcmp(*args,"-passin"))
+            passargout = *(++args);
-			{
+        }
-			if (!args[1]) goto bad;
-			passargin= *(++args);
-			}
-		else if (!strcmp(*args,"-passout"))
-			{
-			if (!args[1]) goto bad;
-			passargout= *(++args);
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (!args[1])
-			if (!args[1]) goto bad;
+                goto bad;
-			engine= *(++args);
+            engine = *(++args);
-			}
+        }
 #endif
-		else if (!strcmp (*args, "-in"))
+        else if (!strcmp(*args, "-in")) {
-			{
+            if (args[1]) {
-			if (args[1])
+                args++;
-				{
+                infile = *args;
-				args++;
+            } else
-				infile = *args;
+                badarg = 1;
-				}
+        } else if (!strcmp(*args, "-out")) {
-			else badarg = 1;
+            if (args[1]) {
-			}
+                args++;
-		else if (!strcmp (*args, "-out"))
+                outfile = *args;
-			{
+            } else
-			if (args[1])
+                badarg = 1;
-				{
+        } else if (strcmp(*args, "-pubin") == 0) {
-				args++;
+            pubin = 1;
-				outfile = *args;
+            pubout = 1;
-				}
+            pubtext = 1;
-			else badarg = 1;
+        } else if (strcmp(*args, "-pubout") == 0)
-			}
+            pubout = 1;
-		else if (strcmp(*args,"-pubin") == 0)
+        else if (strcmp(*args, "-text_pub") == 0) {
-			{
+            pubtext = 1;
-			pubin=1;
+            text = 1;
-			pubout=1;
+        } else if (strcmp(*args, "-text") == 0)
-			pubtext=1;
+            text = 1;
-			}
+        else if (strcmp(*args, "-noout") == 0)
-		else if (strcmp(*args,"-pubout") == 0)
+            noout = 1;
-			pubout=1;
+        else {
-		else if (strcmp(*args,"-text_pub") == 0)
+            cipher = EVP_get_cipherbyname(*args + 1);
-			{
+            if (!cipher) {
-			pubtext=1;
+                BIO_printf(bio_err, "Unknown cipher %s\n", *args + 1);
-			text=1;
+                badarg = 1;
-			}
+            }
-		else if (strcmp(*args,"-text") == 0)
+        }
-			text=1;
+        args++;
-		else if (strcmp(*args,"-noout") == 0)
+    }
-			noout=1;
-		else
-			{
-			cipher = EVP_get_cipherbyname(*args + 1);
-			if (!cipher)
-				{
-				BIO_printf(bio_err, "Unknown cipher %s\n",
-								*args + 1);
-				badarg = 1;
-				}
-			}
-		args++;
-		}
 
-	if (badarg)
+    if (badarg) {
-		{
+ bad:
-		bad:
+        BIO_printf(bio_err, "Usage pkey [options]\n");
-		BIO_printf(bio_err, "Usage pkey [options]\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, "-in file        input file\n");
-		BIO_printf(bio_err, "-in file        input file\n");
+        BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-		BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
+                   "-passin arg     input file pass phrase source\n");
-		BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
+        BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
-		BIO_printf(bio_err, "-out file       output file\n");
+        BIO_printf(bio_err, "-out file       output file\n");
-		BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-passout arg    output file pass phrase source\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
-		return 1;
+        return 1;
-		}
+    }
-
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
+        BIO_printf(bio_err, "Error getting passwords\n");
-		BIO_printf(bio_err, "Error getting passwords\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
+            goto end;
-			BIO_printf(bio_err,
+        }
-				 "Can't open output file %s\n", outfile);
+    } else {
-			goto end;
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-			}
-		}
-	else
-		{
-		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+        {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-			}
+        }
 #endif
-		}
+    }
 
-	if (pubin)
+    if (pubin)
-		pkey = load_pubkey(bio_err, infile, informat, 1,
+        pkey = load_pubkey(bio_err, infile, informat, 1,
-			passin, e, "Public Key");
+                           passin, e, "Public Key");
-	else
+    else
-		pkey = load_key(bio_err, infile, informat, 1,
+        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
-			passin, e, "key");
+    if (!pkey)
-	if (!pkey)
+        goto end;
-		goto end;
 
-	if (!noout)
+    if (!noout) {
-		{
+        if (outformat == FORMAT_PEM) {
-		if (outformat == FORMAT_PEM) 
+            if (pubout)
-			{
+                PEM_write_bio_PUBKEY(out, pkey);
-			if (pubout)
+            else
-				PEM_write_bio_PUBKEY(out,pkey);
+                PEM_write_bio_PrivateKey(out, pkey, cipher,
-			else
+                                         NULL, 0, NULL, passout);
-				PEM_write_bio_PrivateKey(out, pkey, cipher,
+        } else if (outformat == FORMAT_ASN1) {
-							NULL, 0, NULL, passout);
+            if (pubout)
-			}
+                i2d_PUBKEY_bio(out, pkey);
-		else if (outformat == FORMAT_ASN1)
+            else
-			{
+                i2d_PrivateKey_bio(out, pkey);
-			if (pubout)
+        } else {
-				i2d_PUBKEY_bio(out, pkey);
+            BIO_printf(bio_err, "Bad format specified for key\n");
-			else
+            goto end;
-				i2d_PrivateKey_bio(out, pkey);
+        }
-			}
-		else
-			{
-			BIO_printf(bio_err, "Bad format specified for key\n");
-			goto end;
-			}
 
-		}
+    }
 
-	if (text)
+    if (text) {
-		{
+        if (pubtext)
-		if (pubtext)
+            EVP_PKEY_print_public(out, pkey, 0, NULL);
-			EVP_PKEY_print_public(out, pkey, 0, NULL);
+        else
-		else
+            EVP_PKEY_print_private(out, pkey, 0, NULL);
-			EVP_PKEY_print_private(out, pkey, 0, NULL);
+    }
-		}
 
-	ret = 0;
+    ret = 0;
 
-	end:
+ end:
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	BIO_free(in);
+    BIO_free(in);
-	if (passin)
+    if (passin)
-		OPENSSL_free(passin);
+        OPENSSL_free(passin);
-	if (passout)
+    if (passout)
-		OPENSSL_free(passout);
+        OPENSSL_free(passout);
 
-	return ret;
+    return ret;
-	}
+}

apps/pkeyparam.c

@@ -1,6 +1,7 @@
 /* apps/pkeyparam.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -67,134 +68,118 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	char **args, *infile = NULL, *outfile = NULL;
+    char **args, *infile = NULL, *outfile = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int text = 0, noout = 0;
+    int text = 0, noout = 0;
-	EVP_PKEY *pkey=NULL;
+    EVP_PKEY *pkey = NULL;
-	int badarg = 0;
+    int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
-	int ret = 1;
+    int ret = 1;
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	args = argv + 1;
+    args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-in")) {
-		if (!strcmp (*args, "-in"))
+            if (args[1]) {
-			{
+                args++;
-			if (args[1])
+                infile = *args;
-				{
+            } else
-				args++;
+                badarg = 1;
-				infile = *args;
+        } else if (!strcmp(*args, "-out")) {
-				}
+            if (args[1]) {
-			else badarg = 1;
+                args++;
-			}
+                outfile = *args;
-		else if (!strcmp (*args, "-out"))
+            } else
-			{
+                badarg = 1;
-			if (args[1])
+        }
-				{
-				args++;
-				outfile = *args;
-				}
-			else badarg = 1;
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (!args[1])
-			if (!args[1]) goto bad;
+                goto bad;
-			engine= *(++args);
+            engine = *(++args);
-			}
+        }
 #endif
 
-		else if (strcmp(*args,"-text") == 0)
+        else if (strcmp(*args, "-text") == 0)
-			text=1;
+            text = 1;
-		else if (strcmp(*args,"-noout") == 0)
+        else if (strcmp(*args, "-noout") == 0)
-			noout=1;
+            noout = 1;
-		args++;
+        args++;
-		}
+    }
 
-	if (badarg)
+    if (badarg) {
-		{
 #ifndef OPENSSL_NO_ENGINE
-		bad:
+ bad:
 #endif
-		BIO_printf(bio_err, "Usage pkeyparam [options]\n");
+        BIO_printf(bio_err, "Usage pkeyparam [options]\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "-in file        input file\n");
+        BIO_printf(bio_err, "-in file        input file\n");
-		BIO_printf(bio_err, "-out file       output file\n");
+        BIO_printf(bio_err, "-out file       output file\n");
-		BIO_printf(bio_err, "-text           print parameters as text\n");
+        BIO_printf(bio_err, "-text           print parameters as text\n");
-		BIO_printf(bio_err, "-noout          don't output encoded parameters\n");
+        BIO_printf(bio_err,
+                   "-noout          don't output encoded parameters\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
-		return 1;
+        return 1;
-		}
+    }
-
 #ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
-	if (infile)
+    if (infile) {
-		{
+        if (!(in = BIO_new_file(infile, "r"))) {
-		if (!(in = BIO_new_file (infile, "r")))
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-			{
+            goto end;
-			BIO_printf(bio_err,
+        }
-				 "Can't open input file %s\n", infile);
+    } else
-			goto end;
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
-			}
-		}
-	else
-		in = BIO_new_fp (stdin, BIO_NOCLOSE);
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "w"))) {
-		if (!(out = BIO_new_file (outfile, "w")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
+            goto end;
-			BIO_printf(bio_err,
+        }
-				 "Can't open output file %s\n", outfile);
+    } else {
-			goto end;
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-			}
-		}
-	else
-		{
-		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+        {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-			}
+        }
 #endif
-		}
+    }
 
-	pkey = PEM_read_bio_Parameters(in, NULL);
+    pkey = PEM_read_bio_Parameters(in, NULL);
-	if (!pkey)
+    if (!pkey) {
-		{
+        BIO_printf(bio_err, "Error reading parameters\n");
-		BIO_printf(bio_err, "Error reading parameters\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (!noout)
+    if (!noout)
-		PEM_write_bio_Parameters(out,pkey);
+        PEM_write_bio_Parameters(out, pkey);
 
-	if (text)
+    if (text)
-		EVP_PKEY_print_params(out, pkey, 0, NULL);
+        EVP_PKEY_print_params(out, pkey, 0, NULL);
 
-	ret = 0;
+    ret = 0;
 
-	end:
+ end:
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	BIO_free(in);
+    BIO_free(in);
 
-	return ret;
+    return ret;
-	}
+}

apps/pkeyutl.c

@@ -1,5 +1,6 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006.
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -55,16 +56,15 @@
  *
  */
 
-
 #include "apps.h"
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 
-#define KEY_PRIVKEY	1
+#define KEY_PRIVKEY     1
-#define KEY_PUBKEY	2
+#define KEY_PUBKEY      2
-#define KEY_CERT	3
+#define KEY_CERT        3
 
 static void usage(void);
 
@@ -73,498 +73,451 @@ static void usage(void);
 #define PROG pkeyutl_main
 
 static EVP_PKEY_CTX *init_ctx(int *pkeysize,
-				char *keyfile, int keyform, int key_type,
+                              char *keyfile, int keyform, int key_type,
-				char *passargin, int pkey_op, ENGINE *e);
+                              char *passargin, int pkey_op, ENGINE *e);
 
 static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
-							const char *file);
+                      const char *file);
 
 static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
-		unsigned char *out, size_t *poutlen,
+                    unsigned char *out, size_t *poutlen,
-		unsigned char *in, size_t inlen);
+                    unsigned char *in, size_t inlen);
 
 int MAIN(int argc, char **);
 
 int MAIN(int argc, char **argv)
 {
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	char *infile = NULL, *outfile = NULL, *sigfile = NULL;
+    char *infile = NULL, *outfile = NULL, *sigfile = NULL;
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int pkey_op = EVP_PKEY_OP_SIGN, key_type = KEY_PRIVKEY;
+    int pkey_op = EVP_PKEY_OP_SIGN, key_type = KEY_PRIVKEY;
-	int keyform = FORMAT_PEM, peerform = FORMAT_PEM;
+    int keyform = FORMAT_PEM, peerform = FORMAT_PEM;
-	char badarg = 0, rev = 0;
+    char badarg = 0, rev = 0;
-	char hexdump = 0, asn1parse = 0;
+    char hexdump = 0, asn1parse = 0;
-	EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY_CTX *ctx = NULL;
-	char *passargin = NULL;
+    char *passargin = NULL;
-	int keysize = -1;
+    int keysize = -1;
 
-	unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL;
+    unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL;
-	size_t buf_outlen;
+    size_t buf_outlen;
-	int buf_inlen = 0, siglen = -1;
+    int buf_inlen = 0, siglen = -1;
 
-	int ret = 1, rv = -1;
+    int ret = 1, rv = -1;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
 
-	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+    if (!bio_err)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
 
-	while(argc >= 1)
+    while (argc >= 1) {
-		{
+        if (!strcmp(*argv, "-in")) {
-		if (!strcmp(*argv,"-in"))
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1) badarg = 1;
+            else
-                        infile= *(++argv);
+                infile = *(++argv);
-			}
+        } else if (!strcmp(*argv, "-out")) {
-		else if (!strcmp(*argv,"-out"))
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1) badarg = 1;
+            else
-			outfile= *(++argv);
+                outfile = *(++argv);
-			}
+        } else if (!strcmp(*argv, "-sigfile")) {
-		else if (!strcmp(*argv,"-sigfile"))
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1) badarg = 1;
+            else
-			sigfile= *(++argv);
+                sigfile = *(++argv);
-			}
+        } else if (!strcmp(*argv, "-inkey")) {
-		else if(!strcmp(*argv, "-inkey"))
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1)
+            else {
-				badarg = 1;
+                ctx = init_ctx(&keysize,
-			else
+                               *(++argv), keyform, key_type,
-				{
+                               passargin, pkey_op, e);
-				ctx = init_ctx(&keysize,
+                if (!ctx) {
-						*(++argv), keyform, key_type,
+                    BIO_puts(bio_err, "Error initializing context\n");
-						passargin, pkey_op, e);
+                    ERR_print_errors(bio_err);
-				if (!ctx)
+                    badarg = 1;
-					{
+                }
-					BIO_puts(bio_err,
+            }
-						"Error initializing context\n");
+        } else if (!strcmp(*argv, "-peerkey")) {
-					ERR_print_errors(bio_err);
+            if (--argc < 1)
-					badarg = 1;
+                badarg = 1;
-					}
+            else if (!setup_peer(bio_err, ctx, peerform, *(++argv)))
-				}
+                badarg = 1;
-			}
+        } else if (!strcmp(*argv, "-passin")) {
-		else if (!strcmp(*argv,"-peerkey"))
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1)
+            else
-				badarg = 1;
+                passargin = *(++argv);
-			else if (!setup_peer(bio_err, ctx, peerform, *(++argv)))
+        } else if (strcmp(*argv, "-peerform") == 0) {
-				badarg = 1;
+            if (--argc < 1)
-			}
+                badarg = 1;
-		else if (!strcmp(*argv,"-passin"))
+            else
-			{
+                peerform = str2fmt(*(++argv));
-			if (--argc < 1) badarg = 1;
+        } else if (strcmp(*argv, "-keyform") == 0) {
-			passargin= *(++argv);
+            if (--argc < 1)
-			}
+                badarg = 1;
-		else if (strcmp(*argv,"-peerform") == 0)
+            else
-			{
+                keyform = str2fmt(*(++argv));
-			if (--argc < 1) badarg = 1;
+        }
-			peerform=str2fmt(*(++argv));
-			}
-		else if (strcmp(*argv,"-keyform") == 0)
-			{
-			if (--argc < 1) badarg = 1;
-			keyform=str2fmt(*(++argv));
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if(!strcmp(*argv, "-engine"))
+        else if (!strcmp(*argv, "-engine")) {
-			{
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                e = setup_engine(bio_err, *(++argv), 0);
-				e = setup_engine(bio_err, *(++argv), 0);
+        }
-			}
 #endif
-		else if(!strcmp(*argv, "-pubin"))
+        else if (!strcmp(*argv, "-pubin"))
-			key_type = KEY_PUBKEY;
+            key_type = KEY_PUBKEY;
-		else if(!strcmp(*argv, "-certin"))
+        else if (!strcmp(*argv, "-certin"))
-			key_type = KEY_CERT;
+            key_type = KEY_CERT;
-		else if(!strcmp(*argv, "-asn1parse"))
+        else if (!strcmp(*argv, "-asn1parse"))
-			asn1parse = 1;
+            asn1parse = 1;
-		else if(!strcmp(*argv, "-hexdump"))
+        else if (!strcmp(*argv, "-hexdump"))
-			hexdump = 1;
+            hexdump = 1;
-		else if(!strcmp(*argv, "-sign"))
+        else if (!strcmp(*argv, "-sign"))
-			pkey_op = EVP_PKEY_OP_SIGN;
+            pkey_op = EVP_PKEY_OP_SIGN;
-		else if(!strcmp(*argv, "-verify"))
+        else if (!strcmp(*argv, "-verify"))
-			pkey_op = EVP_PKEY_OP_VERIFY;
+            pkey_op = EVP_PKEY_OP_VERIFY;
-		else if(!strcmp(*argv, "-verifyrecover"))
+        else if (!strcmp(*argv, "-verifyrecover"))
-			pkey_op = EVP_PKEY_OP_VERIFYRECOVER;
+            pkey_op = EVP_PKEY_OP_VERIFYRECOVER;
-		else if(!strcmp(*argv, "-rev"))
+        else if (!strcmp(*argv, "-rev"))
-			rev = 1;
+            rev = 1;
-		else if(!strcmp(*argv, "-encrypt"))
+        else if (!strcmp(*argv, "-encrypt"))
-			pkey_op = EVP_PKEY_OP_ENCRYPT;
+            pkey_op = EVP_PKEY_OP_ENCRYPT;
-		else if(!strcmp(*argv, "-decrypt"))
+        else if (!strcmp(*argv, "-decrypt"))
-			pkey_op = EVP_PKEY_OP_DECRYPT;
+            pkey_op = EVP_PKEY_OP_DECRYPT;
-		else if(!strcmp(*argv, "-derive"))
+        else if (!strcmp(*argv, "-derive"))
-			pkey_op = EVP_PKEY_OP_DERIVE;
+            pkey_op = EVP_PKEY_OP_DERIVE;
-		else if (strcmp(*argv,"-pkeyopt") == 0)
+        else if (strcmp(*argv, "-pkeyopt") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else if (!ctx) {
-			else if (!ctx)
+                BIO_puts(bio_err, "-pkeyopt command before -inkey\n");
-				{
+                badarg = 1;
-				BIO_puts(bio_err,
+            } else if (pkey_ctrl_string(ctx, *(++argv)) <= 0) {
-					"-pkeyopt command before -inkey\n");
+                BIO_puts(bio_err, "parameter setting error\n");
-				badarg = 1;
+                ERR_print_errors(bio_err);
-				}
+                goto end;
-			else if (pkey_ctrl_string(ctx, *(++argv)) <= 0)
+            }
-				{
+        } else
-				BIO_puts(bio_err, "parameter setting error\n");
+            badarg = 1;
-				ERR_print_errors(bio_err);
+        if (badarg) {
-				goto end;
+            usage();
-				}
+            goto end;
-			}
+        }
-		else badarg = 1;
+        argc--;
-		if(badarg)
+        argv++;
-			{
+    }
-			usage();
-			goto end;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (!ctx)
+    if (!ctx) {
-		{
+        usage();
-		usage();
+        goto end;
-		goto end;
+    }
-		}
 
-	if (sigfile && (pkey_op != EVP_PKEY_OP_VERIFY))
+    if (sigfile && (pkey_op != EVP_PKEY_OP_VERIFY)) {
-		{
+        BIO_puts(bio_err, "Signature file specified for non verify\n");
-		BIO_puts(bio_err, "Signature file specified for non verify\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	if (!sigfile && (pkey_op == EVP_PKEY_OP_VERIFY))
+    if (!sigfile && (pkey_op == EVP_PKEY_OP_VERIFY)) {
-		{
+        BIO_puts(bio_err, "No signature file specified for verify\n");
-		BIO_puts(bio_err, "No signature file specified for verify\n");
+        goto end;
-		goto end;
+    }
-		}
 
 /* FIXME: seed PRNG only if needed */
-	app_RAND_load_file(NULL, bio_err, 0);
+    app_RAND_load_file(NULL, bio_err, 0);
 
-	if (pkey_op != EVP_PKEY_OP_DERIVE)
+    if (pkey_op != EVP_PKEY_OP_DERIVE) {
-		{
+        if (infile) {
-		if(infile)
+            if (!(in = BIO_new_file(infile, "rb"))) {
-			{
+                BIO_puts(bio_err, "Error Opening Input File\n");
-			if(!(in = BIO_new_file(infile, "rb")))
+                ERR_print_errors(bio_err);
-				{
+                goto end;
-				BIO_puts(bio_err,
+            }
-					"Error Opening Input File\n");
+        } else
-				ERR_print_errors(bio_err);	
+            in = BIO_new_fp(stdin, BIO_NOCLOSE);
-				goto end;
+    }
-				}
-			}
-		else
-			in = BIO_new_fp(stdin, BIO_NOCLOSE);
-		}
 
-	if(outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if(!(out = BIO_new_file(outfile, "wb")))
+            BIO_printf(bio_err, "Error Creating Output File\n");
-			{
+            ERR_print_errors(bio_err);
-			BIO_printf(bio_err, "Error Creating Output File\n");
+            goto end;
-			ERR_print_errors(bio_err);	
+        }
-			goto end;
+    } else {
-			}
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-		}
-	else
-		{
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		    out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-	}
+    }
 
-	if (sigfile)
+    if (sigfile) {
-		{
+        BIO *sigbio = BIO_new_file(sigfile, "rb");
-		BIO *sigbio = BIO_new_file(sigfile, "rb");
+        if (!sigbio) {
-		if (!sigbio)
+            BIO_printf(bio_err, "Can't open signature file %s\n", sigfile);
-			{
+            goto end;
-			BIO_printf(bio_err, "Can't open signature file %s\n",
+        }
-								sigfile);
+        siglen = bio_to_mem(&sig, keysize * 10, sigbio);
-			goto end;
+        BIO_free(sigbio);
-			}
+        if (siglen <= 0) {
-		siglen = bio_to_mem(&sig, keysize * 10, sigbio);
+            BIO_printf(bio_err, "Error reading signature data\n");
-		BIO_free(sigbio);
+            goto end;
-		if (siglen <= 0)
+        }
-			{
+    }
-			BIO_printf(bio_err, "Error reading signature data\n");
-			goto end;
-			}
-		}
 
-	if (in)
+    if (in) {
-		{
+        /* Read the input data */
-		/* Read the input data */
+        buf_inlen = bio_to_mem(&buf_in, keysize * 10, in);
-		buf_inlen = bio_to_mem(&buf_in, keysize * 10, in);
+        if (buf_inlen <= 0) {
-		if(buf_inlen <= 0)
+            BIO_printf(bio_err, "Error reading input Data\n");
-			{
+            exit(1);
-			BIO_printf(bio_err, "Error reading input Data\n");
+        }
-			exit(1);
+        if (rev) {
-			}
+            size_t i;
-		if(rev)
+            unsigned char ctmp;
-			{
+            size_t l = (size_t)buf_inlen;
-			size_t i;
+            for (i = 0; i < l / 2; i++) {
-			unsigned char ctmp;
+                ctmp = buf_in[i];
-			size_t l = (size_t)buf_inlen;
+                buf_in[i] = buf_in[l - 1 - i];
-			for(i = 0; i < l/2; i++)
+                buf_in[l - 1 - i] = ctmp;
-				{
+            }
-				ctmp = buf_in[i];
+        }
-				buf_in[i] = buf_in[l - 1 - i];
+    }
-				buf_in[l - 1 - i] = ctmp;
-				}
-			}
-		}
 
-	if(pkey_op == EVP_PKEY_OP_VERIFY)
+    if (pkey_op == EVP_PKEY_OP_VERIFY) {
-		{
+        rv = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
-		rv  = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
+                             buf_in, (size_t)buf_inlen);
-				      buf_in, (size_t)buf_inlen);
+        if (rv == 0)
-		if (rv == 0)
+            BIO_puts(out, "Signature Verification Failure\n");
-			BIO_puts(out, "Signature Verification Failure\n");
+        else if (rv == 1)
-		else if (rv == 1)
+            BIO_puts(out, "Signature Verified Successfully\n");
-			BIO_puts(out, "Signature Verified Successfully\n");
+        if (rv >= 0)
-		if (rv >= 0)
+            goto end;
-			goto end;
+    } else {
-		}
+        rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
-	else
+                      buf_in, (size_t)buf_inlen);
-		{	
+        if (rv > 0) {
-		rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
+            buf_out = OPENSSL_malloc(buf_outlen);
-			      buf_in, (size_t)buf_inlen);
+            if (!buf_out)
-		if (rv > 0)
+                rv = -1;
-			{
+            else
-			buf_out = OPENSSL_malloc(buf_outlen);
+                rv = do_keyop(ctx, pkey_op,
-			if (!buf_out)
+                              buf_out, (size_t *)&buf_outlen,
-				rv = -1;
+                              buf_in, (size_t)buf_inlen);
-			else
+        }
-				rv = do_keyop(ctx, pkey_op,
+    }
-						buf_out, (size_t *)&buf_outlen,
-						buf_in, (size_t)buf_inlen);
-			}
-		}
 
-	if(rv <= 0)
+    if (rv <= 0) {
-		{
+        BIO_printf(bio_err, "Public Key operation error\n");
-		BIO_printf(bio_err, "Public Key operation error\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    ret = 0;
-	ret = 0;
+    if (asn1parse) {
-	if(asn1parse)
+        if (!ASN1_parse_dump(out, buf_out, buf_outlen, 1, -1))
-		{
+            ERR_print_errors(bio_err);
-		if(!ASN1_parse_dump(out, buf_out, buf_outlen, 1, -1))
+    } else if (hexdump)
-			ERR_print_errors(bio_err);
+        BIO_dump(out, (char *)buf_out, buf_outlen);
-		}
+    else
-	else if(hexdump)
+        BIO_write(out, buf_out, buf_outlen);
-		BIO_dump(out, (char *)buf_out, buf_outlen);
-	else
-		BIO_write(out, buf_out, buf_outlen);
 
-	end:
+ end:
-	if (ctx)
+    if (ctx)
-		EVP_PKEY_CTX_free(ctx);
+        EVP_PKEY_CTX_free(ctx);
-	BIO_free(in);
+    BIO_free(in);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	if (buf_in)
+    if (buf_in)
-		OPENSSL_free(buf_in);
+        OPENSSL_free(buf_in);
-	if (buf_out)
+    if (buf_out)
-		OPENSSL_free(buf_out);
+        OPENSSL_free(buf_out);
-	if (sig)
+    if (sig)
-		OPENSSL_free(sig);
+        OPENSSL_free(sig);
-	return ret;
+    return ret;
 }
 
 static void usage()
 {
-	BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
+    BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
-	BIO_printf(bio_err, "-in file        input file\n");
+    BIO_printf(bio_err, "-in file        input file\n");
-	BIO_printf(bio_err, "-out file       output file\n");
+    BIO_printf(bio_err, "-out file       output file\n");
-	BIO_printf(bio_err, "-sigfile file signature file (verify operation only)\n");
+    BIO_printf(bio_err,
-	BIO_printf(bio_err, "-inkey file     input key\n");
+               "-sigfile file signature file (verify operation only)\n");
-	BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
+    BIO_printf(bio_err, "-inkey file     input key\n");
-	BIO_printf(bio_err, "-pubin          input is a public key\n");
+    BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
-	BIO_printf(bio_err, "-certin         input is a certificate carrying a public key\n");
+    BIO_printf(bio_err, "-pubin          input is a public key\n");
-	BIO_printf(bio_err, "-pkeyopt X:Y    public key options\n");
+    BIO_printf(bio_err,
-	BIO_printf(bio_err, "-sign           sign with private key\n");
+               "-certin         input is a certificate carrying a public key\n");
-	BIO_printf(bio_err, "-verify         verify with public key\n");
+    BIO_printf(bio_err, "-pkeyopt X:Y    public key options\n");
-	BIO_printf(bio_err, "-verifyrecover  verify with public key, recover original data\n");
+    BIO_printf(bio_err, "-sign           sign with private key\n");
-	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
+    BIO_printf(bio_err, "-verify         verify with public key\n");
-	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
+    BIO_printf(bio_err,
-	BIO_printf(bio_err, "-derive         derive shared secret\n");
+               "-verifyrecover  verify with public key, recover original data\n");
-	BIO_printf(bio_err, "-hexdump        hex dump output\n");
+    BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
+    BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
+    BIO_printf(bio_err, "-derive         derive shared secret\n");
+    BIO_printf(bio_err, "-hexdump        hex dump output\n");
 #ifndef OPENSSL_NO_ENGINE
-	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+    BIO_printf(bio_err,
+               "-engine e       use engine e, possibly a hardware device.\n");
 #endif
-	BIO_printf(bio_err, "-passin arg     pass phrase source\n");
+    BIO_printf(bio_err, "-passin arg     pass phrase source\n");
 
 }
 
 static EVP_PKEY_CTX *init_ctx(int *pkeysize,
-				char *keyfile, int keyform, int key_type,
+                              char *keyfile, int keyform, int key_type,
-				char *passargin, int pkey_op, ENGINE *e)
+                              char *passargin, int pkey_op, ENGINE *e)
-	{
+{
-	EVP_PKEY *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
-	EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY_CTX *ctx = NULL;
-	char *passin = NULL;
+    char *passin = NULL;
-	int rv = -1;
+    int rv = -1;
-	X509 *x;
+    X509 *x;
-	if(((pkey_op == EVP_PKEY_OP_SIGN) || (pkey_op == EVP_PKEY_OP_DECRYPT) 
+    if (((pkey_op == EVP_PKEY_OP_SIGN) || (pkey_op == EVP_PKEY_OP_DECRYPT)
-		|| (pkey_op == EVP_PKEY_OP_DERIVE))
+         || (pkey_op == EVP_PKEY_OP_DERIVE))
-		&& (key_type != KEY_PRIVKEY))
+        && (key_type != KEY_PRIVKEY)) {
-		{
+        BIO_printf(bio_err, "A private key is needed for this operation\n");
-		BIO_printf(bio_err, "A private key is needed for this operation\n");
+        goto end;
-		goto end;
+    }
-		}
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+        BIO_printf(bio_err, "Error getting password\n");
-		{
+        goto end;
-		BIO_printf(bio_err, "Error getting password\n");
+    }
-		goto end;
+    switch (key_type) {
-		}
+    case KEY_PRIVKEY:
-	switch(key_type)
+        pkey = load_key(bio_err, keyfile, keyform, 0,
-		{
+                        passin, e, "Private Key");
-		case KEY_PRIVKEY:
+        break;
-		pkey = load_key(bio_err, keyfile, keyform, 0,
-			passin, e, "Private Key");
-		break;
 
-		case KEY_PUBKEY:
+    case KEY_PUBKEY:
-		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
+        pkey = load_pubkey(bio_err, keyfile, keyform, 0,
-			NULL, e, "Public Key");
+                           NULL, e, "Public Key");
-		break;
+        break;
 
-		case KEY_CERT:
+    case KEY_CERT:
-		x = load_cert(bio_err, keyfile, keyform,
+        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
-			NULL, e, "Certificate");
+        if (x) {
-		if(x)
+            pkey = X509_get_pubkey(x);
-			{
+            X509_free(x);
-			pkey = X509_get_pubkey(x);
+        }
-			X509_free(x);
+        break;
-			}
-		break;
 
-		}
+    }
 
-	*pkeysize = EVP_PKEY_size(pkey);
+    *pkeysize = EVP_PKEY_size(pkey);
 
-	if (!pkey)
+    if (!pkey)
-		goto end;
+        goto end;
 
-	ctx = EVP_PKEY_CTX_new(pkey, e);
+    ctx = EVP_PKEY_CTX_new(pkey, e);
 
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
 
-	if (!ctx)
+    if (!ctx)
-		goto end;
+        goto end;
 
-	switch(pkey_op)
+    switch (pkey_op) {
-		{
+    case EVP_PKEY_OP_SIGN:
-		case EVP_PKEY_OP_SIGN:
+        rv = EVP_PKEY_sign_init(ctx);
-		rv = EVP_PKEY_sign_init(ctx);
+        break;
-		break;
 
-		case EVP_PKEY_OP_VERIFY:
+    case EVP_PKEY_OP_VERIFY:
-		rv = EVP_PKEY_verify_init(ctx);
+        rv = EVP_PKEY_verify_init(ctx);
-		break;
+        break;
 
-		case EVP_PKEY_OP_VERIFYRECOVER:
+    case EVP_PKEY_OP_VERIFYRECOVER:
-		rv = EVP_PKEY_verify_recover_init(ctx);
+        rv = EVP_PKEY_verify_recover_init(ctx);
-		break;
+        break;
 
-		case EVP_PKEY_OP_ENCRYPT:
+    case EVP_PKEY_OP_ENCRYPT:
-		rv = EVP_PKEY_encrypt_init(ctx);
+        rv = EVP_PKEY_encrypt_init(ctx);
-		break;
+        break;
 
-		case EVP_PKEY_OP_DECRYPT:
+    case EVP_PKEY_OP_DECRYPT:
-		rv = EVP_PKEY_decrypt_init(ctx);
+        rv = EVP_PKEY_decrypt_init(ctx);
-		break;
+        break;
 
-		case EVP_PKEY_OP_DERIVE:
+    case EVP_PKEY_OP_DERIVE:
-		rv = EVP_PKEY_derive_init(ctx);
+        rv = EVP_PKEY_derive_init(ctx);
-		break;
+        break;
-		}
+    }
 
-	if (rv <= 0)
+    if (rv <= 0) {
-		{
+        EVP_PKEY_CTX_free(ctx);
-		EVP_PKEY_CTX_free(ctx);
+        ctx = NULL;
-		ctx = NULL;
+    }
-		}
 
-	end:
+ end:
 
-	if (passin)
+    if (passin)
-		OPENSSL_free(passin);
+        OPENSSL_free(passin);
 
-	return ctx;
+    return ctx;
 
-
+}
-	}
 
 static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
-							const char *file)
+                      const char *file)
-	{
+{
-	EVP_PKEY *peer = NULL;
+    EVP_PKEY *peer = NULL;
-	int ret;
+    int ret;
-	if (!ctx)
+    if (!ctx) {
-		{
+        BIO_puts(err, "-peerkey command before -inkey\n");
-		BIO_puts(err, "-peerkey command before -inkey\n");
+        return 0;
-		return 0;
+    }
-		}
 
-	peer = load_pubkey(bio_err, file, peerform, 0, NULL, NULL, "Peer Key");
+    peer = load_pubkey(bio_err, file, peerform, 0, NULL, NULL, "Peer Key");
 
-	if (!peer)
+    if (!peer) {
-		{
+        BIO_printf(bio_err, "Error reading peer key %s\n", file);
-		BIO_printf(bio_err, "Error reading peer key %s\n", file);
+        ERR_print_errors(err);
-		ERR_print_errors(err);
+        return 0;
-		return 0;
+    }
-		}
 
-	ret = EVP_PKEY_derive_set_peer(ctx, peer);
+    ret = EVP_PKEY_derive_set_peer(ctx, peer);
 
-	EVP_PKEY_free(peer);
+    EVP_PKEY_free(peer);
-	if (ret <= 0)
+    if (ret <= 0)
-		ERR_print_errors(err);
+        ERR_print_errors(err);
-	return ret;
+    return ret;
-	}
+}
 
 static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
-		unsigned char *out, size_t *poutlen,
+                    unsigned char *out, size_t *poutlen,
-		unsigned char *in, size_t inlen)
+                    unsigned char *in, size_t inlen)
-	{
+{
-	int rv = 0;
+    int rv = 0;
-	switch(pkey_op)
+    switch (pkey_op) {
-		{
+    case EVP_PKEY_OP_VERIFYRECOVER:
-		case EVP_PKEY_OP_VERIFYRECOVER:
+        rv = EVP_PKEY_verify_recover(ctx, out, poutlen, in, inlen);
-		rv  = EVP_PKEY_verify_recover(ctx, out, poutlen, in, inlen);
+        break;
-		break;
 
-		case EVP_PKEY_OP_SIGN:
+    case EVP_PKEY_OP_SIGN:
-		rv  = EVP_PKEY_sign(ctx, out, poutlen, in, inlen);
+        rv = EVP_PKEY_sign(ctx, out, poutlen, in, inlen);
-		break;
+        break;
 
-		case EVP_PKEY_OP_ENCRYPT:
+    case EVP_PKEY_OP_ENCRYPT:
-		rv  = EVP_PKEY_encrypt(ctx, out, poutlen, in, inlen);
+        rv = EVP_PKEY_encrypt(ctx, out, poutlen, in, inlen);
-		break;
+        break;
 
-		case EVP_PKEY_OP_DECRYPT:
+    case EVP_PKEY_OP_DECRYPT:
-		rv  = EVP_PKEY_decrypt(ctx, out, poutlen, in, inlen);
+        rv = EVP_PKEY_decrypt(ctx, out, poutlen, in, inlen);
-		break; 
+        break;
 
-		case EVP_PKEY_OP_DERIVE:
+    case EVP_PKEY_OP_DERIVE:
-		rv  = EVP_PKEY_derive(ctx, out, poutlen);
+        rv = EVP_PKEY_derive(ctx, out, poutlen);
-		break;
+        break;
 
-		}
+    }
-	return rv;
+    return rv;
-	}
+}

apps/prime.c

@@ -52,109 +52,100 @@
 #include "apps.h"
 #include <openssl/bn.h>
 
-
 #undef PROG
 #define PROG prime_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-    {
+{
-    int hex=0;
+    int hex = 0;
-    int checks=20;
+    int checks = 20;
-    int generate=0;
+    int generate = 0;
-    int bits=0;
+    int bits = 0;
-    int safe=0;
+    int safe = 0;
-    BIGNUM *bn=NULL;
+    BIGNUM *bn = NULL;
     BIO *bio_out;
 
     apps_startup();
 
     if (bio_err == NULL)
-	if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-	    BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
     --argc;
     ++argv;
-    while (argc >= 1 && **argv == '-')
+    while (argc >= 1 && **argv == '-') {
-	{
+        if (!strcmp(*argv, "-hex"))
-	if(!strcmp(*argv,"-hex"))
+            hex = 1;
-	    hex=1;
+        else if (!strcmp(*argv, "-generate"))
-	else if(!strcmp(*argv,"-generate"))
+            generate = 1;
-	    generate=1;
+        else if (!strcmp(*argv, "-bits"))
-	else if(!strcmp(*argv,"-bits"))
+            if (--argc < 1)
-	    if(--argc < 1)
+                goto bad;
-		goto bad;
+            else
-	    else
+                bits = atoi(*++argv);
-		bits=atoi(*++argv);
+        else if (!strcmp(*argv, "-safe"))
-	else if(!strcmp(*argv,"-safe"))
+            safe = 1;
-	    safe=1;
+        else if (!strcmp(*argv, "-checks"))
-	else if(!strcmp(*argv,"-checks"))
+            if (--argc < 1)
-	    if(--argc < 1)
+                goto bad;
-		goto bad;
+            else
-	    else
+                checks = atoi(*++argv);
-		checks=atoi(*++argv);
+        else {
-	else
+            BIO_printf(bio_err, "Unknown option '%s'\n", *argv);
-	    {
+            goto bad;
-	    BIO_printf(bio_err,"Unknown option '%s'\n",*argv);
+        }
-	    goto bad;
+        --argc;
-	    }
+        ++argv;
-	--argc;
+    }
-	++argv;
-	}
 
-    if (argv[0] == NULL && !generate)
+    if (argv[0] == NULL && !generate) {
-	{
+        BIO_printf(bio_err, "No prime specified\n");
-	BIO_printf(bio_err,"No prime specified\n");
+        goto bad;
-	goto bad;
+    }
-	}
 
-    if ((bio_out=BIO_new(BIO_s_file())) != NULL)
+    if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
-	{
+        BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
-	BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-	    {
+        {
-	    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	    bio_out = BIO_push(tmpbio, bio_out);
+            bio_out = BIO_push(tmpbio, bio_out);
-	    }
+        }
 #endif
-	}
+    }
 
-    if(generate)
+    if (generate) {
-	{
+        char *s;
-	char *s;
 
-	if(!bits)
+        if (!bits) {
-	    {
+            BIO_printf(bio_err, "Specifiy the number of bits.\n");
-	    BIO_printf(bio_err,"Specifiy the number of bits.\n");
+            return 1;
-	    return 1;
+        }
-	    }
+        bn = BN_new();
-	bn=BN_new();
+        BN_generate_prime_ex(bn, bits, safe, NULL, NULL, NULL);
-	BN_generate_prime_ex(bn,bits,safe,NULL,NULL,NULL);
+        s = hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
-	s=hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
+        BIO_printf(bio_out, "%s\n", s);
-	BIO_printf(bio_out,"%s\n",s);
+        OPENSSL_free(s);
-	OPENSSL_free(s);
+    } else {
-	}
+        if (hex)
-    else
+            BN_hex2bn(&bn, argv[0]);
-	{
+        else
-	if(hex)
+            BN_dec2bn(&bn, argv[0]);
-	    BN_hex2bn(&bn,argv[0]);
-	else
-	    BN_dec2bn(&bn,argv[0]);
 
-	BN_print(bio_out,bn);
+        BN_print(bio_out, bn);
-	BIO_printf(bio_out," is %sprime\n",
+        BIO_printf(bio_out, " is %sprime\n",
-		   BN_is_prime_ex(bn,checks,NULL,NULL) ? "" : "not ");
+                   BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
-	}
+    }
 
     BN_free(bn);
     BIO_free_all(bio_out);
 
     return 0;
 
-    bad:
+ bad:
-    BIO_printf(bio_err,"options are\n");
+    BIO_printf(bio_err, "options are\n");
-    BIO_printf(bio_err,"%-14s hex\n","-hex");
+    BIO_printf(bio_err, "%-14s hex\n", "-hex");
-    BIO_printf(bio_err,"%-14s number of checks\n","-checks <n>");
+    BIO_printf(bio_err, "%-14s number of checks\n", "-checks <n>");
     return 1;
-    }
+}

apps/progs.h

@@ -1,362 +1,362 @@
 /* apps/progs.h */
 /* automatically generated by progs.pl for openssl.c */
 
-extern int verify_main(int argc,char *argv[]);
+extern int verify_main(int argc, char *argv[]);
-extern int asn1parse_main(int argc,char *argv[]);
+extern int asn1parse_main(int argc, char *argv[]);
-extern int req_main(int argc,char *argv[]);
+extern int req_main(int argc, char *argv[]);
-extern int dgst_main(int argc,char *argv[]);
+extern int dgst_main(int argc, char *argv[]);
-extern int dh_main(int argc,char *argv[]);
+extern int dh_main(int argc, char *argv[]);
-extern int dhparam_main(int argc,char *argv[]);
+extern int dhparam_main(int argc, char *argv[]);
-extern int enc_main(int argc,char *argv[]);
+extern int enc_main(int argc, char *argv[]);
-extern int passwd_main(int argc,char *argv[]);
+extern int passwd_main(int argc, char *argv[]);
-extern int gendh_main(int argc,char *argv[]);
+extern int gendh_main(int argc, char *argv[]);
-extern int errstr_main(int argc,char *argv[]);
+extern int errstr_main(int argc, char *argv[]);
-extern int ca_main(int argc,char *argv[]);
+extern int ca_main(int argc, char *argv[]);
-extern int crl_main(int argc,char *argv[]);
+extern int crl_main(int argc, char *argv[]);
-extern int rsa_main(int argc,char *argv[]);
+extern int rsa_main(int argc, char *argv[]);
-extern int rsautl_main(int argc,char *argv[]);
+extern int rsautl_main(int argc, char *argv[]);
-extern int dsa_main(int argc,char *argv[]);
+extern int dsa_main(int argc, char *argv[]);
-extern int dsaparam_main(int argc,char *argv[]);
+extern int dsaparam_main(int argc, char *argv[]);
-extern int ec_main(int argc,char *argv[]);
+extern int ec_main(int argc, char *argv[]);
-extern int ecparam_main(int argc,char *argv[]);
+extern int ecparam_main(int argc, char *argv[]);
-extern int x509_main(int argc,char *argv[]);
+extern int x509_main(int argc, char *argv[]);
-extern int genrsa_main(int argc,char *argv[]);
+extern int genrsa_main(int argc, char *argv[]);
-extern int gendsa_main(int argc,char *argv[]);
+extern int gendsa_main(int argc, char *argv[]);
-extern int genpkey_main(int argc,char *argv[]);
+extern int genpkey_main(int argc, char *argv[]);
-extern int s_server_main(int argc,char *argv[]);
+extern int s_server_main(int argc, char *argv[]);
-extern int s_client_main(int argc,char *argv[]);
+extern int s_client_main(int argc, char *argv[]);
-extern int speed_main(int argc,char *argv[]);
+extern int speed_main(int argc, char *argv[]);
-extern int s_time_main(int argc,char *argv[]);
+extern int s_time_main(int argc, char *argv[]);
-extern int version_main(int argc,char *argv[]);
+extern int version_main(int argc, char *argv[]);
-extern int pkcs7_main(int argc,char *argv[]);
+extern int pkcs7_main(int argc, char *argv[]);
-extern int cms_main(int argc,char *argv[]);
+extern int cms_main(int argc, char *argv[]);
-extern int crl2pkcs7_main(int argc,char *argv[]);
+extern int crl2pkcs7_main(int argc, char *argv[]);
-extern int sess_id_main(int argc,char *argv[]);
+extern int sess_id_main(int argc, char *argv[]);
-extern int ciphers_main(int argc,char *argv[]);
+extern int ciphers_main(int argc, char *argv[]);
-extern int nseq_main(int argc,char *argv[]);
+extern int nseq_main(int argc, char *argv[]);
-extern int pkcs12_main(int argc,char *argv[]);
+extern int pkcs12_main(int argc, char *argv[]);
-extern int pkcs8_main(int argc,char *argv[]);
+extern int pkcs8_main(int argc, char *argv[]);
-extern int pkey_main(int argc,char *argv[]);
+extern int pkey_main(int argc, char *argv[]);
-extern int pkeyparam_main(int argc,char *argv[]);
+extern int pkeyparam_main(int argc, char *argv[]);
-extern int pkeyutl_main(int argc,char *argv[]);
+extern int pkeyutl_main(int argc, char *argv[]);
-extern int spkac_main(int argc,char *argv[]);
+extern int spkac_main(int argc, char *argv[]);
-extern int smime_main(int argc,char *argv[]);
+extern int smime_main(int argc, char *argv[]);
-extern int rand_main(int argc,char *argv[]);
+extern int rand_main(int argc, char *argv[]);
-extern int engine_main(int argc,char *argv[]);
+extern int engine_main(int argc, char *argv[]);
-extern int ocsp_main(int argc,char *argv[]);
+extern int ocsp_main(int argc, char *argv[]);
-extern int prime_main(int argc,char *argv[]);
+extern int prime_main(int argc, char *argv[]);
-extern int ts_main(int argc,char *argv[]);
+extern int ts_main(int argc, char *argv[]);
 
-#define FUNC_TYPE_GENERAL	1
+#define FUNC_TYPE_GENERAL       1
-#define FUNC_TYPE_MD		2
+#define FUNC_TYPE_MD            2
-#define FUNC_TYPE_CIPHER	3
+#define FUNC_TYPE_CIPHER        3
-#define FUNC_TYPE_PKEY		4
+#define FUNC_TYPE_PKEY          4
-#define FUNC_TYPE_MD_ALG	5
+#define FUNC_TYPE_MD_ALG        5
-#define FUNC_TYPE_CIPHER_ALG	6
+#define FUNC_TYPE_CIPHER_ALG    6
 
 typedef struct {
-	int type;
+    int type;
-	const char *name;
+    const char *name;
-	int (*func)(int argc,char *argv[]);
+    int (*func) (int argc, char *argv[]);
-	} FUNCTION;
+} FUNCTION;
 DECLARE_LHASH_OF(FUNCTION);
 
 FUNCTION functions[] = {
-	{FUNC_TYPE_GENERAL,"verify",verify_main},
+    {FUNC_TYPE_GENERAL, "verify", verify_main},
-	{FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},
+    {FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main},
-	{FUNC_TYPE_GENERAL,"req",req_main},
+    {FUNC_TYPE_GENERAL, "req", req_main},
-	{FUNC_TYPE_GENERAL,"dgst",dgst_main},
+    {FUNC_TYPE_GENERAL, "dgst", dgst_main},
 #ifndef OPENSSL_NO_DH
-	{FUNC_TYPE_GENERAL,"dh",dh_main},
+    {FUNC_TYPE_GENERAL, "dh", dh_main},
 #endif
 #ifndef OPENSSL_NO_DH
-	{FUNC_TYPE_GENERAL,"dhparam",dhparam_main},
+    {FUNC_TYPE_GENERAL, "dhparam", dhparam_main},
 #endif
-	{FUNC_TYPE_GENERAL,"enc",enc_main},
+    {FUNC_TYPE_GENERAL, "enc", enc_main},
-	{FUNC_TYPE_GENERAL,"passwd",passwd_main},
+    {FUNC_TYPE_GENERAL, "passwd", passwd_main},
 #ifndef OPENSSL_NO_DH
-	{FUNC_TYPE_GENERAL,"gendh",gendh_main},
+    {FUNC_TYPE_GENERAL, "gendh", gendh_main},
 #endif
-	{FUNC_TYPE_GENERAL,"errstr",errstr_main},
+    {FUNC_TYPE_GENERAL, "errstr", errstr_main},
-	{FUNC_TYPE_GENERAL,"ca",ca_main},
+    {FUNC_TYPE_GENERAL, "ca", ca_main},
-	{FUNC_TYPE_GENERAL,"crl",crl_main},
+    {FUNC_TYPE_GENERAL, "crl", crl_main},
 #ifndef OPENSSL_NO_RSA
-	{FUNC_TYPE_GENERAL,"rsa",rsa_main},
+    {FUNC_TYPE_GENERAL, "rsa", rsa_main},
 #endif
 #ifndef OPENSSL_NO_RSA
-	{FUNC_TYPE_GENERAL,"rsautl",rsautl_main},
+    {FUNC_TYPE_GENERAL, "rsautl", rsautl_main},
 #endif
 #ifndef OPENSSL_NO_DSA
-	{FUNC_TYPE_GENERAL,"dsa",dsa_main},
+    {FUNC_TYPE_GENERAL, "dsa", dsa_main},
 #endif
 #ifndef OPENSSL_NO_DSA
-	{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
+    {FUNC_TYPE_GENERAL, "dsaparam", dsaparam_main},
 #endif
 #ifndef OPENSSL_NO_EC
-	{FUNC_TYPE_GENERAL,"ec",ec_main},
+    {FUNC_TYPE_GENERAL, "ec", ec_main},
 #endif
 #ifndef OPENSSL_NO_EC
-	{FUNC_TYPE_GENERAL,"ecparam",ecparam_main},
+    {FUNC_TYPE_GENERAL, "ecparam", ecparam_main},
 #endif
-	{FUNC_TYPE_GENERAL,"x509",x509_main},
+    {FUNC_TYPE_GENERAL, "x509", x509_main},
 #ifndef OPENSSL_NO_RSA
-	{FUNC_TYPE_GENERAL,"genrsa",genrsa_main},
+    {FUNC_TYPE_GENERAL, "genrsa", genrsa_main},
 #endif
 #ifndef OPENSSL_NO_DSA
-	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
+    {FUNC_TYPE_GENERAL, "gendsa", gendsa_main},
 #endif
-	{FUNC_TYPE_GENERAL,"genpkey",genpkey_main},
+    {FUNC_TYPE_GENERAL, "genpkey", genpkey_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
-	{FUNC_TYPE_GENERAL,"s_server",s_server_main},
+    {FUNC_TYPE_GENERAL, "s_server", s_server_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
-	{FUNC_TYPE_GENERAL,"s_client",s_client_main},
+    {FUNC_TYPE_GENERAL, "s_client", s_client_main},
 #endif
 #ifndef OPENSSL_NO_SPEED
-	{FUNC_TYPE_GENERAL,"speed",speed_main},
+    {FUNC_TYPE_GENERAL, "speed", speed_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
-	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
+    {FUNC_TYPE_GENERAL, "s_time", s_time_main},
 #endif
-	{FUNC_TYPE_GENERAL,"version",version_main},
+    {FUNC_TYPE_GENERAL, "version", version_main},
-	{FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main},
+    {FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main},
 #ifndef OPENSSL_NO_CMS
-	{FUNC_TYPE_GENERAL,"cms",cms_main},
+    {FUNC_TYPE_GENERAL, "cms", cms_main},
 #endif
-	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},
+    {FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main},
-	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},
+    {FUNC_TYPE_GENERAL, "sess_id", sess_id_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
-	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
+    {FUNC_TYPE_GENERAL, "ciphers", ciphers_main},
 #endif
-	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
+    {FUNC_TYPE_GENERAL, "nseq", nseq_main},
 #if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
-	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
+    {FUNC_TYPE_GENERAL, "pkcs12", pkcs12_main},
 #endif
-	{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
+    {FUNC_TYPE_GENERAL, "pkcs8", pkcs8_main},
-	{FUNC_TYPE_GENERAL,"pkey",pkey_main},
+    {FUNC_TYPE_GENERAL, "pkey", pkey_main},
-	{FUNC_TYPE_GENERAL,"pkeyparam",pkeyparam_main},
+    {FUNC_TYPE_GENERAL, "pkeyparam", pkeyparam_main},
-	{FUNC_TYPE_GENERAL,"pkeyutl",pkeyutl_main},
+    {FUNC_TYPE_GENERAL, "pkeyutl", pkeyutl_main},
-	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
+    {FUNC_TYPE_GENERAL, "spkac", spkac_main},
-	{FUNC_TYPE_GENERAL,"smime",smime_main},
+    {FUNC_TYPE_GENERAL, "smime", smime_main},
-	{FUNC_TYPE_GENERAL,"rand",rand_main},
+    {FUNC_TYPE_GENERAL, "rand", rand_main},
 #ifndef OPENSSL_NO_ENGINE
-	{FUNC_TYPE_GENERAL,"engine",engine_main},
+    {FUNC_TYPE_GENERAL, "engine", engine_main},
 #endif
 #ifndef OPENSSL_NO_OCSP
-	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
+    {FUNC_TYPE_GENERAL, "ocsp", ocsp_main},
 #endif
-	{FUNC_TYPE_GENERAL,"prime",prime_main},
+    {FUNC_TYPE_GENERAL, "prime", prime_main},
-	{FUNC_TYPE_GENERAL,"ts",ts_main},
+    {FUNC_TYPE_GENERAL, "ts", ts_main},
 #ifndef OPENSSL_NO_MD2
-	{FUNC_TYPE_MD,"md2",dgst_main},
+    {FUNC_TYPE_MD, "md2", dgst_main},
 #endif
 #ifndef OPENSSL_NO_MD4
-	{FUNC_TYPE_MD,"md4",dgst_main},
+    {FUNC_TYPE_MD, "md4", dgst_main},
 #endif
 #ifndef OPENSSL_NO_MD5
-	{FUNC_TYPE_MD,"md5",dgst_main},
+    {FUNC_TYPE_MD, "md5", dgst_main},
 #endif
 #ifndef OPENSSL_NO_SHA
-	{FUNC_TYPE_MD,"sha",dgst_main},
+    {FUNC_TYPE_MD, "sha", dgst_main},
 #endif
 #ifndef OPENSSL_NO_SHA1
-	{FUNC_TYPE_MD,"sha1",dgst_main},
+    {FUNC_TYPE_MD, "sha1", dgst_main},
 #endif
 #ifndef OPENSSL_NO_MDC2
-	{FUNC_TYPE_MD,"mdc2",dgst_main},
+    {FUNC_TYPE_MD, "mdc2", dgst_main},
 #endif
 #ifndef OPENSSL_NO_RMD160
-	{FUNC_TYPE_MD,"rmd160",dgst_main},
+    {FUNC_TYPE_MD, "rmd160", dgst_main},
 #endif
 #ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-128-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "aes-128-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-192-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "aes-192-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-192-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "aes-192-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-256-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "aes-256-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-	{FUNC_TYPE_CIPHER,"camellia-128-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-	{FUNC_TYPE_CIPHER,"camellia-128-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-	{FUNC_TYPE_CIPHER,"camellia-192-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-	{FUNC_TYPE_CIPHER,"camellia-192-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-	{FUNC_TYPE_CIPHER,"camellia-256-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-	{FUNC_TYPE_CIPHER,"camellia-256-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main},
 #endif
-	{FUNC_TYPE_CIPHER,"base64",enc_main},
+    {FUNC_TYPE_CIPHER, "base64", enc_main},
 #ifdef ZLIB
-	{FUNC_TYPE_CIPHER,"zlib",enc_main},
+    {FUNC_TYPE_CIPHER, "zlib", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des",enc_main},
+    {FUNC_TYPE_CIPHER, "des", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des3",enc_main},
+    {FUNC_TYPE_CIPHER, "des3", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"desx",enc_main},
+    {FUNC_TYPE_CIPHER, "desx", enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-	{FUNC_TYPE_CIPHER,"idea",enc_main},
+    {FUNC_TYPE_CIPHER, "idea", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-	{FUNC_TYPE_CIPHER,"seed",enc_main},
+    {FUNC_TYPE_CIPHER, "seed", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC4
-	{FUNC_TYPE_CIPHER,"rc4",enc_main},
+    {FUNC_TYPE_CIPHER, "rc4", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC4
-	{FUNC_TYPE_CIPHER,"rc4-40",enc_main},
+    {FUNC_TYPE_CIPHER, "rc4-40", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2", enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-	{FUNC_TYPE_CIPHER,"bf",enc_main},
+    {FUNC_TYPE_CIPHER, "bf", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-	{FUNC_TYPE_CIPHER,"cast",enc_main},
+    {FUNC_TYPE_CIPHER, "cast", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-	{FUNC_TYPE_CIPHER,"rc5",enc_main},
+    {FUNC_TYPE_CIPHER, "rc5", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede3",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede3", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "des-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede3-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede3-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede3-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede3-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-	{FUNC_TYPE_CIPHER,"des-ede3-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "des-ede3-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-	{FUNC_TYPE_CIPHER,"idea-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "idea-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-	{FUNC_TYPE_CIPHER,"idea-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "idea-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-	{FUNC_TYPE_CIPHER,"idea-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "idea-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-	{FUNC_TYPE_CIPHER,"idea-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "idea-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-	{FUNC_TYPE_CIPHER,"seed-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "seed-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-	{FUNC_TYPE_CIPHER,"seed-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "seed-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-	{FUNC_TYPE_CIPHER,"seed-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "seed-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-	{FUNC_TYPE_CIPHER,"seed-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "seed-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2-64-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2-64-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-	{FUNC_TYPE_CIPHER,"rc2-40-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "rc2-40-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-	{FUNC_TYPE_CIPHER,"bf-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "bf-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-	{FUNC_TYPE_CIPHER,"bf-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "bf-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-	{FUNC_TYPE_CIPHER,"bf-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "bf-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-	{FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "bf-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-	{FUNC_TYPE_CIPHER,"cast5-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "cast5-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-	{FUNC_TYPE_CIPHER,"cast5-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "cast5-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-	{FUNC_TYPE_CIPHER,"cast5-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "cast5-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-	{FUNC_TYPE_CIPHER,"cast5-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "cast5-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-	{FUNC_TYPE_CIPHER,"cast-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "cast-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-	{FUNC_TYPE_CIPHER,"rc5-cbc",enc_main},
+    {FUNC_TYPE_CIPHER, "rc5-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-	{FUNC_TYPE_CIPHER,"rc5-ecb",enc_main},
+    {FUNC_TYPE_CIPHER, "rc5-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-	{FUNC_TYPE_CIPHER,"rc5-cfb",enc_main},
+    {FUNC_TYPE_CIPHER, "rc5-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-	{FUNC_TYPE_CIPHER,"rc5-ofb",enc_main},
+    {FUNC_TYPE_CIPHER, "rc5-ofb", enc_main},
 #endif
-	{0,NULL,NULL}
+    {0, NULL, NULL}
-	};
+};

apps/progs.pl

@@ -32,7 +32,7 @@ foreach (@ARGV)
 	push(@files,$_);
 	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
 	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
-		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
+		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 
 	elsif ( ($_ =~ /^speed$/))
 		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^engine$/))

apps/rand.c

@@ -66,7 +66,8 @@
 #undef PROG
 #define PROG rand_main
 
-/* -out file         - write to file
+/*-
+ * -out file         - write to file
  * -rand file:file   - PRNG seed files
  * -base64           - base64 encode output
  * -hex              - hex encode output
@@ -76,170 +77,153 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i, r, ret = 1;
+    int i, r, ret = 1;
-	int badopt;
+    int badopt;
-	char *outfile = NULL;
+    char *outfile = NULL;
-	char *inrand = NULL;
+    char *inrand = NULL;
-	int base64 = 0;
+    int base64 = 0;
-	int hex = 0;
+    int hex = 0;
-	BIO *out = NULL;
+    BIO *out = NULL;
-	int num = -1;
+    int num = -1;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto err;
+        goto err;
 
-	badopt = 0;
+    badopt = 0;
-	i = 0;
+    i = 0;
-	while (!badopt && argv[++i] != NULL)
+    while (!badopt && argv[++i] != NULL) {
-		{
+        if (strcmp(argv[i], "-out") == 0) {
-		if (strcmp(argv[i], "-out") == 0)
+            if ((argv[i + 1] != NULL) && (outfile == NULL))
-			{
+                outfile = argv[++i];
-			if ((argv[i+1] != NULL) && (outfile == NULL))
+            else
-				outfile = argv[++i];
+                badopt = 1;
-			else
+        }
-				badopt = 1;
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(argv[i], "-engine") == 0)
+        else if (strcmp(argv[i], "-engine") == 0) {
-			{
+            if ((argv[i + 1] != NULL) && (engine == NULL))
-			if ((argv[i+1] != NULL) && (engine == NULL))
+                engine = argv[++i];
-				engine = argv[++i];
+            else
-			else
+                badopt = 1;
-				badopt = 1;
+        }
-			}
 #endif
-		else if (strcmp(argv[i], "-rand") == 0)
+        else if (strcmp(argv[i], "-rand") == 0) {
-			{
+            if ((argv[i + 1] != NULL) && (inrand == NULL))
-			if ((argv[i+1] != NULL) && (inrand == NULL))
+                inrand = argv[++i];
-				inrand = argv[++i];
+            else
-			else
+                badopt = 1;
-				badopt = 1;
+        } else if (strcmp(argv[i], "-base64") == 0) {
-			}
+            if (!base64)
-		else if (strcmp(argv[i], "-base64") == 0)
+                base64 = 1;
-			{
+            else
-			if (!base64)
+                badopt = 1;
-				base64 = 1;
+        } else if (strcmp(argv[i], "-hex") == 0) {
-			else
+            if (!hex)
-				badopt = 1;
+                hex = 1;
-			}
+            else
-		else if (strcmp(argv[i], "-hex") == 0)
+                badopt = 1;
-			{
+        } else if (isdigit((unsigned char)argv[i][0])) {
-			if (!hex)
+            if (num < 0) {
-				hex = 1;
+                r = sscanf(argv[i], "%d", &num);
-			else
+                if (r == 0 || num < 0)
-				badopt = 1;
+                    badopt = 1;
-			}
+            } else
-		else if (isdigit((unsigned char)argv[i][0]))
+                badopt = 1;
-			{
+        } else
-			if (num < 0)
+            badopt = 1;
-				{
+    }
-				r = sscanf(argv[i], "%d", &num);
-				if (r == 0 || num < 0)
-					badopt = 1;
-				}
-			else
-				badopt = 1;
-			}
-		else
-			badopt = 1;
-		}
 
-	if (hex && base64)
+    if (hex && base64)
-		badopt = 1;
+        badopt = 1;
 
-	if (num < 0)
+    if (num < 0)
-		badopt = 1;
+        badopt = 1;
 
-	if (badopt) 
+    if (badopt) {
-		{
+        BIO_printf(bio_err, "Usage: rand [options] num\n");
-		BIO_printf(bio_err, "Usage: rand [options] num\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, "-out file             - write to file\n");
-		BIO_printf(bio_err, "-out file             - write to file\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e             - use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n",
-		BIO_printf(bio_err, "-base64               - base64 encode output\n");
+                   LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-		BIO_printf(bio_err, "-hex                  - hex encode output\n");
+        BIO_printf(bio_err, "-base64               - base64 encode output\n");
-		goto err;
+        BIO_printf(bio_err, "-hex                  - hex encode output\n");
-		}
+        goto err;
-
+    }
 #ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
-	app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+    app_RAND_load_file(NULL, bio_err, (inrand != NULL));
-	if (inrand != NULL)
+    if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-			app_RAND_load_files(inrand));
+                   app_RAND_load_files(inrand));
 
-	out = BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL)
-		goto err;
+        goto err;
-	if (outfile != NULL)
+    if (outfile != NULL)
-		r = BIO_write_filename(out, outfile);
+        r = BIO_write_filename(out, outfile);
-	else
+    else {
-		{
+        r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-		r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    }
-	if (r <= 0)
+    if (r <= 0)
-		goto err;
+        goto err;
 
-	if (base64)
+    if (base64) {
-		{
+        BIO *b64 = BIO_new(BIO_f_base64());
-		BIO *b64 = BIO_new(BIO_f_base64());
+        if (b64 == NULL)
-		if (b64 == NULL)
+            goto err;
-			goto err;
+        out = BIO_push(b64, out);
-		out = BIO_push(b64, out);
+    }
-		}
 
-	while (num > 0) 
+    while (num > 0) {
-		{
+        unsigned char buf[4096];
-		unsigned char buf[4096];
+        int chunk;
-		int chunk;
 
-		chunk = num;
+        chunk = num;
-		if (chunk > (int)sizeof(buf))
+        if (chunk > (int)sizeof(buf))
-			chunk = sizeof buf;
+            chunk = sizeof buf;
-		r = RAND_bytes(buf, chunk);
+        r = RAND_bytes(buf, chunk);
-		if (r <= 0)
+        if (r <= 0)
-			goto err;
+            goto err;
-		if (!hex) 
+        if (!hex)
-			BIO_write(out, buf, chunk);
+            BIO_write(out, buf, chunk);
-		else
+        else {
-			{
+            for (i = 0; i < chunk; i++)
-			for (i = 0; i < chunk; i++)
+                BIO_printf(out, "%02x", buf[i]);
-				BIO_printf(out, "%02x", buf[i]);
+        }
-			}
+        num -= chunk;
-		num -= chunk;
+    }
-		}
+    if (hex)
-	if (hex)
+        BIO_puts(out, "\n");
-		BIO_puts(out, "\n");
+    (void)BIO_flush(out);
-	(void)BIO_flush(out);
 
-	app_RAND_write_file(NULL, bio_err);
+    app_RAND_write_file(NULL, bio_err);
-	ret = 0;
+    ret = 0;
 
-err:
+ err:
-	ERR_print_errors(bio_err);
+    ERR_print_errors(bio_err);
-	if (out)
+    if (out)
-		BIO_free_all(out);
+        BIO_free_all(out);
-	apps_shutdown();
+    apps_shutdown();
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
-	}
+}

apps/rsa.c

@@ -58,393 +58,382 @@
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <string.h>
+# include <string.h>
-#include <time.h>
+# include <time.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/rsa.h>
+# include <openssl/rsa.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
 
-#undef PROG
+# undef PROG
-#define PROG	rsa_main
+# define PROG    rsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
- * -des		- encrypt output if PEM format with DES in cbc mode
+ * -des         - encrypt output if PEM format with DES in cbc mode
- * -des3	- encrypt output if PEM format
+ * -des3        - encrypt output if PEM format
- * -idea	- encrypt output if PEM format
+ * -idea        - encrypt output if PEM format
- * -seed	- encrypt output if PEM format
+ * -seed        - encrypt output if PEM format
- * -aes128	- encrypt output if PEM format
+ * -aes128      - encrypt output if PEM format
- * -aes192	- encrypt output if PEM format
+ * -aes192      - encrypt output if PEM format
- * -aes256	- encrypt output if PEM format
+ * -aes256      - encrypt output if PEM format
  * -camellia128 - encrypt output if PEM format
  * -camellia192 - encrypt output if PEM format
  * -camellia256 - encrypt output if PEM format
- * -text	- print a text version
+ * -text        - print a text version
- * -modulus	- print the RSA key modulus
+ * -modulus     - print the RSA key modulus
- * -check	- verify key consistency
+ * -check       - verify key consistency
- * -pubin	- Expect a public key in input file.
+ * -pubin       - Expect a public key in input file.
- * -pubout	- Output a public key.
+ * -pubout      - Output a public key.
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int ret=1;
+    int ret = 1;
-	RSA *rsa=NULL;
+    RSA *rsa = NULL;
-	int i,badops=0, sgckey=0;
+    int i, badops = 0, sgckey = 0;
-	const EVP_CIPHER *enc=NULL;
+    const EVP_CIPHER *enc = NULL;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	int informat,outformat,text=0,check=0,noout=0;
+    int informat, outformat, text = 0, check = 0, noout = 0;
-	int pubin = 0, pubout = 0;
+    int pubin = 0, pubout = 0;
-	char *infile,*outfile,*prog;
+    char *infile, *outfile, *prog;
-	char *passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	char *passin = NULL, *passout = NULL;
+    char *passin = NULL, *passout = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
-	int modulus=0;
+    int modulus = 0;
 
-	int pvk_encr = 2;
+    int pvk_encr = 2;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-passin") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargin= *(++argv);
+        }
-			}
+# ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-passout") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			passargout= *(++argv);
+            engine = *(++argv);
-			}
+        }
-#ifndef OPENSSL_NO_ENGINE
+# endif
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-sgckey") == 0)
-			{
+            sgckey = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-pubin") == 0)
-			engine= *(++argv);
+            pubin = 1;
-			}
+        else if (strcmp(*argv, "-pubout") == 0)
-#endif
+            pubout = 1;
-		else if (strcmp(*argv,"-sgckey") == 0)
+        else if (strcmp(*argv, "-RSAPublicKey_in") == 0)
-			sgckey=1;
+            pubin = 2;
-		else if (strcmp(*argv,"-pubin") == 0)
+        else if (strcmp(*argv, "-RSAPublicKey_out") == 0)
-			pubin=1;
+            pubout = 2;
-		else if (strcmp(*argv,"-pubout") == 0)
+        else if (strcmp(*argv, "-pvk-strong") == 0)
-			pubout=1;
+            pvk_encr = 2;
-		else if (strcmp(*argv,"-RSAPublicKey_in") == 0)
+        else if (strcmp(*argv, "-pvk-weak") == 0)
-			pubin = 2;
+            pvk_encr = 1;
-		else if (strcmp(*argv,"-RSAPublicKey_out") == 0)
+        else if (strcmp(*argv, "-pvk-none") == 0)
-			pubout = 2;
+            pvk_encr = 0;
-		else if (strcmp(*argv,"-pvk-strong") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			pvk_encr=2;
+            noout = 1;
-		else if (strcmp(*argv,"-pvk-weak") == 0)
+        else if (strcmp(*argv, "-text") == 0)
-			pvk_encr=1;
+            text = 1;
-		else if (strcmp(*argv,"-pvk-none") == 0)
+        else if (strcmp(*argv, "-modulus") == 0)
-			pvk_encr=0;
+            modulus = 1;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-check") == 0)
-			noout=1;
+            check = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			text=1;
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else if (strcmp(*argv,"-modulus") == 0)
+            badops = 1;
-			modulus=1;
+            break;
-		else if (strcmp(*argv,"-check") == 0)
+        }
-			check=1;
+        argc--;
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+        argv++;
-			{
+    }
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -inform arg     input format - one of DER NET PEM\n");
+                   " -inform arg     input format - one of DER NET PEM\n");
-		BIO_printf(bio_err," -outform arg    output format - one of DER NET PEM\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -in arg         input file\n");
+                   " -outform arg    output format - one of DER NET PEM\n");
-		BIO_printf(bio_err," -sgckey         Use IIS SGC key format\n");
+        BIO_printf(bio_err, " -in arg         input file\n");
-		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
+        BIO_printf(bio_err, " -sgckey         Use IIS SGC key format\n");
-		BIO_printf(bio_err," -out arg        output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+                   " -passin arg     input file pass phrase source\n");
-		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
+        BIO_printf(bio_err, " -out arg        output file\n");
-		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_IDEA
+                   " -passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+        BIO_printf(bio_err,
-#endif
+                   " -des            encrypt PEM output with cbc des\n");
-#ifndef OPENSSL_NO_SEED
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-#endif
+# ifndef OPENSSL_NO_IDEA
-#ifndef OPENSSL_NO_AES
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+                   " -idea           encrypt PEM output with cbc idea\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+# endif
-#endif
+# ifndef OPENSSL_NO_SEED
-#ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+                   " -seed           encrypt PEM output with cbc seed\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+# endif
-#endif
+# ifndef OPENSSL_NO_AES
-		BIO_printf(bio_err," -text           print the key in text\n");
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err," -noout          don't print key out\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -modulus        print the RSA key modulus\n");
+                   "                 encrypt PEM output with cbc aes\n");
-		BIO_printf(bio_err," -check          verify key consistency\n");
+# endif
-		BIO_printf(bio_err," -pubin          expect a public key in input file\n");
+# ifndef OPENSSL_NO_CAMELLIA
-		BIO_printf(bio_err," -pubout         output a public key\n");
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+                   "                 encrypt PEM output with cbc camellia\n");
-#endif
+# endif
-		goto end;
+        BIO_printf(bio_err, " -text           print the key in text\n");
-		}
+        BIO_printf(bio_err, " -noout          don't print key out\n");
+        BIO_printf(bio_err, " -modulus        print the RSA key modulus\n");
+        BIO_printf(bio_err, " -check          verify key consistency\n");
+        BIO_printf(bio_err,
+                   " -pubin          expect a public key in input file\n");
+        BIO_printf(bio_err, " -pubout         output a public key\n");
+# ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
+# endif
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		BIO_printf(bio_err, "Error getting passwords\n");
+        BIO_printf(bio_err, "Error getting passwords\n");
-		goto end;
+        goto end;
-	}
+    }
 
-	if(check && pubin) {
+    if (check && pubin) {
-		BIO_printf(bio_err, "Only private keys can be checked\n");
+        BIO_printf(bio_err, "Only private keys can be checked\n");
-		goto end;
+        goto end;
-	}
+    }
 
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
 
-	{
+    {
-		EVP_PKEY	*pkey;
+        EVP_PKEY *pkey;
 
-		if (pubin)
+        if (pubin) {
-			{
+            int tmpformat = -1;
-			int tmpformat=-1;
+            if (pubin == 2) {
-			if (pubin == 2)
+                if (informat == FORMAT_PEM)
-				{
+                    tmpformat = FORMAT_PEMRSA;
-				if (informat == FORMAT_PEM)
+                else if (informat == FORMAT_ASN1)
-					tmpformat = FORMAT_PEMRSA;
+                    tmpformat = FORMAT_ASN1RSA;
-				else if (informat == FORMAT_ASN1)
+            } else if (informat == FORMAT_NETSCAPE && sgckey)
-					tmpformat = FORMAT_ASN1RSA;
+                tmpformat = FORMAT_IISSGC;
-				}
+            else
-			else if (informat == FORMAT_NETSCAPE && sgckey)
+                tmpformat = informat;
-				tmpformat = FORMAT_IISSGC;
-			else
-				tmpformat = informat;
 
-			pkey = load_pubkey(bio_err, infile, tmpformat, 1,
+            pkey = load_pubkey(bio_err, infile, tmpformat, 1,
-				passin, e, "Public Key");
+                               passin, e, "Public Key");
-			}
+        } else
-		else
+            pkey = load_key(bio_err, infile,
-			pkey = load_key(bio_err, infile,
+                            (informat == FORMAT_NETSCAPE && sgckey ?
-				(informat == FORMAT_NETSCAPE && sgckey ?
+                             FORMAT_IISSGC : informat), 1,
-					FORMAT_IISSGC : informat), 1,
+                            passin, e, "Private Key");
-				passin, e, "Private Key");
 
-		if (pkey != NULL)
+        if (pkey != NULL)
-			rsa = EVP_PKEY_get1_RSA(pkey);
+            rsa = EVP_PKEY_get1_RSA(pkey);
-		EVP_PKEY_free(pkey);
+        EVP_PKEY_free(pkey);
-	}
+    }
 
-	if (rsa == NULL)
+    if (rsa == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-		{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-		out = BIO_push(tmpbio, out);
+        }
-		}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto end;
-		if (BIO_write_filename(out,outfile) <= 0)
+        }
-			{
+    }
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	if (text) 
+    if (text)
-		if (!RSA_print(out,rsa,0))
+        if (!RSA_print(out, rsa, 0)) {
-			{
+            perror(outfile);
-			perror(outfile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
 
-	if (modulus)
+    if (modulus) {
-		{
+        BIO_printf(out, "Modulus=");
-		BIO_printf(out,"Modulus=");
+        BN_print(out, rsa->n);
-		BN_print(out,rsa->n);
+        BIO_printf(out, "\n");
-		BIO_printf(out,"\n");
+    }
-		}
 
-	if (check)
+    if (check) {
-		{
+        int r = RSA_check_key(rsa);
-		int r = RSA_check_key(rsa);
 
-		if (r == 1)
+        if (r == 1)
-			BIO_printf(out,"RSA key ok\n");
+            BIO_printf(out, "RSA key ok\n");
-		else if (r == 0)
+        else if (r == 0) {
-			{
+            unsigned long err;
-			unsigned long err;
 
-			while ((err = ERR_peek_error()) != 0 &&
+            while ((err = ERR_peek_error()) != 0 &&
-				ERR_GET_LIB(err) == ERR_LIB_RSA &&
+                   ERR_GET_LIB(err) == ERR_LIB_RSA &&
-				ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
+                   ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
-				ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE)
+                   ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE) {
-				{
+                BIO_printf(out, "RSA key error: %s\n",
-				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(err));
+                           ERR_reason_error_string(err));
-				ERR_get_error(); /* remove e from error stack */
+                ERR_get_error(); /* remove e from error stack */
-				}
+            }
-			}
+        }
 
-		if (r == -1 || ERR_peek_error() != 0) /* should happen only if r == -1 */
+        if (r == -1 || ERR_peek_error() != 0) { /* should happen only if r ==
-			{
+                                                 * -1 */
-			ERR_print_errors(bio_err);
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-			}
+        }
-		}
+    }
 
-	if (noout)
+    if (noout) {
-		{
+        ret = 0;
-		ret = 0;
+        goto end;
-		goto end;
+    }
-		}
+    BIO_printf(bio_err, "writing RSA key\n");
-	BIO_printf(bio_err,"writing RSA key\n");
+    if (outformat == FORMAT_ASN1) {
-	if 	(outformat == FORMAT_ASN1) {
+        if (pubout || pubin) {
-		if(pubout || pubin) 
+            if (pubout == 2)
-			{
+                i = i2d_RSAPublicKey_bio(out, rsa);
-			if (pubout == 2)
+            else
-				i=i2d_RSAPublicKey_bio(out,rsa);
+                i = i2d_RSA_PUBKEY_bio(out, rsa);
-			else
+        } else
-				i=i2d_RSA_PUBKEY_bio(out,rsa);
+            i = i2d_RSAPrivateKey_bio(out, rsa);
-			}
+    }
-		else i=i2d_RSAPrivateKey_bio(out,rsa);
+# ifndef OPENSSL_NO_RC4
-	}
+    else if (outformat == FORMAT_NETSCAPE) {
-#ifndef OPENSSL_NO_RC4
+        unsigned char *p, *pp;
-	else if (outformat == FORMAT_NETSCAPE)
+        int size;
-		{
-		unsigned char *p,*pp;
-		int size;
 
-		i=1;
+        i = 1;
-		size=i2d_RSA_NET(rsa,NULL,NULL, sgckey);
+        size = i2d_RSA_NET(rsa, NULL, NULL, sgckey);
-		if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL)
+        if ((p = (unsigned char *)OPENSSL_malloc(size)) == NULL) {
-			{
+            BIO_printf(bio_err, "Memory allocation failure\n");
-			BIO_printf(bio_err,"Memory allocation failure\n");
+            goto end;
-			goto end;
+        }
-			}
+        pp = p;
-		pp=p;
+        i2d_RSA_NET(rsa, &p, NULL, sgckey);
-		i2d_RSA_NET(rsa,&p,NULL, sgckey);
+        BIO_write(out, (char *)pp, size);
-		BIO_write(out,(char *)pp,size);
+        OPENSSL_free(pp);
-		OPENSSL_free(pp);
+    }
-		}
+# endif
-#endif
+    else if (outformat == FORMAT_PEM) {
-	else if (outformat == FORMAT_PEM) {
+        if (pubout || pubin) {
-		if(pubout || pubin)
+            if (pubout == 2)
-			{
+                i = PEM_write_bio_RSAPublicKey(out, rsa);
-			if (pubout == 2)
+            else
-		    		i=PEM_write_bio_RSAPublicKey(out,rsa);
+                i = PEM_write_bio_RSA_PUBKEY(out, rsa);
-			else
+        } else
-		    		i=PEM_write_bio_RSA_PUBKEY(out,rsa);
+            i = PEM_write_bio_RSAPrivateKey(out, rsa,
-			}
+                                            enc, NULL, 0, NULL, passout);
-		else i=PEM_write_bio_RSAPrivateKey(out,rsa,
+# if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4)
-						enc,NULL,0,NULL,passout);
+    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
-#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4)
+        EVP_PKEY *pk;
-	} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
+        pk = EVP_PKEY_new();
-		EVP_PKEY *pk;
+        EVP_PKEY_set1_RSA(pk, rsa);
-		pk = EVP_PKEY_new();
+        if (outformat == FORMAT_PVK)
-		EVP_PKEY_set1_RSA(pk, rsa);
+            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
-		if (outformat == FORMAT_PVK)
+        else if (pubin || pubout)
-			i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
+            i = i2b_PublicKey_bio(out, pk);
-		else if (pubin || pubout)
+        else
-			i = i2b_PublicKey_bio(out, pk);
+            i = i2b_PrivateKey_bio(out, pk);
-		else
+        EVP_PKEY_free(pk);
-			i = i2b_PrivateKey_bio(out, pk);
+# endif
-		EVP_PKEY_free(pk);
+    } else {
-#endif
+        BIO_printf(bio_err, "bad output format specified for outfile\n");
-	} else	{
+        goto end;
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+    }
-		goto end;
+    if (i <= 0) {
-		}
+        BIO_printf(bio_err, "unable to write key\n");
-	if (i <= 0)
+        ERR_print_errors(bio_err);
-		{
+    } else
-		BIO_printf(bio_err,"unable to write key\n");
+        ret = 0;
-		ERR_print_errors(bio_err);
+ end:
-		}
+    if (out != NULL)
-	else
+        BIO_free_all(out);
-		ret=0;
+    if (rsa != NULL)
-end:
+        RSA_free(rsa);
-	if(out != NULL) BIO_free_all(out);
+    if (passin)
-	if(rsa != NULL) RSA_free(rsa);
+        OPENSSL_free(passin);
-	if(passin) OPENSSL_free(passin);
+    if (passout)
-	if(passout) OPENSSL_free(passout);
+        OPENSSL_free(passout);
-	apps_shutdown();
+    apps_shutdown();
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
-	}
+}
-#else /* !OPENSSL_NO_RSA */
+#else                           /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/rsautl.c

@@ -1,6 +1,7 @@
 /* rsautl.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2000.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -59,293 +60,311 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 
-#include "apps.h"
+# include "apps.h"
-#include <string.h>
+# include <string.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/rsa.h>
+# include <openssl/rsa.h>
 
-#define RSA_SIGN 	1
+# define RSA_SIGN        1
-#define RSA_VERIFY 	2
+# define RSA_VERIFY      2
-#define RSA_ENCRYPT 	3
+# define RSA_ENCRYPT     3
-#define RSA_DECRYPT 	4
+# define RSA_DECRYPT     4
 
-#define KEY_PRIVKEY	1
+# define KEY_PRIVKEY     1
-#define KEY_PUBKEY	2
+# define KEY_PUBKEY      2
-#define KEY_CERT	3
+# define KEY_CERT        3
 
 static void usage(void);
 
-#undef PROG
+# undef PROG
 
-#define PROG rsautl_main
+# define PROG rsautl_main
 
 int MAIN(int argc, char **);
 
 int MAIN(int argc, char **argv)
 {
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	char *infile = NULL, *outfile = NULL;
+    char *infile = NULL, *outfile = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine = NULL;
+    char *engine = NULL;
-#endif
+# endif
-	char *keyfile = NULL;
+    char *keyfile = NULL;
-	char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
+    char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
-	int keyform = FORMAT_PEM;
+    int keyform = FORMAT_PEM;
-	char need_priv = 0, badarg = 0, rev = 0;
+    char need_priv = 0, badarg = 0, rev = 0;
-	char hexdump = 0, asn1parse = 0;
+    char hexdump = 0, asn1parse = 0;
-	X509 *x;
+    X509 *x;
-	EVP_PKEY *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
-	RSA *rsa = NULL;
+    RSA *rsa = NULL;
-	unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;
+    unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;
-	char *passargin = NULL, *passin = NULL;
+    char *passargin = NULL, *passin = NULL;
-	int rsa_inlen, rsa_outlen = 0;
+    int rsa_inlen, rsa_outlen = 0;
-	int keysize;
+    int keysize;
 
-	int ret = 1;
+    int ret = 1;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
 
-	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+    if (!bio_err)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	pad = RSA_PKCS1_PADDING;
+    pad = RSA_PKCS1_PADDING;
 
-	while(argc >= 1)
+    while (argc >= 1) {
-	{
+        if (!strcmp(*argv, "-in")) {
-		if (!strcmp(*argv,"-in")) {
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                infile = *(++argv);
-				infile= *(++argv);
+        } else if (!strcmp(*argv, "-out")) {
-		} else if (!strcmp(*argv,"-out")) {
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                outfile = *(++argv);
-				outfile= *(++argv);
+        } else if (!strcmp(*argv, "-inkey")) {
-		} else if(!strcmp(*argv, "-inkey")) {
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                keyfile = *(++argv);
-				keyfile = *(++argv);
+        } else if (!strcmp(*argv, "-passin")) {
-		} else if (!strcmp(*argv,"-passin")) {
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                passargin = *(++argv);
-				passargin= *(++argv);
+        } else if (strcmp(*argv, "-keyform") == 0) {
-		} else if (strcmp(*argv,"-keyform") == 0) {
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                keyform = str2fmt(*(++argv));
-				keyform=str2fmt(*(++argv));
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        } else if (!strcmp(*argv, "-engine")) {
-		} else if(!strcmp(*argv, "-engine")) {
+            if (--argc < 1)
-			if (--argc < 1)
+                badarg = 1;
-				badarg = 1;
+            else
-			else
+                engine = *(++argv);
-				engine = *(++argv);
+# endif
-#endif
+        } else if (!strcmp(*argv, "-pubin")) {
-		} else if(!strcmp(*argv, "-pubin")) {
+            key_type = KEY_PUBKEY;
-			key_type = KEY_PUBKEY;
+        } else if (!strcmp(*argv, "-certin")) {
-		} else if(!strcmp(*argv, "-certin")) {
+            key_type = KEY_CERT;
-			key_type = KEY_CERT;
+        } else if (!strcmp(*argv, "-asn1parse"))
-		} 
+            asn1parse = 1;
-		else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
+        else if (!strcmp(*argv, "-hexdump"))
-		else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
+            hexdump = 1;
-		else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;
+        else if (!strcmp(*argv, "-raw"))
-		else if(!strcmp(*argv, "-oaep")) pad = RSA_PKCS1_OAEP_PADDING;
+            pad = RSA_NO_PADDING;
-		else if(!strcmp(*argv, "-ssl")) pad = RSA_SSLV23_PADDING;
+        else if (!strcmp(*argv, "-oaep"))
-		else if(!strcmp(*argv, "-pkcs")) pad = RSA_PKCS1_PADDING;
+            pad = RSA_PKCS1_OAEP_PADDING;
-		else if(!strcmp(*argv, "-x931")) pad = RSA_X931_PADDING;
+        else if (!strcmp(*argv, "-ssl"))
-		else if(!strcmp(*argv, "-sign")) {
+            pad = RSA_SSLV23_PADDING;
-			rsa_mode = RSA_SIGN;
+        else if (!strcmp(*argv, "-pkcs"))
-			need_priv = 1;
+            pad = RSA_PKCS1_PADDING;
-		} else if(!strcmp(*argv, "-verify")) rsa_mode = RSA_VERIFY;
+        else if (!strcmp(*argv, "-x931"))
-		else if(!strcmp(*argv, "-rev")) rev = 1;
+            pad = RSA_X931_PADDING;
-		else if(!strcmp(*argv, "-encrypt")) rsa_mode = RSA_ENCRYPT;
+        else if (!strcmp(*argv, "-sign")) {
-		else if(!strcmp(*argv, "-decrypt")) {
+            rsa_mode = RSA_SIGN;
-			rsa_mode = RSA_DECRYPT;
+            need_priv = 1;
-			need_priv = 1;
+        } else if (!strcmp(*argv, "-verify"))
-		} else badarg = 1;
+            rsa_mode = RSA_VERIFY;
-		if(badarg) {
+        else if (!strcmp(*argv, "-rev"))
-			usage();
+            rev = 1;
-			goto end;
+        else if (!strcmp(*argv, "-encrypt"))
-		}
+            rsa_mode = RSA_ENCRYPT;
-		argc--;
+        else if (!strcmp(*argv, "-decrypt")) {
-		argv++;
+            rsa_mode = RSA_DECRYPT;
-	}
+            need_priv = 1;
+        } else
+            badarg = 1;
+        if (badarg) {
+            usage();
+            goto end;
+        }
+        argc--;
+        argv++;
+    }
 
-	if(need_priv && (key_type != KEY_PRIVKEY)) {
+    if (need_priv && (key_type != KEY_PRIVKEY)) {
-		BIO_printf(bio_err, "A private key is needed for this operation\n");
+        BIO_printf(bio_err, "A private key is needed for this operation\n");
-		goto end;
+        goto end;
-	}
+    }
-
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+    e = setup_engine(bio_err, engine, 0);
-        e = setup_engine(bio_err, engine, 0);
+# endif
-#endif
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+        BIO_printf(bio_err, "Error getting password\n");
-		BIO_printf(bio_err, "Error getting password\n");
+        goto end;
-		goto end;
+    }
-	}
 
 /* FIXME: seed PRNG only if needed */
-	app_RAND_load_file(NULL, bio_err, 0);
+    app_RAND_load_file(NULL, bio_err, 0);
 
-	switch(key_type) {
+    switch (key_type) {
-		case KEY_PRIVKEY:
+    case KEY_PRIVKEY:
-		pkey = load_key(bio_err, keyfile, keyform, 0,
+        pkey = load_key(bio_err, keyfile, keyform, 0,
-			passin, e, "Private Key");
+                        passin, e, "Private Key");
-		break;
+        break;
 
-		case KEY_PUBKEY:
+    case KEY_PUBKEY:
-		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
+        pkey = load_pubkey(bio_err, keyfile, keyform, 0,
-			NULL, e, "Public Key");
+                           NULL, e, "Public Key");
-		break;
+        break;
 
-		case KEY_CERT:
+    case KEY_CERT:
-		x = load_cert(bio_err, keyfile, keyform,
+        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
-			NULL, e, "Certificate");
+        if (x) {
-		if(x) {
+            pkey = X509_get_pubkey(x);
-			pkey = X509_get_pubkey(x);
+            X509_free(x);
-			X509_free(x);
+        }
-		}
+        break;
-		break;
+    }
-	}
 
-	if(!pkey) {
+    if (!pkey) {
-		return 1;
+        return 1;
-	}
+    }
 
-	rsa = EVP_PKEY_get1_RSA(pkey);
+    rsa = EVP_PKEY_get1_RSA(pkey);
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
 
-	if(!rsa) {
+    if (!rsa) {
-		BIO_printf(bio_err, "Error getting RSA key\n");
+        BIO_printf(bio_err, "Error getting RSA key\n");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
+    if (infile) {
+        if (!(in = BIO_new_file(infile, "rb"))) {
+            BIO_printf(bio_err, "Error Reading Input File\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    } else
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if(infile) {
+    if (outfile) {
-		if(!(in = BIO_new_file(infile, "rb"))) {
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-			BIO_printf(bio_err, "Error Reading Input File\n");
+            BIO_printf(bio_err, "Error Reading Output File\n");
-			ERR_print_errors(bio_err);	
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    } else {
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
+        {
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
+        }
+# endif
+    }
 
-	if(outfile) {
+    keysize = RSA_size(rsa);
-		if(!(out = BIO_new_file(outfile, "wb"))) {
-			BIO_printf(bio_err, "Error Reading Output File\n");
-			ERR_print_errors(bio_err);	
-			goto end;
-		}
-	} else {
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-		{
-		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		    out = BIO_push(tmpbio, out);
-		}
-#endif
-	}
 
-	keysize = RSA_size(rsa);
+    rsa_in = OPENSSL_malloc(keysize * 2);
+    rsa_out = OPENSSL_malloc(keysize);
 
-	rsa_in = OPENSSL_malloc(keysize * 2);
+    /* Read the input data */
-	rsa_out = OPENSSL_malloc(keysize);
+    rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
+    if (rsa_inlen <= 0) {
+        BIO_printf(bio_err, "Error reading input Data\n");
+        exit(1);
+    }
+    if (rev) {
+        int i;
+        unsigned char ctmp;
+        for (i = 0; i < rsa_inlen / 2; i++) {
+            ctmp = rsa_in[i];
+            rsa_in[i] = rsa_in[rsa_inlen - 1 - i];
+            rsa_in[rsa_inlen - 1 - i] = ctmp;
+        }
+    }
+    switch (rsa_mode) {
 
-	/* Read the input data */
+    case RSA_VERIFY:
-	rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
+        rsa_outlen = RSA_public_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-	if(rsa_inlen <= 0) {
+        break;
-		BIO_printf(bio_err, "Error reading input Data\n");
-		exit(1);
-	}
-	if(rev) {
-		int i;
-		unsigned char ctmp;
-		for(i = 0; i < rsa_inlen/2; i++) {
-			ctmp = rsa_in[i];
-			rsa_in[i] = rsa_in[rsa_inlen - 1 - i];
-			rsa_in[rsa_inlen - 1 - i] = ctmp;
-		}
-	}
-	switch(rsa_mode) {
 
-		case RSA_VERIFY:
+    case RSA_SIGN:
-			rsa_outlen  = RSA_public_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen =
-		break;
+            RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        break;
 
-		case RSA_SIGN:
+    case RSA_ENCRYPT:
-			rsa_outlen  = RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen = RSA_public_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-		break;
+        break;
 
-		case RSA_ENCRYPT:
+    case RSA_DECRYPT:
-			rsa_outlen  = RSA_public_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen =
-		break;
+            RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        break;
 
-		case RSA_DECRYPT:
+    }
-			rsa_outlen  = RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-		break;
 
-	}
+    if (rsa_outlen <= 0) {
-
+        BIO_printf(bio_err, "RSA operation error\n");
-	if(rsa_outlen <= 0) {
+        ERR_print_errors(bio_err);
-		BIO_printf(bio_err, "RSA operation error\n");
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
+    ret = 0;
-	}
+    if (asn1parse) {
-	ret = 0;
+        if (!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
-	if(asn1parse) {
+            ERR_print_errors(bio_err);
-		if(!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
+        }
-			ERR_print_errors(bio_err);
+    } else if (hexdump)
-		}
+        BIO_dump(out, (char *)rsa_out, rsa_outlen);
-	} else if(hexdump) BIO_dump(out, (char *)rsa_out, rsa_outlen);
+    else
-	else BIO_write(out, rsa_out, rsa_outlen);
+        BIO_write(out, rsa_out, rsa_outlen);
-	end:
+ end:
-	RSA_free(rsa);
+    RSA_free(rsa);
-	BIO_free(in);
+    BIO_free(in);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	if(rsa_in) OPENSSL_free(rsa_in);
+    if (rsa_in)
-	if(rsa_out) OPENSSL_free(rsa_out);
+        OPENSSL_free(rsa_in);
-	if(passin) OPENSSL_free(passin);
+    if (rsa_out)
-	return ret;
+        OPENSSL_free(rsa_out);
+    if (passin)
+        OPENSSL_free(passin);
+    return ret;
 }
 
 static void usage()
 {
-	BIO_printf(bio_err, "Usage: rsautl [options]\n");
+    BIO_printf(bio_err, "Usage: rsautl [options]\n");
-	BIO_printf(bio_err, "-in file        input file\n");
+    BIO_printf(bio_err, "-in file        input file\n");
-	BIO_printf(bio_err, "-out file       output file\n");
+    BIO_printf(bio_err, "-out file       output file\n");
-	BIO_printf(bio_err, "-inkey file     input key\n");
+    BIO_printf(bio_err, "-inkey file     input key\n");
-	BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
+    BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
-	BIO_printf(bio_err, "-pubin          input is an RSA public\n");
+    BIO_printf(bio_err, "-pubin          input is an RSA public\n");
-	BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
+    BIO_printf(bio_err,
-	BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
+               "-certin         input is a certificate carrying an RSA public key\n");
-	BIO_printf(bio_err, "-raw            use no padding\n");
+    BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
-	BIO_printf(bio_err, "-pkcs           use PKCS#1 v1.5 padding (default)\n");
+    BIO_printf(bio_err, "-raw            use no padding\n");
-	BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
+    BIO_printf(bio_err,
-	BIO_printf(bio_err, "-sign           sign with private key\n");
+               "-pkcs           use PKCS#1 v1.5 padding (default)\n");
-	BIO_printf(bio_err, "-verify         verify with public key\n");
+    BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
-	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
+    BIO_printf(bio_err, "-sign           sign with private key\n");
-	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
+    BIO_printf(bio_err, "-verify         verify with public key\n");
-	BIO_printf(bio_err, "-hexdump        hex dump output\n");
+    BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
-#ifndef OPENSSL_NO_ENGINE
+    BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
-	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+    BIO_printf(bio_err, "-hexdump        hex dump output\n");
-	BIO_printf (bio_err, "-passin arg    pass phrase source\n");
+# ifndef OPENSSL_NO_ENGINE
-#endif
+    BIO_printf(bio_err,
+               "-engine e       use engine e, possibly a hardware device.\n");
+    BIO_printf(bio_err, "-passin arg    pass phrase source\n");
+# endif
 
 }
 
-#else /* !OPENSSL_NO_RSA */
+#else                           /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/s_apps.h

@@ -108,47 +108,52 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
+/* conflicts with winsock2 stuff on netware */
-#include <sys/types.h>
+#if !defined(OPENSSL_SYS_NETWARE)
+# include <sys/types.h>
 #endif
 #include <openssl/opensslconf.h>
 
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-#include <conio.h>
+# include <conio.h>
 #endif
 
 #if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
-#define _kbhit kbhit
+# define _kbhit kbhit
 #endif
 
 #if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
-/* VAX C does not defined fd_set and friends, but it's actually quite simple */
+/*
-/* These definitions are borrowed from SOCKETSHR.	/Richard Levitte */
+ * VAX C does not defined fd_set and friends, but it's actually quite simple
-#define MAX_NOFILE	32
+ */
-#define	NBBY		 8		/* number of bits in a byte	*/
+/* These definitions are borrowed from SOCKETSHR.       /Richard Levitte */
+# define MAX_NOFILE      32
+# define NBBY             8     /* number of bits in a byte */
 
-#ifndef	FD_SETSIZE
+# ifndef FD_SETSIZE
-#define	FD_SETSIZE	MAX_NOFILE
+#  define FD_SETSIZE      MAX_NOFILE
-#endif	/* FD_SETSIZE */
+# endif                         /* FD_SETSIZE */
 
 /* How many things we'll allow select to use. 0 if unlimited */
-#define MAXSELFD	MAX_NOFILE
+# define MAXSELFD        MAX_NOFILE
-typedef int	fd_mask;	/* int here! VMS prototypes int, not long */
+typedef int fd_mask;            /* int here! VMS prototypes int, not long */
-#define NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask (power of 2!)*/
+# define NFDBITS (sizeof(fd_mask) * NBBY)/* bits per mask (power of 2!) */
-#define NFDSHIFT 5				/* Shift based on above */
+# define NFDSHIFT 5             /* Shift based on above */
 
 typedef fd_mask fd_set;
-#define	FD_SET(n, p)	(*(p) |= (1 << ((n) % NFDBITS)))
+# define FD_SET(n, p)    (*(p) |= (1 << ((n) % NFDBITS)))
-#define	FD_CLR(n, p)	(*(p) &= ~(1 << ((n) % NFDBITS)))
+# define FD_CLR(n, p)    (*(p) &= ~(1 << ((n) % NFDBITS)))
-#define	FD_ISSET(n, p)	(*(p) & (1 << ((n) % NFDBITS)))
+# define FD_ISSET(n, p)  (*(p) & (1 << ((n) % NFDBITS)))
-#define FD_ZERO(p)	memset((char *)(p), 0, sizeof(*(p)))
+# define FD_ZERO(p)      memset((char *)(p), 0, sizeof(*(p)))
 #endif
 
 #define PORT            4433
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
+int do_server(int port, int type, int *ret,
+              int (*cb) (char *hostname, int s, unsigned char *context),
+              unsigned char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
@@ -159,18 +164,21 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
 int init_client(int *sock, char *server, int port, int type);
 int should_retry(int i);
 int extract_port(char *str, short *port_ptr);
-int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
+int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
+                      short *p);
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
-				   int argi, long argl, long ret);
+                                   int argi, long argl, long ret);
 
 #ifdef HEADER_SSL_H
 void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
+void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
+                        const void *buf, size_t len, SSL *ssl, void *arg);
 void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
-					unsigned char *data, int len,
+                           unsigned char *data, int len, void *arg);
-					void *arg);
 #endif
 
-int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len);
+int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie,
-int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_len);
+                                         unsigned int *cookie_len);
+int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie,
+                                       unsigned int cookie_len);

apps/s_time.c

@@ -58,7 +58,7 @@
 
 #define NO_SHUTDOWN
 
-/*-----------------------------------------
+/* ----------------------------------------
    s_time - SSL client connection timer program
    Written and donated by Larry Streepy <streepy@healthcare.com>
   -----------------------------------------*/
@@ -70,7 +70,7 @@
 #define USE_SOCKETS
 #include "apps.h"
 #ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
+# define APPS_WIN16
 #endif
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
@@ -78,11 +78,11 @@
 #include "s_apps.h"
 #include <openssl/err.h>
 #ifdef WIN32_STUFF
-#include "winmain.h"
+# include "winmain.h"
-#include "wintext.h"
+# include "wintext.h"
 #endif
 #if !defined(OPENSSL_SYS_MSDOS)
-#include OPENSSL_UNISTD
+# include OPENSSL_UNISTD
 #endif
 
 #undef PROG
@@ -91,9 +91,12 @@
 #undef ioctl
 #define ioctl ioctlsocket
 
-#define SSL_CONNECT_NAME	"localhost:4433"
+#define SSL_CONNECT_NAME        "localhost:4433"
 
-/*#define TEST_CERT "client.pem" */ /* no default cert. */
+/* no default cert. */
+/*
+ * #define TEST_CERT "client.pem"
+ */
 
 #undef BUFSIZZ
 #define BUFSIZZ 1024*10
@@ -106,13 +109,13 @@
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 
 #undef SECONDS
-#define SECONDS	30
+#define SECONDS 30
 extern int verify_depth;
 extern int verify_error;
 
 static void s_time_usage(void);
-static int parseArgs( int argc, char **argv );
+static int parseArgs(int argc, char **argv);
-static SSL *doConnection( SSL *scon );
+static SSL *doConnection(SSL *scon);
 static void s_time_init(void);
 
 /***********************************************************************
@@ -120,58 +123,58 @@ static void s_time_init(void);
  */
 
 /* static char *port=PORT_STR;*/
-static char *host=SSL_CONNECT_NAME;
+static char *host = SSL_CONNECT_NAME;
-static char *t_cert_file=NULL;
+static char *t_cert_file = NULL;
-static char *t_key_file=NULL;
+static char *t_key_file = NULL;
-static char *CApath=NULL;
+static char *CApath = NULL;
-static char *CAfile=NULL;
+static char *CAfile = NULL;
-static char *tm_cipher=NULL;
+static char *tm_cipher = NULL;
 static int tm_verify = SSL_VERIFY_NONE;
 static int maxTime = SECONDS;
-static SSL_CTX *tm_ctx=NULL;
+static SSL_CTX *tm_ctx = NULL;
-static const SSL_METHOD *s_time_meth=NULL;
+static const SSL_METHOD *s_time_meth = NULL;
-static char *s_www_path=NULL;
+static char *s_www_path = NULL;
-static long bytes_read=0; 
+static long bytes_read = 0;
-static int st_bugs=0;
+static int st_bugs = 0;
-static int perform=0;
+static int perform = 0;
 #ifdef FIONBIO
-static int t_nbio=0;
+static int t_nbio = 0;
 #endif
 #ifdef OPENSSL_SYS_WIN32
-static int exitNow = 0;		/* Set when it's time to exit main */
+static int exitNow = 0;         /* Set when it's time to exit main */
 #endif
 
 static void s_time_init(void)
-	{
+{
-	host=SSL_CONNECT_NAME;
+    host = SSL_CONNECT_NAME;
-	t_cert_file=NULL;
+    t_cert_file = NULL;
-	t_key_file=NULL;
+    t_key_file = NULL;
-	CApath=NULL;
+    CApath = NULL;
-	CAfile=NULL;
+    CAfile = NULL;
-	tm_cipher=NULL;
+    tm_cipher = NULL;
-	tm_verify = SSL_VERIFY_NONE;
+    tm_verify = SSL_VERIFY_NONE;
-	maxTime = SECONDS;
+    maxTime = SECONDS;
-	tm_ctx=NULL;
+    tm_ctx = NULL;
-	s_time_meth=NULL;
+    s_time_meth = NULL;
-	s_www_path=NULL;
+    s_www_path = NULL;
-	bytes_read=0; 
+    bytes_read = 0;
-	st_bugs=0;
+    st_bugs = 0;
-	perform=0;
+    perform = 0;
 
 #ifdef FIONBIO
-	t_nbio=0;
+    t_nbio = 0;
 #endif
 #ifdef OPENSSL_SYS_WIN32
-	exitNow = 0;		/* Set when it's time to exit main */
+    exitNow = 0;                /* Set when it's time to exit main */
 #endif
-	}
+}
 
 /***********************************************************************
  * usage - display usage message
  */
 static void s_time_usage(void)
 {
-	static char umsg[] = "\
+    static char umsg[] = "\
 -time arg     - max number of seconds to collect data, default %d\n\
 -verify arg   - turn on peer certificate verification, arg == depth\n\
 -cert arg     - certificate file to use, PEM format assumed\n\
@@ -181,19 +184,20 @@ static void s_time_usage(void)
 -CAfile arg   - PEM format file of CA's\n\
 -cipher       - preferred cipher to use, play with 'openssl ciphers'\n\n";
 
-	printf( "usage: s_time <args>\n\n" );
+    printf("usage: s_time <args>\n\n");
 
-	printf("-connect host:port - host:port to connect to (default is %s)\n",SSL_CONNECT_NAME);
+    printf("-connect host:port - host:port to connect to (default is %s)\n",
+           SSL_CONNECT_NAME);
 #ifdef FIONBIO
-	printf("-nbio         - Run with non-blocking IO\n");
+    printf("-nbio         - Run with non-blocking IO\n");
-	printf("-ssl2         - Just use SSLv2\n");
+    printf("-ssl2         - Just use SSLv2\n");
-	printf("-ssl3         - Just use SSLv3\n");
+    printf("-ssl3         - Just use SSLv3\n");
-	printf("-bugs         - Turn on SSL bug compatibility\n");
+    printf("-bugs         - Turn on SSL bug compatibility\n");
-	printf("-new          - Just time new connections\n");
+    printf("-new          - Just time new connections\n");
-	printf("-reuse        - Just time connection reuse\n");
+    printf("-reuse        - Just time connection reuse\n");
-	printf("-www page     - Retrieve 'page' from the site\n");
+    printf("-www page     - Retrieve 'page' from the site\n");
 #endif
-	printf( umsg,SECONDS );
+    printf(umsg, SECONDS);
 }
 
 /***********************************************************************
@@ -205,428 +209,434 @@ static int parseArgs(int argc, char **argv)
 {
     int badop = 0;
 
-    verify_depth=0;
+    verify_depth = 0;
-    verify_error=X509_V_OK;
+    verify_error = X509_V_OK;
 
     argc--;
     argv++;
 
     while (argc >= 1) {
-	if (strcmp(*argv,"-connect") == 0)
+        if (strcmp(*argv, "-connect") == 0) {
-		{
+            if (--argc < 1)
-		if (--argc < 1) goto bad;
+                goto bad;
-		host= *(++argv);
+            host = *(++argv);
-		}
+        }
 #if 0
-	else if( strcmp(*argv,"-host") == 0)
+        else if (strcmp(*argv, "-host") == 0) {
-		{
+            if (--argc < 1)
-		if (--argc < 1) goto bad;
+                goto bad;
-		host= *(++argv);
+            host = *(++argv);
-		}
+        } else if (strcmp(*argv, "-port") == 0) {
-	else if( strcmp(*argv,"-port") == 0)
+            if (--argc < 1)
-		{
+                goto bad;
-		if (--argc < 1) goto bad;
+            port = *(++argv);
-		port= *(++argv);
+        }
-		}
 #endif
-	else if (strcmp(*argv,"-reuse") == 0)
+        else if (strcmp(*argv, "-reuse") == 0)
-		perform=2;
+            perform = 2;
-	else if (strcmp(*argv,"-new") == 0)
+        else if (strcmp(*argv, "-new") == 0)
-		perform=1;
+            perform = 1;
-	else if( strcmp(*argv,"-verify") == 0) {
+        else if (strcmp(*argv, "-verify") == 0) {
 
-	    tm_verify=SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE;
+            tm_verify = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    verify_depth=atoi(*(++argv));
+                goto bad;
-	    BIO_printf(bio_err,"verify depth is %d\n",verify_depth);
+            verify_depth = atoi(*(++argv));
+            BIO_printf(bio_err, "verify depth is %d\n", verify_depth);
 
-	} else if( strcmp(*argv,"-cert") == 0) {
+        } else if (strcmp(*argv, "-cert") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    t_cert_file= *(++argv);
+                goto bad;
+            t_cert_file = *(++argv);
 
-	} else if( strcmp(*argv,"-key") == 0) {
+        } else if (strcmp(*argv, "-key") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    t_key_file= *(++argv);
+                goto bad;
+            t_key_file = *(++argv);
 
-	} else if( strcmp(*argv,"-CApath") == 0) {
+        } else if (strcmp(*argv, "-CApath") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    CApath= *(++argv);
+                goto bad;
+            CApath = *(++argv);
 
-	} else if( strcmp(*argv,"-CAfile") == 0) {
+        } else if (strcmp(*argv, "-CAfile") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    CAfile= *(++argv);
+                goto bad;
+            CAfile = *(++argv);
 
-	} else if( strcmp(*argv,"-cipher") == 0) {
+        } else if (strcmp(*argv, "-cipher") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    tm_cipher= *(++argv);
+                goto bad;
-	}
+            tm_cipher = *(++argv);
+        }
 #ifdef FIONBIO
-	else if(strcmp(*argv,"-nbio") == 0) {
+        else if (strcmp(*argv, "-nbio") == 0) {
-	    t_nbio=1;
+            t_nbio = 1;
-	}
+        }
 #endif
-	else if(strcmp(*argv,"-www") == 0)
+        else if (strcmp(*argv, "-www") == 0) {
-		{
+            if (--argc < 1)
-		if (--argc < 1) goto bad;
+                goto bad;
-		s_www_path= *(++argv);
+            s_www_path = *(++argv);
-		if(strlen(s_www_path) > MYBUFSIZ-100)
+            if (strlen(s_www_path) > MYBUFSIZ - 100) {
-			{
+                BIO_printf(bio_err, "-www option too long\n");
-			BIO_printf(bio_err,"-www option too long\n");
+                badop = 1;
-			badop=1;
+            }
-			}
+        } else if (strcmp(*argv, "-bugs") == 0)
-		}
+            st_bugs = 1;
-	else if(strcmp(*argv,"-bugs") == 0)
-	    st_bugs=1;
 #ifndef OPENSSL_NO_SSL2
-	else if(strcmp(*argv,"-ssl2") == 0)
+        else if (strcmp(*argv, "-ssl2") == 0)
-	    s_time_meth=SSLv2_client_method();
+            s_time_meth = SSLv2_client_method();
 #endif
 #ifndef OPENSSL_NO_SSL3
-	else if(strcmp(*argv,"-ssl3") == 0)
+        else if (strcmp(*argv, "-ssl3") == 0)
-	    s_time_meth=SSLv3_client_method();
+            s_time_meth = SSLv3_client_method();
 #endif
-	else if( strcmp(*argv,"-time") == 0) {
+        else if (strcmp(*argv, "-time") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
-	    maxTime= atoi(*(++argv));
+                goto bad;
-	}
+            maxTime = atoi(*(++argv));
-	else {
+        } else {
-	    BIO_printf(bio_err,"unknown option %s\n",*argv);
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-	    badop=1;
+            badop = 1;
-	    break;
+            break;
-	}
+        }
 
-	argc--;
+        argc--;
-	argv++;
+        argv++;
     }
 
-    if (perform == 0) perform=3;
+    if (perform == 0)
+        perform = 3;
 
-    if(badop) {
+    if (badop) {
-bad:
+ bad:
-		s_time_usage();
+        s_time_usage();
-		return -1;
+        return -1;
     }
 
-	return 0;			/* Valid args */
+    return 0;                   /* Valid args */
 }
 
 /***********************************************************************
  * TIME - time functions
  */
-#define START	0
+#define START   0
-#define STOP	1
+#define STOP    1
 
 static double tm_Time_F(int s)
-	{
+{
-	return app_tminterval(s,1);
+    return app_tminterval(s, 1);
-	}
+}
 
 /***********************************************************************
  * MAIN - main processing area for client
- *			real name depends on MONOLITH
+ *                      real name depends on MONOLITH
  */
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	double totalTime = 0.0;
+    double totalTime = 0.0;
-	int nConn = 0;
+    int nConn = 0;
-	SSL *scon=NULL;
+    SSL *scon = NULL;
-	long finishtime=0;
+    long finishtime = 0;
-	int ret=1,i;
+    int ret = 1, i;
-	MS_STATIC char buf[1024*8];
+    MS_STATIC char buf[1024 * 8];
-	int ver;
+    int ver;
 
-	apps_startup();
+    apps_startup();
-	s_time_init();
+    s_time_init();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
-	s_time_meth=SSLv23_client_method();
+    s_time_meth = SSLv23_client_method();
 #elif !defined(OPENSSL_NO_SSL3)
-	s_time_meth=SSLv3_client_method();
+    s_time_meth = SSLv3_client_method();
 #elif !defined(OPENSSL_NO_SSL2)
-	s_time_meth=SSLv2_client_method();
+    s_time_meth = SSLv2_client_method();
 #endif
 
-	/* parse the command line arguments */
+    /* parse the command line arguments */
-	if( parseArgs( argc, argv ) < 0 )
+    if (parseArgs(argc, argv) < 0)
-		goto end;
+        goto end;
 
-	OpenSSL_add_ssl_algorithms();
+    OpenSSL_add_ssl_algorithms();
-	if ((tm_ctx=SSL_CTX_new(s_time_meth)) == NULL) return(1);
+    if ((tm_ctx = SSL_CTX_new(s_time_meth)) == NULL)
+        return (1);
 
-	SSL_CTX_set_quiet_shutdown(tm_ctx,1);
+    SSL_CTX_set_quiet_shutdown(tm_ctx, 1);
 
-	if (st_bugs) SSL_CTX_set_options(tm_ctx,SSL_OP_ALL);
+    if (st_bugs)
-	SSL_CTX_set_cipher_list(tm_ctx,tm_cipher);
+        SSL_CTX_set_options(tm_ctx, SSL_OP_ALL);
-	if(!set_cert_stuff(tm_ctx,t_cert_file,t_key_file)) 
+    SSL_CTX_set_cipher_list(tm_ctx, tm_cipher);
-		goto end;
+    if (!set_cert_stuff(tm_ctx, t_cert_file, t_key_file))
+        goto end;
 
-	SSL_load_error_strings();
+    SSL_load_error_strings();
 
-	if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
+    if ((!SSL_CTX_load_verify_locations(tm_ctx, CAfile, CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(tm_ctx)))
+        (!SSL_CTX_set_default_verify_paths(tm_ctx))) {
-		{
+        /*
-		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
+         * BIO_printf(bio_err,"error setting default verify locations\n");
-		ERR_print_errors(bio_err);
+         */
-		/* goto end; */
+        ERR_print_errors(bio_err);
-		}
+        /* goto end; */
+    }
 
-	if (tm_cipher == NULL)
+    if (tm_cipher == NULL)
-		tm_cipher = getenv("SSL_CIPHER");
+        tm_cipher = getenv("SSL_CIPHER");
 
-	if (tm_cipher == NULL ) {
+    if (tm_cipher == NULL) {
-		fprintf( stderr, "No CIPHER specified\n" );
+        fprintf(stderr, "No CIPHER specified\n");
-	}
+    }
 
-	if (!(perform & 1)) goto next;
+    if (!(perform & 1))
-	printf( "Collecting connection statistics for %d seconds\n", maxTime );
+        goto next;
+    printf("Collecting connection statistics for %d seconds\n", maxTime);
 
-	/* Loop and time how long it takes to make connections */
+    /* Loop and time how long it takes to make connections */
 
-	bytes_read=0;
+    bytes_read = 0;
-	finishtime=(long)time(NULL)+maxTime;
+    finishtime = (long)time(NULL) + maxTime;
-	tm_Time_F(START);
+    tm_Time_F(START);
-	for (;;)
+    for (;;) {
-		{
+        if (finishtime < (long)time(NULL))
-		if (finishtime < (long)time(NULL)) break;
+            break;
 #ifdef WIN32_STUFF
 
-		if( flushWinMsgs(0) == -1 )
+        if (flushWinMsgs(0) == -1)
-			goto end;
+            goto end;
 
-		if( waitingToDie || exitNow )		/* we're dead */
+        if (waitingToDie || exitNow) /* we're dead */
-			goto end;
+            goto end;
 #endif
 
-		if( (scon = doConnection( NULL )) == NULL )
+        if ((scon = doConnection(NULL)) == NULL)
-			goto end;
+            goto end;
-
-		if (s_www_path != NULL)
-			{
-			BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
-			SSL_write(scon,buf,strlen(buf));
-			while ((i=SSL_read(scon,buf,sizeof(buf))) > 0)
-				bytes_read+=i;
-			}
 
+        if (s_www_path != NULL) {
+            BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
+                         s_www_path);
+            SSL_write(scon, buf, strlen(buf));
+            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
+                bytes_read += i;
+        }
 #ifdef NO_SHUTDOWN
-		SSL_set_shutdown(scon,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+        SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 #else
-		SSL_shutdown(scon);
+        SSL_shutdown(scon);
 #endif
-		SHUTDOWN2(SSL_get_fd(scon));
+        SHUTDOWN2(SSL_get_fd(scon));
 
-		nConn += 1;
+        nConn += 1;
-		if (SSL_session_reused(scon))
+        if (SSL_session_reused(scon))
-			ver='r';
+            ver = 'r';
-		else
+        else {
-			{
+            ver = SSL_version(scon);
-			ver=SSL_version(scon);
+            if (ver == TLS1_VERSION)
-			if (ver == TLS1_VERSION)
+                ver = 't';
-				ver='t';
+            else if (ver == SSL3_VERSION)
-			else if (ver == SSL3_VERSION)
+                ver = '3';
-				ver='3';
+            else if (ver == SSL2_VERSION)
-			else if (ver == SSL2_VERSION)
+                ver = '2';
-				ver='2';
+            else
-			else
+                ver = '*';
-				ver='*';
+        }
-			}
+        fputc(ver, stdout);
-		fputc(ver,stdout);
+        fflush(stdout);
-		fflush(stdout);
 
-		SSL_free( scon );
+        SSL_free(scon);
-		scon=NULL;
+        scon = NULL;
-		}
+    }
-	totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
+    totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
 
-	i=(int)((long)time(NULL)-finishtime+maxTime);
+    i = (int)((long)time(NULL) - finishtime + maxTime);
-	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
+    printf
-	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
+        ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+         nConn, totalTime, ((double)nConn / totalTime), bytes_read);
+    printf
+        ("%d connections in %ld real seconds, %ld bytes read per connection\n",
+         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
 
-	/* Now loop and time connections using the same session id over and over */
+    /*
+     * Now loop and time connections using the same session id over and over
+     */
 
-next:
+ next:
-	if (!(perform & 2)) goto end;
+    if (!(perform & 2))
-	printf( "\n\nNow timing with session id reuse.\n" );
+        goto end;
+    printf("\n\nNow timing with session id reuse.\n");
 
-	/* Get an SSL object so we can reuse the session id */
+    /* Get an SSL object so we can reuse the session id */
-	if( (scon = doConnection( NULL )) == NULL )
+    if ((scon = doConnection(NULL)) == NULL) {
-		{
+        fprintf(stderr, "Unable to get connection\n");
-		fprintf( stderr, "Unable to get connection\n" );
+        goto end;
-		goto end;
+    }
-		}
 
-	if (s_www_path != NULL)
+    if (s_www_path != NULL) {
-		{
+        BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n", s_www_path);
-		BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
+        SSL_write(scon, buf, strlen(buf));
-		SSL_write(scon,buf,strlen(buf));
+        while (SSL_read(scon, buf, sizeof(buf)) > 0) ;
-		while (SSL_read(scon,buf,sizeof(buf)) > 0)
+    }
-			;
-		}
 #ifdef NO_SHUTDOWN
-	SSL_set_shutdown(scon,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+    SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 #else
-	SSL_shutdown(scon);
+    SSL_shutdown(scon);
 #endif
-	SHUTDOWN2(SSL_get_fd(scon));
+    SHUTDOWN2(SSL_get_fd(scon));
 
-	nConn = 0;
+    nConn = 0;
-	totalTime = 0.0;
+    totalTime = 0.0;
 
-	finishtime=(long)time(NULL)+maxTime;
+    finishtime = (long)time(NULL) + maxTime;
 
-	printf( "starting\n" );
+    printf("starting\n");
-	bytes_read=0;
+    bytes_read = 0;
-	tm_Time_F(START);
+    tm_Time_F(START);
 
-	for (;;)
+    for (;;) {
-		{
+        if (finishtime < (long)time(NULL))
-		if (finishtime < (long)time(NULL)) break;
+            break;
 
 #ifdef WIN32_STUFF
-		if( flushWinMsgs(0) == -1 )
+        if (flushWinMsgs(0) == -1)
-			goto end;
+            goto end;
 
-		if( waitingToDie || exitNow )	/* we're dead */
+        if (waitingToDie || exitNow) /* we're dead */
-			goto end;
+            goto end;
 #endif
 
-	 	if( (doConnection( scon )) == NULL )
+        if ((doConnection(scon)) == NULL)
-			goto end;
+            goto end;
-
-		if (s_www_path)
-			{
-			BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
-			SSL_write(scon,buf,strlen(buf));
-			while ((i=SSL_read(scon,buf,sizeof(buf))) > 0)
-				bytes_read+=i;
-			}
 
+        if (s_www_path) {
+            BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
+                         s_www_path);
+            SSL_write(scon, buf, strlen(buf));
+            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
+                bytes_read += i;
+        }
 #ifdef NO_SHUTDOWN
-		SSL_set_shutdown(scon,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+        SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 #else
-		SSL_shutdown(scon);
+        SSL_shutdown(scon);
 #endif
-		SHUTDOWN2(SSL_get_fd(scon));
+        SHUTDOWN2(SSL_get_fd(scon));
 
-		nConn += 1;
+        nConn += 1;
-		if (SSL_session_reused(scon))
+        if (SSL_session_reused(scon))
-			ver='r';
+            ver = 'r';
-		else
+        else {
-			{
+            ver = SSL_version(scon);
-			ver=SSL_version(scon);
+            if (ver == TLS1_VERSION)
-			if (ver == TLS1_VERSION)
+                ver = 't';
-				ver='t';
+            else if (ver == SSL3_VERSION)
-			else if (ver == SSL3_VERSION)
+                ver = '3';
-				ver='3';
+            else if (ver == SSL2_VERSION)
-			else if (ver == SSL2_VERSION)
+                ver = '2';
-				ver='2';
+            else
-			else
+                ver = '*';
-				ver='*';
+        }
-			}
+        fputc(ver, stdout);
-		fputc(ver,stdout);
+        fflush(stdout);
-		fflush(stdout);
+    }
-		}
+    totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
-	totalTime += tm_Time_F(STOP); /* Add the time for this iteration*/
 
+    printf
+        ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+         nConn, totalTime, ((double)nConn / totalTime), bytes_read);
+    printf
+        ("%d connections in %ld real seconds, %ld bytes read per connection\n",
+         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
 
-	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
+    ret = 0;
-	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
+ end:
+    if (scon != NULL)
+        SSL_free(scon);
 
-	ret=0;
+    if (tm_ctx != NULL) {
-end:
+        SSL_CTX_free(tm_ctx);
-	if (scon != NULL) SSL_free(scon);
+        tm_ctx = NULL;
+    }
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
-	if (tm_ctx != NULL)
+/*-
-		{
-		SSL_CTX_free(tm_ctx);
-		tm_ctx=NULL;
-		}
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
-
-/***********************************************************************
  * doConnection - make a connection
  * Args:
- *		scon	= earlier ssl connection for session id, or NULL
+ *              scon    = earlier ssl connection for session id, or NULL
  * Returns:
- *		SSL *	= the connection pointer.
+ *              SSL *   = the connection pointer.
  */
 static SSL *doConnection(SSL *scon)
-	{
+{
-	BIO *conn;
+    BIO *conn;
-	SSL *serverCon;
+    SSL *serverCon;
-	int width, i;
+    int width, i;
-	fd_set readfds;
+    fd_set readfds;
 
-	if ((conn=BIO_new(BIO_s_connect())) == NULL)
+    if ((conn = BIO_new(BIO_s_connect())) == NULL)
-		return(NULL);
+        return (NULL);
 
-/*	BIO_set_conn_port(conn,port);*/
+/*      BIO_set_conn_port(conn,port);*/
-	BIO_set_conn_hostname(conn,host);
+    BIO_set_conn_hostname(conn, host);
 
-	if (scon == NULL)
+    if (scon == NULL)
-		serverCon=SSL_new(tm_ctx);
+        serverCon = SSL_new(tm_ctx);
-	else
+    else {
-		{
+        serverCon = scon;
-		serverCon=scon;
+        SSL_set_connect_state(serverCon);
-		SSL_set_connect_state(serverCon);
+    }
-		}
 
-	SSL_set_bio(serverCon,conn,conn);
+    SSL_set_bio(serverCon, conn, conn);
 
 #if 0
-	if( scon != NULL )
+    if (scon != NULL)
-		SSL_set_session(serverCon,SSL_get_session(scon));
+        SSL_set_session(serverCon, SSL_get_session(scon));
 #endif
 
-	/* ok, lets connect */
+    /* ok, lets connect */
-	for(;;) {
+    for (;;) {
-		i=SSL_connect(serverCon);
+        i = SSL_connect(serverCon);
-		if (BIO_sock_should_retry(i))
+        if (BIO_sock_should_retry(i)) {
-			{
+            BIO_printf(bio_err, "DELAY\n");
-			BIO_printf(bio_err,"DELAY\n");
-
-			i=SSL_get_fd(serverCon);
-			width=i+1;
-			FD_ZERO(&readfds);
-			openssl_fdset(i,&readfds);
-			/* Note: under VMS with SOCKETSHR the 2nd parameter
-			 * is currently of type (int *) whereas under other
-			 * systems it is (void *) if you don't have a cast it
-			 * will choke the compiler: if you do have a cast then
-			 * you can either go for (int *) or (void *).
-			 */
-			select(width,(void *)&readfds,NULL,NULL,NULL);
-			continue;
-			}
-		break;
-		}
-	if(i <= 0)
-		{
-		BIO_printf(bio_err,"ERROR\n");
-		if (verify_error != X509_V_OK)
-			BIO_printf(bio_err,"verify error:%s\n",
-				X509_verify_cert_error_string(verify_error));
-		else
-			ERR_print_errors(bio_err);
-		if (scon == NULL)
-			SSL_free(serverCon);
-		return NULL;
-		}
-
-	return serverCon;
-	}
 
+            i = SSL_get_fd(serverCon);
+            width = i + 1;
+            FD_ZERO(&readfds);
+            openssl_fdset(i, &readfds);
+            /*
+             * Note: under VMS with SOCKETSHR the 2nd parameter is currently
+             * of type (int *) whereas under other systems it is (void *) if
+             * you don't have a cast it will choke the compiler: if you do
+             * have a cast then you can either go for (int *) or (void *).
+             */
+            select(width, (void *)&readfds, NULL, NULL, NULL);
+            continue;
+        }
+        break;
+    }
+    if (i <= 0) {
+        BIO_printf(bio_err, "ERROR\n");
+        if (verify_error != X509_V_OK)
+            BIO_printf(bio_err, "verify error:%s\n",
+                       X509_verify_cert_error_string(verify_error));
+        else
+            ERR_print_errors(bio_err);
+        if (scon == NULL)
+            SSL_free(serverCon);
+        return NULL;
+    }
 
+    return serverCon;
+}

apps/sess_id.c

@@ -67,20 +67,20 @@
 #include <openssl/ssl.h>
 
 #undef PROG
-#define PROG	sess_id_main
+#define PROG    sess_id_main
 
-static const char *sess_id_usage[]={
+static const char *sess_id_usage[] = {
-"usage: sess_id args\n",
+    "usage: sess_id args\n",
-"\n",
+    "\n",
-" -inform arg     - input format - default PEM (DER or PEM)\n",
+    " -inform arg     - input format - default PEM (DER or PEM)\n",
-" -outform arg    - output format - default PEM\n",
+    " -outform arg    - output format - default PEM\n",
-" -in arg         - input file - default stdin\n",
+    " -in arg         - input file - default stdin\n",
-" -out arg        - output file - default stdout\n",
+    " -out arg        - output file - default stdout\n",
-" -text           - print ssl session id details\n",
+    " -text           - print ssl session id details\n",
-" -cert           - output certificate \n",
+    " -cert           - output certificate \n",
-" -noout          - no CRL output\n",
+    " -noout          - no CRL output\n",
-" -context arg    - set the session ID context\n",
+    " -context arg    - set the session ID context\n",
-NULL
+    NULL
 };
 
 static SSL_SESSION *load_sess_id(char *file, int format);
@@ -88,233 +88,211 @@ static SSL_SESSION *load_sess_id(char *file, int format);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	SSL_SESSION *x=NULL;
+    SSL_SESSION *x = NULL;
-	int ret=1,i,num,badops=0;
+    int ret = 1, i, num, badops = 0;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile=NULL,*outfile=NULL,*context=NULL;
+    char *infile = NULL, *outfile = NULL, *context = NULL;
-	int cert=0,noout=0,text=0;
+    int cert = 0, noout = 0, text = 0;
-	const char **pp;
+    const char **pp;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	num=0;
+    num = 0;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            informat = str2fmt(*(++argv));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-text") == 0)
-			{
+            text = ++num;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-cert") == 0)
-			outfile= *(++argv);
+            cert = ++num;
-			}
+        else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-text") == 0)
+            noout = ++num;
-			text= ++num;
+        else if (strcmp(*argv, "-context") == 0) {
-		else if (strcmp(*argv,"-cert") == 0)
+            if (--argc < 1)
-			cert= ++num;
+                goto bad;
-		else if (strcmp(*argv,"-noout") == 0)
+            context = *++argv;
-			noout= ++num;
+        } else {
-		else if (strcmp(*argv,"-context") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		    {
+            badops = 1;
-		    if(--argc < 1) goto bad;
+            break;
-		    context=*++argv;
+        }
-		    }
+        argc--;
-		else
+        argv++;
-			{
+    }
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        for (pp = sess_id_usage; (*pp != NULL); pp++)
-		for (pp=sess_id_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	x=load_sess_id(infile,informat);
+    x = load_sess_id(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
-
+        goto end;
-	if(context)
+    }
-	    {
-	    x->sid_ctx_length=strlen(context);
-	    if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
-		{
-		BIO_printf(bio_err,"Context too long\n");
-		goto end;
-		}
-	    memcpy(x->sid_ctx,context,x->sid_ctx_length);
-	    }
 
+    if (context) {
+        x->sid_ctx_length = strlen(context);
+        if (x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH) {
+            BIO_printf(bio_err, "Context too long\n");
+            goto end;
+        }
+        memcpy(x->sid_ctx, context, x->sid_ctx_length);
+    }
 #ifdef undef
-	/* just testing for memory leaks :-) */
+    /* just testing for memory leaks :-) */
-	{
+    {
-	SSL_SESSION *s;
+        SSL_SESSION *s;
-	char buf[1024*10],*p;
+        char buf[1024 * 10], *p;
-	int i;
+        int i;
 
-	s=SSL_SESSION_new();
+        s = SSL_SESSION_new();
 
-	p= &buf;
+        p = &buf;
-	i=i2d_SSL_SESSION(x,&p);
+        i = i2d_SSL_SESSION(x, &p);
-	p= &buf;
+        p = &buf;
-	d2i_SSL_SESSION(&s,&p,(long)i);
+        d2i_SSL_SESSION(&s, &p, (long)i);
-	p= &buf;
+        p = &buf;
-	d2i_SSL_SESSION(&s,&p,(long)i);
+        d2i_SSL_SESSION(&s, &p, (long)i);
-	p= &buf;
+        p = &buf;
-	d2i_SSL_SESSION(&s,&p,(long)i);
+        d2i_SSL_SESSION(&s, &p, (long)i);
-	SSL_SESSION_free(s);
+        SSL_SESSION_free(s);
-	}
+    }
 #endif
 
-	if (!noout || text)
+    if (!noout || text) {
-		{
+        out = BIO_new(BIO_s_file());
-		out=BIO_new(BIO_s_file());
+        if (out == NULL) {
-		if (out == NULL)
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
-			}
 
-		if (outfile == NULL)
+        if (outfile == NULL) {
-			{
+            BIO_set_fp(out, stdout, BIO_NOCLOSE);
-			BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+                out = BIO_push(tmpbio, out);
-			}
+            }
 #endif
-			}
+        } else {
-		else
+            if (BIO_write_filename(out, outfile) <= 0) {
-			{
+                perror(outfile);
-			if (BIO_write_filename(out,outfile) <= 0)
+                goto end;
-				{
+            }
-				perror(outfile);
+        }
-				goto end;
+    }
-				}
-			}
-		}
 
-	if (text)
+    if (text) {
-		{
+        SSL_SESSION_print(out, x);
-		SSL_SESSION_print(out,x);
 
-		if (cert)
+        if (cert) {
-			{
+            if (x->peer == NULL)
-			if (x->peer == NULL)
+                BIO_puts(out, "No certificate present\n");
-				BIO_puts(out,"No certificate present\n");
+            else
-			else
+                X509_print(out, x->peer);
-				X509_print(out,x->peer);
+        }
-			}
+    }
-		}
 
-	if (!noout && !cert)
+    if (!noout && !cert) {
-		{
+        if (outformat == FORMAT_ASN1)
-		if 	(outformat == FORMAT_ASN1)
+            i = i2d_SSL_SESSION_bio(out, x);
-			i=i2d_SSL_SESSION_bio(out,x);
+        else if (outformat == FORMAT_PEM)
-		else if (outformat == FORMAT_PEM)
+            i = PEM_write_bio_SSL_SESSION(out, x);
-			i=PEM_write_bio_SSL_SESSION(out,x);
+        else {
-		else	{
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+            goto end;
-			goto end;
+        }
-			}
+        if (!i) {
-		if (!i) {
+            BIO_printf(bio_err, "unable to write SSL_SESSION\n");
-			BIO_printf(bio_err,"unable to write SSL_SESSION\n");
+            goto end;
-			goto end;
+        }
-			}
+    } else if (!noout && (x->peer != NULL)) { /* just print the certificate */
-		}
+        if (outformat == FORMAT_ASN1)
-	else if (!noout && (x->peer != NULL)) /* just print the certificate */
+            i = (int)i2d_X509_bio(out, x->peer);
-		{
+        else if (outformat == FORMAT_PEM)
-		if 	(outformat == FORMAT_ASN1)
+            i = PEM_write_bio_X509(out, x->peer);
-			i=(int)i2d_X509_bio(out,x->peer);
+        else {
-		else if (outformat == FORMAT_PEM)
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-			i=PEM_write_bio_X509(out,x->peer);
+            goto end;
-		else	{
+        }
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+        if (!i) {
-			goto end;
+            BIO_printf(bio_err, "unable to write X509\n");
-			}
+            goto end;
-		if (!i) {
+        }
-			BIO_printf(bio_err,"unable to write X509\n");
+    }
-			goto end;
+    ret = 0;
-			}
+ end:
-		}
+    if (out != NULL)
-	ret=0;
+        BIO_free_all(out);
-end:
+    if (x != NULL)
-	if (out != NULL) BIO_free_all(out);
+        SSL_SESSION_free(x);
-	if (x != NULL) SSL_SESSION_free(x);
+    apps_shutdown();
-	apps_shutdown();
+    OPENSSL_EXIT(ret);
-	OPENSSL_EXIT(ret);
+}
-	}
 
 static SSL_SESSION *load_sess_id(char *infile, int format)
-	{
+{
-	SSL_SESSION *x=NULL;
+    SSL_SESSION *x = NULL;
-	BIO *in=NULL;
+    BIO *in = NULL;
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	if (in == NULL)
+    if (in == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (format == FORMAT_ASN1)
-		}
+        x = d2i_SSL_SESSION_bio(in, NULL);
-	if 	(format == FORMAT_ASN1)
+    else if (format == FORMAT_PEM)
-		x=d2i_SSL_SESSION_bio(in,NULL);
+        x = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
-	else if (format == FORMAT_PEM)
+    else {
-		x=PEM_read_bio_SSL_SESSION(in,NULL,NULL,NULL);
+        BIO_printf(bio_err, "bad input format specified for input crl\n");
-	else	{
+        goto end;
-		BIO_printf(bio_err,"bad input format specified for input crl\n");
+    }
-		goto end;
+    if (x == NULL) {
-		}
+        BIO_printf(bio_err, "unable to load SSL_SESSION\n");
-	if (x == NULL)
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		BIO_printf(bio_err,"unable to load SSL_SESSION\n");
+    }
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	
-end:
-	if (in != NULL) BIO_free(in);
-	return(x);
-	}
 
+ end:
+    if (in != NULL)
+        BIO_free(in);
+    return (x);
+}

apps/spkac.c

@@ -1,8 +1,8 @@
 /* apps/spkac.c */
 
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 1999. Based on an original idea by Massimiliano Pala
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * (madwolf@openca.org).
+ * 1999. Based on an original idea by Massimiliano Pala (madwolf@openca.org).
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -71,238 +71,242 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	spkac_main
+#define PROG    spkac_main
 
-/* -in arg	- input file - default stdin
+/*-
- * -out arg	- output file - default stdout
+ * -in arg      - input file - default stdin
+ * -out arg     - output file - default stdout
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int i,badops=0, ret = 1;
+    int i, badops = 0, ret = 1;
-	BIO *in = NULL,*out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int verify=0,noout=0,pubkey=0;
+    int verify = 0, noout = 0, pubkey = 0;
-	char *infile = NULL,*outfile = NULL,*prog;
+    char *infile = NULL, *outfile = NULL, *prog;
-	char *passargin = NULL, *passin = NULL;
+    char *passargin = NULL, *passin = NULL;
-	const char *spkac = "SPKAC", *spksect = "default";
+    const char *spkac = "SPKAC", *spksect = "default";
-	char *spkstr = NULL;
+    char *spkstr = NULL;
-	char *challenge = NULL, *keyfile = NULL;
+    char *challenge = NULL, *keyfile = NULL;
-	CONF *conf = NULL;
+    CONF *conf = NULL;
-	NETSCAPE_SPKI *spki = NULL;
+    NETSCAPE_SPKI *spki = NULL;
-	EVP_PKEY *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	apps_startup();
+    apps_startup();
 
-	if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+    if (!bio_err)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-in") == 0) {
-		if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            infile = *(++argv);
-			infile= *(++argv);
+        } else if (strcmp(*argv, "-out") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-out") == 0)
+                goto bad;
-			{
+            outfile = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-passin") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-passin") == 0)
+            passargin = *(++argv);
-			{
+        } else if (strcmp(*argv, "-key") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			passargin= *(++argv);
+                goto bad;
-			}
+            keyfile = *(++argv);
-		else if (strcmp(*argv,"-key") == 0)
+        } else if (strcmp(*argv, "-challenge") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			keyfile= *(++argv);
+            challenge = *(++argv);
-			}
+        } else if (strcmp(*argv, "-spkac") == 0) {
-		else if (strcmp(*argv,"-challenge") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            spkac = *(++argv);
-			challenge= *(++argv);
+        } else if (strcmp(*argv, "-spksect") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-spkac") == 0)
+                goto bad;
-			{
+            spksect = *(++argv);
-			if (--argc < 1) goto bad;
+        }
-			spkac= *(++argv);
-			}
-		else if (strcmp(*argv,"-spksect") == 0)
-			{
-			if (--argc < 1) goto bad;
-			spksect= *(++argv);
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			engine= *(++argv);
+            engine = *(++argv);
-			}
+        }
 #endif
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			noout=1;
+            noout = 1;
-		else if (strcmp(*argv,"-pubkey") == 0)
+        else if (strcmp(*argv, "-pubkey") == 0)
-			pubkey=1;
+            pubkey = 1;
-		else if (strcmp(*argv,"-verify") == 0)
+        else if (strcmp(*argv, "-verify") == 0)
-			verify=1;
+            verify = 1;
-		else badops = 1;
+        else
-		argc--;
+            badops = 1;
-		argv++;
+        argc--;
-		}
+        argv++;
+    }
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options]\n", prog);
-		BIO_printf(bio_err,"%s [options]\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -in arg        input file\n");
-		BIO_printf(bio_err," -in arg        input file\n");
+        BIO_printf(bio_err, " -out arg       output file\n");
-		BIO_printf(bio_err," -out arg       output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -key arg       create SPKAC using private key\n");
+                   " -key arg       create SPKAC using private key\n");
-		BIO_printf(bio_err," -passin arg    input file pass phrase source\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -challenge arg challenge string\n");
+                   " -passin arg    input file pass phrase source\n");
-		BIO_printf(bio_err," -spkac arg     alternative SPKAC name\n");
+        BIO_printf(bio_err, " -challenge arg challenge string\n");
-		BIO_printf(bio_err," -noout         don't print SPKAC\n");
+        BIO_printf(bio_err, " -spkac arg     alternative SPKAC name\n");
-		BIO_printf(bio_err," -pubkey        output public key\n");
+        BIO_printf(bio_err, " -noout         don't print SPKAC\n");
-		BIO_printf(bio_err," -verify        verify SPKAC signature\n");
+        BIO_printf(bio_err, " -pubkey        output public key\n");
+        BIO_printf(bio_err, " -verify        verify SPKAC signature\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e      use engine e, possibly a hardware device.\n");
 #endif
-		goto end;
+        goto end;
-		}
+    }
-
-	ERR_load_crypto_strings();
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
-		BIO_printf(bio_err, "Error getting password\n");
-		goto end;
-	}
 
+    ERR_load_crypto_strings();
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+        BIO_printf(bio_err, "Error getting password\n");
+        goto end;
+    }
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if(keyfile) {
+    if (keyfile) {
-		pkey = load_key(bio_err,
+        pkey = load_key(bio_err,
-				strcmp(keyfile, "-") ? keyfile : NULL,
+                        strcmp(keyfile, "-") ? keyfile : NULL,
-				FORMAT_PEM, 1, passin, e, "private key");
+                        FORMAT_PEM, 1, passin, e, "private key");
-		if(!pkey) {
+        if (!pkey) {
-			goto end;
+            goto end;
-		}
+        }
-		spki = NETSCAPE_SPKI_new();
+        spki = NETSCAPE_SPKI_new();
-		if(challenge) ASN1_STRING_set(spki->spkac->challenge,
+        if (challenge)
-						 challenge, (int)strlen(challenge));
+            ASN1_STRING_set(spki->spkac->challenge,
-		NETSCAPE_SPKI_set_pubkey(spki, pkey);
+                            challenge, (int)strlen(challenge));
-		NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
+        NETSCAPE_SPKI_set_pubkey(spki, pkey);
-		spkstr = NETSCAPE_SPKI_b64_encode(spki);
+        NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
+        spkstr = NETSCAPE_SPKI_b64_encode(spki);
 
-		if (outfile) out = BIO_new_file(outfile, "w");
+        if (outfile)
-		else {
+            out = BIO_new_file(outfile, "w");
-			out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        else {
+            out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			    out = BIO_push(tmpbio, out);
+                out = BIO_push(tmpbio, out);
-			}
+            }
 #endif
-		}
+        }
 
-		if(!out) {
+        if (!out) {
-			BIO_printf(bio_err, "Error opening output file\n");
+            BIO_printf(bio_err, "Error opening output file\n");
-			ERR_print_errors(bio_err);
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-		BIO_printf(out, "SPKAC=%s\n", spkstr);
+        BIO_printf(out, "SPKAC=%s\n", spkstr);
-		OPENSSL_free(spkstr);
+        OPENSSL_free(spkstr);
-		ret = 0;
+        ret = 0;
-		goto end;
+        goto end;
-	}
+    }
 
+    if (infile)
+        in = BIO_new_file(infile, "r");
+    else
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
+    if (!in) {
+        BIO_printf(bio_err, "Error opening input file\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	if (infile) in = BIO_new_file(infile, "r");
+    conf = NCONF_new(NULL);
-	else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    i = NCONF_load_bio(conf, in, NULL);
 
-	if(!in) {
+    if (!i) {
-		BIO_printf(bio_err, "Error opening input file\n");
+        BIO_printf(bio_err, "Error parsing config file\n");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	conf = NCONF_new(NULL);
+    spkstr = NCONF_get_string(conf, spksect, spkac);
-	i = NCONF_load_bio(conf, in, NULL);
 
-	if(!i) {
+    if (!spkstr) {
-		BIO_printf(bio_err, "Error parsing config file\n");
+        BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	spkstr = NCONF_get_string(conf, spksect, spkac);
+    spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
 
-	if(!spkstr) {
+    if (!spki) {
-		BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
+        BIO_printf(bio_err, "Error loading SPKAC\n");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
+    if (outfile)
-	
+        out = BIO_new_file(outfile, "w");
-	if(!spki) {
+    else {
-		BIO_printf(bio_err, "Error loading SPKAC\n");
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-		ERR_print_errors(bio_err);
-		goto end;
-	}
-
-	if (outfile) out = BIO_new_file(outfile, "w");
-	else {
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		    out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-	}
+    }
 
-	if(!out) {
+    if (!out) {
-		BIO_printf(bio_err, "Error opening output file\n");
+        BIO_printf(bio_err, "Error opening output file\n");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	if(!noout) NETSCAPE_SPKI_print(out, spki);
+    if (!noout)
-	pkey = NETSCAPE_SPKI_get_pubkey(spki);
+        NETSCAPE_SPKI_print(out, spki);
-	if(verify) {
+    pkey = NETSCAPE_SPKI_get_pubkey(spki);
-		i = NETSCAPE_SPKI_verify(spki, pkey);
+    if (verify) {
-		if (i > 0) BIO_printf(bio_err, "Signature OK\n");
+        i = NETSCAPE_SPKI_verify(spki, pkey);
-		else {
+        if (i > 0)
-			BIO_printf(bio_err, "Signature Failure\n");
+            BIO_printf(bio_err, "Signature OK\n");
-			ERR_print_errors(bio_err);
+        else {
-			goto end;
+            BIO_printf(bio_err, "Signature Failure\n");
-		}
+            ERR_print_errors(bio_err);
-	}
+            goto end;
-	if(pubkey) PEM_write_bio_PUBKEY(out, pkey);
+        }
+    }
+    if (pubkey)
+        PEM_write_bio_PUBKEY(out, pkey);
 
-	ret = 0;
+    ret = 0;
 
-end:
+ end:
-	NCONF_free(conf);
+    NCONF_free(conf);
-	NETSCAPE_SPKI_free(spki);
+    NETSCAPE_SPKI_free(spki);
-	BIO_free(in);
+    BIO_free(in);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
-	if(passin) OPENSSL_free(passin);
+    if (passin)
-	apps_shutdown();
+        OPENSSL_free(passin);
-	OPENSSL_EXIT(ret);
+    apps_shutdown();
-	}
+    OPENSSL_EXIT(ret);
+}

apps/testdsa.h

@@ -1,217 +1,233 @@
 /* NOCW */
 /* used by apps/speed.c */
-DSA *get_dsa512(void );
+DSA *get_dsa512(void);
-DSA *get_dsa1024(void );
+DSA *get_dsa1024(void);
-DSA *get_dsa2048(void );
+DSA *get_dsa2048(void);
 static unsigned char dsa512_priv[] = {
-	0x65,0xe5,0xc7,0x38,0x60,0x24,0xb5,0x89,0xd4,0x9c,0xeb,0x4c,
+    0x65, 0xe5, 0xc7, 0x38, 0x60, 0x24, 0xb5, 0x89, 0xd4, 0x9c, 0xeb, 0x4c,
-	0x9c,0x1d,0x7a,0x22,0xbd,0xd1,0xc2,0xd2,
+    0x9c, 0x1d, 0x7a, 0x22, 0xbd, 0xd1, 0xc2, 0xd2,
-	};
+};
+
 static unsigned char dsa512_pub[] = {
-	0x00,0x95,0xa7,0x0d,0xec,0x93,0x68,0xba,0x5f,0xf7,0x5f,0x07,
+    0x00, 0x95, 0xa7, 0x0d, 0xec, 0x93, 0x68, 0xba, 0x5f, 0xf7, 0x5f, 0x07,
-	0xf2,0x3b,0xad,0x6b,0x01,0xdc,0xbe,0xec,0xde,0x04,0x7a,0x3a,
+    0xf2, 0x3b, 0xad, 0x6b, 0x01, 0xdc, 0xbe, 0xec, 0xde, 0x04, 0x7a, 0x3a,
-	0x27,0xb3,0xec,0x49,0xfd,0x08,0x43,0x3d,0x7e,0xa8,0x2c,0x5e,
+    0x27, 0xb3, 0xec, 0x49, 0xfd, 0x08, 0x43, 0x3d, 0x7e, 0xa8, 0x2c, 0x5e,
-	0x7b,0xbb,0xfc,0xf4,0x6e,0xeb,0x6c,0xb0,0x6e,0xf8,0x02,0x12,
+    0x7b, 0xbb, 0xfc, 0xf4, 0x6e, 0xeb, 0x6c, 0xb0, 0x6e, 0xf8, 0x02, 0x12,
-	0x8c,0x38,0x5d,0x83,0x56,0x7d,0xee,0x53,0x05,0x3e,0x24,0x84,
+    0x8c, 0x38, 0x5d, 0x83, 0x56, 0x7d, 0xee, 0x53, 0x05, 0x3e, 0x24, 0x84,
-	0xbe,0xba,0x0a,0x6b,0xc8,
+    0xbe, 0xba, 0x0a, 0x6b, 0xc8,
-	};
+};
-static unsigned char dsa512_p[]={
+
-	0x9D,0x1B,0x69,0x8E,0x26,0xDB,0xF2,0x2B,0x11,0x70,0x19,0x86,
+static unsigned char dsa512_p[] = {
-	0xF6,0x19,0xC8,0xF8,0x19,0xF2,0x18,0x53,0x94,0x46,0x06,0xD0,
+    0x9D, 0x1B, 0x69, 0x8E, 0x26, 0xDB, 0xF2, 0x2B, 0x11, 0x70, 0x19, 0x86,
-	0x62,0x50,0x33,0x4B,0x02,0x3C,0x52,0x30,0x03,0x8B,0x3B,0xF9,
+    0xF6, 0x19, 0xC8, 0xF8, 0x19, 0xF2, 0x18, 0x53, 0x94, 0x46, 0x06, 0xD0,
-	0x5F,0xD1,0x24,0x06,0x4F,0x7B,0x4C,0xBA,0xAA,0x40,0x9B,0xFD,
+    0x62, 0x50, 0x33, 0x4B, 0x02, 0x3C, 0x52, 0x30, 0x03, 0x8B, 0x3B, 0xF9,
-	0x96,0xE4,0x37,0x33,0xBB,0x2D,0x5A,0xD7,0x5A,0x11,0x40,0x66,
+    0x5F, 0xD1, 0x24, 0x06, 0x4F, 0x7B, 0x4C, 0xBA, 0xAA, 0x40, 0x9B, 0xFD,
-	0xA2,0x76,0x7D,0x31,
+    0x96, 0xE4, 0x37, 0x33, 0xBB, 0x2D, 0x5A, 0xD7, 0x5A, 0x11, 0x40, 0x66,
-	};
+    0xA2, 0x76, 0x7D, 0x31,
-static unsigned char dsa512_q[]={
+};
-	0xFB,0x53,0xEF,0x50,0xB4,0x40,0x92,0x31,0x56,0x86,0x53,0x7A,
+
-	0xE8,0x8B,0x22,0x9A,0x49,0xFB,0x71,0x8F,
+static unsigned char dsa512_q[] = {
-	};
+    0xFB, 0x53, 0xEF, 0x50, 0xB4, 0x40, 0x92, 0x31, 0x56, 0x86, 0x53, 0x7A,
-static unsigned char dsa512_g[]={
+    0xE8, 0x8B, 0x22, 0x9A, 0x49, 0xFB, 0x71, 0x8F,
-	0x83,0x3E,0x88,0xE5,0xC5,0x89,0x73,0xCE,0x3B,0x6C,0x01,0x49,
+};
-	0xBF,0xB3,0xC7,0x9F,0x0A,0xEA,0x44,0x91,0xE5,0x30,0xAA,0xD9,
+
-	0xBE,0x5B,0x5F,0xB7,0x10,0xD7,0x89,0xB7,0x8E,0x74,0xFB,0xCF,
+static unsigned char dsa512_g[] = {
-	0x29,0x1E,0xEB,0xA8,0x2C,0x54,0x51,0xB8,0x10,0xDE,0xA0,0xCE,
+    0x83, 0x3E, 0x88, 0xE5, 0xC5, 0x89, 0x73, 0xCE, 0x3B, 0x6C, 0x01, 0x49,
-	0x2F,0xCC,0x24,0x6B,0x90,0x77,0xDE,0xA2,0x68,0xA6,0x52,0x12,
+    0xBF, 0xB3, 0xC7, 0x9F, 0x0A, 0xEA, 0x44, 0x91, 0xE5, 0x30, 0xAA, 0xD9,
-	0xA2,0x03,0x9D,0x20,
+    0xBE, 0x5B, 0x5F, 0xB7, 0x10, 0xD7, 0x89, 0xB7, 0x8E, 0x74, 0xFB, 0xCF,
-	};
+    0x29, 0x1E, 0xEB, 0xA8, 0x2C, 0x54, 0x51, 0xB8, 0x10, 0xDE, 0xA0, 0xCE,
+    0x2F, 0xCC, 0x24, 0x6B, 0x90, 0x77, 0xDE, 0xA2, 0x68, 0xA6, 0x52, 0x12,
+    0xA2, 0x03, 0x9D, 0x20,
+};
 
 DSA *get_dsa512()
-	{
+{
-	DSA *dsa;
+    DSA *dsa;
 
-	if ((dsa=DSA_new()) == NULL) return(NULL);
+    if ((dsa = DSA_new()) == NULL)
-	dsa->priv_key=BN_bin2bn(dsa512_priv,sizeof(dsa512_priv),NULL);
+        return (NULL);
-	dsa->pub_key=BN_bin2bn(dsa512_pub,sizeof(dsa512_pub),NULL);
+    dsa->priv_key = BN_bin2bn(dsa512_priv, sizeof(dsa512_priv), NULL);
-	dsa->p=BN_bin2bn(dsa512_p,sizeof(dsa512_p),NULL);
+    dsa->pub_key = BN_bin2bn(dsa512_pub, sizeof(dsa512_pub), NULL);
-	dsa->q=BN_bin2bn(dsa512_q,sizeof(dsa512_q),NULL);
+    dsa->p = BN_bin2bn(dsa512_p, sizeof(dsa512_p), NULL);
-	dsa->g=BN_bin2bn(dsa512_g,sizeof(dsa512_g),NULL);
+    dsa->q = BN_bin2bn(dsa512_q, sizeof(dsa512_q), NULL);
-	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
+    dsa->g = BN_bin2bn(dsa512_g, sizeof(dsa512_g), NULL);
-				(dsa->q == NULL) || (dsa->g == NULL))
+    if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL)
-		return(NULL);
+        || (dsa->q == NULL) || (dsa->g == NULL))
-	return(dsa);
+        return (NULL);
-	}
+    return (dsa);
+}
 
-static unsigned char dsa1024_priv[]={
+static unsigned char dsa1024_priv[] = {
-	0x7d,0x21,0xda,0xbb,0x62,0x15,0x47,0x36,0x07,0x67,0x12,0xe8,
+    0x7d, 0x21, 0xda, 0xbb, 0x62, 0x15, 0x47, 0x36, 0x07, 0x67, 0x12, 0xe8,
-	0x8c,0xaa,0x1c,0xcd,0x38,0x12,0x61,0x18,
+    0x8c, 0xaa, 0x1c, 0xcd, 0x38, 0x12, 0x61, 0x18,
-	};
+};
-static unsigned char dsa1024_pub[]={
+
-	0x3c,0x4e,0x9c,0x2a,0x7f,0x16,0xc1,0x25,0xeb,0xac,0x78,0x63,
+static unsigned char dsa1024_pub[] = {
-	0x90,0x14,0x8c,0x8b,0xf4,0x68,0x43,0x3c,0x2d,0xee,0x65,0x50,
+    0x3c, 0x4e, 0x9c, 0x2a, 0x7f, 0x16, 0xc1, 0x25, 0xeb, 0xac, 0x78, 0x63,
-	0x7d,0x9c,0x8f,0x8c,0x8a,0x51,0xd6,0x11,0x2b,0x99,0xaf,0x1e,
+    0x90, 0x14, 0x8c, 0x8b, 0xf4, 0x68, 0x43, 0x3c, 0x2d, 0xee, 0x65, 0x50,
-	0x90,0x97,0xb5,0xd3,0xa6,0x20,0x25,0xd6,0xfe,0x43,0x02,0xd5,
+    0x7d, 0x9c, 0x8f, 0x8c, 0x8a, 0x51, 0xd6, 0x11, 0x2b, 0x99, 0xaf, 0x1e,
-	0x91,0x7d,0xa7,0x8c,0xdb,0xc9,0x85,0xa3,0x36,0x48,0xf7,0x68,
+    0x90, 0x97, 0xb5, 0xd3, 0xa6, 0x20, 0x25, 0xd6, 0xfe, 0x43, 0x02, 0xd5,
-	0xaa,0x60,0xb1,0xf7,0x05,0x68,0x3a,0xa3,0x3f,0xd3,0x19,0x82,
+    0x91, 0x7d, 0xa7, 0x8c, 0xdb, 0xc9, 0x85, 0xa3, 0x36, 0x48, 0xf7, 0x68,
-	0xd8,0x82,0x7a,0x77,0xfb,0xef,0xf4,0x15,0x0a,0xeb,0x06,0x04,
+    0xaa, 0x60, 0xb1, 0xf7, 0x05, 0x68, 0x3a, 0xa3, 0x3f, 0xd3, 0x19, 0x82,
-	0x7f,0x53,0x07,0x0c,0xbc,0xcb,0x2d,0x83,0xdb,0x3e,0xd1,0x28,
+    0xd8, 0x82, 0x7a, 0x77, 0xfb, 0xef, 0xf4, 0x15, 0x0a, 0xeb, 0x06, 0x04,
-	0xa5,0xa1,0x31,0xe0,0x67,0xfa,0x50,0xde,0x9b,0x07,0x83,0x7e,
+    0x7f, 0x53, 0x07, 0x0c, 0xbc, 0xcb, 0x2d, 0x83, 0xdb, 0x3e, 0xd1, 0x28,
-	0x2c,0x0b,0xc3,0x13,0x50,0x61,0xe5,0xad,0xbd,0x36,0xb8,0x97,
+    0xa5, 0xa1, 0x31, 0xe0, 0x67, 0xfa, 0x50, 0xde, 0x9b, 0x07, 0x83, 0x7e,
-	0x4e,0x40,0x7d,0xe8,0x83,0x0d,0xbc,0x4b
+    0x2c, 0x0b, 0xc3, 0x13, 0x50, 0x61, 0xe5, 0xad, 0xbd, 0x36, 0xb8, 0x97,
-	};
+    0x4e, 0x40, 0x7d, 0xe8, 0x83, 0x0d, 0xbc, 0x4b
-static unsigned char dsa1024_p[]={
+};
-	0xA7,0x3F,0x6E,0x85,0xBF,0x41,0x6A,0x29,0x7D,0xF0,0x9F,0x47,
+
-	0x19,0x30,0x90,0x9A,0x09,0x1D,0xDA,0x6A,0x33,0x1E,0xC5,0x3D,
+static unsigned char dsa1024_p[] = {
-	0x86,0x96,0xB3,0x15,0xE0,0x53,0x2E,0x8F,0xE0,0x59,0x82,0x73,
+    0xA7, 0x3F, 0x6E, 0x85, 0xBF, 0x41, 0x6A, 0x29, 0x7D, 0xF0, 0x9F, 0x47,
-	0x90,0x3E,0x75,0x31,0x99,0x47,0x7A,0x52,0xFB,0x85,0xE4,0xD9,
+    0x19, 0x30, 0x90, 0x9A, 0x09, 0x1D, 0xDA, 0x6A, 0x33, 0x1E, 0xC5, 0x3D,
-	0xA6,0x7B,0x38,0x9B,0x68,0x8A,0x84,0x9B,0x87,0xC6,0x1E,0xB5,
+    0x86, 0x96, 0xB3, 0x15, 0xE0, 0x53, 0x2E, 0x8F, 0xE0, 0x59, 0x82, 0x73,
-	0x7E,0x86,0x4B,0x53,0x5B,0x59,0xCF,0x71,0x65,0x19,0x88,0x6E,
+    0x90, 0x3E, 0x75, 0x31, 0x99, 0x47, 0x7A, 0x52, 0xFB, 0x85, 0xE4, 0xD9,
-	0xCE,0x66,0xAE,0x6B,0x88,0x36,0xFB,0xEC,0x28,0xDC,0xC2,0xD7,
+    0xA6, 0x7B, 0x38, 0x9B, 0x68, 0x8A, 0x84, 0x9B, 0x87, 0xC6, 0x1E, 0xB5,
-	0xA5,0xBB,0xE5,0x2C,0x39,0x26,0x4B,0xDA,0x9A,0x70,0x18,0x95,
+    0x7E, 0x86, 0x4B, 0x53, 0x5B, 0x59, 0xCF, 0x71, 0x65, 0x19, 0x88, 0x6E,
-	0x37,0x95,0x10,0x56,0x23,0xF6,0x15,0xED,0xBA,0x04,0x5E,0xDE,
+    0xCE, 0x66, 0xAE, 0x6B, 0x88, 0x36, 0xFB, 0xEC, 0x28, 0xDC, 0xC2, 0xD7,
-	0x39,0x4F,0xFD,0xB7,0x43,0x1F,0xB5,0xA4,0x65,0x6F,0xCD,0x80,
+    0xA5, 0xBB, 0xE5, 0x2C, 0x39, 0x26, 0x4B, 0xDA, 0x9A, 0x70, 0x18, 0x95,
-	0x11,0xE4,0x70,0x95,0x5B,0x50,0xCD,0x49,
+    0x37, 0x95, 0x10, 0x56, 0x23, 0xF6, 0x15, 0xED, 0xBA, 0x04, 0x5E, 0xDE,
-	};
+    0x39, 0x4F, 0xFD, 0xB7, 0x43, 0x1F, 0xB5, 0xA4, 0x65, 0x6F, 0xCD, 0x80,
-static unsigned char dsa1024_q[]={
+    0x11, 0xE4, 0x70, 0x95, 0x5B, 0x50, 0xCD, 0x49,
-	0xF7,0x07,0x31,0xED,0xFA,0x6C,0x06,0x03,0xD5,0x85,0x8A,0x1C,
+};
-	0xAC,0x9C,0x65,0xE7,0x50,0x66,0x65,0x6F,
+
-	};
+static unsigned char dsa1024_q[] = {
-static unsigned char dsa1024_g[]={
+    0xF7, 0x07, 0x31, 0xED, 0xFA, 0x6C, 0x06, 0x03, 0xD5, 0x85, 0x8A, 0x1C,
-	0x4D,0xDF,0x4C,0x03,0xA6,0x91,0x8A,0xF5,0x19,0x6F,0x50,0x46,
+    0xAC, 0x9C, 0x65, 0xE7, 0x50, 0x66, 0x65, 0x6F,
-	0x25,0x99,0xE5,0x68,0x6F,0x30,0xE3,0x69,0xE1,0xE5,0xB3,0x5D,
+};
-	0x98,0xBB,0x28,0x86,0x48,0xFC,0xDE,0x99,0x04,0x3F,0x5F,0x88,
+
-	0x0C,0x9C,0x73,0x24,0x0D,0x20,0x5D,0xB9,0x2A,0x9A,0x3F,0x18,
+static unsigned char dsa1024_g[] = {
-	0x96,0x27,0xE4,0x62,0x87,0xC1,0x7B,0x74,0x62,0x53,0xFC,0x61,
+    0x4D, 0xDF, 0x4C, 0x03, 0xA6, 0x91, 0x8A, 0xF5, 0x19, 0x6F, 0x50, 0x46,
-	0x27,0xA8,0x7A,0x91,0x09,0x9D,0xB6,0xF1,0x4D,0x9C,0x54,0x0F,
+    0x25, 0x99, 0xE5, 0x68, 0x6F, 0x30, 0xE3, 0x69, 0xE1, 0xE5, 0xB3, 0x5D,
-	0x58,0x06,0xEE,0x49,0x74,0x07,0xCE,0x55,0x7E,0x23,0xCE,0x16,
+    0x98, 0xBB, 0x28, 0x86, 0x48, 0xFC, 0xDE, 0x99, 0x04, 0x3F, 0x5F, 0x88,
-	0xF6,0xCA,0xDC,0x5A,0x61,0x01,0x7E,0xC9,0x71,0xB5,0x4D,0xF6,
+    0x0C, 0x9C, 0x73, 0x24, 0x0D, 0x20, 0x5D, 0xB9, 0x2A, 0x9A, 0x3F, 0x18,
-	0xDC,0x34,0x29,0x87,0x68,0xF6,0x5E,0x20,0x93,0xB3,0xDB,0xF5,
+    0x96, 0x27, 0xE4, 0x62, 0x87, 0xC1, 0x7B, 0x74, 0x62, 0x53, 0xFC, 0x61,
-	0xE4,0x09,0x6C,0x41,0x17,0x95,0x92,0xEB,0x01,0xB5,0x73,0xA5,
+    0x27, 0xA8, 0x7A, 0x91, 0x09, 0x9D, 0xB6, 0xF1, 0x4D, 0x9C, 0x54, 0x0F,
-	0x6A,0x7E,0xD8,0x32,0xED,0x0E,0x02,0xB8,
+    0x58, 0x06, 0xEE, 0x49, 0x74, 0x07, 0xCE, 0x55, 0x7E, 0x23, 0xCE, 0x16,
-	};
+    0xF6, 0xCA, 0xDC, 0x5A, 0x61, 0x01, 0x7E, 0xC9, 0x71, 0xB5, 0x4D, 0xF6,
+    0xDC, 0x34, 0x29, 0x87, 0x68, 0xF6, 0x5E, 0x20, 0x93, 0xB3, 0xDB, 0xF5,
+    0xE4, 0x09, 0x6C, 0x41, 0x17, 0x95, 0x92, 0xEB, 0x01, 0xB5, 0x73, 0xA5,
+    0x6A, 0x7E, 0xD8, 0x32, 0xED, 0x0E, 0x02, 0xB8,
+};
 
 DSA *get_dsa1024()
-	{
+{
-	DSA *dsa;
+    DSA *dsa;
 
-	if ((dsa=DSA_new()) == NULL) return(NULL);
+    if ((dsa = DSA_new()) == NULL)
-	dsa->priv_key=BN_bin2bn(dsa1024_priv,sizeof(dsa1024_priv),NULL);
+        return (NULL);
-	dsa->pub_key=BN_bin2bn(dsa1024_pub,sizeof(dsa1024_pub),NULL);
+    dsa->priv_key = BN_bin2bn(dsa1024_priv, sizeof(dsa1024_priv), NULL);
-	dsa->p=BN_bin2bn(dsa1024_p,sizeof(dsa1024_p),NULL);
+    dsa->pub_key = BN_bin2bn(dsa1024_pub, sizeof(dsa1024_pub), NULL);
-	dsa->q=BN_bin2bn(dsa1024_q,sizeof(dsa1024_q),NULL);
+    dsa->p = BN_bin2bn(dsa1024_p, sizeof(dsa1024_p), NULL);
-	dsa->g=BN_bin2bn(dsa1024_g,sizeof(dsa1024_g),NULL);
+    dsa->q = BN_bin2bn(dsa1024_q, sizeof(dsa1024_q), NULL);
-	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
+    dsa->g = BN_bin2bn(dsa1024_g, sizeof(dsa1024_g), NULL);
-				(dsa->q == NULL) || (dsa->g == NULL))
+    if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL)
-		return(NULL);
+        || (dsa->q == NULL) || (dsa->g == NULL))
-	return(dsa);
+        return (NULL);
-	}
+    return (dsa);
+}
 
-static unsigned char dsa2048_priv[]={
+static unsigned char dsa2048_priv[] = {
-	0x32,0x67,0x92,0xf6,0xc4,0xe2,0xe2,0xe8,0xa0,0x8b,0x6b,0x45,
+    0x32, 0x67, 0x92, 0xf6, 0xc4, 0xe2, 0xe2, 0xe8, 0xa0, 0x8b, 0x6b, 0x45,
-	0x0c,0x8a,0x76,0xb0,0xee,0xcf,0x91,0xa7,
+    0x0c, 0x8a, 0x76, 0xb0, 0xee, 0xcf, 0x91, 0xa7,
-	};
+};
-static unsigned char dsa2048_pub[]={
+
-	0x17,0x8f,0xa8,0x11,0x84,0x92,0xec,0x83,0x47,0xc7,0x6a,0xb0,
+static unsigned char dsa2048_pub[] = {
-	0x92,0xaf,0x5a,0x20,0x37,0xa3,0x64,0x79,0xd2,0xd0,0x3d,0xcd,
+    0x17, 0x8f, 0xa8, 0x11, 0x84, 0x92, 0xec, 0x83, 0x47, 0xc7, 0x6a, 0xb0,
-	0xe0,0x61,0x88,0x88,0x21,0xcc,0x74,0x5d,0xce,0x4c,0x51,0x47,
+    0x92, 0xaf, 0x5a, 0x20, 0x37, 0xa3, 0x64, 0x79, 0xd2, 0xd0, 0x3d, 0xcd,
-	0xf0,0xc5,0x5c,0x4c,0x82,0x7a,0xaf,0x72,0xad,0xb9,0xe0,0x53,
+    0xe0, 0x61, 0x88, 0x88, 0x21, 0xcc, 0x74, 0x5d, 0xce, 0x4c, 0x51, 0x47,
-	0xf2,0x78,0xb7,0xf0,0xb5,0x48,0x7f,0x8a,0x3a,0x18,0xd1,0x9f,
+    0xf0, 0xc5, 0x5c, 0x4c, 0x82, 0x7a, 0xaf, 0x72, 0xad, 0xb9, 0xe0, 0x53,
-	0x8b,0x7d,0xa5,0x47,0xb7,0x95,0xab,0x98,0xf8,0x7b,0x74,0x50,
+    0xf2, 0x78, 0xb7, 0xf0, 0xb5, 0x48, 0x7f, 0x8a, 0x3a, 0x18, 0xd1, 0x9f,
-	0x56,0x8e,0x57,0xf0,0xee,0xf5,0xb7,0xba,0xab,0x85,0x86,0xf9,
+    0x8b, 0x7d, 0xa5, 0x47, 0xb7, 0x95, 0xab, 0x98, 0xf8, 0x7b, 0x74, 0x50,
-	0x2b,0xef,0x41,0x56,0xa0,0xa4,0x9f,0xb7,0x38,0x00,0x46,0x0a,
+    0x56, 0x8e, 0x57, 0xf0, 0xee, 0xf5, 0xb7, 0xba, 0xab, 0x85, 0x86, 0xf9,
-	0xa6,0xf1,0xfc,0x1f,0xd8,0x4e,0x85,0x44,0x92,0x43,0x21,0x5d,
+    0x2b, 0xef, 0x41, 0x56, 0xa0, 0xa4, 0x9f, 0xb7, 0x38, 0x00, 0x46, 0x0a,
-	0x6e,0xcc,0xc2,0xcb,0x26,0x31,0x0d,0x21,0xc4,0xbd,0x8d,0x24,
+    0xa6, 0xf1, 0xfc, 0x1f, 0xd8, 0x4e, 0x85, 0x44, 0x92, 0x43, 0x21, 0x5d,
-	0xbc,0xd9,0x18,0x19,0xd7,0xdc,0xf1,0xe7,0x93,0x50,0x48,0x03,
+    0x6e, 0xcc, 0xc2, 0xcb, 0x26, 0x31, 0x0d, 0x21, 0xc4, 0xbd, 0x8d, 0x24,
-	0x2c,0xae,0x2e,0xe7,0x49,0x88,0x5f,0x93,0x57,0x27,0x99,0x36,
+    0xbc, 0xd9, 0x18, 0x19, 0xd7, 0xdc, 0xf1, 0xe7, 0x93, 0x50, 0x48, 0x03,
-	0xb4,0x20,0xab,0xfc,0xa7,0x2b,0xf2,0xd9,0x98,0xd7,0xd4,0x34,
+    0x2c, 0xae, 0x2e, 0xe7, 0x49, 0x88, 0x5f, 0x93, 0x57, 0x27, 0x99, 0x36,
-	0x9d,0x96,0x50,0x58,0x9a,0xea,0x54,0xf3,0xee,0xf5,0x63,0x14,
+    0xb4, 0x20, 0xab, 0xfc, 0xa7, 0x2b, 0xf2, 0xd9, 0x98, 0xd7, 0xd4, 0x34,
-	0xee,0x85,0x83,0x74,0x76,0xe1,0x52,0x95,0xc3,0xf7,0xeb,0x04,
+    0x9d, 0x96, 0x50, 0x58, 0x9a, 0xea, 0x54, 0xf3, 0xee, 0xf5, 0x63, 0x14,
-	0x04,0x7b,0xa7,0x28,0x1b,0xcc,0xea,0x4a,0x4e,0x84,0xda,0xd8,
+    0xee, 0x85, 0x83, 0x74, 0x76, 0xe1, 0x52, 0x95, 0xc3, 0xf7, 0xeb, 0x04,
-	0x9c,0x79,0xd8,0x9b,0x66,0x89,0x2f,0xcf,0xac,0xd7,0x79,0xf9,
+    0x04, 0x7b, 0xa7, 0x28, 0x1b, 0xcc, 0xea, 0x4a, 0x4e, 0x84, 0xda, 0xd8,
-	0xa9,0xd8,0x45,0x13,0x78,0xb9,0x00,0x14,0xc9,0x7e,0x22,0x51,
+    0x9c, 0x79, 0xd8, 0x9b, 0x66, 0x89, 0x2f, 0xcf, 0xac, 0xd7, 0x79, 0xf9,
-	0x86,0x67,0xb0,0x9f,0x26,0x11,0x23,0xc8,0x38,0xd7,0x70,0x1d,
+    0xa9, 0xd8, 0x45, 0x13, 0x78, 0xb9, 0x00, 0x14, 0xc9, 0x7e, 0x22, 0x51,
-	0x15,0x8e,0x4d,0x4f,0x95,0x97,0x40,0xa1,0xc2,0x7e,0x01,0x18,
+    0x86, 0x67, 0xb0, 0x9f, 0x26, 0x11, 0x23, 0xc8, 0x38, 0xd7, 0x70, 0x1d,
-	0x72,0xf4,0x10,0xe6,0x8d,0x52,0x16,0x7f,0xf2,0xc9,0xf8,0x33,
+    0x15, 0x8e, 0x4d, 0x4f, 0x95, 0x97, 0x40, 0xa1, 0xc2, 0x7e, 0x01, 0x18,
-	0x8b,0x33,0xb7,0xce,
+    0x72, 0xf4, 0x10, 0xe6, 0x8d, 0x52, 0x16, 0x7f, 0xf2, 0xc9, 0xf8, 0x33,
-	};
+    0x8b, 0x33, 0xb7, 0xce,
-static unsigned char dsa2048_p[]={
+};
-	0xA0,0x25,0xFA,0xAD,0xF4,0x8E,0xB9,0xE5,0x99,0xF3,0x5D,0x6F,
+
-	0x4F,0x83,0x34,0xE2,0x7E,0xCF,0x6F,0xBF,0x30,0xAF,0x6F,0x81,
+static unsigned char dsa2048_p[] = {
-	0xEB,0xF8,0xC4,0x13,0xD9,0xA0,0x5D,0x8B,0x5C,0x8E,0xDC,0xC2,
+    0xA0, 0x25, 0xFA, 0xAD, 0xF4, 0x8E, 0xB9, 0xE5, 0x99, 0xF3, 0x5D, 0x6F,
-	0x1D,0x0B,0x41,0x32,0xB0,0x1F,0xFE,0xEF,0x0C,0xC2,0xA2,0x7E,
+    0x4F, 0x83, 0x34, 0xE2, 0x7E, 0xCF, 0x6F, 0xBF, 0x30, 0xAF, 0x6F, 0x81,
-	0x68,0x5C,0x28,0x21,0xE9,0xF5,0xB1,0x58,0x12,0x63,0x4C,0x19,
+    0xEB, 0xF8, 0xC4, 0x13, 0xD9, 0xA0, 0x5D, 0x8B, 0x5C, 0x8E, 0xDC, 0xC2,
-	0x4E,0xFF,0x02,0x4B,0x92,0xED,0xD2,0x07,0x11,0x4D,0x8C,0x58,
+    0x1D, 0x0B, 0x41, 0x32, 0xB0, 0x1F, 0xFE, 0xEF, 0x0C, 0xC2, 0xA2, 0x7E,
-	0x16,0x5C,0x55,0x8E,0xAD,0xA3,0x67,0x7D,0xB9,0x86,0x6E,0x0B,
+    0x68, 0x5C, 0x28, 0x21, 0xE9, 0xF5, 0xB1, 0x58, 0x12, 0x63, 0x4C, 0x19,
-	0xE6,0x54,0x6F,0x40,0xAE,0x0E,0x67,0x4C,0xF9,0x12,0x5B,0x3C,
+    0x4E, 0xFF, 0x02, 0x4B, 0x92, 0xED, 0xD2, 0x07, 0x11, 0x4D, 0x8C, 0x58,
-	0x08,0x7A,0xF7,0xFC,0x67,0x86,0x69,0xE7,0x0A,0x94,0x40,0xBF,
+    0x16, 0x5C, 0x55, 0x8E, 0xAD, 0xA3, 0x67, 0x7D, 0xB9, 0x86, 0x6E, 0x0B,
-	0x8B,0x76,0xFE,0x26,0xD1,0xF2,0xA1,0x1A,0x84,0xA1,0x43,0x56,
+    0xE6, 0x54, 0x6F, 0x40, 0xAE, 0x0E, 0x67, 0x4C, 0xF9, 0x12, 0x5B, 0x3C,
-	0x28,0xBC,0x9A,0x5F,0xD7,0x3B,0x69,0x89,0x8A,0x36,0x2C,0x51,
+    0x08, 0x7A, 0xF7, 0xFC, 0x67, 0x86, 0x69, 0xE7, 0x0A, 0x94, 0x40, 0xBF,
-	0xDF,0x12,0x77,0x2F,0x57,0x7B,0xA0,0xAA,0xDD,0x7F,0xA1,0x62,
+    0x8B, 0x76, 0xFE, 0x26, 0xD1, 0xF2, 0xA1, 0x1A, 0x84, 0xA1, 0x43, 0x56,
-	0x3B,0x40,0x7B,0x68,0x1A,0x8F,0x0D,0x38,0xBB,0x21,0x5D,0x18,
+    0x28, 0xBC, 0x9A, 0x5F, 0xD7, 0x3B, 0x69, 0x89, 0x8A, 0x36, 0x2C, 0x51,
-	0xFC,0x0F,0x46,0xF7,0xA3,0xB0,0x1D,0x23,0xC3,0xD2,0xC7,0x72,
+    0xDF, 0x12, 0x77, 0x2F, 0x57, 0x7B, 0xA0, 0xAA, 0xDD, 0x7F, 0xA1, 0x62,
-	0x51,0x18,0xDF,0x46,0x95,0x79,0xD9,0xBD,0xB5,0x19,0x02,0x2C,
+    0x3B, 0x40, 0x7B, 0x68, 0x1A, 0x8F, 0x0D, 0x38, 0xBB, 0x21, 0x5D, 0x18,
-	0x87,0xDC,0xE7,0x57,0x82,0x7E,0xF1,0x8B,0x06,0x3D,0x00,0xA5,
+    0xFC, 0x0F, 0x46, 0xF7, 0xA3, 0xB0, 0x1D, 0x23, 0xC3, 0xD2, 0xC7, 0x72,
-	0x7B,0x6B,0x26,0x27,0x91,0x0F,0x6A,0x77,0xE4,0xD5,0x04,0xE4,
+    0x51, 0x18, 0xDF, 0x46, 0x95, 0x79, 0xD9, 0xBD, 0xB5, 0x19, 0x02, 0x2C,
-	0x12,0x2C,0x42,0xFF,0xD2,0x88,0xBB,0xD3,0x92,0xA0,0xF9,0xC8,
+    0x87, 0xDC, 0xE7, 0x57, 0x82, 0x7E, 0xF1, 0x8B, 0x06, 0x3D, 0x00, 0xA5,
-	0x51,0x64,0x14,0x5C,0xD8,0xF9,0x6C,0x47,0x82,0xB4,0x1C,0x7F,
+    0x7B, 0x6B, 0x26, 0x27, 0x91, 0x0F, 0x6A, 0x77, 0xE4, 0xD5, 0x04, 0xE4,
-	0x09,0xB8,0xF0,0x25,0x83,0x1D,0x3F,0x3F,0x05,0xB3,0x21,0x0A,
+    0x12, 0x2C, 0x42, 0xFF, 0xD2, 0x88, 0xBB, 0xD3, 0x92, 0xA0, 0xF9, 0xC8,
-	0x5D,0xA7,0xD8,0x54,0xC3,0x65,0x7D,0xC3,0xB0,0x1D,0xBF,0xAE,
+    0x51, 0x64, 0x14, 0x5C, 0xD8, 0xF9, 0x6C, 0x47, 0x82, 0xB4, 0x1C, 0x7F,
-	0xF8,0x68,0xCF,0x9B,
+    0x09, 0xB8, 0xF0, 0x25, 0x83, 0x1D, 0x3F, 0x3F, 0x05, 0xB3, 0x21, 0x0A,
-	};
+    0x5D, 0xA7, 0xD8, 0x54, 0xC3, 0x65, 0x7D, 0xC3, 0xB0, 0x1D, 0xBF, 0xAE,
-static unsigned char dsa2048_q[]={
+    0xF8, 0x68, 0xCF, 0x9B,
-	0x97,0xE7,0x33,0x4D,0xD3,0x94,0x3E,0x0B,0xDB,0x62,0x74,0xC6,
+};
-	0xA1,0x08,0xDD,0x19,0xA3,0x75,0x17,0x1B,
+
-	};
+static unsigned char dsa2048_q[] = {
-static unsigned char dsa2048_g[]={
+    0x97, 0xE7, 0x33, 0x4D, 0xD3, 0x94, 0x3E, 0x0B, 0xDB, 0x62, 0x74, 0xC6,
-	0x2C,0x78,0x16,0x59,0x34,0x63,0xF4,0xF3,0x92,0xFC,0xB5,0xA5,
+    0xA1, 0x08, 0xDD, 0x19, 0xA3, 0x75, 0x17, 0x1B,
-	0x4F,0x13,0xDE,0x2F,0x1C,0xA4,0x3C,0xAE,0xAD,0x38,0x3F,0x7E,
+};
-	0x90,0xBF,0x96,0xA6,0xAE,0x25,0x90,0x72,0xF5,0x8E,0x80,0x0C,
+
-	0x39,0x1C,0xD9,0xEC,0xBA,0x90,0x5B,0x3A,0xE8,0x58,0x6C,0x9E,
+static unsigned char dsa2048_g[] = {
-	0x30,0x42,0x37,0x02,0x31,0x82,0xBC,0x6A,0xDF,0x6A,0x09,0x29,
+    0x2C, 0x78, 0x16, 0x59, 0x34, 0x63, 0xF4, 0xF3, 0x92, 0xFC, 0xB5, 0xA5,
-	0xE3,0xC0,0x46,0xD1,0xCB,0x85,0xEC,0x0C,0x30,0x5E,0xEA,0xC8,
+    0x4F, 0x13, 0xDE, 0x2F, 0x1C, 0xA4, 0x3C, 0xAE, 0xAD, 0x38, 0x3F, 0x7E,
-	0x39,0x8E,0x22,0x9F,0x22,0x10,0xD2,0x34,0x61,0x68,0x37,0x3D,
+    0x90, 0xBF, 0x96, 0xA6, 0xAE, 0x25, 0x90, 0x72, 0xF5, 0x8E, 0x80, 0x0C,
-	0x2E,0x4A,0x5B,0x9A,0xF5,0xC1,0x48,0xC6,0xF6,0xDC,0x63,0x1A,
+    0x39, 0x1C, 0xD9, 0xEC, 0xBA, 0x90, 0x5B, 0x3A, 0xE8, 0x58, 0x6C, 0x9E,
-	0xD3,0x96,0x64,0xBA,0x34,0xC9,0xD1,0xA0,0xD1,0xAE,0x6C,0x2F,
+    0x30, 0x42, 0x37, 0x02, 0x31, 0x82, 0xBC, 0x6A, 0xDF, 0x6A, 0x09, 0x29,
-	0x48,0x17,0x93,0x14,0x43,0xED,0xF0,0x21,0x30,0x19,0xC3,0x1B,
+    0xE3, 0xC0, 0x46, 0xD1, 0xCB, 0x85, 0xEC, 0x0C, 0x30, 0x5E, 0xEA, 0xC8,
-	0x5F,0xDE,0xA3,0xF0,0x70,0x78,0x18,0xE1,0xA8,0xE4,0xEE,0x2E,
+    0x39, 0x8E, 0x22, 0x9F, 0x22, 0x10, 0xD2, 0x34, 0x61, 0x68, 0x37, 0x3D,
-	0x00,0xA5,0xE4,0xB3,0x17,0xC8,0x0C,0x7D,0x6E,0x42,0xDC,0xB7,
+    0x2E, 0x4A, 0x5B, 0x9A, 0xF5, 0xC1, 0x48, 0xC6, 0xF6, 0xDC, 0x63, 0x1A,
-	0x46,0x00,0x36,0x4D,0xD4,0x46,0xAA,0x3D,0x3C,0x46,0x89,0x40,
+    0xD3, 0x96, 0x64, 0xBA, 0x34, 0xC9, 0xD1, 0xA0, 0xD1, 0xAE, 0x6C, 0x2F,
-	0xBF,0x1D,0x84,0x77,0x0A,0x75,0xF3,0x87,0x1D,0x08,0x4C,0xA6,
+    0x48, 0x17, 0x93, 0x14, 0x43, 0xED, 0xF0, 0x21, 0x30, 0x19, 0xC3, 0x1B,
-	0xD1,0xA9,0x1C,0x1E,0x12,0x1E,0xE1,0xC7,0x30,0x28,0x76,0xA5,
+    0x5F, 0xDE, 0xA3, 0xF0, 0x70, 0x78, 0x18, 0xE1, 0xA8, 0xE4, 0xEE, 0x2E,
-	0x7F,0x6C,0x85,0x96,0x2B,0x6F,0xDB,0x80,0x66,0x26,0xAE,0xF5,
+    0x00, 0xA5, 0xE4, 0xB3, 0x17, 0xC8, 0x0C, 0x7D, 0x6E, 0x42, 0xDC, 0xB7,
-	0x93,0xC7,0x8E,0xAE,0x9A,0xED,0xE4,0xCA,0x04,0xEA,0x3B,0x72,
+    0x46, 0x00, 0x36, 0x4D, 0xD4, 0x46, 0xAA, 0x3D, 0x3C, 0x46, 0x89, 0x40,
-	0xEF,0xDC,0x87,0xED,0x0D,0xA5,0x4C,0x4A,0xDD,0x71,0x22,0x64,
+    0xBF, 0x1D, 0x84, 0x77, 0x0A, 0x75, 0xF3, 0x87, 0x1D, 0x08, 0x4C, 0xA6,
-	0x59,0x69,0x4E,0x8E,0xBF,0x43,0xDC,0xAB,0x8E,0x66,0xBB,0x01,
+    0xD1, 0xA9, 0x1C, 0x1E, 0x12, 0x1E, 0xE1, 0xC7, 0x30, 0x28, 0x76, 0xA5,
-	0xB6,0xF4,0xE7,0xFD,0xD2,0xAD,0x9F,0x36,0xC1,0xA0,0x29,0x99,
+    0x7F, 0x6C, 0x85, 0x96, 0x2B, 0x6F, 0xDB, 0x80, 0x66, 0x26, 0xAE, 0xF5,
-	0xD1,0x96,0x70,0x59,0x06,0x78,0x35,0xBD,0x65,0x55,0x52,0x9E,
+    0x93, 0xC7, 0x8E, 0xAE, 0x9A, 0xED, 0xE4, 0xCA, 0x04, 0xEA, 0x3B, 0x72,
-	0xF8,0xB2,0xE5,0x38,
+    0xEF, 0xDC, 0x87, 0xED, 0x0D, 0xA5, 0x4C, 0x4A, 0xDD, 0x71, 0x22, 0x64,
-	};
+    0x59, 0x69, 0x4E, 0x8E, 0xBF, 0x43, 0xDC, 0xAB, 0x8E, 0x66, 0xBB, 0x01,
+    0xB6, 0xF4, 0xE7, 0xFD, 0xD2, 0xAD, 0x9F, 0x36, 0xC1, 0xA0, 0x29, 0x99,
+    0xD1, 0x96, 0x70, 0x59, 0x06, 0x78, 0x35, 0xBD, 0x65, 0x55, 0x52, 0x9E,
+    0xF8, 0xB2, 0xE5, 0x38,
+};
 
 DSA *get_dsa2048()
-	{
+{
-	DSA *dsa;
+    DSA *dsa;
 
-	if ((dsa=DSA_new()) == NULL) return(NULL);
+    if ((dsa = DSA_new()) == NULL)
-	dsa->priv_key=BN_bin2bn(dsa2048_priv,sizeof(dsa2048_priv),NULL);
+        return (NULL);
-	dsa->pub_key=BN_bin2bn(dsa2048_pub,sizeof(dsa2048_pub),NULL);
+    dsa->priv_key = BN_bin2bn(dsa2048_priv, sizeof(dsa2048_priv), NULL);
-	dsa->p=BN_bin2bn(dsa2048_p,sizeof(dsa2048_p),NULL);
+    dsa->pub_key = BN_bin2bn(dsa2048_pub, sizeof(dsa2048_pub), NULL);
-	dsa->q=BN_bin2bn(dsa2048_q,sizeof(dsa2048_q),NULL);
+    dsa->p = BN_bin2bn(dsa2048_p, sizeof(dsa2048_p), NULL);
-	dsa->g=BN_bin2bn(dsa2048_g,sizeof(dsa2048_g),NULL);
+    dsa->q = BN_bin2bn(dsa2048_q, sizeof(dsa2048_q), NULL);
-	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
+    dsa->g = BN_bin2bn(dsa2048_g, sizeof(dsa2048_g), NULL);
-				(dsa->q == NULL) || (dsa->g == NULL))
+    if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL)
-		return(NULL);
+        || (dsa->q == NULL) || (dsa->g == NULL))
-	return(dsa);
+        return (NULL);
-	}
+    return (dsa);
+}
 
-static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+static const char rnd_seed[] =
+    "string to make the random number generator think it has entropy";
 static int rnd_fake = 0;

apps/testrsa.h

@@ -57,462 +57,462 @@
  * [including the GNU Public Licence.]
  */
 
-static unsigned char test512[]={
+static unsigned char test512[] = {
-	0x30,0x82,0x01,0x3a,0x02,0x01,0x00,0x02,0x41,0x00,
+    0x30, 0x82, 0x01, 0x3a, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00,
-	0xd6,0x33,0xb9,0xc8,0xfb,0x4f,0x3c,0x7d,0xc0,0x01,
+    0xd6, 0x33, 0xb9, 0xc8, 0xfb, 0x4f, 0x3c, 0x7d, 0xc0, 0x01,
-	0x86,0xd0,0xe7,0xa0,0x55,0xf2,0x95,0x93,0xcc,0x4f,
+    0x86, 0xd0, 0xe7, 0xa0, 0x55, 0xf2, 0x95, 0x93, 0xcc, 0x4f,
-	0xb7,0x5b,0x67,0x5b,0x94,0x68,0xc9,0x34,0x15,0xde,
+    0xb7, 0x5b, 0x67, 0x5b, 0x94, 0x68, 0xc9, 0x34, 0x15, 0xde,
-	0xa5,0x2e,0x1c,0x33,0xc2,0x6e,0xfc,0x34,0x5e,0x71,
+    0xa5, 0x2e, 0x1c, 0x33, 0xc2, 0x6e, 0xfc, 0x34, 0x5e, 0x71,
-	0x13,0xb7,0xd6,0xee,0xd8,0xa5,0x65,0x05,0x72,0x87,
+    0x13, 0xb7, 0xd6, 0xee, 0xd8, 0xa5, 0x65, 0x05, 0x72, 0x87,
-	0xa8,0xb0,0x77,0xfe,0x57,0xf5,0xfc,0x5f,0x55,0x83,
+    0xa8, 0xb0, 0x77, 0xfe, 0x57, 0xf5, 0xfc, 0x5f, 0x55, 0x83,
-	0x87,0xdd,0x57,0x49,0x02,0x03,0x01,0x00,0x01,0x02,
+    0x87, 0xdd, 0x57, 0x49, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
-	0x41,0x00,0xa7,0xf7,0x91,0xc5,0x0f,0x84,0x57,0xdc,
+    0x41, 0x00, 0xa7, 0xf7, 0x91, 0xc5, 0x0f, 0x84, 0x57, 0xdc,
-	0x07,0xf7,0x6a,0x7f,0x60,0x52,0xb3,0x72,0xf1,0x66,
+    0x07, 0xf7, 0x6a, 0x7f, 0x60, 0x52, 0xb3, 0x72, 0xf1, 0x66,
-	0x1f,0x7d,0x97,0x3b,0x9e,0xb6,0x0a,0x8f,0x8c,0xcf,
+    0x1f, 0x7d, 0x97, 0x3b, 0x9e, 0xb6, 0x0a, 0x8f, 0x8c, 0xcf,
-	0x42,0x23,0x00,0x04,0xd4,0x28,0x0e,0x1c,0x90,0xc4,
+    0x42, 0x23, 0x00, 0x04, 0xd4, 0x28, 0x0e, 0x1c, 0x90, 0xc4,
-	0x11,0x25,0x25,0xa5,0x93,0xa5,0x2f,0x70,0x02,0xdf,
+    0x11, 0x25, 0x25, 0xa5, 0x93, 0xa5, 0x2f, 0x70, 0x02, 0xdf,
-	0x81,0x9c,0x49,0x03,0xa0,0xf8,0x6d,0x54,0x2e,0x26,
+    0x81, 0x9c, 0x49, 0x03, 0xa0, 0xf8, 0x6d, 0x54, 0x2e, 0x26,
-	0xde,0xaa,0x85,0x59,0xa8,0x31,0x02,0x21,0x00,0xeb,
+    0xde, 0xaa, 0x85, 0x59, 0xa8, 0x31, 0x02, 0x21, 0x00, 0xeb,
-	0x47,0xd7,0x3b,0xf6,0xc3,0xdd,0x5a,0x46,0xc5,0xb9,
+    0x47, 0xd7, 0x3b, 0xf6, 0xc3, 0xdd, 0x5a, 0x46, 0xc5, 0xb9,
-	0x2b,0x9a,0xa0,0x09,0x8f,0xa6,0xfb,0xf3,0x78,0x7a,
+    0x2b, 0x9a, 0xa0, 0x09, 0x8f, 0xa6, 0xfb, 0xf3, 0x78, 0x7a,
-	0x33,0x70,0x9d,0x0f,0x42,0x6b,0x13,0x68,0x24,0xd3,
+    0x33, 0x70, 0x9d, 0x0f, 0x42, 0x6b, 0x13, 0x68, 0x24, 0xd3,
-	0x15,0x02,0x21,0x00,0xe9,0x10,0xb0,0xb3,0x0d,0xe2,
+    0x15, 0x02, 0x21, 0x00, 0xe9, 0x10, 0xb0, 0xb3, 0x0d, 0xe2,
-	0x82,0x68,0x77,0x8a,0x6e,0x7c,0xda,0xbc,0x3e,0x53,
+    0x82, 0x68, 0x77, 0x8a, 0x6e, 0x7c, 0xda, 0xbc, 0x3e, 0x53,
-	0x83,0xfb,0xd6,0x22,0xe7,0xb5,0xae,0x6e,0x80,0xda,
+    0x83, 0xfb, 0xd6, 0x22, 0xe7, 0xb5, 0xae, 0x6e, 0x80, 0xda,
-	0x00,0x55,0x97,0xc1,0xd0,0x65,0x02,0x20,0x4c,0xf8,
+    0x00, 0x55, 0x97, 0xc1, 0xd0, 0x65, 0x02, 0x20, 0x4c, 0xf8,
-	0x73,0xb1,0x6a,0x49,0x29,0x61,0x1f,0x46,0x10,0x0d,
+    0x73, 0xb1, 0x6a, 0x49, 0x29, 0x61, 0x1f, 0x46, 0x10, 0x0d,
-	0xf3,0xc7,0xe7,0x58,0xd7,0x88,0x15,0x5e,0x94,0x9b,
+    0xf3, 0xc7, 0xe7, 0x58, 0xd7, 0x88, 0x15, 0x5e, 0x94, 0x9b,
-	0xbf,0x7b,0xa2,0x42,0x58,0x45,0x41,0x0c,0xcb,0x01,
+    0xbf, 0x7b, 0xa2, 0x42, 0x58, 0x45, 0x41, 0x0c, 0xcb, 0x01,
-	0x02,0x20,0x12,0x11,0xba,0x31,0x57,0x9d,0x3d,0x11,
+    0x02, 0x20, 0x12, 0x11, 0xba, 0x31, 0x57, 0x9d, 0x3d, 0x11,
-	0x0e,0x5b,0x8c,0x2f,0x5f,0xe2,0x02,0x4f,0x05,0x47,
+    0x0e, 0x5b, 0x8c, 0x2f, 0x5f, 0xe2, 0x02, 0x4f, 0x05, 0x47,
-	0x8c,0x15,0x8e,0xb3,0x56,0x3f,0xb8,0xfb,0xad,0xd4,
+    0x8c, 0x15, 0x8e, 0xb3, 0x56, 0x3f, 0xb8, 0xfb, 0xad, 0xd4,
-	0xf4,0xfc,0x10,0xc5,0x02,0x20,0x18,0xa1,0x29,0x99,
+    0xf4, 0xfc, 0x10, 0xc5, 0x02, 0x20, 0x18, 0xa1, 0x29, 0x99,
-	0x5b,0xd9,0xc8,0xd4,0xfc,0x49,0x7a,0x2a,0x21,0x2c,
+    0x5b, 0xd9, 0xc8, 0xd4, 0xfc, 0x49, 0x7a, 0x2a, 0x21, 0x2c,
-	0x49,0xe4,0x4f,0xeb,0xef,0x51,0xf1,0xab,0x6d,0xfb,
+    0x49, 0xe4, 0x4f, 0xeb, 0xef, 0x51, 0xf1, 0xab, 0x6d, 0xfb,
-	0x4b,0x14,0xe9,0x4b,0x52,0xb5,0x82,0x2c,
+    0x4b, 0x14, 0xe9, 0x4b, 0x52, 0xb5, 0x82, 0x2c,
-	};
+};
 
-static unsigned char test1024[]={
+static unsigned char test1024[] = {
-	0x30,0x82,0x02,0x5c,0x02,0x01,0x00,0x02,0x81,0x81,
+    0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
-	0x00,0xdc,0x98,0x43,0xe8,0x3d,0x43,0x5b,0xe4,0x05,
+    0x00, 0xdc, 0x98, 0x43, 0xe8, 0x3d, 0x43, 0x5b, 0xe4, 0x05,
-	0xcd,0xd0,0xa9,0x3e,0xcb,0x83,0x75,0xf6,0xb5,0xa5,
+    0xcd, 0xd0, 0xa9, 0x3e, 0xcb, 0x83, 0x75, 0xf6, 0xb5, 0xa5,
-	0x9f,0x6b,0xe9,0x34,0x41,0x29,0x18,0xfa,0x6a,0x55,
+    0x9f, 0x6b, 0xe9, 0x34, 0x41, 0x29, 0x18, 0xfa, 0x6a, 0x55,
-	0x4d,0x70,0xfc,0xec,0xae,0x87,0x38,0x0a,0x20,0xa9,
+    0x4d, 0x70, 0xfc, 0xec, 0xae, 0x87, 0x38, 0x0a, 0x20, 0xa9,
-	0xc0,0x45,0x77,0x6e,0x57,0x60,0x57,0xf4,0xed,0x96,
+    0xc0, 0x45, 0x77, 0x6e, 0x57, 0x60, 0x57, 0xf4, 0xed, 0x96,
-	0x22,0xcb,0x8f,0xe1,0x33,0x3a,0x17,0x1f,0xed,0x37,
+    0x22, 0xcb, 0x8f, 0xe1, 0x33, 0x3a, 0x17, 0x1f, 0xed, 0x37,
-	0xa5,0x6f,0xeb,0xa6,0xbc,0x12,0x80,0x1d,0x53,0xbd,
+    0xa5, 0x6f, 0xeb, 0xa6, 0xbc, 0x12, 0x80, 0x1d, 0x53, 0xbd,
-	0x70,0xeb,0x21,0x76,0x3e,0xc9,0x2f,0x1a,0x45,0x24,
+    0x70, 0xeb, 0x21, 0x76, 0x3e, 0xc9, 0x2f, 0x1a, 0x45, 0x24,
-	0x82,0xff,0xcd,0x59,0x32,0x06,0x2e,0x12,0x3b,0x23,
+    0x82, 0xff, 0xcd, 0x59, 0x32, 0x06, 0x2e, 0x12, 0x3b, 0x23,
-	0x78,0xed,0x12,0x3d,0xe0,0x8d,0xf9,0x67,0x4f,0x37,
+    0x78, 0xed, 0x12, 0x3d, 0xe0, 0x8d, 0xf9, 0x67, 0x4f, 0x37,
-	0x4e,0x47,0x02,0x4c,0x2d,0xc0,0x4f,0x1f,0xb3,0x94,
+    0x4e, 0x47, 0x02, 0x4c, 0x2d, 0xc0, 0x4f, 0x1f, 0xb3, 0x94,
-	0xe1,0x41,0x2e,0x2d,0x90,0x10,0xfc,0x82,0x91,0x8b,
+    0xe1, 0x41, 0x2e, 0x2d, 0x90, 0x10, 0xfc, 0x82, 0x91, 0x8b,
-	0x0f,0x22,0xd4,0xf2,0xfc,0x2c,0xab,0x53,0x55,0x02,
+    0x0f, 0x22, 0xd4, 0xf2, 0xfc, 0x2c, 0xab, 0x53, 0x55, 0x02,
-	0x03,0x01,0x00,0x01,0x02,0x81,0x80,0x2b,0xcc,0x3f,
+    0x03, 0x01, 0x00, 0x01, 0x02, 0x81, 0x80, 0x2b, 0xcc, 0x3f,
-	0x8f,0x58,0xba,0x8b,0x00,0x16,0xf6,0xea,0x3a,0xf0,
+    0x8f, 0x58, 0xba, 0x8b, 0x00, 0x16, 0xf6, 0xea, 0x3a, 0xf0,
-	0x30,0xd0,0x05,0x17,0xda,0xb0,0xeb,0x9a,0x2d,0x4f,
+    0x30, 0xd0, 0x05, 0x17, 0xda, 0xb0, 0xeb, 0x9a, 0x2d, 0x4f,
-	0x26,0xb0,0xd6,0x38,0xc1,0xeb,0xf5,0xd8,0x3d,0x1f,
+    0x26, 0xb0, 0xd6, 0x38, 0xc1, 0xeb, 0xf5, 0xd8, 0x3d, 0x1f,
-	0x70,0xf7,0x7f,0xf4,0xe2,0xcf,0x51,0x51,0x79,0x88,
+    0x70, 0xf7, 0x7f, 0xf4, 0xe2, 0xcf, 0x51, 0x51, 0x79, 0x88,
-	0xfa,0xe8,0x32,0x0e,0x7b,0x2d,0x97,0xf2,0xfa,0xba,
+    0xfa, 0xe8, 0x32, 0x0e, 0x7b, 0x2d, 0x97, 0xf2, 0xfa, 0xba,
-	0x27,0xc5,0x9c,0xd9,0xc5,0xeb,0x8a,0x79,0x52,0x3c,
+    0x27, 0xc5, 0x9c, 0xd9, 0xc5, 0xeb, 0x8a, 0x79, 0x52, 0x3c,
-	0x64,0x34,0x7d,0xc2,0xcf,0x28,0xc7,0x4e,0xd5,0x43,
+    0x64, 0x34, 0x7d, 0xc2, 0xcf, 0x28, 0xc7, 0x4e, 0xd5, 0x43,
-	0x0b,0xd1,0xa6,0xca,0x6d,0x03,0x2d,0x72,0x23,0xbc,
+    0x0b, 0xd1, 0xa6, 0xca, 0x6d, 0x03, 0x2d, 0x72, 0x23, 0xbc,
-	0x6d,0x05,0xfa,0x16,0x09,0x2f,0x2e,0x5c,0xb6,0xee,
+    0x6d, 0x05, 0xfa, 0x16, 0x09, 0x2f, 0x2e, 0x5c, 0xb6, 0xee,
-	0x74,0xdd,0xd2,0x48,0x8e,0x36,0x0c,0x06,0x3d,0x4d,
+    0x74, 0xdd, 0xd2, 0x48, 0x8e, 0x36, 0x0c, 0x06, 0x3d, 0x4d,
-	0xe5,0x10,0x82,0xeb,0x6a,0xf3,0x4b,0x9f,0xd6,0xed,
+    0xe5, 0x10, 0x82, 0xeb, 0x6a, 0xf3, 0x4b, 0x9f, 0xd6, 0xed,
-	0x11,0xb1,0x6e,0xec,0xf4,0xfe,0x8e,0x75,0x94,0x20,
+    0x11, 0xb1, 0x6e, 0xec, 0xf4, 0xfe, 0x8e, 0x75, 0x94, 0x20,
-	0x2f,0xcb,0xac,0x46,0xf1,0x02,0x41,0x00,0xf9,0x8c,
+    0x2f, 0xcb, 0xac, 0x46, 0xf1, 0x02, 0x41, 0x00, 0xf9, 0x8c,
-	0xa3,0x85,0xb1,0xdd,0x29,0xaf,0x65,0xc1,0x33,0xf3,
+    0xa3, 0x85, 0xb1, 0xdd, 0x29, 0xaf, 0x65, 0xc1, 0x33, 0xf3,
-	0x95,0xc5,0x52,0x68,0x0b,0xd4,0xf1,0xe5,0x0e,0x02,
+    0x95, 0xc5, 0x52, 0x68, 0x0b, 0xd4, 0xf1, 0xe5, 0x0e, 0x02,
-	0x9f,0x4f,0xfa,0x77,0xdc,0x46,0x9e,0xc7,0xa6,0xe4,
+    0x9f, 0x4f, 0xfa, 0x77, 0xdc, 0x46, 0x9e, 0xc7, 0xa6, 0xe4,
-	0x16,0x29,0xda,0xb0,0x07,0xcf,0x5b,0xa9,0x12,0x8a,
+    0x16, 0x29, 0xda, 0xb0, 0x07, 0xcf, 0x5b, 0xa9, 0x12, 0x8a,
-	0xdd,0x63,0x0a,0xde,0x2e,0x8c,0x66,0x8b,0x8c,0xdc,
+    0xdd, 0x63, 0x0a, 0xde, 0x2e, 0x8c, 0x66, 0x8b, 0x8c, 0xdc,
-	0x19,0xa3,0x7e,0xf4,0x3b,0xd0,0x1a,0x8c,0xa4,0xc2,
+    0x19, 0xa3, 0x7e, 0xf4, 0x3b, 0xd0, 0x1a, 0x8c, 0xa4, 0xc2,
-	0xe1,0xd3,0x02,0x41,0x00,0xe2,0x4c,0x05,0xf2,0x04,
+    0xe1, 0xd3, 0x02, 0x41, 0x00, 0xe2, 0x4c, 0x05, 0xf2, 0x04,
-	0x86,0x4e,0x61,0x43,0xdb,0xb0,0xb9,0x96,0x86,0x52,
+    0x86, 0x4e, 0x61, 0x43, 0xdb, 0xb0, 0xb9, 0x96, 0x86, 0x52,
-	0x2c,0xca,0x8d,0x7b,0xab,0x0b,0x13,0x0d,0x7e,0x38,
+    0x2c, 0xca, 0x8d, 0x7b, 0xab, 0x0b, 0x13, 0x0d, 0x7e, 0x38,
-	0x5b,0xe2,0x2e,0x7b,0x0e,0xe7,0x19,0x99,0x38,0xe7,
+    0x5b, 0xe2, 0x2e, 0x7b, 0x0e, 0xe7, 0x19, 0x99, 0x38, 0xe7,
-	0xf2,0x21,0xbd,0x85,0x85,0xe3,0xfd,0x28,0x77,0x20,
+    0xf2, 0x21, 0xbd, 0x85, 0x85, 0xe3, 0xfd, 0x28, 0x77, 0x20,
-	0x31,0x71,0x2c,0xd0,0xff,0xfb,0x2e,0xaf,0x85,0xb4,
+    0x31, 0x71, 0x2c, 0xd0, 0xff, 0xfb, 0x2e, 0xaf, 0x85, 0xb4,
-	0x86,0xca,0xf3,0xbb,0xca,0xaa,0x0f,0x95,0x37,0x02,
+    0x86, 0xca, 0xf3, 0xbb, 0xca, 0xaa, 0x0f, 0x95, 0x37, 0x02,
-	0x40,0x0e,0x41,0x9a,0x95,0xe8,0xb3,0x59,0xce,0x4b,
+    0x40, 0x0e, 0x41, 0x9a, 0x95, 0xe8, 0xb3, 0x59, 0xce, 0x4b,
-	0x61,0xde,0x35,0xec,0x38,0x79,0x9c,0xb8,0x10,0x52,
+    0x61, 0xde, 0x35, 0xec, 0x38, 0x79, 0x9c, 0xb8, 0x10, 0x52,
-	0x41,0x63,0xab,0x82,0xae,0x6f,0x00,0xa9,0xf4,0xde,
+    0x41, 0x63, 0xab, 0x82, 0xae, 0x6f, 0x00, 0xa9, 0xf4, 0xde,
-	0xdd,0x49,0x0b,0x7e,0xb8,0xa5,0x65,0xa9,0x0c,0x8f,
+    0xdd, 0x49, 0x0b, 0x7e, 0xb8, 0xa5, 0x65, 0xa9, 0x0c, 0x8f,
-	0x8f,0xf9,0x1f,0x35,0xc6,0x92,0xb8,0x5e,0xb0,0x66,
+    0x8f, 0xf9, 0x1f, 0x35, 0xc6, 0x92, 0xb8, 0x5e, 0xb0, 0x66,
-	0xab,0x52,0x40,0xc0,0xb6,0x36,0x6a,0x7d,0x80,0x46,
+    0xab, 0x52, 0x40, 0xc0, 0xb6, 0x36, 0x6a, 0x7d, 0x80, 0x46,
-	0x04,0x02,0xe5,0x9f,0x41,0x02,0x41,0x00,0xc0,0xad,
+    0x04, 0x02, 0xe5, 0x9f, 0x41, 0x02, 0x41, 0x00, 0xc0, 0xad,
-	0xcc,0x4e,0x21,0xee,0x1d,0x24,0x91,0xfb,0xa7,0x80,
+    0xcc, 0x4e, 0x21, 0xee, 0x1d, 0x24, 0x91, 0xfb, 0xa7, 0x80,
-	0x8d,0x9a,0xb6,0xb3,0x2e,0x8f,0xc2,0xe1,0x82,0xdf,
+    0x8d, 0x9a, 0xb6, 0xb3, 0x2e, 0x8f, 0xc2, 0xe1, 0x82, 0xdf,
-	0x69,0x18,0xb4,0x71,0xff,0xa6,0x65,0xde,0xed,0x84,
+    0x69, 0x18, 0xb4, 0x71, 0xff, 0xa6, 0x65, 0xde, 0xed, 0x84,
-	0x8d,0x42,0xb7,0xb3,0x21,0x69,0x56,0x1c,0x07,0x60,
+    0x8d, 0x42, 0xb7, 0xb3, 0x21, 0x69, 0x56, 0x1c, 0x07, 0x60,
-	0x51,0x29,0x04,0xff,0x34,0x06,0xdd,0xb9,0x67,0x2c,
+    0x51, 0x29, 0x04, 0xff, 0x34, 0x06, 0xdd, 0xb9, 0x67, 0x2c,
-	0x7c,0x04,0x93,0x0e,0x46,0x15,0xbb,0x2a,0xb7,0x1b,
+    0x7c, 0x04, 0x93, 0x0e, 0x46, 0x15, 0xbb, 0x2a, 0xb7, 0x1b,
-	0xe7,0x87,0x02,0x40,0x78,0xda,0x5d,0x07,0x51,0x0c,
+    0xe7, 0x87, 0x02, 0x40, 0x78, 0xda, 0x5d, 0x07, 0x51, 0x0c,
-	0x16,0x7a,0x9f,0x29,0x20,0x84,0x0d,0x42,0xfa,0xd7,
+    0x16, 0x7a, 0x9f, 0x29, 0x20, 0x84, 0x0d, 0x42, 0xfa, 0xd7,
-	0x00,0xd8,0x77,0x7e,0xb0,0xb0,0x6b,0xd6,0x5b,0x53,
+    0x00, 0xd8, 0x77, 0x7e, 0xb0, 0xb0, 0x6b, 0xd6, 0x5b, 0x53,
-	0xb8,0x9b,0x7a,0xcd,0xc7,0x2b,0xb8,0x6a,0x63,0xa9,
+    0xb8, 0x9b, 0x7a, 0xcd, 0xc7, 0x2b, 0xb8, 0x6a, 0x63, 0xa9,
-	0xfb,0x6f,0xa4,0x72,0xbf,0x4c,0x5d,0x00,0x14,0xba,
+    0xfb, 0x6f, 0xa4, 0x72, 0xbf, 0x4c, 0x5d, 0x00, 0x14, 0xba,
-	0xfa,0x59,0x88,0xed,0xe4,0xe0,0x8c,0xa2,0xec,0x14,
+    0xfa, 0x59, 0x88, 0xed, 0xe4, 0xe0, 0x8c, 0xa2, 0xec, 0x14,
-	0x7e,0x2d,0xe2,0xf0,0x46,0x49,0x95,0x45,
+    0x7e, 0x2d, 0xe2, 0xf0, 0x46, 0x49, 0x95, 0x45,
-	};
+};
 
-static unsigned char test2048[]={
+static unsigned char test2048[] = {
-	0x30,0x82,0x04,0xa3,0x02,0x01,0x00,0x02,0x82,0x01,
+    0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
-	0x01,0x00,0xc0,0xc0,0xce,0x3e,0x3c,0x53,0x67,0x3f,
+    0x01, 0x00, 0xc0, 0xc0, 0xce, 0x3e, 0x3c, 0x53, 0x67, 0x3f,
-	0x4f,0xc5,0x2f,0xa4,0xc2,0x5a,0x2f,0x58,0xfd,0x27,
+    0x4f, 0xc5, 0x2f, 0xa4, 0xc2, 0x5a, 0x2f, 0x58, 0xfd, 0x27,
-	0x52,0x6a,0xe8,0xcf,0x4a,0x73,0x47,0x8d,0x25,0x0f,
+    0x52, 0x6a, 0xe8, 0xcf, 0x4a, 0x73, 0x47, 0x8d, 0x25, 0x0f,
-	0x5f,0x03,0x26,0x78,0xef,0xf0,0x22,0x12,0xd3,0xde,
+    0x5f, 0x03, 0x26, 0x78, 0xef, 0xf0, 0x22, 0x12, 0xd3, 0xde,
-	0x47,0xb2,0x1c,0x0b,0x38,0x63,0x1a,0x6c,0x85,0x7a,
+    0x47, 0xb2, 0x1c, 0x0b, 0x38, 0x63, 0x1a, 0x6c, 0x85, 0x7a,
-	0x80,0xc6,0x8f,0xa0,0x41,0xaf,0x62,0xc4,0x67,0x32,
+    0x80, 0xc6, 0x8f, 0xa0, 0x41, 0xaf, 0x62, 0xc4, 0x67, 0x32,
-	0x88,0xf8,0xa6,0x9c,0xf5,0x23,0x1d,0xe4,0xac,0x3f,
+    0x88, 0xf8, 0xa6, 0x9c, 0xf5, 0x23, 0x1d, 0xe4, 0xac, 0x3f,
-	0x29,0xf9,0xec,0xe1,0x8b,0x26,0x03,0x2c,0xb2,0xab,
+    0x29, 0xf9, 0xec, 0xe1, 0x8b, 0x26, 0x03, 0x2c, 0xb2, 0xab,
-	0xf3,0x7d,0xb5,0xca,0x49,0xc0,0x8f,0x1c,0xdf,0x33,
+    0xf3, 0x7d, 0xb5, 0xca, 0x49, 0xc0, 0x8f, 0x1c, 0xdf, 0x33,
-	0x3a,0x60,0xda,0x3c,0xb0,0x16,0xf8,0xa9,0x12,0x8f,
+    0x3a, 0x60, 0xda, 0x3c, 0xb0, 0x16, 0xf8, 0xa9, 0x12, 0x8f,
-	0x64,0xac,0x23,0x0c,0x69,0x64,0x97,0x5d,0x99,0xd4,
+    0x64, 0xac, 0x23, 0x0c, 0x69, 0x64, 0x97, 0x5d, 0x99, 0xd4,
-	0x09,0x83,0x9b,0x61,0xd3,0xac,0xf0,0xde,0xdd,0x5e,
+    0x09, 0x83, 0x9b, 0x61, 0xd3, 0xac, 0xf0, 0xde, 0xdd, 0x5e,
-	0x9f,0x44,0x94,0xdb,0x3a,0x4d,0x97,0xe8,0x52,0x29,
+    0x9f, 0x44, 0x94, 0xdb, 0x3a, 0x4d, 0x97, 0xe8, 0x52, 0x29,
-	0xf7,0xdb,0x94,0x07,0x45,0x90,0x78,0x1e,0x31,0x0b,
+    0xf7, 0xdb, 0x94, 0x07, 0x45, 0x90, 0x78, 0x1e, 0x31, 0x0b,
-	0x80,0xf7,0x57,0xad,0x1c,0x79,0xc5,0xcb,0x32,0xb0,
+    0x80, 0xf7, 0x57, 0xad, 0x1c, 0x79, 0xc5, 0xcb, 0x32, 0xb0,
-	0xce,0xcd,0x74,0xb3,0xe2,0x94,0xc5,0x78,0x2f,0x34,
+    0xce, 0xcd, 0x74, 0xb3, 0xe2, 0x94, 0xc5, 0x78, 0x2f, 0x34,
-	0x1a,0x45,0xf7,0x8c,0x52,0xa5,0xbc,0x8d,0xec,0xd1,
+    0x1a, 0x45, 0xf7, 0x8c, 0x52, 0xa5, 0xbc, 0x8d, 0xec, 0xd1,
-	0x2f,0x31,0x3b,0xf0,0x49,0x59,0x5e,0x88,0x9d,0x15,
+    0x2f, 0x31, 0x3b, 0xf0, 0x49, 0x59, 0x5e, 0x88, 0x9d, 0x15,
-	0x92,0x35,0x32,0xc1,0xe7,0x61,0xec,0x50,0x48,0x7c,
+    0x92, 0x35, 0x32, 0xc1, 0xe7, 0x61, 0xec, 0x50, 0x48, 0x7c,
-	0xba,0x05,0xf9,0xf8,0xf8,0xa7,0x8c,0x83,0xe8,0x66,
+    0xba, 0x05, 0xf9, 0xf8, 0xf8, 0xa7, 0x8c, 0x83, 0xe8, 0x66,
-	0x5b,0xeb,0xfe,0xd8,0x4f,0xdd,0x6d,0x36,0xc0,0xb2,
+    0x5b, 0xeb, 0xfe, 0xd8, 0x4f, 0xdd, 0x6d, 0x36, 0xc0, 0xb2,
-	0x90,0x0f,0xb8,0x52,0xf9,0x04,0x9b,0x40,0x2c,0x27,
+    0x90, 0x0f, 0xb8, 0x52, 0xf9, 0x04, 0x9b, 0x40, 0x2c, 0x27,
-	0xd6,0x36,0x8e,0xc2,0x1b,0x44,0xf3,0x92,0xd5,0x15,
+    0xd6, 0x36, 0x8e, 0xc2, 0x1b, 0x44, 0xf3, 0x92, 0xd5, 0x15,
-	0x9e,0x9a,0xbc,0xf3,0x7d,0x03,0xd7,0x02,0x14,0x20,
+    0x9e, 0x9a, 0xbc, 0xf3, 0x7d, 0x03, 0xd7, 0x02, 0x14, 0x20,
-	0xe9,0x10,0x92,0xfd,0xf9,0xfc,0x8f,0xe5,0x18,0xe1,
+    0xe9, 0x10, 0x92, 0xfd, 0xf9, 0xfc, 0x8f, 0xe5, 0x18, 0xe1,
-	0x95,0xcc,0x9e,0x60,0xa6,0xfa,0x38,0x4d,0x02,0x03,
+    0x95, 0xcc, 0x9e, 0x60, 0xa6, 0xfa, 0x38, 0x4d, 0x02, 0x03,
-	0x01,0x00,0x01,0x02,0x82,0x01,0x00,0x00,0xc3,0xc3,
+    0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x00, 0xc3, 0xc3,
-	0x0d,0xb4,0x27,0x90,0x8d,0x4b,0xbf,0xb8,0x84,0xaa,
+    0x0d, 0xb4, 0x27, 0x90, 0x8d, 0x4b, 0xbf, 0xb8, 0x84, 0xaa,
-	0xd0,0xb8,0xc7,0x5d,0x99,0xbe,0x55,0xf6,0x3e,0x7c,
+    0xd0, 0xb8, 0xc7, 0x5d, 0x99, 0xbe, 0x55, 0xf6, 0x3e, 0x7c,
-	0x49,0x20,0xcb,0x8a,0x8e,0x19,0x0e,0x66,0x24,0xac,
+    0x49, 0x20, 0xcb, 0x8a, 0x8e, 0x19, 0x0e, 0x66, 0x24, 0xac,
-	0xaf,0x03,0x33,0x97,0xeb,0x95,0xd5,0x3b,0x0f,0x40,
+    0xaf, 0x03, 0x33, 0x97, 0xeb, 0x95, 0xd5, 0x3b, 0x0f, 0x40,
-	0x56,0x04,0x50,0xd1,0xe6,0xbe,0x84,0x0b,0x25,0xd3,
+    0x56, 0x04, 0x50, 0xd1, 0xe6, 0xbe, 0x84, 0x0b, 0x25, 0xd3,
-	0x9c,0xe2,0x83,0x6c,0xf5,0x62,0x5d,0xba,0x2b,0x7d,
+    0x9c, 0xe2, 0x83, 0x6c, 0xf5, 0x62, 0x5d, 0xba, 0x2b, 0x7d,
-	0x3d,0x7a,0x6c,0xe1,0xd2,0x0e,0x54,0x93,0x80,0x01,
+    0x3d, 0x7a, 0x6c, 0xe1, 0xd2, 0x0e, 0x54, 0x93, 0x80, 0x01,
-	0x91,0x51,0x09,0xe8,0x5b,0x8e,0x47,0xbd,0x64,0xe4,
+    0x91, 0x51, 0x09, 0xe8, 0x5b, 0x8e, 0x47, 0xbd, 0x64, 0xe4,
-	0x0e,0x03,0x83,0x55,0xcf,0x5a,0x37,0xf0,0x25,0xb5,
+    0x0e, 0x03, 0x83, 0x55, 0xcf, 0x5a, 0x37, 0xf0, 0x25, 0xb5,
-	0x7d,0x21,0xd7,0x69,0xdf,0x6f,0xc2,0xcf,0x10,0xc9,
+    0x7d, 0x21, 0xd7, 0x69, 0xdf, 0x6f, 0xc2, 0xcf, 0x10, 0xc9,
-	0x8a,0x40,0x9f,0x7a,0x70,0xc0,0xe8,0xe8,0xc0,0xe6,
+    0x8a, 0x40, 0x9f, 0x7a, 0x70, 0xc0, 0xe8, 0xe8, 0xc0, 0xe6,
-	0x9a,0x15,0x0a,0x8d,0x4e,0x46,0xcb,0x7a,0xdb,0xb3,
+    0x9a, 0x15, 0x0a, 0x8d, 0x4e, 0x46, 0xcb, 0x7a, 0xdb, 0xb3,
-	0xcb,0x83,0x02,0xc4,0xf0,0xab,0xeb,0x02,0x01,0x0e,
+    0xcb, 0x83, 0x02, 0xc4, 0xf0, 0xab, 0xeb, 0x02, 0x01, 0x0e,
-	0x23,0xfc,0x1d,0xc4,0xbd,0xd4,0xaa,0x5d,0x31,0x46,
+    0x23, 0xfc, 0x1d, 0xc4, 0xbd, 0xd4, 0xaa, 0x5d, 0x31, 0x46,
-	0x99,0xce,0x9e,0xf8,0x04,0x75,0x10,0x67,0xc4,0x53,
+    0x99, 0xce, 0x9e, 0xf8, 0x04, 0x75, 0x10, 0x67, 0xc4, 0x53,
-	0x47,0x44,0xfa,0xc2,0x25,0x73,0x7e,0xd0,0x8e,0x59,
+    0x47, 0x44, 0xfa, 0xc2, 0x25, 0x73, 0x7e, 0xd0, 0x8e, 0x59,
-	0xd1,0xb2,0x5a,0xf4,0xc7,0x18,0x92,0x2f,0x39,0xab,
+    0xd1, 0xb2, 0x5a, 0xf4, 0xc7, 0x18, 0x92, 0x2f, 0x39, 0xab,
-	0xcd,0xa3,0xb5,0xc2,0xb9,0xc7,0xb9,0x1b,0x9f,0x48,
+    0xcd, 0xa3, 0xb5, 0xc2, 0xb9, 0xc7, 0xb9, 0x1b, 0x9f, 0x48,
-	0xfa,0x13,0xc6,0x98,0x4d,0xca,0x84,0x9c,0x06,0xca,
+    0xfa, 0x13, 0xc6, 0x98, 0x4d, 0xca, 0x84, 0x9c, 0x06, 0xca,
-	0xe7,0x89,0x01,0x04,0xc4,0x6c,0xfd,0x29,0x59,0x35,
+    0xe7, 0x89, 0x01, 0x04, 0xc4, 0x6c, 0xfd, 0x29, 0x59, 0x35,
-	0xe7,0xf3,0xdd,0xce,0x64,0x59,0xbf,0x21,0x13,0xa9,
+    0xe7, 0xf3, 0xdd, 0xce, 0x64, 0x59, 0xbf, 0x21, 0x13, 0xa9,
-	0x9f,0x0e,0xc5,0xff,0xbd,0x33,0x00,0xec,0xac,0x6b,
+    0x9f, 0x0e, 0xc5, 0xff, 0xbd, 0x33, 0x00, 0xec, 0xac, 0x6b,
-	0x11,0xef,0x51,0x5e,0xad,0x07,0x15,0xde,0xb8,0x5f,
+    0x11, 0xef, 0x51, 0x5e, 0xad, 0x07, 0x15, 0xde, 0xb8, 0x5f,
-	0xc6,0xb9,0xa3,0x22,0x65,0x46,0x83,0x14,0xdf,0xd0,
+    0xc6, 0xb9, 0xa3, 0x22, 0x65, 0x46, 0x83, 0x14, 0xdf, 0xd0,
-	0xf1,0x44,0x8a,0xe1,0x9c,0x23,0x33,0xb4,0x97,0x33,
+    0xf1, 0x44, 0x8a, 0xe1, 0x9c, 0x23, 0x33, 0xb4, 0x97, 0x33,
-	0xe6,0x6b,0x81,0x02,0x81,0x81,0x00,0xec,0x12,0xa7,
+    0xe6, 0x6b, 0x81, 0x02, 0x81, 0x81, 0x00, 0xec, 0x12, 0xa7,
-	0x59,0x74,0x6a,0xde,0x3e,0xad,0xd8,0x36,0x80,0x50,
+    0x59, 0x74, 0x6a, 0xde, 0x3e, 0xad, 0xd8, 0x36, 0x80, 0x50,
-	0xa2,0xd5,0x21,0x81,0x07,0xf1,0xd0,0x91,0xf2,0x6c,
+    0xa2, 0xd5, 0x21, 0x81, 0x07, 0xf1, 0xd0, 0x91, 0xf2, 0x6c,
-	0x12,0x2f,0x9d,0x1a,0x26,0xf8,0x30,0x65,0xdf,0xe8,
+    0x12, 0x2f, 0x9d, 0x1a, 0x26, 0xf8, 0x30, 0x65, 0xdf, 0xe8,
-	0xc0,0x9b,0x6a,0x30,0x98,0x82,0x87,0xec,0xa2,0x56,
+    0xc0, 0x9b, 0x6a, 0x30, 0x98, 0x82, 0x87, 0xec, 0xa2, 0x56,
-	0x87,0x62,0x6f,0xe7,0x9f,0xf6,0x56,0xe6,0x71,0x8f,
+    0x87, 0x62, 0x6f, 0xe7, 0x9f, 0xf6, 0x56, 0xe6, 0x71, 0x8f,
-	0x49,0x86,0x93,0x5a,0x4d,0x34,0x58,0xfe,0xd9,0x04,
+    0x49, 0x86, 0x93, 0x5a, 0x4d, 0x34, 0x58, 0xfe, 0xd9, 0x04,
-	0x13,0xaf,0x79,0xb7,0xad,0x11,0xd1,0x30,0x9a,0x14,
+    0x13, 0xaf, 0x79, 0xb7, 0xad, 0x11, 0xd1, 0x30, 0x9a, 0x14,
-	0x06,0xa0,0xfa,0xb7,0x55,0xdc,0x6c,0x5a,0x4c,0x2c,
+    0x06, 0xa0, 0xfa, 0xb7, 0x55, 0xdc, 0x6c, 0x5a, 0x4c, 0x2c,
-	0x59,0x56,0xf6,0xe8,0x9d,0xaf,0x0a,0x78,0x99,0x06,
+    0x59, 0x56, 0xf6, 0xe8, 0x9d, 0xaf, 0x0a, 0x78, 0x99, 0x06,
-	0x06,0x9e,0xe7,0x9c,0x51,0x55,0x43,0xfc,0x3b,0x6c,
+    0x06, 0x9e, 0xe7, 0x9c, 0x51, 0x55, 0x43, 0xfc, 0x3b, 0x6c,
-	0x0b,0xbf,0x2d,0x41,0xa7,0xaf,0xb7,0xe0,0xe8,0x28,
+    0x0b, 0xbf, 0x2d, 0x41, 0xa7, 0xaf, 0xb7, 0xe0, 0xe8, 0x28,
-	0x18,0xb4,0x13,0xd1,0xe6,0x97,0xd0,0x9f,0x6a,0x80,
+    0x18, 0xb4, 0x13, 0xd1, 0xe6, 0x97, 0xd0, 0x9f, 0x6a, 0x80,
-	0xca,0xdd,0x1a,0x7e,0x15,0x02,0x81,0x81,0x00,0xd1,
+    0xca, 0xdd, 0x1a, 0x7e, 0x15, 0x02, 0x81, 0x81, 0x00, 0xd1,
-	0x06,0x0c,0x1f,0xe3,0xd0,0xab,0xd6,0xca,0x7c,0xbc,
+    0x06, 0x0c, 0x1f, 0xe3, 0xd0, 0xab, 0xd6, 0xca, 0x7c, 0xbc,
-	0x7d,0x13,0x35,0xce,0x27,0xcd,0xd8,0x49,0x51,0x63,
+    0x7d, 0x13, 0x35, 0xce, 0x27, 0xcd, 0xd8, 0x49, 0x51, 0x63,
-	0x64,0x0f,0xca,0x06,0x12,0xfc,0x07,0x3e,0xaf,0x61,
+    0x64, 0x0f, 0xca, 0x06, 0x12, 0xfc, 0x07, 0x3e, 0xaf, 0x61,
-	0x6d,0xe2,0x53,0x39,0x27,0xae,0xc3,0x11,0x9e,0x94,
+    0x6d, 0xe2, 0x53, 0x39, 0x27, 0xae, 0xc3, 0x11, 0x9e, 0x94,
-	0x01,0x4f,0xe3,0xf3,0x67,0xf9,0x77,0xf9,0xe7,0x95,
+    0x01, 0x4f, 0xe3, 0xf3, 0x67, 0xf9, 0x77, 0xf9, 0xe7, 0x95,
-	0x3a,0x6f,0xe2,0x20,0x73,0x3e,0xa4,0x7a,0x28,0xd4,
+    0x3a, 0x6f, 0xe2, 0x20, 0x73, 0x3e, 0xa4, 0x7a, 0x28, 0xd4,
-	0x61,0x97,0xf6,0x17,0xa0,0x23,0x10,0x2b,0xce,0x84,
+    0x61, 0x97, 0xf6, 0x17, 0xa0, 0x23, 0x10, 0x2b, 0xce, 0x84,
-	0x57,0x7e,0x25,0x1f,0xf4,0xa8,0x54,0xd2,0x65,0x94,
+    0x57, 0x7e, 0x25, 0x1f, 0xf4, 0xa8, 0x54, 0xd2, 0x65, 0x94,
-	0xcc,0x95,0x0a,0xab,0x30,0xc1,0x59,0x1f,0x61,0x8e,
+    0xcc, 0x95, 0x0a, 0xab, 0x30, 0xc1, 0x59, 0x1f, 0x61, 0x8e,
-	0xb9,0x6b,0xd7,0x4e,0xb9,0x83,0x43,0x79,0x85,0x11,
+    0xb9, 0x6b, 0xd7, 0x4e, 0xb9, 0x83, 0x43, 0x79, 0x85, 0x11,
-	0xbc,0x0f,0xae,0x25,0x20,0x05,0xbc,0xd2,0x48,0xa1,
+    0xbc, 0x0f, 0xae, 0x25, 0x20, 0x05, 0xbc, 0xd2, 0x48, 0xa1,
-	0x68,0x09,0x84,0xf6,0x12,0x9a,0x66,0xb9,0x2b,0xbb,
+    0x68, 0x09, 0x84, 0xf6, 0x12, 0x9a, 0x66, 0xb9, 0x2b, 0xbb,
-	0x76,0x03,0x17,0x46,0x4e,0x97,0x59,0x02,0x81,0x80,
+    0x76, 0x03, 0x17, 0x46, 0x4e, 0x97, 0x59, 0x02, 0x81, 0x80,
-	0x09,0x4c,0xfa,0xd6,0xe5,0x65,0x48,0x78,0x43,0xb5,
+    0x09, 0x4c, 0xfa, 0xd6, 0xe5, 0x65, 0x48, 0x78, 0x43, 0xb5,
-	0x1f,0x00,0x93,0x2c,0xb7,0x24,0xe8,0xc6,0x7d,0x5a,
+    0x1f, 0x00, 0x93, 0x2c, 0xb7, 0x24, 0xe8, 0xc6, 0x7d, 0x5a,
-	0x70,0x45,0x92,0xc8,0x6c,0xa3,0xcd,0xe1,0xf7,0x29,
+    0x70, 0x45, 0x92, 0xc8, 0x6c, 0xa3, 0xcd, 0xe1, 0xf7, 0x29,
-	0x40,0xfa,0x3f,0x5b,0x47,0x44,0x39,0xc1,0xe8,0x72,
+    0x40, 0xfa, 0x3f, 0x5b, 0x47, 0x44, 0x39, 0xc1, 0xe8, 0x72,
-	0x9e,0x7a,0x0e,0xda,0xaa,0xa0,0x2a,0x09,0xfd,0x54,
+    0x9e, 0x7a, 0x0e, 0xda, 0xaa, 0xa0, 0x2a, 0x09, 0xfd, 0x54,
-	0x93,0x23,0xaa,0x37,0x85,0x5b,0xcc,0xd4,0xf9,0xd8,
+    0x93, 0x23, 0xaa, 0x37, 0x85, 0x5b, 0xcc, 0xd4, 0xf9, 0xd8,
-	0xff,0xc1,0x61,0x0d,0xbd,0x7e,0x18,0x24,0x73,0x6d,
+    0xff, 0xc1, 0x61, 0x0d, 0xbd, 0x7e, 0x18, 0x24, 0x73, 0x6d,
-	0x40,0x72,0xf1,0x93,0x09,0x48,0x97,0x6c,0x84,0x90,
+    0x40, 0x72, 0xf1, 0x93, 0x09, 0x48, 0x97, 0x6c, 0x84, 0x90,
-	0xa8,0x46,0x14,0x01,0x39,0x11,0xe5,0x3c,0x41,0x27,
+    0xa8, 0x46, 0x14, 0x01, 0x39, 0x11, 0xe5, 0x3c, 0x41, 0x27,
-	0x32,0x75,0x24,0xed,0xa1,0xd9,0x12,0x29,0x8a,0x28,
+    0x32, 0x75, 0x24, 0xed, 0xa1, 0xd9, 0x12, 0x29, 0x8a, 0x28,
-	0x71,0x89,0x8d,0xca,0x30,0xb0,0x01,0xc4,0x2f,0x82,
+    0x71, 0x89, 0x8d, 0xca, 0x30, 0xb0, 0x01, 0xc4, 0x2f, 0x82,
-	0x19,0x14,0x4c,0x70,0x1c,0xb8,0x23,0x2e,0xe8,0x90,
+    0x19, 0x14, 0x4c, 0x70, 0x1c, 0xb8, 0x23, 0x2e, 0xe8, 0x90,
-	0x49,0x97,0x92,0x97,0x6b,0x7a,0x9d,0xb9,0x02,0x81,
+    0x49, 0x97, 0x92, 0x97, 0x6b, 0x7a, 0x9d, 0xb9, 0x02, 0x81,
-	0x80,0x0f,0x0e,0xa1,0x76,0xf6,0xa1,0x44,0x8f,0xaf,
+    0x80, 0x0f, 0x0e, 0xa1, 0x76, 0xf6, 0xa1, 0x44, 0x8f, 0xaf,
-	0x7c,0x76,0xd3,0x87,0xbb,0xbb,0x83,0x10,0x88,0x01,
+    0x7c, 0x76, 0xd3, 0x87, 0xbb, 0xbb, 0x83, 0x10, 0x88, 0x01,
-	0x18,0x14,0xd1,0xd3,0x75,0x59,0x24,0xaa,0xf5,0x16,
+    0x18, 0x14, 0xd1, 0xd3, 0x75, 0x59, 0x24, 0xaa, 0xf5, 0x16,
-	0xa5,0xe9,0x9d,0xd1,0xcc,0xee,0xf4,0x15,0xd9,0xc5,
+    0xa5, 0xe9, 0x9d, 0xd1, 0xcc, 0xee, 0xf4, 0x15, 0xd9, 0xc5,
-	0x7e,0x27,0xe9,0x44,0x49,0x06,0x72,0xb9,0xfc,0xd3,
+    0x7e, 0x27, 0xe9, 0x44, 0x49, 0x06, 0x72, 0xb9, 0xfc, 0xd3,
-	0x8a,0xc4,0x2c,0x36,0x7d,0x12,0x9b,0x5a,0xaa,0xdc,
+    0x8a, 0xc4, 0x2c, 0x36, 0x7d, 0x12, 0x9b, 0x5a, 0xaa, 0xdc,
-	0x85,0xee,0x6e,0xad,0x54,0xb3,0xf4,0xfc,0x31,0xa1,
+    0x85, 0xee, 0x6e, 0xad, 0x54, 0xb3, 0xf4, 0xfc, 0x31, 0xa1,
-	0x06,0x3a,0x70,0x57,0x0c,0xf3,0x95,0x5b,0x3e,0xe8,
+    0x06, 0x3a, 0x70, 0x57, 0x0c, 0xf3, 0x95, 0x5b, 0x3e, 0xe8,
-	0xfd,0x1a,0x4f,0xf6,0x78,0x93,0x46,0x6a,0xd7,0x31,
+    0xfd, 0x1a, 0x4f, 0xf6, 0x78, 0x93, 0x46, 0x6a, 0xd7, 0x31,
-	0xb4,0x84,0x64,0x85,0x09,0x38,0x89,0x92,0x94,0x1c,
+    0xb4, 0x84, 0x64, 0x85, 0x09, 0x38, 0x89, 0x92, 0x94, 0x1c,
-	0xbf,0xe2,0x3c,0x2a,0xe0,0xff,0x99,0xa3,0xf0,0x2b,
+    0xbf, 0xe2, 0x3c, 0x2a, 0xe0, 0xff, 0x99, 0xa3, 0xf0, 0x2b,
-	0x31,0xc2,0x36,0xcd,0x60,0xbf,0x9d,0x2d,0x74,0x32,
+    0x31, 0xc2, 0x36, 0xcd, 0x60, 0xbf, 0x9d, 0x2d, 0x74, 0x32,
-	0xe8,0x9c,0x93,0x6e,0xbb,0x91,0x7b,0xfd,0xd9,0x02,
+    0xe8, 0x9c, 0x93, 0x6e, 0xbb, 0x91, 0x7b, 0xfd, 0xd9, 0x02,
-	0x81,0x81,0x00,0xa2,0x71,0x25,0x38,0xeb,0x2a,0xe9,
+    0x81, 0x81, 0x00, 0xa2, 0x71, 0x25, 0x38, 0xeb, 0x2a, 0xe9,
-	0x37,0xcd,0xfe,0x44,0xce,0x90,0x3f,0x52,0x87,0x84,
+    0x37, 0xcd, 0xfe, 0x44, 0xce, 0x90, 0x3f, 0x52, 0x87, 0x84,
-	0x52,0x1b,0xae,0x8d,0x22,0x94,0xce,0x38,0xe6,0x04,
+    0x52, 0x1b, 0xae, 0x8d, 0x22, 0x94, 0xce, 0x38, 0xe6, 0x04,
-	0x88,0x76,0x85,0x9a,0xd3,0x14,0x09,0xe5,0x69,0x9a,
+    0x88, 0x76, 0x85, 0x9a, 0xd3, 0x14, 0x09, 0xe5, 0x69, 0x9a,
-	0xff,0x58,0x92,0x02,0x6a,0x7d,0x7c,0x1e,0x2c,0xfd,
+    0xff, 0x58, 0x92, 0x02, 0x6a, 0x7d, 0x7c, 0x1e, 0x2c, 0xfd,
-	0xa8,0xca,0x32,0x14,0x4f,0x0d,0x84,0x0d,0x37,0x43,
+    0xa8, 0xca, 0x32, 0x14, 0x4f, 0x0d, 0x84, 0x0d, 0x37, 0x43,
-	0xbf,0xe4,0x5d,0x12,0xc8,0x24,0x91,0x27,0x8d,0x46,
+    0xbf, 0xe4, 0x5d, 0x12, 0xc8, 0x24, 0x91, 0x27, 0x8d, 0x46,
-	0xd9,0x54,0x53,0xe7,0x62,0x71,0xa8,0x2b,0x71,0x41,
+    0xd9, 0x54, 0x53, 0xe7, 0x62, 0x71, 0xa8, 0x2b, 0x71, 0x41,
-	0x8d,0x75,0xf8,0x3a,0xa0,0x61,0x29,0x46,0xa6,0xe5,
+    0x8d, 0x75, 0xf8, 0x3a, 0xa0, 0x61, 0x29, 0x46, 0xa6, 0xe5,
-	0x82,0xfa,0x3a,0xd9,0x08,0xfa,0xfc,0x63,0xfd,0x6b,
+    0x82, 0xfa, 0x3a, 0xd9, 0x08, 0xfa, 0xfc, 0x63, 0xfd, 0x6b,
-	0x30,0xbc,0xf4,0x4e,0x9e,0x8c,0x25,0x0c,0xb6,0x55,
+    0x30, 0xbc, 0xf4, 0x4e, 0x9e, 0x8c, 0x25, 0x0c, 0xb6, 0x55,
-	0xe7,0x3c,0xd4,0x4e,0x0b,0xfd,0x8b,0xc3,0x0e,0x1d,
+    0xe7, 0x3c, 0xd4, 0x4e, 0x0b, 0xfd, 0x8b, 0xc3, 0x0e, 0x1d,
-	0x9c,0x44,0x57,0x8f,0x1f,0x86,0xf7,0xd5,0x1b,0xe4,
+    0x9c, 0x44, 0x57, 0x8f, 0x1f, 0x86, 0xf7, 0xd5, 0x1b, 0xe4,
-	0x95,
+    0x95,
-	};
+};
 
-static unsigned char test4096[]={
+static unsigned char test4096[] = {
-	0x30,0x82,0x09,0x29,0x02,0x01,0x00,0x02,0x82,0x02,
+    0x30, 0x82, 0x09, 0x29, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02,
-	0x01,0x00,0xc0,0x71,0xac,0x1a,0x13,0x88,0x82,0x43,
+    0x01, 0x00, 0xc0, 0x71, 0xac, 0x1a, 0x13, 0x88, 0x82, 0x43,
-	0x3b,0x51,0x57,0x71,0x8d,0xb6,0x2b,0x82,0x65,0x21,
+    0x3b, 0x51, 0x57, 0x71, 0x8d, 0xb6, 0x2b, 0x82, 0x65, 0x21,
-	0x53,0x5f,0x28,0x29,0x4f,0x8d,0x7c,0x8a,0xb9,0x44,
+    0x53, 0x5f, 0x28, 0x29, 0x4f, 0x8d, 0x7c, 0x8a, 0xb9, 0x44,
-	0xb3,0x28,0x41,0x4f,0xd3,0xfa,0x6a,0xf8,0xb9,0x28,
+    0xb3, 0x28, 0x41, 0x4f, 0xd3, 0xfa, 0x6a, 0xf8, 0xb9, 0x28,
-	0x50,0x39,0x67,0x53,0x2c,0x3c,0xd7,0xcb,0x96,0x41,
+    0x50, 0x39, 0x67, 0x53, 0x2c, 0x3c, 0xd7, 0xcb, 0x96, 0x41,
-	0x40,0x32,0xbb,0xeb,0x70,0xae,0x1f,0xb0,0x65,0xf7,
+    0x40, 0x32, 0xbb, 0xeb, 0x70, 0xae, 0x1f, 0xb0, 0x65, 0xf7,
-	0x3a,0xd9,0x22,0xfd,0x10,0xae,0xbd,0x02,0xe2,0xdd,
+    0x3a, 0xd9, 0x22, 0xfd, 0x10, 0xae, 0xbd, 0x02, 0xe2, 0xdd,
-	0xf3,0xc2,0x79,0x3c,0xc6,0xfc,0x75,0xbb,0xaf,0x4e,
+    0xf3, 0xc2, 0x79, 0x3c, 0xc6, 0xfc, 0x75, 0xbb, 0xaf, 0x4e,
-	0x3a,0x36,0xc2,0x4f,0xea,0x25,0xdf,0x13,0x16,0x4b,
+    0x3a, 0x36, 0xc2, 0x4f, 0xea, 0x25, 0xdf, 0x13, 0x16, 0x4b,
-	0x20,0xfe,0x4b,0x69,0x16,0xc4,0x7f,0x1a,0x43,0xa6,
+    0x20, 0xfe, 0x4b, 0x69, 0x16, 0xc4, 0x7f, 0x1a, 0x43, 0xa6,
-	0x17,0x1b,0xb9,0x0a,0xf3,0x09,0x86,0x28,0x89,0xcf,
+    0x17, 0x1b, 0xb9, 0x0a, 0xf3, 0x09, 0x86, 0x28, 0x89, 0xcf,
-	0x2c,0xd0,0xd4,0x81,0xaf,0xc6,0x6d,0xe6,0x21,0x8d,
+    0x2c, 0xd0, 0xd4, 0x81, 0xaf, 0xc6, 0x6d, 0xe6, 0x21, 0x8d,
-	0xee,0xef,0xea,0xdc,0xb7,0xc6,0x3b,0x63,0x9f,0x0e,
+    0xee, 0xef, 0xea, 0xdc, 0xb7, 0xc6, 0x3b, 0x63, 0x9f, 0x0e,
-	0xad,0x89,0x78,0x23,0x18,0xbf,0x70,0x7e,0x84,0xe0,
+    0xad, 0x89, 0x78, 0x23, 0x18, 0xbf, 0x70, 0x7e, 0x84, 0xe0,
-	0x37,0xec,0xdb,0x8e,0x9c,0x3e,0x6a,0x19,0xcc,0x99,
+    0x37, 0xec, 0xdb, 0x8e, 0x9c, 0x3e, 0x6a, 0x19, 0xcc, 0x99,
-	0x72,0xe6,0xb5,0x7d,0x6d,0xfa,0xe5,0xd3,0xe4,0x90,
+    0x72, 0xe6, 0xb5, 0x7d, 0x6d, 0xfa, 0xe5, 0xd3, 0xe4, 0x90,
-	0xb5,0xb2,0xb2,0x12,0x70,0x4e,0xca,0xf8,0x10,0xf8,
+    0xb5, 0xb2, 0xb2, 0x12, 0x70, 0x4e, 0xca, 0xf8, 0x10, 0xf8,
-	0xa3,0x14,0xc2,0x48,0x19,0xeb,0x60,0x99,0xbb,0x2a,
+    0xa3, 0x14, 0xc2, 0x48, 0x19, 0xeb, 0x60, 0x99, 0xbb, 0x2a,
-	0x1f,0xb1,0x7a,0xb1,0x3d,0x24,0xfb,0xa0,0x29,0xda,
+    0x1f, 0xb1, 0x7a, 0xb1, 0x3d, 0x24, 0xfb, 0xa0, 0x29, 0xda,
-	0xbd,0x1b,0xd7,0xa4,0xbf,0xef,0x60,0x2d,0x22,0xca,
+    0xbd, 0x1b, 0xd7, 0xa4, 0xbf, 0xef, 0x60, 0x2d, 0x22, 0xca,
-	0x65,0x98,0xf1,0xc4,0xe1,0xc9,0x02,0x6b,0x16,0x28,
+    0x65, 0x98, 0xf1, 0xc4, 0xe1, 0xc9, 0x02, 0x6b, 0x16, 0x28,
-	0x2f,0xa1,0xaa,0x79,0x00,0xda,0xdc,0x7c,0x43,0xf7,
+    0x2f, 0xa1, 0xaa, 0x79, 0x00, 0xda, 0xdc, 0x7c, 0x43, 0xf7,
-	0x42,0x3c,0xa0,0xef,0x68,0xf7,0xdf,0xb9,0x69,0xfb,
+    0x42, 0x3c, 0xa0, 0xef, 0x68, 0xf7, 0xdf, 0xb9, 0x69, 0xfb,
-	0x8e,0x01,0xed,0x01,0x42,0xb5,0x4e,0x57,0xa6,0x26,
+    0x8e, 0x01, 0xed, 0x01, 0x42, 0xb5, 0x4e, 0x57, 0xa6, 0x26,
-	0xb8,0xd0,0x7b,0x56,0x6d,0x03,0xc6,0x40,0x8c,0x8c,
+    0xb8, 0xd0, 0x7b, 0x56, 0x6d, 0x03, 0xc6, 0x40, 0x8c, 0x8c,
-	0x2a,0x55,0xd7,0x9c,0x35,0x00,0x94,0x93,0xec,0x03,
+    0x2a, 0x55, 0xd7, 0x9c, 0x35, 0x00, 0x94, 0x93, 0xec, 0x03,
-	0xeb,0x22,0xef,0x77,0xbb,0x79,0x13,0x3f,0x15,0xa1,
+    0xeb, 0x22, 0xef, 0x77, 0xbb, 0x79, 0x13, 0x3f, 0x15, 0xa1,
-	0x8f,0xca,0xdf,0xfd,0xd3,0xb8,0xe1,0xd4,0xcc,0x09,
+    0x8f, 0xca, 0xdf, 0xfd, 0xd3, 0xb8, 0xe1, 0xd4, 0xcc, 0x09,
-	0x3f,0x3c,0x2c,0xdb,0xd1,0x49,0x7f,0x38,0x07,0x83,
+    0x3f, 0x3c, 0x2c, 0xdb, 0xd1, 0x49, 0x7f, 0x38, 0x07, 0x83,
-	0x6d,0xeb,0x08,0x66,0xe9,0x06,0x44,0x12,0xac,0x95,
+    0x6d, 0xeb, 0x08, 0x66, 0xe9, 0x06, 0x44, 0x12, 0xac, 0x95,
-	0x22,0x90,0x23,0x67,0xd4,0x08,0xcc,0xf4,0xb7,0xdc,
+    0x22, 0x90, 0x23, 0x67, 0xd4, 0x08, 0xcc, 0xf4, 0xb7, 0xdc,
-	0xcc,0x87,0xd4,0xac,0x69,0x35,0x4c,0xb5,0x39,0x36,
+    0xcc, 0x87, 0xd4, 0xac, 0x69, 0x35, 0x4c, 0xb5, 0x39, 0x36,
-	0xcd,0xa4,0xd2,0x95,0xca,0x0d,0xc5,0xda,0xc2,0xc5,
+    0xcd, 0xa4, 0xd2, 0x95, 0xca, 0x0d, 0xc5, 0xda, 0xc2, 0xc5,
-	0x22,0x32,0x28,0x08,0xe3,0xd2,0x8b,0x38,0x30,0xdc,
+    0x22, 0x32, 0x28, 0x08, 0xe3, 0xd2, 0x8b, 0x38, 0x30, 0xdc,
-	0x8c,0x75,0x4f,0x6a,0xec,0x7a,0xac,0x16,0x3e,0xa8,
+    0x8c, 0x75, 0x4f, 0x6a, 0xec, 0x7a, 0xac, 0x16, 0x3e, 0xa8,
-	0xd4,0x6a,0x45,0xe1,0xa8,0x4f,0x2e,0x80,0x34,0xaa,
+    0xd4, 0x6a, 0x45, 0xe1, 0xa8, 0x4f, 0x2e, 0x80, 0x34, 0xaa,
-	0x54,0x1b,0x02,0x95,0x7d,0x8a,0x6d,0xcc,0x79,0xca,
+    0x54, 0x1b, 0x02, 0x95, 0x7d, 0x8a, 0x6d, 0xcc, 0x79, 0xca,
-	0xf2,0xa4,0x2e,0x8d,0xfb,0xfe,0x15,0x51,0x10,0x0e,
+    0xf2, 0xa4, 0x2e, 0x8d, 0xfb, 0xfe, 0x15, 0x51, 0x10, 0x0e,
-	0x4d,0x88,0xb1,0xc7,0xf4,0x79,0xdb,0xf0,0xb4,0x56,
+    0x4d, 0x88, 0xb1, 0xc7, 0xf4, 0x79, 0xdb, 0xf0, 0xb4, 0x56,
-	0x44,0x37,0xca,0x5a,0xc1,0x8c,0x48,0xac,0xae,0x48,
+    0x44, 0x37, 0xca, 0x5a, 0xc1, 0x8c, 0x48, 0xac, 0xae, 0x48,
-	0x80,0x83,0x01,0x3f,0xde,0xd9,0xd3,0x2c,0x51,0x46,
+    0x80, 0x83, 0x01, 0x3f, 0xde, 0xd9, 0xd3, 0x2c, 0x51, 0x46,
-	0xb1,0x41,0xb6,0xc6,0x91,0x72,0xf9,0x83,0x55,0x1b,
+    0xb1, 0x41, 0xb6, 0xc6, 0x91, 0x72, 0xf9, 0x83, 0x55, 0x1b,
-	0x8c,0xba,0xf3,0x73,0xe5,0x2c,0x74,0x50,0x3a,0xbe,
+    0x8c, 0xba, 0xf3, 0x73, 0xe5, 0x2c, 0x74, 0x50, 0x3a, 0xbe,
-	0xc5,0x2f,0xa7,0xb2,0x6d,0x8c,0x9e,0x13,0x77,0xa3,
+    0xc5, 0x2f, 0xa7, 0xb2, 0x6d, 0x8c, 0x9e, 0x13, 0x77, 0xa3,
-	0x13,0xcd,0x6d,0x8c,0x45,0xe1,0xfc,0x0b,0xb7,0x69,
+    0x13, 0xcd, 0x6d, 0x8c, 0x45, 0xe1, 0xfc, 0x0b, 0xb7, 0x69,
-	0xe9,0x27,0xbc,0x65,0xc3,0xfa,0x9b,0xd0,0xef,0xfe,
+    0xe9, 0x27, 0xbc, 0x65, 0xc3, 0xfa, 0x9b, 0xd0, 0xef, 0xfe,
-	0xe8,0x1f,0xb3,0x5e,0x34,0xf4,0x8c,0xea,0xfc,0xd3,
+    0xe8, 0x1f, 0xb3, 0x5e, 0x34, 0xf4, 0x8c, 0xea, 0xfc, 0xd3,
-	0x81,0xbf,0x3d,0x30,0xb2,0xb4,0x01,0xe8,0x43,0x0f,
+    0x81, 0xbf, 0x3d, 0x30, 0xb2, 0xb4, 0x01, 0xe8, 0x43, 0x0f,
-	0xba,0x02,0x23,0x42,0x76,0x82,0x31,0x73,0x91,0xed,
+    0xba, 0x02, 0x23, 0x42, 0x76, 0x82, 0x31, 0x73, 0x91, 0xed,
-	0x07,0x46,0x61,0x0d,0x39,0x83,0x40,0xce,0x7a,0xd4,
+    0x07, 0x46, 0x61, 0x0d, 0x39, 0x83, 0x40, 0xce, 0x7a, 0xd4,
-	0xdb,0x80,0x2c,0x1f,0x0d,0xd1,0x34,0xd4,0x92,0xe3,
+    0xdb, 0x80, 0x2c, 0x1f, 0x0d, 0xd1, 0x34, 0xd4, 0x92, 0xe3,
-	0xd4,0xf1,0xc2,0x01,0x02,0x03,0x01,0x00,0x01,0x02,
+    0xd4, 0xf1, 0xc2, 0x01, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
-	0x82,0x02,0x01,0x00,0x97,0x6c,0xda,0x6e,0xea,0x4f,
+    0x82, 0x02, 0x01, 0x00, 0x97, 0x6c, 0xda, 0x6e, 0xea, 0x4f,
-	0xcf,0xaf,0xf7,0x4c,0xd9,0xf1,0x90,0x00,0x77,0xdb,
+    0xcf, 0xaf, 0xf7, 0x4c, 0xd9, 0xf1, 0x90, 0x00, 0x77, 0xdb,
-	0xf2,0x97,0x76,0x72,0xb9,0xb7,0x47,0xd1,0x9c,0xdd,
+    0xf2, 0x97, 0x76, 0x72, 0xb9, 0xb7, 0x47, 0xd1, 0x9c, 0xdd,
-	0xcb,0x4a,0x33,0x6e,0xc9,0x75,0x76,0xe6,0xe4,0xa5,
+    0xcb, 0x4a, 0x33, 0x6e, 0xc9, 0x75, 0x76, 0xe6, 0xe4, 0xa5,
-	0x31,0x8c,0x77,0x13,0xb4,0x29,0xcd,0xf5,0x52,0x17,
+    0x31, 0x8c, 0x77, 0x13, 0xb4, 0x29, 0xcd, 0xf5, 0x52, 0x17,
-	0xef,0xf3,0x08,0x00,0xe3,0xbd,0x2e,0xbc,0xd4,0x52,
+    0xef, 0xf3, 0x08, 0x00, 0xe3, 0xbd, 0x2e, 0xbc, 0xd4, 0x52,
-	0x88,0xe9,0x30,0x75,0x0b,0x02,0xf5,0xcd,0x89,0x0c,
+    0x88, 0xe9, 0x30, 0x75, 0x0b, 0x02, 0xf5, 0xcd, 0x89, 0x0c,
-	0x6c,0x57,0x19,0x27,0x3d,0x1e,0x85,0xb4,0xc1,0x2f,
+    0x6c, 0x57, 0x19, 0x27, 0x3d, 0x1e, 0x85, 0xb4, 0xc1, 0x2f,
-	0x1d,0x92,0x00,0x5c,0x76,0x29,0x4b,0xa4,0xe1,0x12,
+    0x1d, 0x92, 0x00, 0x5c, 0x76, 0x29, 0x4b, 0xa4, 0xe1, 0x12,
-	0xb3,0xc8,0x09,0xfe,0x0e,0x78,0x72,0x61,0xcb,0x61,
+    0xb3, 0xc8, 0x09, 0xfe, 0x0e, 0x78, 0x72, 0x61, 0xcb, 0x61,
-	0x6f,0x39,0x91,0x95,0x4e,0xd5,0x3e,0xc7,0x8f,0xb8,
+    0x6f, 0x39, 0x91, 0x95, 0x4e, 0xd5, 0x3e, 0xc7, 0x8f, 0xb8,
-	0xf6,0x36,0xfe,0x9c,0x93,0x9a,0x38,0x25,0x7a,0xf4,
+    0xf6, 0x36, 0xfe, 0x9c, 0x93, 0x9a, 0x38, 0x25, 0x7a, 0xf4,
-	0x4a,0x12,0xd4,0xa0,0x13,0xbd,0xf9,0x1d,0x12,0x3e,
+    0x4a, 0x12, 0xd4, 0xa0, 0x13, 0xbd, 0xf9, 0x1d, 0x12, 0x3e,
-	0x21,0x39,0xfb,0x72,0xe0,0x05,0x3d,0xc3,0xe5,0x50,
+    0x21, 0x39, 0xfb, 0x72, 0xe0, 0x05, 0x3d, 0xc3, 0xe5, 0x50,
-	0xa8,0x5d,0x85,0xa3,0xea,0x5f,0x1c,0xb2,0x3f,0xea,
+    0xa8, 0x5d, 0x85, 0xa3, 0xea, 0x5f, 0x1c, 0xb2, 0x3f, 0xea,
-	0x6d,0x03,0x91,0x55,0xd8,0x19,0x0a,0x21,0x12,0x16,
+    0x6d, 0x03, 0x91, 0x55, 0xd8, 0x19, 0x0a, 0x21, 0x12, 0x16,
-	0xd9,0x12,0xc4,0xe6,0x07,0x18,0x5b,0x26,0xa4,0xae,
+    0xd9, 0x12, 0xc4, 0xe6, 0x07, 0x18, 0x5b, 0x26, 0xa4, 0xae,
-	0xed,0x2b,0xb7,0xa6,0xed,0xf8,0xad,0xec,0x77,0xe6,
+    0xed, 0x2b, 0xb7, 0xa6, 0xed, 0xf8, 0xad, 0xec, 0x77, 0xe6,
-	0x7f,0x4f,0x76,0x00,0xc0,0xfa,0x15,0x92,0xb4,0x2c,
+    0x7f, 0x4f, 0x76, 0x00, 0xc0, 0xfa, 0x15, 0x92, 0xb4, 0x2c,
-	0x22,0xc2,0xeb,0x6a,0xad,0x14,0x05,0xb2,0xe5,0x8a,
+    0x22, 0xc2, 0xeb, 0x6a, 0xad, 0x14, 0x05, 0xb2, 0xe5, 0x8a,
-	0x9e,0x85,0x83,0xcc,0x04,0xf1,0x56,0x78,0x44,0x5e,
+    0x9e, 0x85, 0x83, 0xcc, 0x04, 0xf1, 0x56, 0x78, 0x44, 0x5e,
-	0xde,0xe0,0x60,0x1a,0x65,0x79,0x31,0x23,0x05,0xbb,
+    0xde, 0xe0, 0x60, 0x1a, 0x65, 0x79, 0x31, 0x23, 0x05, 0xbb,
-	0x01,0xff,0xdd,0x2e,0xb7,0xb3,0xaa,0x74,0xe0,0xa5,
+    0x01, 0xff, 0xdd, 0x2e, 0xb7, 0xb3, 0xaa, 0x74, 0xe0, 0xa5,
-	0x94,0xaf,0x4b,0xde,0x58,0x0f,0x55,0xde,0x33,0xf6,
+    0x94, 0xaf, 0x4b, 0xde, 0x58, 0x0f, 0x55, 0xde, 0x33, 0xf6,
-	0xe3,0xd6,0x34,0x36,0x57,0xd6,0x79,0x91,0x2e,0xbe,
+    0xe3, 0xd6, 0x34, 0x36, 0x57, 0xd6, 0x79, 0x91, 0x2e, 0xbe,
-	0x3b,0xd9,0x4e,0xb6,0x9d,0x21,0x5c,0xd3,0x48,0x14,
+    0x3b, 0xd9, 0x4e, 0xb6, 0x9d, 0x21, 0x5c, 0xd3, 0x48, 0x14,
-	0x7f,0x4a,0xc4,0x60,0xa9,0x29,0xf8,0x53,0x7f,0x88,
+    0x7f, 0x4a, 0xc4, 0x60, 0xa9, 0x29, 0xf8, 0x53, 0x7f, 0x88,
-	0x11,0x2d,0xb5,0xc5,0x2d,0x6f,0xee,0x85,0x0b,0xf7,
+    0x11, 0x2d, 0xb5, 0xc5, 0x2d, 0x6f, 0xee, 0x85, 0x0b, 0xf7,
-	0x8d,0x9a,0xbe,0xb0,0x42,0xf2,0x2e,0x71,0xaf,0x19,
+    0x8d, 0x9a, 0xbe, 0xb0, 0x42, 0xf2, 0x2e, 0x71, 0xaf, 0x19,
-	0x31,0x6d,0xec,0xcd,0x6f,0x2b,0x23,0xdf,0xb4,0x40,
+    0x31, 0x6d, 0xec, 0xcd, 0x6f, 0x2b, 0x23, 0xdf, 0xb4, 0x40,
-	0xaf,0x2c,0x0a,0xc3,0x1b,0x7d,0x7d,0x03,0x1d,0x4b,
+    0xaf, 0x2c, 0x0a, 0xc3, 0x1b, 0x7d, 0x7d, 0x03, 0x1d, 0x4b,
-	0xf3,0xb5,0xe0,0x85,0xd8,0xdf,0x91,0x6b,0x0a,0x69,
+    0xf3, 0xb5, 0xe0, 0x85, 0xd8, 0xdf, 0x91, 0x6b, 0x0a, 0x69,
-	0xf7,0xf2,0x69,0x66,0x5b,0xf1,0xcf,0x46,0x7d,0xe9,
+    0xf7, 0xf2, 0x69, 0x66, 0x5b, 0xf1, 0xcf, 0x46, 0x7d, 0xe9,
-	0x70,0xfa,0x6d,0x7e,0x75,0x4e,0xa9,0x77,0xe6,0x8c,
+    0x70, 0xfa, 0x6d, 0x7e, 0x75, 0x4e, 0xa9, 0x77, 0xe6, 0x8c,
-	0x02,0xf7,0x14,0x4d,0xa5,0x41,0x8f,0x3f,0xc1,0x62,
+    0x02, 0xf7, 0x14, 0x4d, 0xa5, 0x41, 0x8f, 0x3f, 0xc1, 0x62,
-	0x1e,0x71,0x5e,0x38,0xb4,0xd6,0xe6,0xe1,0x4b,0xc2,
+    0x1e, 0x71, 0x5e, 0x38, 0xb4, 0xd6, 0xe6, 0xe1, 0x4b, 0xc2,
-	0x2c,0x30,0x83,0x81,0x6f,0x49,0x2e,0x96,0xe6,0xc9,
+    0x2c, 0x30, 0x83, 0x81, 0x6f, 0x49, 0x2e, 0x96, 0xe6, 0xc9,
-	0x9a,0xf7,0x5d,0x09,0xa0,0x55,0x02,0xa5,0x3a,0x25,
+    0x9a, 0xf7, 0x5d, 0x09, 0xa0, 0x55, 0x02, 0xa5, 0x3a, 0x25,
-	0x23,0xd0,0x92,0xc3,0xa3,0xe3,0x0e,0x12,0x2f,0x4d,
+    0x23, 0xd0, 0x92, 0xc3, 0xa3, 0xe3, 0x0e, 0x12, 0x2f, 0x4d,
-	0xef,0xf3,0x55,0x5a,0xbe,0xe6,0x19,0x86,0x31,0xab,
+    0xef, 0xf3, 0x55, 0x5a, 0xbe, 0xe6, 0x19, 0x86, 0x31, 0xab,
-	0x75,0x9a,0xd3,0xf0,0x2c,0xc5,0x41,0x92,0xd9,0x1f,
+    0x75, 0x9a, 0xd3, 0xf0, 0x2c, 0xc5, 0x41, 0x92, 0xd9, 0x1f,
-	0x5f,0x11,0x8c,0x75,0x1c,0x63,0xd0,0x02,0x80,0x2c,
+    0x5f, 0x11, 0x8c, 0x75, 0x1c, 0x63, 0xd0, 0x02, 0x80, 0x2c,
-	0x68,0xcb,0x93,0xfb,0x51,0x73,0x49,0xb4,0x60,0xda,
+    0x68, 0xcb, 0x93, 0xfb, 0x51, 0x73, 0x49, 0xb4, 0x60, 0xda,
-	0xe2,0x26,0xaf,0xa9,0x46,0x12,0xb8,0xec,0x50,0xdd,
+    0xe2, 0x26, 0xaf, 0xa9, 0x46, 0x12, 0xb8, 0xec, 0x50, 0xdd,
-	0x12,0x06,0x5f,0xce,0x59,0xe6,0xf6,0x1c,0xe0,0x54,
+    0x12, 0x06, 0x5f, 0xce, 0x59, 0xe6, 0xf6, 0x1c, 0xe0, 0x54,
-	0x10,0xad,0xf6,0xcd,0x98,0xcc,0x0f,0xfb,0xcb,0x41,
+    0x10, 0xad, 0xf6, 0xcd, 0x98, 0xcc, 0x0f, 0xfb, 0xcb, 0x41,
-	0x14,0x9d,0xed,0xe4,0xb4,0x74,0x5f,0x09,0x60,0xc7,
+    0x14, 0x9d, 0xed, 0xe4, 0xb4, 0x74, 0x5f, 0x09, 0x60, 0xc7,
-	0x12,0xf6,0x7b,0x3c,0x8f,0xa7,0x20,0xbc,0xe4,0xb1,
+    0x12, 0xf6, 0x7b, 0x3c, 0x8f, 0xa7, 0x20, 0xbc, 0xe4, 0xb1,
-	0xef,0xeb,0xa4,0x93,0xc5,0x06,0xca,0x9a,0x27,0x9d,
+    0xef, 0xeb, 0xa4, 0x93, 0xc5, 0x06, 0xca, 0x9a, 0x27, 0x9d,
-	0x87,0xf3,0xde,0xca,0xe5,0xe7,0xf6,0x1c,0x01,0x65,
+    0x87, 0xf3, 0xde, 0xca, 0xe5, 0xe7, 0xf6, 0x1c, 0x01, 0x65,
-	0x5b,0xfb,0x19,0x79,0x6e,0x08,0x26,0xc5,0xc8,0x28,
+    0x5b, 0xfb, 0x19, 0x79, 0x6e, 0x08, 0x26, 0xc5, 0xc8, 0x28,
-	0x0e,0xb6,0x3b,0x07,0x08,0xc1,0x02,0x82,0x01,0x01,
+    0x0e, 0xb6, 0x3b, 0x07, 0x08, 0xc1, 0x02, 0x82, 0x01, 0x01,
-	0x00,0xe8,0x1c,0x73,0xa6,0xb8,0xe0,0x0e,0x6d,0x8d,
+    0x00, 0xe8, 0x1c, 0x73, 0xa6, 0xb8, 0xe0, 0x0e, 0x6d, 0x8d,
-	0x1b,0xb9,0x53,0xed,0x58,0x94,0xe6,0x1d,0x60,0x14,
+    0x1b, 0xb9, 0x53, 0xed, 0x58, 0x94, 0xe6, 0x1d, 0x60, 0x14,
-	0x5c,0x76,0x43,0xc4,0x58,0x19,0xc4,0x24,0xe8,0xbc,
+    0x5c, 0x76, 0x43, 0xc4, 0x58, 0x19, 0xc4, 0x24, 0xe8, 0xbc,
-	0x1b,0x3b,0x0b,0x13,0x24,0x45,0x54,0x0e,0xcc,0x37,
+    0x1b, 0x3b, 0x0b, 0x13, 0x24, 0x45, 0x54, 0x0e, 0xcc, 0x37,
-	0xf0,0xe0,0x63,0x7d,0xc3,0xf7,0xfb,0x81,0x74,0x81,
+    0xf0, 0xe0, 0x63, 0x7d, 0xc3, 0xf7, 0xfb, 0x81, 0x74, 0x81,
-	0xc4,0x0f,0x1a,0x21,0x48,0xaf,0xce,0xc1,0xc4,0x94,
+    0xc4, 0x0f, 0x1a, 0x21, 0x48, 0xaf, 0xce, 0xc1, 0xc4, 0x94,
-	0x18,0x06,0x44,0x8d,0xd3,0xd2,0x22,0x2d,0x2d,0x3e,
+    0x18, 0x06, 0x44, 0x8d, 0xd3, 0xd2, 0x22, 0x2d, 0x2d, 0x3e,
-	0x5a,0x31,0xdc,0x95,0x8e,0xf4,0x41,0xfc,0x58,0xc9,
+    0x5a, 0x31, 0xdc, 0x95, 0x8e, 0xf4, 0x41, 0xfc, 0x58, 0xc9,
-	0x40,0x92,0x17,0x5f,0xe3,0xda,0xac,0x9e,0x3f,0x1c,
+    0x40, 0x92, 0x17, 0x5f, 0xe3, 0xda, 0xac, 0x9e, 0x3f, 0x1c,
-	0x2a,0x6b,0x58,0x5f,0x48,0x78,0x20,0xb1,0xaf,0x24,
+    0x2a, 0x6b, 0x58, 0x5f, 0x48, 0x78, 0x20, 0xb1, 0xaf, 0x24,
-	0x9b,0x3c,0x20,0x8b,0x93,0x25,0x9e,0xe6,0x6b,0xbc,
+    0x9b, 0x3c, 0x20, 0x8b, 0x93, 0x25, 0x9e, 0xe6, 0x6b, 0xbc,
-	0x13,0x42,0x14,0x6c,0x36,0x31,0xff,0x7a,0xd1,0xc1,
+    0x13, 0x42, 0x14, 0x6c, 0x36, 0x31, 0xff, 0x7a, 0xd1, 0xc1,
-	0x1a,0x26,0x14,0x7f,0xa9,0x76,0xa7,0x0c,0xf8,0xcc,
+    0x1a, 0x26, 0x14, 0x7f, 0xa9, 0x76, 0xa7, 0x0c, 0xf8, 0xcc,
-	0xed,0x07,0x6a,0xd2,0xdf,0x62,0xee,0x0a,0x7c,0x84,
+    0xed, 0x07, 0x6a, 0xd2, 0xdf, 0x62, 0xee, 0x0a, 0x7c, 0x84,
-	0xcb,0x49,0x90,0xb2,0x03,0x0d,0xa2,0x82,0x06,0x77,
+    0xcb, 0x49, 0x90, 0xb2, 0x03, 0x0d, 0xa2, 0x82, 0x06, 0x77,
-	0xf1,0xcd,0x67,0xf2,0x47,0x21,0x02,0x3f,0x43,0x21,
+    0xf1, 0xcd, 0x67, 0xf2, 0x47, 0x21, 0x02, 0x3f, 0x43, 0x21,
-	0xf0,0x46,0x30,0x62,0x51,0x72,0xb1,0xe7,0x48,0xc6,
+    0xf0, 0x46, 0x30, 0x62, 0x51, 0x72, 0xb1, 0xe7, 0x48, 0xc6,
-	0x67,0x12,0xcd,0x9e,0xd6,0x15,0xe5,0x21,0xed,0xfa,
+    0x67, 0x12, 0xcd, 0x9e, 0xd6, 0x15, 0xe5, 0x21, 0xed, 0xfa,
-	0x8f,0x30,0xa6,0x41,0xfe,0xb6,0xfa,0x8f,0x34,0x14,
+    0x8f, 0x30, 0xa6, 0x41, 0xfe, 0xb6, 0xfa, 0x8f, 0x34, 0x14,
-	0x19,0xe8,0x11,0xf7,0xa5,0x77,0x3e,0xb7,0xf9,0x39,
+    0x19, 0xe8, 0x11, 0xf7, 0xa5, 0x77, 0x3e, 0xb7, 0xf9, 0x39,
-	0x07,0x8c,0x67,0x2a,0xab,0x7b,0x08,0xf8,0xb0,0x06,
+    0x07, 0x8c, 0x67, 0x2a, 0xab, 0x7b, 0x08, 0xf8, 0xb0, 0x06,
-	0xa8,0xea,0x2f,0x8f,0xfa,0xcc,0xcc,0x40,0xce,0xf3,
+    0xa8, 0xea, 0x2f, 0x8f, 0xfa, 0xcc, 0xcc, 0x40, 0xce, 0xf3,
-	0x70,0x4f,0x3f,0x7f,0xe2,0x0c,0xea,0x76,0x4a,0x35,
+    0x70, 0x4f, 0x3f, 0x7f, 0xe2, 0x0c, 0xea, 0x76, 0x4a, 0x35,
-	0x4e,0x47,0xad,0x2b,0xa7,0x97,0x5d,0x74,0x43,0x97,
+    0x4e, 0x47, 0xad, 0x2b, 0xa7, 0x97, 0x5d, 0x74, 0x43, 0x97,
-	0x90,0xd2,0xfb,0xd9,0xf9,0x96,0x01,0x33,0x05,0xed,
+    0x90, 0xd2, 0xfb, 0xd9, 0xf9, 0x96, 0x01, 0x33, 0x05, 0xed,
-	0x7b,0x03,0x05,0xad,0xf8,0x49,0x03,0x02,0x82,0x01,
+    0x7b, 0x03, 0x05, 0xad, 0xf8, 0x49, 0x03, 0x02, 0x82, 0x01,
-	0x01,0x00,0xd4,0x40,0x17,0x66,0x10,0x92,0x95,0xc8,
+    0x01, 0x00, 0xd4, 0x40, 0x17, 0x66, 0x10, 0x92, 0x95, 0xc8,
-	0xec,0x62,0xa9,0x7a,0xcb,0x93,0x8e,0xe6,0x53,0xd4,
+    0xec, 0x62, 0xa9, 0x7a, 0xcb, 0x93, 0x8e, 0xe6, 0x53, 0xd4,
-	0x80,0x48,0x27,0x4b,0x41,0xce,0x61,0xdf,0xbf,0x94,
+    0x80, 0x48, 0x27, 0x4b, 0x41, 0xce, 0x61, 0xdf, 0xbf, 0x94,
-	0xa4,0x3d,0x71,0x03,0x0b,0xed,0x25,0x71,0x98,0xa4,
+    0xa4, 0x3d, 0x71, 0x03, 0x0b, 0xed, 0x25, 0x71, 0x98, 0xa4,
-	0xd6,0xd5,0x4a,0x57,0xf5,0x6c,0x1b,0xda,0x21,0x7d,
+    0xd6, 0xd5, 0x4a, 0x57, 0xf5, 0x6c, 0x1b, 0xda, 0x21, 0x7d,
-	0x35,0x45,0xb3,0xf3,0x6a,0xd9,0xd3,0x43,0xe8,0x5c,
+    0x35, 0x45, 0xb3, 0xf3, 0x6a, 0xd9, 0xd3, 0x43, 0xe8, 0x5c,
-	0x54,0x1c,0x83,0x1b,0xb4,0x5f,0xf2,0x97,0x24,0x2e,
+    0x54, 0x1c, 0x83, 0x1b, 0xb4, 0x5f, 0xf2, 0x97, 0x24, 0x2e,
-	0xdc,0x40,0xde,0x92,0x23,0x59,0x8e,0xbc,0xd2,0xa1,
+    0xdc, 0x40, 0xde, 0x92, 0x23, 0x59, 0x8e, 0xbc, 0xd2, 0xa1,
-	0xf2,0xe0,0x4c,0xdd,0x0b,0xd1,0xe7,0xae,0x65,0xbc,
+    0xf2, 0xe0, 0x4c, 0xdd, 0x0b, 0xd1, 0xe7, 0xae, 0x65, 0xbc,
-	0xb5,0xf5,0x5b,0x98,0xe9,0xd7,0xc2,0xb7,0x0e,0x55,
+    0xb5, 0xf5, 0x5b, 0x98, 0xe9, 0xd7, 0xc2, 0xb7, 0x0e, 0x55,
-	0x71,0x0e,0x3c,0x0a,0x24,0x6b,0xa6,0xe6,0x14,0x61,
+    0x71, 0x0e, 0x3c, 0x0a, 0x24, 0x6b, 0xa6, 0xe6, 0x14, 0x61,
-	0x11,0xfd,0x33,0x42,0x99,0x2b,0x84,0x77,0x74,0x92,
+    0x11, 0xfd, 0x33, 0x42, 0x99, 0x2b, 0x84, 0x77, 0x74, 0x92,
-	0x91,0xf5,0x79,0x79,0xcf,0xad,0x8e,0x04,0xef,0x80,
+    0x91, 0xf5, 0x79, 0x79, 0xcf, 0xad, 0x8e, 0x04, 0xef, 0x80,
-	0x1e,0x57,0xf4,0x14,0xf5,0x35,0x09,0x74,0xb2,0x13,
+    0x1e, 0x57, 0xf4, 0x14, 0xf5, 0x35, 0x09, 0x74, 0xb2, 0x13,
-	0x71,0x58,0x6b,0xea,0x32,0x5d,0xf3,0xd3,0x76,0x48,
+    0x71, 0x58, 0x6b, 0xea, 0x32, 0x5d, 0xf3, 0xd3, 0x76, 0x48,
-	0x39,0x10,0x23,0x84,0x9d,0xbe,0x92,0x77,0x4a,0xed,
+    0x39, 0x10, 0x23, 0x84, 0x9d, 0xbe, 0x92, 0x77, 0x4a, 0xed,
-	0x70,0x3e,0x1a,0xa2,0x6c,0xb3,0x81,0x00,0xc3,0xc9,
+    0x70, 0x3e, 0x1a, 0xa2, 0x6c, 0xb3, 0x81, 0x00, 0xc3, 0xc9,
-	0xe4,0x52,0xc8,0x24,0x88,0x0c,0x41,0xad,0x87,0x5a,
+    0xe4, 0x52, 0xc8, 0x24, 0x88, 0x0c, 0x41, 0xad, 0x87, 0x5a,
-	0xea,0xa3,0x7a,0x85,0x1c,0x5e,0x31,0x7f,0xc3,0x35,
+    0xea, 0xa3, 0x7a, 0x85, 0x1c, 0x5e, 0x31, 0x7f, 0xc3, 0x35,
-	0xc6,0xfa,0x10,0xc8,0x75,0x10,0xc4,0x96,0x99,0xe7,
+    0xc6, 0xfa, 0x10, 0xc8, 0x75, 0x10, 0xc4, 0x96, 0x99, 0xe7,
-	0xfe,0x01,0xb4,0x74,0xdb,0xb4,0x11,0xc3,0xc8,0x8c,
+    0xfe, 0x01, 0xb4, 0x74, 0xdb, 0xb4, 0x11, 0xc3, 0xc8, 0x8c,
-	0xf6,0xf7,0x3b,0x66,0x50,0xfc,0xdb,0xeb,0xca,0x47,
+    0xf6, 0xf7, 0x3b, 0x66, 0x50, 0xfc, 0xdb, 0xeb, 0xca, 0x47,
-	0x85,0x89,0xe1,0x65,0xd9,0x62,0x34,0x3c,0x70,0xd8,
+    0x85, 0x89, 0xe1, 0x65, 0xd9, 0x62, 0x34, 0x3c, 0x70, 0xd8,
-	0x2e,0xb4,0x2f,0x65,0x3c,0x4a,0xa6,0x2a,0xe7,0xc7,
+    0x2e, 0xb4, 0x2f, 0x65, 0x3c, 0x4a, 0xa6, 0x2a, 0xe7, 0xc7,
-	0xd8,0x41,0x8f,0x8a,0x43,0xbf,0x42,0xf2,0x4d,0xbc,
+    0xd8, 0x41, 0x8f, 0x8a, 0x43, 0xbf, 0x42, 0xf2, 0x4d, 0xbc,
-	0xfc,0x9e,0x27,0x95,0xfb,0x75,0xff,0xab,0x02,0x82,
+    0xfc, 0x9e, 0x27, 0x95, 0xfb, 0x75, 0xff, 0xab, 0x02, 0x82,
-	0x01,0x00,0x41,0x2f,0x44,0x57,0x6d,0x12,0x17,0x5b,
+    0x01, 0x00, 0x41, 0x2f, 0x44, 0x57, 0x6d, 0x12, 0x17, 0x5b,
-	0x32,0xc6,0xb7,0x6c,0x57,0x7a,0x8a,0x0e,0x79,0xef,
+    0x32, 0xc6, 0xb7, 0x6c, 0x57, 0x7a, 0x8a, 0x0e, 0x79, 0xef,
-	0x72,0xa8,0x68,0xda,0x2d,0x38,0xe4,0xbb,0x8d,0xf6,
+    0x72, 0xa8, 0x68, 0xda, 0x2d, 0x38, 0xe4, 0xbb, 0x8d, 0xf6,
-	0x02,0x65,0xcf,0x56,0x13,0xe1,0x1a,0xcb,0x39,0x80,
+    0x02, 0x65, 0xcf, 0x56, 0x13, 0xe1, 0x1a, 0xcb, 0x39, 0x80,
-	0xa6,0xb1,0x32,0x03,0x1e,0xdd,0xbb,0x35,0xd9,0xac,
+    0xa6, 0xb1, 0x32, 0x03, 0x1e, 0xdd, 0xbb, 0x35, 0xd9, 0xac,
-	0x43,0x89,0x31,0x08,0x90,0x92,0x5e,0x35,0x3d,0x7b,
+    0x43, 0x89, 0x31, 0x08, 0x90, 0x92, 0x5e, 0x35, 0x3d, 0x7b,
-	0x9c,0x6f,0x86,0xcb,0x17,0xdd,0x85,0xe4,0xed,0x35,
+    0x9c, 0x6f, 0x86, 0xcb, 0x17, 0xdd, 0x85, 0xe4, 0xed, 0x35,
-	0x08,0x8e,0xc1,0xf4,0x05,0xd8,0x68,0xc6,0x63,0x3c,
+    0x08, 0x8e, 0xc1, 0xf4, 0x05, 0xd8, 0x68, 0xc6, 0x63, 0x3c,
-	0xf7,0xff,0xf7,0x47,0x33,0x39,0xc5,0x3e,0xb7,0x0e,
+    0xf7, 0xff, 0xf7, 0x47, 0x33, 0x39, 0xc5, 0x3e, 0xb7, 0x0e,
-	0x58,0x35,0x9d,0x81,0xea,0xf8,0x6a,0x2c,0x1c,0x5a,
+    0x58, 0x35, 0x9d, 0x81, 0xea, 0xf8, 0x6a, 0x2c, 0x1c, 0x5a,
-	0x68,0x78,0x64,0x11,0x6b,0xc1,0x3e,0x4e,0x7a,0xbd,
+    0x68, 0x78, 0x64, 0x11, 0x6b, 0xc1, 0x3e, 0x4e, 0x7a, 0xbd,
-	0x84,0xcb,0x0f,0xc2,0xb6,0x85,0x1d,0xd3,0x76,0xc5,
+    0x84, 0xcb, 0x0f, 0xc2, 0xb6, 0x85, 0x1d, 0xd3, 0x76, 0xc5,
-	0x93,0x6a,0x69,0x89,0x56,0x34,0xdc,0x4a,0x9b,0xbc,
+    0x93, 0x6a, 0x69, 0x89, 0x56, 0x34, 0xdc, 0x4a, 0x9b, 0xbc,
-	0xff,0xa8,0x0d,0x6e,0x35,0x9c,0x60,0xa7,0x23,0x30,
+    0xff, 0xa8, 0x0d, 0x6e, 0x35, 0x9c, 0x60, 0xa7, 0x23, 0x30,
-	0xc7,0x06,0x64,0x39,0x8b,0x94,0x89,0xee,0xba,0x7f,
+    0xc7, 0x06, 0x64, 0x39, 0x8b, 0x94, 0x89, 0xee, 0xba, 0x7f,
-	0x60,0x8d,0xfa,0xb6,0x97,0x76,0xdc,0x51,0x4a,0x3c,
+    0x60, 0x8d, 0xfa, 0xb6, 0x97, 0x76, 0xdc, 0x51, 0x4a, 0x3c,
-	0xeb,0x3a,0x14,0x2c,0x20,0x60,0x69,0x4a,0x86,0xfe,
+    0xeb, 0x3a, 0x14, 0x2c, 0x20, 0x60, 0x69, 0x4a, 0x86, 0xfe,
-	0x8c,0x21,0x84,0x49,0x54,0xb3,0x20,0xe1,0x01,0x7f,
+    0x8c, 0x21, 0x84, 0x49, 0x54, 0xb3, 0x20, 0xe1, 0x01, 0x7f,
-	0x58,0xdf,0x7f,0xb5,0x21,0x51,0x8c,0x47,0x9f,0x91,
+    0x58, 0xdf, 0x7f, 0xb5, 0x21, 0x51, 0x8c, 0x47, 0x9f, 0x91,
-	0xeb,0x97,0x3e,0xf2,0x54,0xcf,0x16,0x46,0xf9,0xd9,
+    0xeb, 0x97, 0x3e, 0xf2, 0x54, 0xcf, 0x16, 0x46, 0xf9, 0xd9,
-	0xb6,0xe7,0x64,0xc9,0xd0,0x54,0xea,0x2f,0xa1,0xcf,
+    0xb6, 0xe7, 0x64, 0xc9, 0xd0, 0x54, 0xea, 0x2f, 0xa1, 0xcf,
-	0xa5,0x7f,0x28,0x8d,0x84,0xec,0xd5,0x39,0x03,0x76,
+    0xa5, 0x7f, 0x28, 0x8d, 0x84, 0xec, 0xd5, 0x39, 0x03, 0x76,
-	0x5b,0x2d,0x8e,0x43,0xf2,0x01,0x24,0xc9,0x6f,0xc0,
+    0x5b, 0x2d, 0x8e, 0x43, 0xf2, 0x01, 0x24, 0xc9, 0x6f, 0xc0,
-	0xf5,0x69,0x6f,0x7d,0xb5,0x85,0xd2,0x5f,0x7f,0x78,
+    0xf5, 0x69, 0x6f, 0x7d, 0xb5, 0x85, 0xd2, 0x5f, 0x7f, 0x78,
-	0x40,0x07,0x7f,0x09,0x15,0xb5,0x1f,0x28,0x65,0x10,
+    0x40, 0x07, 0x7f, 0x09, 0x15, 0xb5, 0x1f, 0x28, 0x65, 0x10,
-	0xe4,0x19,0xa8,0xc6,0x9e,0x8d,0xdc,0xcb,0x02,0x82,
+    0xe4, 0x19, 0xa8, 0xc6, 0x9e, 0x8d, 0xdc, 0xcb, 0x02, 0x82,
-	0x01,0x00,0x13,0x01,0xee,0x56,0x80,0x93,0x70,0x00,
+    0x01, 0x00, 0x13, 0x01, 0xee, 0x56, 0x80, 0x93, 0x70, 0x00,
-	0x7f,0x52,0xd2,0x94,0xa1,0x98,0x84,0x4a,0x92,0x25,
+    0x7f, 0x52, 0xd2, 0x94, 0xa1, 0x98, 0x84, 0x4a, 0x92, 0x25,
-	0x4c,0x9b,0xa9,0x91,0x2e,0xc2,0x79,0xb7,0x5c,0xe3,
+    0x4c, 0x9b, 0xa9, 0x91, 0x2e, 0xc2, 0x79, 0xb7, 0x5c, 0xe3,
-	0xc5,0xd5,0x8e,0xc2,0x54,0x16,0x17,0xad,0x55,0x9b,
+    0xc5, 0xd5, 0x8e, 0xc2, 0x54, 0x16, 0x17, 0xad, 0x55, 0x9b,
-	0x25,0x76,0x12,0x63,0x50,0x22,0x2f,0x58,0x58,0x79,
+    0x25, 0x76, 0x12, 0x63, 0x50, 0x22, 0x2f, 0x58, 0x58, 0x79,
-	0x6b,0x04,0xe3,0xf9,0x9f,0x8f,0x04,0x41,0x67,0x94,
+    0x6b, 0x04, 0xe3, 0xf9, 0x9f, 0x8f, 0x04, 0x41, 0x67, 0x94,
-	0xa5,0x1f,0xac,0x8a,0x15,0x9c,0x26,0x10,0x6c,0xf8,
+    0xa5, 0x1f, 0xac, 0x8a, 0x15, 0x9c, 0x26, 0x10, 0x6c, 0xf8,
-	0x19,0x57,0x61,0xd7,0x3a,0x7d,0x31,0xb0,0x2d,0x38,
+    0x19, 0x57, 0x61, 0xd7, 0x3a, 0x7d, 0x31, 0xb0, 0x2d, 0x38,
-	0xbd,0x94,0x62,0xad,0xc4,0xfa,0x36,0x42,0x42,0xf0,
+    0xbd, 0x94, 0x62, 0xad, 0xc4, 0xfa, 0x36, 0x42, 0x42, 0xf0,
-	0x24,0x67,0x65,0x9d,0x8b,0x0b,0x7c,0x6f,0x82,0x44,
+    0x24, 0x67, 0x65, 0x9d, 0x8b, 0x0b, 0x7c, 0x6f, 0x82, 0x44,
-	0x1a,0x8c,0xc8,0xc9,0xab,0xbb,0x4c,0x45,0xfc,0x7b,
+    0x1a, 0x8c, 0xc8, 0xc9, 0xab, 0xbb, 0x4c, 0x45, 0xfc, 0x7b,
-	0x38,0xee,0x30,0xe1,0xfc,0xef,0x8d,0xbc,0x58,0xdf,
+    0x38, 0xee, 0x30, 0xe1, 0xfc, 0xef, 0x8d, 0xbc, 0x58, 0xdf,
-	0x2b,0x5d,0x0d,0x54,0xe0,0x49,0x4d,0x97,0x99,0x8f,
+    0x2b, 0x5d, 0x0d, 0x54, 0xe0, 0x49, 0x4d, 0x97, 0x99, 0x8f,
-	0x22,0xa8,0x83,0xbe,0x40,0xbb,0x50,0x2e,0x78,0x28,
+    0x22, 0xa8, 0x83, 0xbe, 0x40, 0xbb, 0x50, 0x2e, 0x78, 0x28,
-	0x0f,0x95,0x78,0x8c,0x8f,0x98,0x24,0x56,0xc2,0x97,
+    0x0f, 0x95, 0x78, 0x8c, 0x8f, 0x98, 0x24, 0x56, 0xc2, 0x97,
-	0xf3,0x2c,0x43,0xd2,0x03,0x82,0x66,0x81,0x72,0x5f,
+    0xf3, 0x2c, 0x43, 0xd2, 0x03, 0x82, 0x66, 0x81, 0x72, 0x5f,
-	0x53,0x16,0xec,0xb1,0xb1,0x04,0x5e,0x40,0x20,0x48,
+    0x53, 0x16, 0xec, 0xb1, 0xb1, 0x04, 0x5e, 0x40, 0x20, 0x48,
-	0x7b,0x3f,0x02,0x97,0x6a,0xeb,0x96,0x12,0x21,0x35,
+    0x7b, 0x3f, 0x02, 0x97, 0x6a, 0xeb, 0x96, 0x12, 0x21, 0x35,
-	0xfe,0x1f,0x47,0xc0,0x95,0xea,0xc5,0x8a,0x08,0x84,
+    0xfe, 0x1f, 0x47, 0xc0, 0x95, 0xea, 0xc5, 0x8a, 0x08, 0x84,
-	0x4f,0x5e,0x63,0x94,0x60,0x0f,0x71,0x5b,0x7f,0x4a,
+    0x4f, 0x5e, 0x63, 0x94, 0x60, 0x0f, 0x71, 0x5b, 0x7f, 0x4a,
-	0xec,0x4f,0x60,0xc6,0xba,0x4a,0x24,0xf1,0x20,0x8b,
+    0xec, 0x4f, 0x60, 0xc6, 0xba, 0x4a, 0x24, 0xf1, 0x20, 0x8b,
-	0xa7,0x2e,0x3a,0xce,0x8d,0xe0,0x27,0x1d,0xb5,0x8e,
+    0xa7, 0x2e, 0x3a, 0xce, 0x8d, 0xe0, 0x27, 0x1d, 0xb5, 0x8e,
-	0xb4,0x21,0xc5,0xe2,0xa6,0x16,0x0a,0x51,0x83,0x55,
+    0xb4, 0x21, 0xc5, 0xe2, 0xa6, 0x16, 0x0a, 0x51, 0x83, 0x55,
-	0x88,0xd1,0x30,0x11,0x63,0xd5,0xd7,0x8d,0xae,0x16,
+    0x88, 0xd1, 0x30, 0x11, 0x63, 0xd5, 0xd7, 0x8d, 0xae, 0x16,
-	0x12,0x82,0xc4,0x85,0x00,0x4e,0x27,0x83,0xa5,0x7c,
+    0x12, 0x82, 0xc4, 0x85, 0x00, 0x4e, 0x27, 0x83, 0xa5, 0x7c,
-	0x90,0x2e,0xe5,0xa2,0xa3,0xd3,0x4c,0x63,0x02,0x82,
+    0x90, 0x2e, 0xe5, 0xa2, 0xa3, 0xd3, 0x4c, 0x63, 0x02, 0x82,
-	0x01,0x01,0x00,0x86,0x08,0x98,0x98,0xa5,0x00,0x05,
+    0x01, 0x01, 0x00, 0x86, 0x08, 0x98, 0x98, 0xa5, 0x00, 0x05,
-	0x39,0x77,0xd9,0x66,0xb3,0xcf,0xca,0xa0,0x71,0xb3,
+    0x39, 0x77, 0xd9, 0x66, 0xb3, 0xcf, 0xca, 0xa0, 0x71, 0xb3,
-	0x50,0xce,0x3d,0xb1,0x93,0x95,0x35,0xc4,0xd4,0x2e,
+    0x50, 0xce, 0x3d, 0xb1, 0x93, 0x95, 0x35, 0xc4, 0xd4, 0x2e,
-	0x90,0xdf,0x0f,0xfc,0x60,0xc1,0x94,0x68,0x61,0x43,
+    0x90, 0xdf, 0x0f, 0xfc, 0x60, 0xc1, 0x94, 0x68, 0x61, 0x43,
-	0xca,0x9a,0x23,0x4a,0x1e,0x45,0x72,0x99,0xb5,0x1e,
+    0xca, 0x9a, 0x23, 0x4a, 0x1e, 0x45, 0x72, 0x99, 0xb5, 0x1e,
-	0x61,0x8d,0x77,0x0f,0xa0,0xbb,0xd7,0x77,0xb4,0x2a,
+    0x61, 0x8d, 0x77, 0x0f, 0xa0, 0xbb, 0xd7, 0x77, 0xb4, 0x2a,
-	0x15,0x11,0x88,0x2d,0xb3,0x56,0x61,0x5e,0x6a,0xed,
+    0x15, 0x11, 0x88, 0x2d, 0xb3, 0x56, 0x61, 0x5e, 0x6a, 0xed,
-	0xa4,0x46,0x4a,0x3f,0x50,0x11,0xd6,0xba,0xb6,0xd7,
+    0xa4, 0x46, 0x4a, 0x3f, 0x50, 0x11, 0xd6, 0xba, 0xb6, 0xd7,
-	0x95,0x65,0x53,0xc3,0xa1,0x8f,0xe0,0xa3,0xf5,0x1c,
+    0x95, 0x65, 0x53, 0xc3, 0xa1, 0x8f, 0xe0, 0xa3, 0xf5, 0x1c,
-	0xfd,0xaf,0x6e,0x43,0xd7,0x17,0xa7,0xd3,0x81,0x1b,
+    0xfd, 0xaf, 0x6e, 0x43, 0xd7, 0x17, 0xa7, 0xd3, 0x81, 0x1b,
-	0xa4,0xdf,0xe0,0x97,0x8a,0x46,0x03,0xd3,0x46,0x0e,
+    0xa4, 0xdf, 0xe0, 0x97, 0x8a, 0x46, 0x03, 0xd3, 0x46, 0x0e,
-	0x83,0x48,0x4e,0xd2,0x02,0xcb,0xc0,0xad,0x79,0x95,
+    0x83, 0x48, 0x4e, 0xd2, 0x02, 0xcb, 0xc0, 0xad, 0x79, 0x95,
-	0x8c,0x96,0xba,0x40,0x34,0x11,0x71,0x5e,0xe9,0x11,
+    0x8c, 0x96, 0xba, 0x40, 0x34, 0x11, 0x71, 0x5e, 0xe9, 0x11,
-	0xf9,0xc5,0x4a,0x5e,0x91,0x9d,0xf5,0x92,0x4f,0xeb,
+    0xf9, 0xc5, 0x4a, 0x5e, 0x91, 0x9d, 0xf5, 0x92, 0x4f, 0xeb,
-	0xc6,0x70,0x02,0x2d,0x3d,0x04,0xaa,0xe9,0x3a,0x8e,
+    0xc6, 0x70, 0x02, 0x2d, 0x3d, 0x04, 0xaa, 0xe9, 0x3a, 0x8e,
-	0xd5,0xa8,0xad,0xf7,0xce,0x0d,0x16,0xb2,0xec,0x0a,
+    0xd5, 0xa8, 0xad, 0xf7, 0xce, 0x0d, 0x16, 0xb2, 0xec, 0x0a,
-	0x9c,0xf5,0x94,0x39,0xb9,0x8a,0xfc,0x1e,0xf9,0xcc,
+    0x9c, 0xf5, 0x94, 0x39, 0xb9, 0x8a, 0xfc, 0x1e, 0xf9, 0xcc,
-	0xf2,0x5f,0x21,0x31,0x74,0x72,0x6b,0x64,0xae,0x35,
+    0xf2, 0x5f, 0x21, 0x31, 0x74, 0x72, 0x6b, 0x64, 0xae, 0x35,
-	0x61,0x8d,0x0d,0xcb,0xe7,0xda,0x39,0xca,0xf3,0x21,
+    0x61, 0x8d, 0x0d, 0xcb, 0xe7, 0xda, 0x39, 0xca, 0xf3, 0x21,
-	0x66,0x0b,0x95,0xd7,0x0a,0x7c,0xca,0xa1,0xa9,0x5a,
+    0x66, 0x0b, 0x95, 0xd7, 0x0a, 0x7c, 0xca, 0xa1, 0xa9, 0x5a,
-	0xe8,0xac,0xe0,0x71,0x54,0xaf,0x28,0xcf,0xd5,0x70,
+    0xe8, 0xac, 0xe0, 0x71, 0x54, 0xaf, 0x28, 0xcf, 0xd5, 0x70,
-	0x89,0xe0,0xf3,0x9e,0x43,0x6c,0x8d,0x7b,0x99,0x01,
+    0x89, 0xe0, 0xf3, 0x9e, 0x43, 0x6c, 0x8d, 0x7b, 0x99, 0x01,
-	0x68,0x4d,0xa1,0x45,0x46,0x0c,0x43,0xbc,0xcc,0x2c,
+    0x68, 0x4d, 0xa1, 0x45, 0x46, 0x0c, 0x43, 0xbc, 0xcc, 0x2c,
-	0xdd,0xc5,0x46,0xc8,0x4e,0x0e,0xbe,0xed,0xb9,0x26,
+    0xdd, 0xc5, 0x46, 0xc8, 0x4e, 0x0e, 0xbe, 0xed, 0xb9, 0x26,
-	0xab,0x2e,0xdb,0xeb,0x8f,0xff,0xdb,0xb0,0xc6,0x55,
+    0xab, 0x2e, 0xdb, 0xeb, 0x8f, 0xff, 0xdb, 0xb0, 0xc6, 0x55,
-	0xaf,0xf8,0x2a,0x91,0x9d,0x50,0x44,0x21,0x17,
+    0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
-	};
+};

apps/timeouts.h

@@ -58,10 +58,10 @@
  */
 
 #ifndef INCLUDED_TIMEOUTS_H
-#define INCLUDED_TIMEOUTS_H
+# define INCLUDED_TIMEOUTS_H
 
 /* numbers in us */
-#define DGRAM_RCV_TIMEOUT         250000
+# define DGRAM_RCV_TIMEOUT         250000
-#define DGRAM_SND_TIMEOUT         250000
+# define DGRAM_SND_TIMEOUT         250000
 
-#endif /* ! INCLUDED_TIMEOUTS_H */
+#endif                          /* ! INCLUDED_TIMEOUTS_H */

apps/verify.c

@@ -67,284 +67,275 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	verify_main
+#define PROG    verify_main
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
 static int check(X509_STORE *ctx, char *file,
-		STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
+                 STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-		STACK_OF(X509_CRL) *crls, ENGINE *e);
+                 STACK_OF(X509_CRL) *crls, ENGINE *e);
-static int v_verbose=0, vflags = 0;
+static int v_verbose = 0, vflags = 0;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int i,ret=1, badarg = 0;
+    int i, ret = 1, badarg = 0;
-	char *CApath=NULL,*CAfile=NULL;
+    char *CApath = NULL, *CAfile = NULL;
-	char *untfile = NULL, *trustfile = NULL, *crlfile = NULL;
+    char *untfile = NULL, *trustfile = NULL, *crlfile = NULL;
-	STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
+    STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
-	STACK_OF(X509_CRL) *crls = NULL;
+    STACK_OF(X509_CRL) *crls = NULL;
-	X509_STORE *cert_ctx=NULL;
+    X509_STORE *cert_ctx = NULL;
-	X509_LOOKUP *lookup=NULL;
+    X509_LOOKUP *lookup = NULL;
-	X509_VERIFY_PARAM *vpm = NULL;
+    X509_VERIFY_PARAM *vpm = NULL;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	cert_ctx=X509_STORE_new();
+    cert_ctx = X509_STORE_new();
-	if (cert_ctx == NULL) goto end;
+    if (cert_ctx == NULL)
-	X509_STORE_set_verify_cb(cert_ctx,cb);
+        goto end;
+    X509_STORE_set_verify_cb(cert_ctx, cb);
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	for (;;)
+    for (;;) {
-		{
+        if (argc >= 1) {
-		if (argc >= 1)
+            if (strcmp(*argv, "-CApath") == 0) {
-			{
+                if (argc-- < 1)
-			if (strcmp(*argv,"-CApath") == 0)
+                    goto end;
-				{
+                CApath = *(++argv);
-				if (argc-- < 1) goto end;
+            } else if (strcmp(*argv, "-CAfile") == 0) {
-				CApath= *(++argv);
+                if (argc-- < 1)
-				}
+                    goto end;
-			else if (strcmp(*argv,"-CAfile") == 0)
+                CAfile = *(++argv);
-				{
+            } else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) {
-				if (argc-- < 1) goto end;
+                if (badarg)
-				CAfile= *(++argv);
+                    goto end;
-				}
+                continue;
-			else if (args_verify(&argv, &argc, &badarg, bio_err,
+            } else if (strcmp(*argv, "-untrusted") == 0) {
-									&vpm))
+                if (argc-- < 1)
-				{
+                    goto end;
-				if (badarg)
+                untfile = *(++argv);
-					goto end;
+            } else if (strcmp(*argv, "-trusted") == 0) {
-				continue;
+                if (argc-- < 1)
-				}
+                    goto end;
-			else if (strcmp(*argv,"-untrusted") == 0)
+                trustfile = *(++argv);
-				{
+            } else if (strcmp(*argv, "-CRLfile") == 0) {
-				if (argc-- < 1) goto end;
+                if (argc-- < 1)
-				untfile= *(++argv);
+                    goto end;
-				}
+                crlfile = *(++argv);
-			else if (strcmp(*argv,"-trusted") == 0)
+            }
-				{
-				if (argc-- < 1) goto end;
-				trustfile= *(++argv);
-				}
-			else if (strcmp(*argv,"-CRLfile") == 0)
-				{
-				if (argc-- < 1) goto end;
-				crlfile= *(++argv);
-				}
 #ifndef OPENSSL_NO_ENGINE
-			else if (strcmp(*argv,"-engine") == 0)
+            else if (strcmp(*argv, "-engine") == 0) {
-				{
+                if (--argc < 1)
-				if (--argc < 1) goto end;
+                    goto end;
-				engine= *(++argv);
+                engine = *(++argv);
-				}
+            }
 #endif
-			else if (strcmp(*argv,"-help") == 0)
+            else if (strcmp(*argv, "-help") == 0)
-				goto end;
+                goto end;
-			else if (strcmp(*argv,"-verbose") == 0)
+            else if (strcmp(*argv, "-verbose") == 0)
-				v_verbose=1;
+                v_verbose = 1;
-			else if (argv[0][0] == '-')
+            else if (argv[0][0] == '-')
-				goto end;
+                goto end;
-			else
+            else
-				break;
+                break;
-			argc--;
+            argc--;
-			argv++;
+            argv++;
-			}
+        } else
-		else
+            break;
-			break;
+    }
-		}
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if (vpm)
+    if (vpm)
-		X509_STORE_set1_param(cert_ctx, vpm);
+        X509_STORE_set1_param(cert_ctx, vpm);
 
-	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file());
+    lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file());
-	if (lookup == NULL) abort();
+    if (lookup == NULL)
-	if (CAfile) {
+        abort();
-		i=X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM);
+    if (CAfile) {
-		if(!i) {
+        i = X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM);
-			BIO_printf(bio_err, "Error loading file %s\n", CAfile);
+        if (!i) {
-			ERR_print_errors(bio_err);
+            BIO_printf(bio_err, "Error loading file %s\n", CAfile);
-			goto end;
+            ERR_print_errors(bio_err);
-		}
+            goto end;
-	} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+        }
+    } else
+        X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 
-	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_hash_dir());
+    lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir());
-	if (lookup == NULL) abort();
+    if (lookup == NULL)
-	if (CApath) {
+        abort();
-		i=X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM);
+    if (CApath) {
-		if(!i) {
+        i = X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM);
-			BIO_printf(bio_err, "Error loading directory %s\n", CApath);
+        if (!i) {
-			ERR_print_errors(bio_err);
+            BIO_printf(bio_err, "Error loading directory %s\n", CApath);
-			goto end;
+            ERR_print_errors(bio_err);
-		}
+            goto end;
-	} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
+        }
+    } else
+        X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
 
-	ERR_clear_error();
+    ERR_clear_error();
 
-	if(untfile)
+    if (untfile) {
-		{
+        untrusted = load_certs(bio_err, untfile, FORMAT_PEM,
-		untrusted = load_certs(bio_err, untfile, FORMAT_PEM,
+                               NULL, e, "untrusted certificates");
-					NULL, e, "untrusted certificates");
+        if (!untrusted)
-		if(!untrusted)
+            goto end;
-			goto end;
+    }
-		}
 
-	if(trustfile)
+    if (trustfile) {
-		{
+        trusted = load_certs(bio_err, trustfile, FORMAT_PEM,
-		trusted = load_certs(bio_err, trustfile, FORMAT_PEM,
+                             NULL, e, "trusted certificates");
-					NULL, e, "trusted certificates");
+        if (!trusted)
-		if(!trusted)
+            goto end;
-			goto end;
+    }
-		}
 
-	if(crlfile)
+    if (crlfile) {
-		{
+        crls = load_crls(bio_err, crlfile, FORMAT_PEM, NULL, e, "other CRLs");
-		crls = load_crls(bio_err, crlfile, FORMAT_PEM,
+        if (!crls)
-					NULL, e, "other CRLs");
+            goto end;
-		if(!crls)
+    }
-			goto end;
-		}
 
-	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e);
+    if (argc < 1)
-	else
+        check(cert_ctx, NULL, untrusted, trusted, crls, e);
-		for (i=0; i<argc; i++)
+    else
-			check(cert_ctx,argv[i], untrusted, trusted, crls, e);
+        for (i = 0; i < argc; i++)
-	ret=0;
+            check(cert_ctx, argv[i], untrusted, trusted, crls, e);
-end:
+    ret = 0;
-	if (ret == 1) {
+ end:
-		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
+    if (ret == 1) {
+        BIO_printf(bio_err,
+                   "usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," [-engine e]");
+        BIO_printf(bio_err, " [-engine e]");
 #endif
-		BIO_printf(bio_err," cert1 cert2 ...\n");
+        BIO_printf(bio_err, " cert1 cert2 ...\n");
-		BIO_printf(bio_err,"recognized usages:\n");
+        BIO_printf(bio_err, "recognized usages:\n");
-		for(i = 0; i < X509_PURPOSE_get_count(); i++) {
+        for (i = 0; i < X509_PURPOSE_get_count(); i++) {
-			X509_PURPOSE *ptmp;
+            X509_PURPOSE *ptmp;
-			ptmp = X509_PURPOSE_get0(i);
+            ptmp = X509_PURPOSE_get0(i);
-			BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_get0_sname(ptmp),
+            BIO_printf(bio_err, "\t%-10s\t%s\n",
-								X509_PURPOSE_get0_name(ptmp));
+                       X509_PURPOSE_get0_sname(ptmp),
-		}
+                       X509_PURPOSE_get0_name(ptmp));
-	}
+        }
-	if (vpm) X509_VERIFY_PARAM_free(vpm);
+    }
-	if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
+    if (vpm)
-	sk_X509_pop_free(untrusted, X509_free);
+        X509_VERIFY_PARAM_free(vpm);
-	sk_X509_pop_free(trusted, X509_free);
+    if (cert_ctx != NULL)
-	sk_X509_CRL_pop_free(crls, X509_CRL_free);
+        X509_STORE_free(cert_ctx);
-	apps_shutdown();
+    sk_X509_pop_free(untrusted, X509_free);
-	OPENSSL_EXIT(ret);
+    sk_X509_pop_free(trusted, X509_free);
-	}
+    sk_X509_CRL_pop_free(crls, X509_CRL_free);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static int check(X509_STORE *ctx, char *file,
-		STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
+                 STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-		STACK_OF(X509_CRL) *crls, ENGINE *e)
+                 STACK_OF(X509_CRL) *crls, ENGINE *e)
-	{
+{
-	X509 *x=NULL;
+    X509 *x = NULL;
-	int i=0,ret=0;
+    int i = 0, ret = 0;
-	X509_STORE_CTX *csc;
+    X509_STORE_CTX *csc;
 
-	x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
+    x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
-	if (x == NULL)
+    if (x == NULL)
-		goto end;
+        goto end;
-	fprintf(stdout,"%s: ",(file == NULL)?"stdin":file);
+    fprintf(stdout, "%s: ", (file == NULL) ? "stdin" : file);
 
-	csc = X509_STORE_CTX_new();
+    csc = X509_STORE_CTX_new();
-	if (csc == NULL)
+    if (csc == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    X509_STORE_set_flags(ctx, vflags);
-	X509_STORE_set_flags(ctx, vflags);
+    if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) {
-	if(!X509_STORE_CTX_init(csc,ctx,x,uchain))
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
+    if (tchain)
-		}
+        X509_STORE_CTX_trusted_stack(csc, tchain);
-	if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
+    if (crls)
-	if (crls)
+        X509_STORE_CTX_set0_crls(csc, crls);
-		X509_STORE_CTX_set0_crls(csc, crls);
+    i = X509_verify_cert(csc);
-	i=X509_verify_cert(csc);
+    X509_STORE_CTX_free(csc);
-	X509_STORE_CTX_free(csc);
 
-	ret=0;
+    ret = 0;
-end:
+ end:
-	if (i > 0)
+    if (i > 0) {
-		{
+        fprintf(stdout, "OK\n");
-		fprintf(stdout,"OK\n");
+        ret = 1;
-		ret=1;
+    } else
-		}
+        ERR_print_errors(bio_err);
-	else
+    if (x != NULL)
-		ERR_print_errors(bio_err);
+        X509_free(x);
-	if (x != NULL) X509_free(x);
 
-	return(ret);
+    return (ret);
-	}
+}
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
-	{
+{
-	int cert_error = X509_STORE_CTX_get_error(ctx);
+    int cert_error = X509_STORE_CTX_get_error(ctx);
-	X509 *current_cert = X509_STORE_CTX_get_current_cert(ctx);
+    X509 *current_cert = X509_STORE_CTX_get_current_cert(ctx);
 
-	if (!ok)
+    if (!ok) {
-		{
+        if (current_cert) {
-		if (current_cert)
+            X509_NAME_print_ex_fp(stdout,
-			{
+                                  X509_get_subject_name(current_cert),
-			X509_NAME_print_ex_fp(stdout,
+                                  0, XN_FLAG_ONELINE);
-				X509_get_subject_name(current_cert),
+            printf("\n");
-				0, XN_FLAG_ONELINE);
+        }
-			printf("\n");
+        printf("%serror %d at %d depth lookup:%s\n",
-			}
+               X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path]" : "",
-		printf("%serror %d at %d depth lookup:%s\n",
+               cert_error,
-			X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path]" : "",
+               X509_STORE_CTX_get_error_depth(ctx),
-			cert_error,
+               X509_verify_cert_error_string(cert_error));
-			X509_STORE_CTX_get_error_depth(ctx),
+        switch (cert_error) {
-			X509_verify_cert_error_string(cert_error));
+        case X509_V_ERR_NO_EXPLICIT_POLICY:
-		switch(cert_error)
+            policies_print(NULL, ctx);
-			{
+        case X509_V_ERR_CERT_HAS_EXPIRED:
-			case X509_V_ERR_NO_EXPLICIT_POLICY:
-				policies_print(NULL, ctx);
-			case X509_V_ERR_CERT_HAS_EXPIRED:
 
-			/* since we are just checking the certificates, it is
+            /*
-			 * ok if they are self signed. But we should still warn
+             * since we are just checking the certificates, it is ok if they
-			 * the user.
+             * are self signed. But we should still warn the user.
-			 */
+             */
 
-			case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+        case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-			/* Continue after extension errors too */
+            /* Continue after extension errors too */
-			case X509_V_ERR_INVALID_CA:
+        case X509_V_ERR_INVALID_CA:
-			case X509_V_ERR_INVALID_NON_CA:
+        case X509_V_ERR_INVALID_NON_CA:
-			case X509_V_ERR_PATH_LENGTH_EXCEEDED:
+        case X509_V_ERR_PATH_LENGTH_EXCEEDED:
-			case X509_V_ERR_INVALID_PURPOSE:
+        case X509_V_ERR_INVALID_PURPOSE:
-			case X509_V_ERR_CRL_HAS_EXPIRED:
+        case X509_V_ERR_CRL_HAS_EXPIRED:
-			case X509_V_ERR_CRL_NOT_YET_VALID:
+        case X509_V_ERR_CRL_NOT_YET_VALID:
-			case X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION:
+        case X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION:
-			ok = 1;
+            ok = 1;
 
-			}
+        }
 
-		return ok;
+        return ok;
 
-		}
+    }
-	if (cert_error == X509_V_OK && ok == 2)
+    if (cert_error == X509_V_OK && ok == 2)
-		policies_print(NULL, ctx);
+        policies_print(NULL, ctx);
-	if (!v_verbose)
+    if (!v_verbose)
-		ERR_clear_error();
+        ERR_clear_error();
-	return(ok);
+    return (ok);
-	}
+}

apps/version.c

@@ -133,85 +133,82 @@
 #endif
 
 #undef PROG
-#define PROG	version_main
+#define PROG    version_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,ret=0;
+    int i, ret = 0;
-	int cflags=0,version=0,date=0,options=0,platform=0,dir=0;
+    int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (argc == 1) version=1;
+    if (argc == 1)
-	for (i=1; i<argc; i++)
+        version = 1;
-		{
+    for (i = 1; i < argc; i++) {
-		if (strcmp(argv[i],"-v") == 0)
+        if (strcmp(argv[i], "-v") == 0)
-			version=1;	
+            version = 1;
-		else if (strcmp(argv[i],"-b") == 0)
+        else if (strcmp(argv[i], "-b") == 0)
-			date=1;
+            date = 1;
-		else if (strcmp(argv[i],"-f") == 0)
+        else if (strcmp(argv[i], "-f") == 0)
-			cflags=1;
+            cflags = 1;
-		else if (strcmp(argv[i],"-o") == 0)
+        else if (strcmp(argv[i], "-o") == 0)
-			options=1;
+            options = 1;
-		else if (strcmp(argv[i],"-p") == 0)
+        else if (strcmp(argv[i], "-p") == 0)
-			platform=1;
+            platform = 1;
-		else if (strcmp(argv[i],"-d") == 0)
+        else if (strcmp(argv[i], "-d") == 0)
-			dir=1;
+            dir = 1;
-		else if (strcmp(argv[i],"-a") == 0)
+        else if (strcmp(argv[i], "-a") == 0)
-			date=version=cflags=options=platform=dir=1;
+            date = version = cflags = options = platform = dir = 1;
-		else
+        else {
-			{
+            BIO_printf(bio_err, "usage:version -[avbofpd]\n");
-			BIO_printf(bio_err,"usage:version -[avbofpd]\n");
+            ret = 1;
-			ret=1;
+            goto end;
-			goto end;
+        }
-			}
+    }
-		}
 
-	if (version)
+    if (version) {
-		{
+        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
-		if (SSLeay() == SSLEAY_VERSION_NUMBER)
+            printf("%s\n", SSLeay_version(SSLEAY_VERSION));
-			{
+        } else {
-			printf("%s\n",SSLeay_version(SSLEAY_VERSION));
+            printf("%s (Library: %s)\n",
-			}
+                   OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
-		else
+        }
-			{
+    }
-			printf("%s (Library: %s)\n",
+    if (date)
-				OPENSSL_VERSION_TEXT,
+        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
-				SSLeay_version(SSLEAY_VERSION));
+    if (platform)
-			}
+        printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
-		}
+    if (options) {
-	if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
+        printf("options:  ");
-	if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
+        printf("%s ", BN_options());
-	if (options) 
-		{
-		printf("options:  ");
-		printf("%s ",BN_options());
 #ifndef OPENSSL_NO_MD2
-		printf("%s ",MD2_options());
+        printf("%s ", MD2_options());
 #endif
 #ifndef OPENSSL_NO_RC4
-		printf("%s ",RC4_options());
+        printf("%s ", RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-		printf("%s ",DES_options());
+        printf("%s ", DES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
-		printf("%s ",idea_options());
+        printf("%s ", idea_options());
 #endif
 #ifndef OPENSSL_NO_BF
-		printf("%s ",BF_options());
+        printf("%s ", BF_options());
 #endif
-		printf("\n");
+        printf("\n");
-		}
+    }
-	if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
+    if (cflags)
-	if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
+        printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
-end:
+    if (dir)
-	apps_shutdown();
+        printf("%s\n", SSLeay_version(SSLEAY_DIR));
-	OPENSSL_EXIT(ret);
+ end:
-	}
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}

apps/vms_decc_init.c

@@ -0,0 +1,172 @@
+#if defined( __VMS) && !defined( OPENSSL_NO_DECC_INIT) && \
+ defined( __DECC) && !defined( __VAX) && (__CRTL_VER >= 70301000)
+# define USE_DECC_INIT 1
+#endif
+
+#ifdef USE_DECC_INIT
+
+/*-
+ * 2010-04-26 SMS.
+ *
+ *----------------------------------------------------------------------
+ *
+ *       decc_init()
+ *
+ *    On non-VAX systems, uses LIB$INITIALIZE to set a collection of C
+ *    RTL features without using the DECC$* logical name method.
+ *
+ *----------------------------------------------------------------------
+ */
+
+# include <stdio.h>
+# include <stdlib.h>
+# include <unixlib.h>
+
+/* Global storage. */
+
+/* Flag to sense if decc_init() was called. */
+
+int decc_init_done = -1;
+
+/* Structure to hold a DECC$* feature name and its desired value. */
+
+typedef struct {
+    char *name;
+    int value;
+} decc_feat_t;
+
+/*
+ * Array of DECC$* feature names and their desired values. Note:
+ * DECC$ARGV_PARSE_STYLE is the urgent one.
+ */
+
+decc_feat_t decc_feat_array[] = {
+    /* Preserve command-line case with SET PROCESS/PARSE_STYLE=EXTENDED */
+    {"DECC$ARGV_PARSE_STYLE", 1},
+
+    /* Preserve case for file names on ODS5 disks. */
+    {"DECC$EFS_CASE_PRESERVE", 1},
+
+    /*
+     * Enable multiple dots (and most characters) in ODS5 file names, while
+     * preserving VMS-ness of ";version".
+     */
+    {"DECC$EFS_CHARSET", 1},
+
+    /* List terminator. */
+    {(char *)NULL, 0}
+};
+
+/* LIB$INITIALIZE initialization function. */
+
+static void decc_init(void)
+{
+    char *openssl_debug_decc_init;
+    int verbose = 0;
+    int feat_index;
+    int feat_value;
+    int feat_value_max;
+    int feat_value_min;
+    int i;
+    int sts;
+
+    /* Get debug option. */
+    openssl_debug_decc_init = getenv("OPENSSL_DEBUG_DECC_INIT");
+    if (openssl_debug_decc_init != NULL) {
+        verbose = strtol(openssl_debug_decc_init, NULL, 10);
+        if (verbose <= 0) {
+            verbose = 1;
+        }
+    }
+
+    /* Set the global flag to indicate that LIB$INITIALIZE worked. */
+    decc_init_done = 1;
+
+    /* Loop through all items in the decc_feat_array[]. */
+
+    for (i = 0; decc_feat_array[i].name != NULL; i++) {
+        /* Get the feature index. */
+        feat_index = decc$feature_get_index(decc_feat_array[i].name);
+        if (feat_index >= 0) {
+            /* Valid item.  Collect its properties. */
+            feat_value = decc$feature_get_value(feat_index, 1);
+            feat_value_min = decc$feature_get_value(feat_index, 2);
+            feat_value_max = decc$feature_get_value(feat_index, 3);
+
+            /* Check the validity of our desired value. */
+            if ((decc_feat_array[i].value >= feat_value_min) &&
+                (decc_feat_array[i].value <= feat_value_max)) {
+                /* Valid value.  Set it if necessary. */
+                if (feat_value != decc_feat_array[i].value) {
+                    sts = decc$feature_set_value(feat_index,
+                                                 1, decc_feat_array[i].value);
+
+                    if (verbose > 1) {
+                        fprintf(stderr, " %s = %d, sts = %d.\n",
+                                decc_feat_array[i].name,
+                                decc_feat_array[i].value, sts);
+                    }
+                }
+            } else {
+                /* Invalid DECC feature value. */
+                fprintf(stderr,
+                        " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n",
+                        feat_value,
+                        feat_value_min, decc_feat_array[i].name,
+                        feat_value_max);
+            }
+        } else {
+            /* Invalid DECC feature name. */
+            fprintf(stderr,
+                    " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[i].name);
+        }
+    }
+
+    if (verbose > 0) {
+        fprintf(stderr, " DECC_INIT complete.\n");
+    }
+}
+
+/* Get "decc_init()" into a valid, loaded LIB$INITIALIZE PSECT. */
+
+# pragma nostandard
+
+/*
+ * Establish the LIB$INITIALIZE PSECTs, with proper alignment and other
+ * attributes.  Note that "nopic" is significant only on VAX.
+ */
+# pragma extern_model save
+
+# if __INITIAL_POINTER_SIZE == 64
+#  define PSECT_ALIGN 3
+# else
+#  define PSECT_ALIGN 2
+# endif
+
+# pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt
+const int spare[8] = { 0 };
+
+# pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt
+void (*const x_decc_init) () = decc_init;
+
+# pragma extern_model restore
+
+/* Fake reference to ensure loading the LIB$INITIALIZE PSECT. */
+
+# pragma extern_model save
+
+int LIB$INITIALIZE(void);
+
+# pragma extern_model strict_refdef
+int dmy_lib$initialize = (int)LIB$INITIALIZE;
+
+# pragma extern_model restore
+
+# pragma standard
+
+#else                           /* def USE_DECC_INIT */
+
+/* Dummy code to avoid a %CC-W-EMPTYFILE complaint. */
+int decc_init_dummy(void);
+
+#endif                          /* def USE_DECC_INIT */

apps/winrand.c

@@ -53,7 +53,8 @@
  *
  */
 
-/* Usage: winrand [filename]
+/*-
+ * Usage: winrand [filename]
  *
  * Collects entropy from mouse movements and other events and writes
  * random data to filename or .rnd
@@ -67,82 +68,79 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 const char *filename;
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
-        PSTR cmdline, int iCmdShow)
+                   PSTR cmdline, int iCmdShow)
-	{
+{
-	static char appname[] = "OpenSSL";
+    static char appname[] = "OpenSSL";
-	HWND hwnd;
+    HWND hwnd;
-	MSG msg;
+    MSG msg;
-	WNDCLASSEX wndclass;
+    WNDCLASSEX wndclass;
-        char buffer[200];
+    char buffer[200];
 
-        if (cmdline[0] == '\0')
+    if (cmdline[0] == '\0')
-                filename = RAND_file_name(buffer, sizeof buffer);
+        filename = RAND_file_name(buffer, sizeof buffer);
-        else
+    else
-                filename = cmdline;
+        filename = cmdline;
 
-        RAND_load_file(filename, -1);
+    RAND_load_file(filename, -1);
 
-	wndclass.cbSize = sizeof(wndclass);
+    wndclass.cbSize = sizeof(wndclass);
-	wndclass.style = CS_HREDRAW | CS_VREDRAW;
+    wndclass.style = CS_HREDRAW | CS_VREDRAW;
-	wndclass.lpfnWndProc = WndProc;
+    wndclass.lpfnWndProc = WndProc;
-	wndclass.cbClsExtra = 0;
+    wndclass.cbClsExtra = 0;
-	wndclass.cbWndExtra = 0;
+    wndclass.cbWndExtra = 0;
-	wndclass.hInstance = hInstance;
+    wndclass.hInstance = hInstance;
-	wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+    wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
-	wndclass.lpszMenuName = NULL;
+    wndclass.lpszMenuName = NULL;
-        wndclass.lpszClassName = appname;
+    wndclass.lpszClassName = appname;
-	wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+    wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
-	RegisterClassEx(&wndclass);
+    RegisterClassEx(&wndclass);
 
-        hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT,
+    hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT,
-		WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
+                        WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
-		CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
+                        CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance,
+                        NULL);
 
-	ShowWindow(hwnd, iCmdShow);
+    ShowWindow(hwnd, iCmdShow);
-	UpdateWindow(hwnd);
+    UpdateWindow(hwnd);
 
+    while (GetMessage(&msg, NULL, 0, 0)) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
 
-	while (GetMessage(&msg, NULL, 0, 0))
+    return msg.wParam;
-		{
+}
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-		}
-
-	return msg.wParam;
-	}
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
-	{
+{
-        HDC hdc;
+    HDC hdc;
-	PAINTSTRUCT ps;
+    PAINTSTRUCT ps;
-        RECT rect;
+    RECT rect;
-        static int seeded = 0;
+    static int seeded = 0;
 
-	switch (iMsg)
+    switch (iMsg) {
-		{
+    case WM_PAINT:
-	case WM_PAINT:
+        hdc = BeginPaint(hwnd, &ps);
-		hdc = BeginPaint(hwnd, &ps);
+        GetClientRect(hwnd, &rect);
-		GetClientRect(hwnd, &rect);
+        DrawText(hdc, "Seeding the PRNG. Please move the mouse!", -1,
-                DrawText(hdc, "Seeding the PRNG. Please move the mouse!", -1,
+                 &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
-			&rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
+        EndPaint(hwnd, &ps);
-		EndPaint(hwnd, &ps);
+        return 0;
-		return 0;
 
-        case WM_DESTROY:
+    case WM_DESTROY:
-                PostQuitMessage(0);
+        PostQuitMessage(0);
-                return 0;
+        return 0;
-                }
+    }
 
-        if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0)
+    if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0) {
-                {
+        seeded = 1;
-                seeded = 1;
+        if (RAND_write_file(filename) <= 0)
-                if (RAND_write_file(filename) <= 0)
+            MessageBox(hwnd, "Couldn't write random file!",
-                        MessageBox(hwnd, "Couldn't write random file!",
+                       "OpenSSL", MB_OK | MB_ICONERROR);
-				"OpenSSL", MB_OK | MB_ICONERROR);
+        PostQuitMessage(0);
-                PostQuitMessage(0);
+    }
-                }
 
-	return DefWindowProc(hwnd, iMsg, wParam, lParam);
+    return DefWindowProc(hwnd, iMsg, wParam, lParam);
-	}
+}

bugs/alpha.c

@@ -56,11 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-/* while not exactly a bug (ASN1 C leaves this undefined) it is
+/*
- * something to watch out for.  This was fine on linux/NT/Solaris but not
+ * while not exactly a bug (ASN1 C leaves this undefined) it is something to
- * Alpha */
+ * watch out for.  This was fine on linux/NT/Solaris but not Alpha
+ */
 
-/* it is basically an example of
+/*-
+ * it is basically an example of
  * func(*(a++),*(a++))
  * which parameter is evaluated first?  It is not defined in ASN1 C.
  */
@@ -69,23 +71,22 @@
 
 #define TYPE    unsigned int
 
-void func(a,b)
+void func(a, b)
 TYPE *a;
 TYPE b;
-        {
+{
-        printf("%ld -1 == %ld\n",a[0],b);
+    printf("%ld -1 == %ld\n", a[0], b);
-        }
+}
 
 main()
-        {
+{
-        TYPE data[5]={1L,2L,3L,4L,5L};
+    TYPE data[5] = { 1L, 2L, 3L, 4L, 5L };
-        TYPE *p;
+    TYPE *p;
-        int i;
+    int i;
 
-        p=data;
+    p = data;
 
-        for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++) {
-                {
+        func(p, *(p++));
-                func(p,*(p++));
+    }
-                }
+}
-        }

bugs/dggccbug.c

@@ -4,17 +4,18 @@
 
 #include <stdio.h>
 
-/* There is a bug in
+/*
- * gcc version 2.5.8 (88open OCS/BCS, DG-2.5.8.3, Oct 14 1994)
+ * There is a bug in gcc version 2.5.8 (88open OCS/BCS, DG-2.5.8.3, Oct 14
- * as shipped with DGUX 5.4R3.10 that can be bypassed by defining
+ * 1994) as shipped with DGUX 5.4R3.10 that can be bypassed by defining
- * DG_GCC_BUG in my code.
+ * DG_GCC_BUG in my code. The bug manifests itself by the vaule of a pointer
- * The bug manifests itself by the vaule of a pointer that is
+ * that is used only by reference, not having it's value change when it is
- * used only by reference, not having it's value change when it is used
+ * used to check for exiting the loop.  Probably caused by there being 2
- * to check for exiting the loop.  Probably caused by there being 2
+ * copies of the valiable, one in a register and one being an address that is
- * copies of the valiable, one in a register and one being an address
+ * passed.
- * that is passed. */
+ */
 
-/* compare the out put from
+/*-
+ * compare the out put from
  * gcc dggccbug.c; ./a.out
  * and
  * gcc -O dggccbug.c; ./a.out
@@ -23,23 +24,22 @@
 
 void inc(a)
 int *a;
-	{
+{
-	(*a)++;
+    (*a)++;
-	}
+}
 
 main()
-	{
+{
-	int p=0;
+    int p = 0;
 #ifdef FIXBUG
-	int dummy;
+    int dummy;
 #endif
 
-	while (p<3)
+    while (p < 3) {
-		{
+        fprintf(stderr, "%08X\n", p);
-		fprintf(stderr,"%08X\n",p);
+        inc(&p);
-		inc(&p);
 #ifdef FIXBUG
-		dummy+=p;
+        dummy += p;
 #endif
-		}
+    }
-	}
+}

bugs/sgiccbug.c

@@ -4,54 +4,57 @@
 
 #include <stdio.h>
 
-/* This compiler bug it present on IRIX 5.3, 5.1 and 4.0.5 (these are
+/*
- * the only versions of IRIX I have access to.
+ * This compiler bug it present on IRIX 5.3, 5.1 and 4.0.5 (these are the
- * defining FIXBUG removes the bug.
+ * only versions of IRIX I have access to. defining FIXBUG removes the bug.
- * (bug is still present in IRIX 6.3 according to
+ * (bug is still present in IRIX 6.3 according to Gage
- * Gage <agage@forgetmenot.Mines.EDU>
+ * <agage@forgetmenot.Mines.EDU>
  */
 
-/* Compare the output from
+/*-
+ * Compare the output from
  * cc sgiccbug.c; ./a.out
  * and
  * cc -O sgiccbug.c; ./a.out
  */
 
-static unsigned long a[4]={0x01234567,0x89ABCDEF,0xFEDCBA98,0x76543210};
+static unsigned long a[4] =
-static unsigned long b[4]={0x89ABCDEF,0xFEDCBA98,0x76543210,0x01234567};
+    { 0x01234567, 0x89ABCDEF, 0xFEDCBA98, 0x76543210 };
-static unsigned long c[4]={0x77777778,0x8ACF1357,0x88888888,0x7530ECA9};
+static unsigned long b[4] =
+    { 0x89ABCDEF, 0xFEDCBA98, 0x76543210, 0x01234567 };
+static unsigned long c[4] =
+    { 0x77777778, 0x8ACF1357, 0x88888888, 0x7530ECA9 };
 
 main()
-	{
+{
-	unsigned long r[4];
+    unsigned long r[4];
-	sub(r,a,b);
+    sub(r, a, b);
-	fprintf(stderr,"input a= %08X %08X %08X %08X\n",a[3],a[2],a[1],a[0]);
+    fprintf(stderr, "input a= %08X %08X %08X %08X\n", a[3], a[2], a[1], a[0]);
-	fprintf(stderr,"input b= %08X %08X %08X %08X\n",b[3],b[2],b[1],b[0]);
+    fprintf(stderr, "input b= %08X %08X %08X %08X\n", b[3], b[2], b[1], b[0]);
-	fprintf(stderr,"output = %08X %08X %08X %08X\n",r[3],r[2],r[1],r[0]);
+    fprintf(stderr, "output = %08X %08X %08X %08X\n", r[3], r[2], r[1], r[0]);
-	fprintf(stderr,"correct= %08X %08X %08X %08X\n",c[3],c[2],c[1],c[0]);
+    fprintf(stderr, "correct= %08X %08X %08X %08X\n", c[3], c[2], c[1], c[0]);
-	}
+}
 
-int sub(r,a,b)
+int sub(r, a, b)
-unsigned long *r,*a,*b;
+unsigned long *r, *a, *b;
-	{
+{
-	register unsigned long t1,t2,*ap,*bp,*rp;
+    register unsigned long t1, t2, *ap, *bp, *rp;
-	int i,carry;
+    int i, carry;
 #ifdef FIXBUG
-	unsigned long dummy;
+    unsigned long dummy;
 #endif
 
-	ap=a;
+    ap = a;
-	bp=b;
+    bp = b;
-	rp=r;
+    rp = r;
-	carry=0;
+    carry = 0;
-	for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++) {
-		{
+        t1 = *(ap++);
-		t1= *(ap++);
+        t2 = *(bp++);
-		t2= *(bp++);
+        t1 = (t1 - t2);
-		t1=(t1-t2);
 #ifdef FIXBUG
-		dummy=t1;
+        dummy = t1;
 #endif
-		*(rp++)=t1&0xffffffff;
+        *(rp++) = t1 & 0xffffffff;
-		}
+    }
-	}
+}

bugs/stream.c

@@ -59,73 +59,74 @@
 #include <stdio.h>
 #include <openssl/rc4.h>
 #ifdef OPENSSL_NO_DES
-#include <des.h>
+# include <des.h>
 #else
-#include <openssl/des.h>
+# include <openssl/des.h>
 #endif
 
-/* show how stream ciphers are not very good.  The mac has no affect
+/*
- * on RC4 while it does for cfb DES
+ * show how stream ciphers are not very good.  The mac has no affect on RC4
+ * while it does for cfb DES
  */
 
 main()
-	{
+{
-	fprintf(stderr,"rc4\n");
+    fprintf(stderr, "rc4\n");
-	rc4();
+    rc4();
-	fprintf(stderr,"cfb des\n");
+    fprintf(stderr, "cfb des\n");
-	des();
+    des();
-	}
+}
 
 int des()
-	{
+{
-	des_key_schedule ks;
+    des_key_schedule ks;
-	des_cblock iv,key;
+    des_cblock iv, key;
-	int num;
+    int num;
-	static char *keystr="01234567";
+    static char *keystr = "01234567";
-	static char *in1="0123456789ABCEDFdata 12345";
+    static char *in1 = "0123456789ABCEDFdata 12345";
-	static char *in2="9876543210abcdefdata 12345";
+    static char *in2 = "9876543210abcdefdata 12345";
-	unsigned char out[100];
+    unsigned char out[100];
-	int i;
+    int i;
 
-	des_set_key((des_cblock *)keystr,ks);
+    des_set_key((des_cblock *)keystr, ks);
 
-	num=0;
+    num = 0;
-	memset(iv,0,8);
+    memset(iv, 0, 8);
-	des_cfb64_encrypt(in1,out,26,ks,(des_cblock *)iv,&num,1);
+    des_cfb64_encrypt(in1, out, 26, ks, (des_cblock *)iv, &num, 1);
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
 
-	num=0;
+    num = 0;
-	memset(iv,0,8);
+    memset(iv, 0, 8);
-	des_cfb64_encrypt(in2,out,26,ks,(des_cblock *)iv,&num,1);
+    des_cfb64_encrypt(in2, out, 26, ks, (des_cblock *)iv, &num, 1);
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
-	}
+}
 
 int rc4()
-	{
+{
-	static char *keystr="0123456789abcdef";
+    static char *keystr = "0123456789abcdef";
-	RC4_KEY key;
+    RC4_KEY key;
-	unsigned char in[100],out[100];
+    unsigned char in[100], out[100];
-	int i;
+    int i;
 
-	RC4_set_key(&key,16,keystr);
+    RC4_set_key(&key, 16, keystr);
-	in[0]='\0';
+    in[0] = '\0';
-	strcpy(in,"0123456789ABCEDFdata 12345");
+    strcpy(in, "0123456789ABCEDFdata 12345");
-	RC4(key,26,in,out);
+    RC4(key, 26, in, out);
 
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
 
-	RC4_set_key(&key,16,keystr);
+    RC4_set_key(&key, 16, keystr);
-	in[0]='\0';
+    in[0] = '\0';
-	strcpy(in,"9876543210abcdefdata 12345");
+    strcpy(in, "9876543210abcdefdata 12345");
-	RC4(key,26,in,out);
+    RC4(key, 26, in, out);
 
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
-	}
+}

bugs/ultrixcc.c

@@ -1,6 +1,7 @@
 #include <stdio.h>
 
-/* This is a cc optimiser bug for ultrix 4.3, mips CPU.
+/*-
+ * This is a cc optimiser bug for ultrix 4.3, mips CPU.
  * What happens is that the compiler, due to the (a)&7,
  * does
  * i=a&7;
@@ -12,34 +13,32 @@
  */
 
 main()
-	{
+{
-	f(5);
+    f(5);
-	f(0);
+    f(0);
-	}
+}
 
 int f(a)
 int a;
-	{
+{
-	switch(a&7)
+    switch (a & 7) {
-		{
+    case 7:
-	case 7:
+        printf("7\n");
-		printf("7\n");
+    case 6:
-	case 6:
+        printf("6\n");
-		printf("6\n");
+    case 5:
-	case 5:
+        printf("5\n");
-		printf("5\n");
+    case 4:
-	case 4:
+        printf("4\n");
-		printf("4\n");
+    case 3:
-	case 3:
+        printf("3\n");
-		printf("3\n");
+    case 2:
-	case 2:
+        printf("2\n");
-		printf("2\n");
+    case 1:
-	case 1:
+        printf("1\n");
-		printf("1\n");
 #ifdef FIX_BUG
-	case 0:
+    case 0:
-		;
+        ;
 #endif
-		}
+    }
-	}	
+}
-

config

@@ -706,7 +706,7 @@ case "$GUESSOS" in
 			    libc=/usr/lib/libc.so
 			else					# OpenBSD
 			    # ld searches for highest libc.so.* and so do we
-			    libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null`
+			    libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null`
 			fi
 			case "`(file -L $libc) 2>/dev/null`" in
 			*ELF*)	OUT="BSD-x86-elf" ;;
@@ -825,6 +825,12 @@ esac
 #  options="$options -DATALLA"
 #fi
 
+if expr "$options" : '.*no\-asm' > /dev/null; then :; else
+  sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
+  grep \\--noexecstack >/dev/null && \
+  options="$options -Wa,--noexecstack"
+fi
+
 # gcc < 2.8 does not support -march=ultrasparc
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
 then

crypto/LPdir_nyi.c

@@ -1,4 +1,6 @@
-/* $LP: LPlib/source/LPdir_win.c,v 1.1 2004/06/14 10:07:56 _cvs_levitte Exp $ */
+/*
+ * $LP: LPlib/source/LPdir_win.c,v 1.1 2004/06/14 10:07:56 _cvs_levitte Exp $
+ */
 /*
  * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
  * All rights reserved.
@@ -26,17 +28,20 @@
  */
 
 #ifndef LPDIR_H
-#include "LPdir.h"
+# include "LPdir.h"
 #endif
 
-struct LP_dir_context_st { void *dummy; };
+struct LP_dir_context_st {
+    void *dummy;
+};
 const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
-	{
+{
-	errno = EINVAL;
+    errno = EINVAL;
-	return 0;
+    return 0;
-	}
+}
+
 int LP_find_file_end(LP_DIR_CTX **ctx)
-	{
+{
-	errno = EINVAL;
+    errno = EINVAL;
-	return 0;
+    return 0;
-	}
+}