[Pkg-openssl-changes] r653 - in openssl/trunk/debian: . patches

Kurt Roeckx kroeckx at moszumanska.debian.org
Mon Feb 24 23:34:28 UTC 2014


Author: kroeckx
Date: 2014-02-24 23:34:27 +0000 (Mon, 24 Feb 2014)
New Revision: 653

Removed:
   openssl/trunk/debian/patches/libssl-misspell.patch
   openssl/trunk/debian/patches/openssl_fix_for_x32.patch
   openssl/trunk/debian/patches/pkcs12-doc.patch
   openssl/trunk/debian/patches/pod_ec.misspell.patch
   openssl/trunk/debian/patches/pod_pksc12.misspell.patch
   openssl/trunk/debian/patches/pod_req_misspell2.patch
   openssl/trunk/debian/patches/pod_s_server.misspell.patch
   openssl/trunk/debian/patches/pod_x509setflags.misspell.patch
   openssl/trunk/debian/patches/req_bits.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/libssl1.0.0.symbols
   openssl/trunk/debian/patches/block_digicert_malaysia.patch
   openssl/trunk/debian/patches/block_diginotar.patch
   openssl/trunk/debian/patches/dgst_hmac.patch
   openssl/trunk/debian/patches/fix-pod-errors.patch
   openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch
   openssl/trunk/debian/patches/openssl-pod-misspell.patch
   openssl/trunk/debian/patches/series
   openssl/trunk/debian/patches/version-script.patch
Log:
New upstream beta version.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/changelog	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,3 +1,21 @@
+openssl (1.0.2~beta1-1) experimental; urgency=medium
+
+  * New upstream beta version
+    - Update list of symbols that should be exported and adjust the symbols
+      file.  This also removes a bunch of duplicate symbols in the linker
+      file.
+    - Fix additional pod errors
+    - Following patches have been applied upstream and are removed:
+      libssl-misspell.patch, pod_req_misspell2.patch,
+      pod_pksc12.misspell.patch, pod_s_server.misspell.patch,
+      pod_x509setflags.misspell.patch, pod_ec.misspell.patch,
+      pkcs12-doc.patch, req_bits.patch
+    - Following patches have been partially applied upstream:
+      libdoc-manpgs-pod-spell.patch, openssl-pod-misspell.patch
+    - Remove openssl_fix_for_x32.patch, different patch applied upstream.
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Mon, 24 Feb 2014 21:00:20 +0100
+
 openssl (1.0.1f-1) unstable; urgency=high
 
   * New upstream version

Modified: openssl/trunk/debian/libssl1.0.0.symbols
===================================================================
--- openssl/trunk/debian/libssl1.0.0.symbols	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/libssl1.0.0.symbols	2014-02-24 23:34:27 UTC (rev 653)
@@ -2,7 +2,9 @@
  *@OPENSSL_1.0.0 1.0.0
  *@OPENSSL_1.0.1 1.0.1
  *@OPENSSL_1.0.1d 1.0.1d
+ *@OPENSSL_1.0.2 1.0.2~beta1
 libssl.so.1.0.0 libssl1.0.0 #MINVER#
  *@OPENSSL_1.0.0 1.0.0
  *@OPENSSL_1.0.1 1.0.1
  *@OPENSSL_1.0.1d 1.0.1d
+ *@OPENSSL_1.0.2 1.0.2~beta1

Modified: openssl/trunk/debian/patches/block_digicert_malaysia.patch
===================================================================
--- openssl/trunk/debian/patches/block_digicert_malaysia.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/block_digicert_malaysia.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -5,11 +5,11 @@
 Origin: vendor
 Last-Update: 2011-11-05
 
-Index: openssl-1.0.0e/crypto/x509/x509_vfy.c
+Index: openssl-1.0.2~beta1/crypto/x509/x509_vfy.c
 ===================================================================
---- openssl-1.0.0e.orig/crypto/x509/x509_vfy.c
-+++ openssl-1.0.0e/crypto/x509/x509_vfy.c
-@@ -833,10 +833,11 @@ static int check_ca_blacklist(X509_STORE
+--- openssl-1.0.2~beta1.orig/crypto/x509/x509_vfy.c	2014-02-25 00:16:12.488028844 +0100
++++ openssl-1.0.2~beta1/crypto/x509/x509_vfy.c	2014-02-25 00:16:12.484028929 +0100
+@@ -964,10 +964,11 @@
  	for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--)
  		{
  		x = sk_X509_value(ctx->chain, i);

Modified: openssl/trunk/debian/patches/block_diginotar.patch
===================================================================
--- openssl/trunk/debian/patches/block_diginotar.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/block_diginotar.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -10,11 +10,11 @@
 
 This is not meant as final patch.  
 
-Index: openssl-1.0.0d/crypto/x509/x509_vfy.c
+Index: openssl-1.0.2~beta1/crypto/x509/x509_vfy.c
 ===================================================================
---- openssl-1.0.0d.orig/crypto/x509/x509_vfy.c
-+++ openssl-1.0.0d/crypto/x509/x509_vfy.c
-@@ -117,6 +117,7 @@ static int check_trust(X509_STORE_CTX *c
+--- openssl-1.0.2~beta1.orig/crypto/x509/x509_vfy.c	2014-02-25 00:15:53.512433441 +0100
++++ openssl-1.0.2~beta1/crypto/x509/x509_vfy.c	2014-02-25 00:15:53.508433526 +0100
+@@ -119,6 +119,7 @@
  static int check_revocation(X509_STORE_CTX *ctx);
  static int check_cert(X509_STORE_CTX *ctx);
  static int check_policy(X509_STORE_CTX *ctx);
@@ -22,7 +22,7 @@
  
  static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
  			unsigned int *preasons,
-@@ -374,6 +375,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx
+@@ -437,6 +438,9 @@
  		ok=internal_verify(ctx);
  	if(!ok) goto end;
  
@@ -32,7 +32,7 @@
  #ifndef OPENSSL_NO_RFC3779
  	/* RFC 3779 path validation, now that CRL check has been done */
  	ok = v3_asid_validate_path(ctx);
-@@ -820,6 +824,29 @@ static int check_crl_time(X509_STORE_CTX
+@@ -952,6 +956,29 @@
  	return 1;
  	}
  

Modified: openssl/trunk/debian/patches/dgst_hmac.patch
===================================================================
--- openssl/trunk/debian/patches/dgst_hmac.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/dgst_hmac.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -8,10 +8,10 @@
 ding though, especially considering the FIPS option, which I
 found as undocumented too.
 
-Index: openssl-1.0.0d/doc/apps/dgst.pod
+Index: openssl-1.0.2~beta1/doc/apps/dgst.pod
 ===================================================================
---- openssl-1.0.0d.orig/doc/apps/dgst.pod	2009-04-10 16:42:27.000000000 +0000
-+++ openssl-1.0.0d/doc/apps/dgst.pod	2011-06-13 11:00:04.000000000 +0000
+--- openssl-1.0.2~beta1.orig/doc/apps/dgst.pod	2014-02-25 00:15:34.364841692 +0100
++++ openssl-1.0.2~beta1/doc/apps/dgst.pod	2014-02-25 00:15:34.360841777 +0100
 @@ -12,6 +12,8 @@
  [B<-d>]
  [B<-hex>]
@@ -36,11 +36,11 @@
  =item B<-out filename>
  
  filename to output to, or standard output by default.
-Index: openssl-1.0.0d/apps/dgst.c
+Index: openssl-1.0.2~beta1/apps/dgst.c
 ===================================================================
---- openssl-1.0.0d.orig/apps/dgst.c	2010-02-12 17:07:24.000000000 +0000
-+++ openssl-1.0.0d/apps/dgst.c	2011-06-13 11:00:04.000000000 +0000
-@@ -268,6 +268,8 @@
+--- openssl-1.0.2~beta1.orig/apps/dgst.c	2014-02-25 00:15:34.364841692 +0100
++++ openssl-1.0.2~beta1/apps/dgst.c	2014-02-25 00:15:34.360841777 +0100
+@@ -276,6 +276,8 @@
  		BIO_printf(bio_err,"-d              to output debug info\n");
  		BIO_printf(bio_err,"-hex            output as hex dump\n");
  		BIO_printf(bio_err,"-binary         output in binary form\n");

Modified: openssl/trunk/debian/patches/fix-pod-errors.patch
===================================================================
--- openssl/trunk/debian/patches/fix-pod-errors.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/fix-pod-errors.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -7,10 +7,10 @@
 Bug-Debian: http://bugs.debian.org/723954
 Bug: http://rt.openssl.org/Ticket/Display.html?id=3146&user=guest&pass=guest
 
-Index: openssl-1.0.1e/doc/apps/smime.pod
+Index: openssl-1.0.2~beta1/doc/apps/smime.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/apps/smime.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/apps/smime.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/apps/smime.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/apps/smime.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -308,28 +308,28 @@
  
  =over 4
@@ -46,11 +46,11 @@
  
  the message was verified correctly but an error occurred writing out
  the signers certificates.
-Index: openssl-1.0.1e/doc/apps/cms.pod
+Index: openssl-1.0.2~beta1/doc/apps/cms.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/apps/cms.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/apps/cms.pod	2013-12-22 17:21:52.909435656 +0100
-@@ -450,28 +450,28 @@
+--- openssl-1.0.2~beta1.orig/doc/apps/cms.pod	2014-01-23 17:09:34.000000000 +0100
++++ openssl-1.0.2~beta1/doc/apps/cms.pod	2014-02-24 23:30:39.000000000 +0100
+@@ -463,28 +463,28 @@
  
  =over 4
  
@@ -85,10 +85,10 @@
  
  the message was verified correctly but an error occurred writing out
  the signers certificates.
-Index: openssl-1.0.1e/doc/ssl/SSL_clear.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_clear.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_clear.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_clear.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_clear.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -56,12 +56,12 @@
  
  =over 4
@@ -104,10 +104,10 @@
  
  The SSL_clear() operation was successful.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_session_reused.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_session_reused.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_session_reused.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_session_reused.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_session_reused.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -27,11 +27,11 @@
  
  =over 4
@@ -122,10 +122,10 @@
  
  A session was reused.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_set_session.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_set_session.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_set_session.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_set_session.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_set_session.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -37,11 +37,11 @@
  
  =over 4
@@ -140,10 +140,10 @@
  
  The operation succeeded.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_connect.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_connect.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_connect.pod	2013-12-22 17:22:42.956402467 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_connect.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_connect.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -41,13 +41,13 @@
  
  =over 4
@@ -160,10 +160,10 @@
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
-Index: openssl-1.0.1e/doc/ssl/SSL_shutdown.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_shutdown.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_shutdown.pod	2013-12-22 17:23:49.347031915 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_shutdown.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_shutdown.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -92,14 +92,14 @@
  
  =over 4
@@ -181,10 +181,10 @@
  
  The shutdown was successfully completed. The "close notify" alert was sent
  and the peer's "close notify" alert was received.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set_client_CA_list.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod	2013-12-22 17:24:41.985942861 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -66,13 +66,13 @@
  
  =over 4
@@ -201,10 +201,10 @@
  
  The operation succeeded.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_accept.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_accept.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_accept.pod	2013-12-22 17:24:17.466450402 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_accept.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_accept.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -44,13 +44,13 @@
  
  =over 4
@@ -221,10 +221,10 @@
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set_session_id_context.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_set_session_id_context.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set_session_id_context.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -64,13 +64,13 @@
  
  =over 4
@@ -241,10 +241,10 @@
  
  The operation succeeded.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_write.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_write.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_write.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_write.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_write.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_write.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -79,7 +79,7 @@
  The write operation was successful, the return value is the number of
  bytes actually written to the TLS/SSL connection.
@@ -254,10 +254,10 @@
  
  The write operation was not successful. Probably the underlying connection
  was closed. Call SSL_get_error() with the return value B<ret> to find out,
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_load_verify_locations.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_load_verify_locations.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_load_verify_locations.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -100,13 +100,13 @@
  
  =over 4
@@ -274,10 +274,10 @@
  
  The operation succeeded.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_set_fd.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_set_fd.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_set_fd.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_set_fd.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_set_fd.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -35,11 +35,11 @@
  
  =over 4
@@ -292,10 +292,10 @@
  
  The operation succeeded.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -96,7 +96,7 @@
  connection will fail with decryption_error before it will be finished
  completely.
@@ -305,10 +305,10 @@
  
  PSK identity was not found. An "unknown_psk_identity" alert message
  will be sent and the connection setup fails.
-Index: openssl-1.0.1e/doc/ssl/SSL_read.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_read.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_read.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_read.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_read.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_read.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -86,7 +86,7 @@
  The read operation was successful; the return value is the number of
  bytes actually read from the TLS/SSL connection.
@@ -318,23 +318,10 @@
  
  The read operation was not successful. The reason may either be a clean
  shutdown due to a "close notify" alert sent by the peer (in which case
-Index: openssl-1.0.1e/doc/ssl/SSL_set_shutdown.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_add_session.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_set_shutdown.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_set_shutdown.pod	2013-12-22 17:21:52.909435656 +0100
-@@ -24,7 +24,7 @@
- 
- =over 4
- 
--=item 0
-+=item C<0>
- 
- No shutdown setting, yet.
- 
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_add_session.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_add_session.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -52,13 +52,13 @@
  
  =over 4
@@ -351,10 +338,10 @@
   
   The operation succeeded.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_do_handshake.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod	2013-12-22 17:23:09.503854843 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_do_handshake.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_do_handshake.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -45,13 +45,13 @@
  
  =over 4
@@ -371,10 +358,10 @@
  
  The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
  established.
-Index: openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_COMP_add_compression_method.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_COMP_add_compression_method.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_COMP_add_compression_method.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -53,11 +53,11 @@
  
  =over 4
@@ -389,10 +376,10 @@
  
  The operation failed. Check the error queue to find out the reason.
  
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set_ssl_version.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod	2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod	2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_set_ssl_version.pod	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set_ssl_version.pod	2014-02-24 23:30:39.000000000 +0100
 @@ -42,11 +42,11 @@
  
  =over 4
@@ -407,3 +394,55 @@
  
  The operation succeeded.
  
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CONF_cmd.pod
+===================================================================
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CONF_cmd.pod	2014-01-23 17:09:34.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CONF_cmd.pod	2014-02-24 23:30:39.000000000 +0100
+@@ -320,6 +320,8 @@
+ 
+ The value is a directory name.
+ 
++=back
++
+ =head1 NOTES
+ 
+ The order of operations is significant. This can be used to set either defaults
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_add1_chain_cert.pod
+===================================================================
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_add1_chain_cert.pod	2014-02-24 13:36:16.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_add1_chain_cert.pod	2014-02-24 23:30:39.000000000 +0100
+@@ -128,8 +128,6 @@
+ 
+ All other functions return 1 for success and 0 for failure.
+ 
+-=back
+-
+ =head1 SEE ALSO
+ 
+ L<SSL_CTX_add_extra_chain_cert(3)|SSL_CTX_add_extra_chain_cert(3)>
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set1_curves.pod
+===================================================================
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_set1_curves.pod	2014-01-23 17:09:34.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set1_curves.pod	2014-02-24 23:36:33.494605576 +0100
+@@ -87,8 +87,6 @@
+ SSL_get1_shared_curve() returns the NID of shared curve B<n> of zero if there
+ is no shared curve B<n> or the number of shared curves if B<n> is -1.
+ 
+-=back
+-
+ =head1 SEE ALSO
+ 
+ L<SSL_CTX_add_extra_chain_cert(3)|SSL_CTX_add_extra_chain_cert(3)>
+Index: openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set1_verify_cert_store.pod
+===================================================================
+--- openssl-1.0.2~beta1.orig/doc/ssl/SSL_CTX_set1_verify_cert_store.pod	2014-01-23 17:09:34.000000000 +0100
++++ openssl-1.0.2~beta1/doc/ssl/SSL_CTX_set1_verify_cert_store.pod	2014-02-24 23:37:38.017238073 +0100
+@@ -70,8 +70,6 @@
+ 
+ All these functions return 1 for success and 0 for failure.
+ 
+-=back
+-
+ =head1 SEE ALSO
+ 
+ L<SSL_CTX_add_extra_chain_cert(3)|SSL_CTX_add_extra_chain_cert(3)>

Modified: openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch
===================================================================
--- openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,7 +1,7 @@
-Index: openssl-1.0.1e/doc/crypto/ASN1_generate_nconf.pod
+Index: openssl-1.0.2~beta1/doc/crypto/ASN1_generate_nconf.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/crypto/ASN1_generate_nconf.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/crypto/ASN1_generate_nconf.pod	2013-12-22 16:16:44.691836721 +0100
+--- openssl-1.0.2~beta1.orig/doc/crypto/ASN1_generate_nconf.pod	2014-02-24 23:58:25.834727363 +0100
++++ openssl-1.0.2~beta1/doc/crypto/ASN1_generate_nconf.pod	2014-02-24 23:58:25.834727363 +0100
 @@ -61,7 +61,7 @@
  =item B<INTEGER>, B<INT>
  
@@ -11,49 +11,10 @@
  is normally interpreted as a decimal value unless the prefix B<0x>
  is included.
  
-Index: openssl-1.0.1e/doc/crypto/BN_BLINDING_new.pod
+Index: openssl-1.0.2~beta1/doc/crypto/EVP_PKEY_cmp.pod
 ===================================================================
---- openssl-1.0.1e.orig/doc/crypto/BN_BLINDING_new.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/crypto/BN_BLINDING_new.pod	2013-12-22 16:16:44.691836721 +0100
-@@ -48,7 +48,7 @@
- 
- BN_BLINDING_convert_ex() multiplies B<n> with the blinding factor B<A>.
- If B<r> is not NULL a copy the inverse blinding factor B<Ai> will be
--returned in B<r> (this is useful if a B<RSA> object is shared amoung
-+returned in B<r> (this is useful if a B<RSA> object is shared among
- several threads). BN_BLINDING_invert_ex() multiplies B<n> with the
- inverse blinding factor B<Ai>. If B<r> is not NULL it will be used as
- the inverse blinding.
-Index: openssl-1.0.1e/doc/crypto/EVP_BytesToKey.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/crypto/EVP_BytesToKey.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/crypto/EVP_BytesToKey.pod	2013-12-22 16:16:44.691836721 +0100
-@@ -17,7 +17,7 @@
- 
- EVP_BytesToKey() derives a key and IV from various parameters. B<type> is
- the cipher to derive the key and IV for. B<md> is the message digest to use.
--The B<salt> paramter is used as a salt in the derivation: it should point to
-+The B<salt> parameter is used as a salt in the derivation: it should point to
- an 8 byte buffer or NULL if no salt is used. B<data> is a buffer containing
- B<datal> bytes which is used to derive the keying data. B<count> is the
- iteration count to use. The derived key and IV will be written to B<key>
-Index: openssl-1.0.1e/doc/crypto/EVP_EncryptInit.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/crypto/EVP_EncryptInit.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/crypto/EVP_EncryptInit.pod	2013-12-22 16:16:44.691836721 +0100
-@@ -152,7 +152,7 @@
- 
- EVP_EncryptInit(), EVP_DecryptInit() and EVP_CipherInit() behave in a
- similar way to EVP_EncryptInit_ex(), EVP_DecryptInit_ex and
--EVP_CipherInit_ex() except the B<ctx> paramter does not need to be
-+EVP_CipherInit_ex() except the B<ctx> parameter does not need to be
- initialized and they always use the default cipher implementation.
- 
- EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a
-Index: openssl-1.0.1e/doc/crypto/EVP_PKEY_cmp.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/crypto/EVP_PKEY_cmp.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/crypto/EVP_PKEY_cmp.pod	2013-12-22 16:16:44.691836721 +0100
+--- openssl-1.0.2~beta1.orig/doc/crypto/EVP_PKEY_cmp.pod	2014-02-24 23:58:25.834727363 +0100
++++ openssl-1.0.2~beta1/doc/crypto/EVP_PKEY_cmp.pod	2014-02-24 23:58:25.834727363 +0100
 @@ -26,7 +26,7 @@
  The funcion EVP_PKEY_cmp_parameters() compares the parameters of keys
  B<a> and B<b>.
@@ -63,31 +24,3 @@
  (if present) of keys B<a> and B<b>.
  
  =head1 NOTES
-Index: openssl-1.0.1e/doc/crypto/pem.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/crypto/pem.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/crypto/pem.pod	2013-12-22 16:16:44.691836721 +0100
-@@ -201,7 +201,7 @@
- PEM_write_bio_PKCS8PrivateKey() and PEM_write_PKCS8PrivateKey()
- write a private key in an EVP_PKEY structure in PKCS#8
- EncryptedPrivateKeyInfo format using PKCS#5 v2.0 password based encryption
--algorithms. The B<cipher> argument specifies the encryption algoritm to
-+algorithms. The B<cipher> argument specifies the encryption algorithm to
- use: unlike all other PEM routines the encryption is applied at the
- PKCS#8 level and not in the PEM headers. If B<cipher> is NULL then no
- encryption is used and a PKCS#8 PrivateKeyInfo structure is used instead.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_verify.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_verify.pod	2013-12-22 16:16:44.695836636 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_verify.pod	2013-12-22 16:16:44.695836636 +0100
-@@ -169,8 +169,8 @@
- failure, if wished. The callback realizes a verification depth limit with
- more informational output.
- 
--All verification errors are printed, informations about the certificate chain
--are printed on request.
-+All verification errors are printed; information about the certificate chain
-+is printed on request.
- The example is realized for a server that does allow but not require client
- certificates.
- 

Deleted: openssl/trunk/debian/patches/libssl-misspell.patch
===================================================================
--- openssl/trunk/debian/patches/libssl-misspell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/libssl-misspell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,11 +0,0 @@
---- a/crypto/asn1/asn1_err.c
-+++ b/crypto/asn1/asn1_err.c
-@@ -302,7 +302,7 @@
- {ERR_REASON(ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE),"unknown public key type"},
- {ERR_REASON(ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM),"unknown signature algorithm"},
- {ERR_REASON(ASN1_R_UNKNOWN_TAG)          ,"unknown tag"},
--{ERR_REASON(ASN1_R_UNKOWN_FORMAT)        ,"unkown format"},
-+{ERR_REASON(ASN1_R_UNKOWN_FORMAT)        ,"unknown format"},
- {ERR_REASON(ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE),"unsupported any defined by type"},
- {ERR_REASON(ASN1_R_UNSUPPORTED_CIPHER)   ,"unsupported cipher"},
- {ERR_REASON(ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM),"unsupported encryption algorithm"},

Modified: openssl/trunk/debian/patches/openssl-pod-misspell.patch
===================================================================
--- openssl/trunk/debian/patches/openssl-pod-misspell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/openssl-pod-misspell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,7 +1,7 @@
-Index: openssl-1.0.1/apps/ca.c
+Index: openssl-1.0.2~beta1/apps/ca.c
 ===================================================================
---- openssl-1.0.1.orig/apps/ca.c	2012-01-12 16:28:02.000000000 +0000
-+++ openssl-1.0.1/apps/ca.c	2012-03-17 09:31:48.000000000 +0000
+--- openssl-1.0.2~beta1.orig/apps/ca.c	2014-02-25 00:04:16.731281175 +0100
++++ openssl-1.0.2~beta1/apps/ca.c	2014-02-25 00:04:16.731281175 +0100
 @@ -148,7 +148,7 @@
  static const char *ca_usage[]={
  "usage: ca args\n",
@@ -11,32 +11,10 @@
  " -config file    - A config file\n",
  " -name arg       - The particular CA definition to use\n",
  " -gencrl         - Generate a new CRL\n",
-Index: openssl-1.0.1/apps/ecparam.c
+Index: openssl-1.0.2~beta1/crypto/evp/encode.c
 ===================================================================
---- openssl-1.0.1.orig/apps/ecparam.c	2010-06-15 17:25:02.000000000 +0000
-+++ openssl-1.0.1/apps/ecparam.c	2012-03-17 09:31:48.000000000 +0000
-@@ -105,7 +105,7 @@
-  *                    in the asn1 der encoding
-  *                    possible values: named_curve (default)
-  *                                     explicit
-- * -no_seed         - if 'explicit' parameters are choosen do not use the seed
-+ * -no_seed         - if 'explicit' parameters are chosen do not use the seed
-  * -genkey          - generate ec key
-  * -rand file       - files to use for random number input
-  * -engine e        - use engine e, possibly a hardware device
-@@ -286,7 +286,7 @@
- 		BIO_printf(bio_err, "                                   "
- 				" explicit\n");
- 		BIO_printf(bio_err, " -no_seed          if 'explicit'"
--				" parameters are choosen do not"
-+				" parameters are chosen do not"
- 				" use the seed\n");
- 		BIO_printf(bio_err, " -genkey           generate ec"
- 				" key\n");
-Index: openssl-1.0.1/crypto/evp/encode.c
-===================================================================
---- openssl-1.0.1.orig/crypto/evp/encode.c	2010-06-15 17:25:09.000000000 +0000
-+++ openssl-1.0.1/crypto/evp/encode.c	2012-03-17 09:31:48.000000000 +0000
+--- openssl-1.0.2~beta1.orig/crypto/evp/encode.c	2014-02-25 00:04:16.731281175 +0100
++++ openssl-1.0.2~beta1/crypto/evp/encode.c	2014-02-25 00:04:16.731281175 +0100
 @@ -250,7 +250,7 @@
  	/* We parse the input data */
  	for (i=0; i<inl; i++)
@@ -46,23 +24,10 @@
  		if (ln >= 80) { rv= -1; goto end; }
  
  		/* Get char and put it into the buffer */
-Index: openssl-1.0.1/doc/apps/config.pod
+Index: openssl-1.0.2~beta1/doc/apps/req.pod
 ===================================================================
---- openssl-1.0.1.orig/doc/apps/config.pod	2004-11-25 17:47:29.000000000 +0000
-+++ openssl-1.0.1/doc/apps/config.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -119,7 +119,7 @@
- information.
- 
- The section pointed to by B<engines> is a table of engine names (though see
--B<engine_id> below) and further sections containing configuration informations
-+B<engine_id> below) and further sections containing configuration information
- specific to each ENGINE.
- 
- Each ENGINE specific section is used to set default algorithms, load
-Index: openssl-1.0.1/doc/apps/req.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/req.pod	2009-04-10 16:42:28.000000000 +0000
-+++ openssl-1.0.1/doc/apps/req.pod	2012-03-17 09:31:48.000000000 +0000
+--- openssl-1.0.2~beta1.orig/doc/apps/req.pod	2014-02-25 00:04:16.731281175 +0100
++++ openssl-1.0.2~beta1/doc/apps/req.pod	2014-02-25 00:04:16.731281175 +0100
 @@ -159,7 +159,7 @@
  the algorithm is determined by the parameters. B<algname:file> use algorithm
  B<algname> and parameter file B<file>: the two algorithms must match or an
@@ -72,45 +37,10 @@
  
  B<dsa:filename> generates a DSA key using the parameters
  in the file B<filename>. B<ec:filename> generates EC key (usable both with
-Index: openssl-1.0.1/doc/apps/ts.pod
+Index: openssl-1.0.2~beta1/doc/apps/x509v3_config.pod
 ===================================================================
---- openssl-1.0.1.orig/doc/apps/ts.pod	2009-04-10 11:25:54.000000000 +0000
-+++ openssl-1.0.1/doc/apps/ts.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -352,7 +352,7 @@
- 
- This is the main section and it specifies the name of another section
- that contains all the options for the B<-reply> command. This default
--section can be overriden with the B<-section> command line switch. (Optional)
-+section can be overridden with the B<-section> command line switch. (Optional)
- 
- =item B<oid_file>
- 
-@@ -453,7 +453,7 @@
- =head1 ENVIRONMENT VARIABLES
- 
- B<OPENSSL_CONF> contains the path of the configuration file and can be
--overriden by the B<-config> command line option.
-+overridden by the B<-config> command line option.
- 
- =head1 EXAMPLES
- 
-Index: openssl-1.0.1/doc/apps/tsget.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/tsget.pod	2010-01-05 17:17:20.000000000 +0000
-+++ openssl-1.0.1/doc/apps/tsget.pod	2012-03-17 09:31:48.000000000 +0000
-@@ -124,7 +124,7 @@
- =item [request]...
- 
- List of files containing B<RFC 3161> DER-encoded time stamp requests. If no
--requests are specifed only one request will be sent to the server and it will be
-+requests are specified only one request will be sent to the server and it will be
- read from the standard input. (Optional)
- 
- =back
-Index: openssl-1.0.1/doc/apps/x509v3_config.pod
-===================================================================
---- openssl-1.0.1.orig/doc/apps/x509v3_config.pod	2006-11-07 13:44:03.000000000 +0000
-+++ openssl-1.0.1/doc/apps/x509v3_config.pod	2012-03-17 09:31:48.000000000 +0000
+--- openssl-1.0.2~beta1.orig/doc/apps/x509v3_config.pod	2014-02-25 00:04:16.731281175 +0100
++++ openssl-1.0.2~beta1/doc/apps/x509v3_config.pod	2014-02-25 00:04:16.731281175 +0100
 @@ -174,7 +174,7 @@
  
  The value of B<dirName> should point to a section containing the distinguished

Deleted: openssl/trunk/debian/patches/openssl_fix_for_x32.patch
===================================================================
--- openssl/trunk/debian/patches/openssl_fix_for_x32.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/openssl_fix_for_x32.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,39 +0,0 @@
-Index: openssl-1.0.1c/crypto/bn/asm/x86_64-gcc.c
-===================================================================
---- openssl-1.0.1c.orig/crypto/bn/asm/x86_64-gcc.c	2010-02-28 05:38:16.000000000 -0800
-+++ openssl-1.0.1c/crypto/bn/asm/x86_64-gcc.c	2013-01-17 20:16:12.000000000 -0800
-@@ -55,7 +55,7 @@
-  *    machine.
-  */
- 
--#ifdef _WIN64
-+#if defined _WIN64 || !defined __LP64__
- #define BN_ULONG unsigned long long
- #else
- #define BN_ULONG unsigned long
-@@ -192,9 +192,9 @@
- 	asm (
- 	"	subq	%2,%2		\n"
- 	".p2align 4			\n"
--	"1:	movq	(%4,%2,8),%0	\n"
--	"	adcq	(%5,%2,8),%0	\n"
--	"	movq	%0,(%3,%2,8)	\n"
-+	"1:	movq	(%q4,%2,8),%0	\n"
-+	"	adcq	(%q5,%2,8),%0	\n"
-+	"	movq	%0,(%q3,%2,8)	\n"
- 	"	leaq	1(%2),%2	\n"
- 	"	loop	1b		\n"
- 	"	sbbq	%0,%0		\n"
-@@ -215,9 +215,9 @@
- 	asm (
- 	"	subq	%2,%2		\n"
- 	".p2align 4			\n"
--	"1:	movq	(%4,%2,8),%0	\n"
--	"	sbbq	(%5,%2,8),%0	\n"
--	"	movq	%0,(%3,%2,8)	\n"
-+	"1:	movq	(%q4,%2,8),%0	\n"
-+	"	sbbq	(%q5,%2,8),%0	\n"
-+	"	movq	%0,(%q3,%2,8)	\n"
- 	"	leaq	1(%2),%2	\n"
- 	"	loop	1b		\n"
- 	"	sbbq	%0,%0		\n"

Deleted: openssl/trunk/debian/patches/pkcs12-doc.patch
===================================================================
--- openssl/trunk/debian/patches/pkcs12-doc.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/pkcs12-doc.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,36 +0,0 @@
-This is another documentation issue ...
-
-apps/pkcs12.c accepts -password as an argument.  The document author 
-almost certainly meant to write "-password, -passin".
-
-However, that is not correct, either.  Actually the code treats 
--password as equivalent to -passin, EXCEPT when -export is also 
-specified, in which case -password as equivalent to -passout.  The patch 
-below makes this explicit.
-
-
-Index: openssl-1.0.0d/doc/apps/pkcs12.pod
-===================================================================
---- openssl-1.0.0d.orig/doc/apps/pkcs12.pod	2011-06-13 10:46:06.000000000 +0000
-+++ openssl-1.0.0d/doc/apps/pkcs12.pod	2011-06-13 10:47:36.000000000 +0000
-@@ -67,7 +67,7 @@
- The filename to write certificates and private keys to, standard output by
- default.  They are all written in PEM format.
- 
--=item B<-pass arg>, B<-passin arg>
-+=item B<-passin arg>
- 
- the PKCS#12 file (i.e. input file) password source. For more information about
- the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
-@@ -79,6 +79,11 @@
- information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section
- in L<openssl(1)|openssl(1)>.
- 
-+=item B<-password arg>
-+
-+With -export, -password is equivalent to -passout.
-+Otherwise, -password is equivalent to -passin.
-+
- =item B<-noout>
- 
- this option inhibits output of the keys and certificates to the output file

Deleted: openssl/trunk/debian/patches/pod_ec.misspell.patch
===================================================================
--- openssl/trunk/debian/patches/pod_ec.misspell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/pod_ec.misspell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,11 +0,0 @@
---- a/doc/apps/ec.pod
-+++ b/doc/apps/ec.pod
-@@ -41,7 +41,7 @@
- 
- This specifies the input format. The B<DER> option with a private key uses
- an ASN.1 DER encoded SEC1 private key. When used with a public key it
--uses the SubjectPublicKeyInfo structur as specified in RFC 3280.
-+uses the SubjectPublicKeyInfo structure as specified in RFC 3280.
- The B<PEM> form is the default format: it consists of the B<DER> format base64
- encoded with additional header and footer lines. In the case of a private key
- PKCS#8 format is also accepted.

Deleted: openssl/trunk/debian/patches/pod_pksc12.misspell.patch
===================================================================
--- openssl/trunk/debian/patches/pod_pksc12.misspell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/pod_pksc12.misspell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,11 +0,0 @@
---- a/doc/apps/pkcs12.pod
-+++ b/doc/apps/pkcs12.pod
-@@ -75,7 +75,7 @@
- 
- =item B<-passout arg>
- 
--pass phrase source to encrypt any outputed private keys with. For more
-+pass phrase source to encrypt any outputted private keys with. For more
- information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section
- in L<openssl(1)|openssl(1)>.
- 

Deleted: openssl/trunk/debian/patches/pod_req_misspell2.patch
===================================================================
--- openssl/trunk/debian/patches/pod_req_misspell2.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/pod_req_misspell2.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,12 +0,0 @@
-diff --git a/doc/apps/req.pod b/doc/apps/req.pod
---- a/doc/apps/req.pod
-+++ b/doc/apps/req.pod
-@@ -303,7 +303,7 @@
- 
- =item B<-newhdr>
- 
--Adds the word B<NEW> to the PEM file header and footer lines on the outputed
-+Adds the word B<NEW> to the PEM file header and footer lines on the outputted
- request. Some software (Netscape certificate server) and some CAs need this.
- 
- =item B<-batch>

Deleted: openssl/trunk/debian/patches/pod_s_server.misspell.patch
===================================================================
--- openssl/trunk/debian/patches/pod_s_server.misspell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/pod_s_server.misspell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,11 +0,0 @@
---- a/doc/apps/s_server.pod
-+++ b/doc/apps/s_server.pod
-@@ -111,7 +111,7 @@
- 
- =item B<-dcertform format>, B<-dkeyform format>, B<-dpass arg>
- 
--addtional certificate and private key format and passphrase respectively.
-+additional certificate and private key format and passphrase respectively.
- 
- =item B<-nocert>
- 

Deleted: openssl/trunk/debian/patches/pod_x509setflags.misspell.patch
===================================================================
--- openssl/trunk/debian/patches/pod_x509setflags.misspell.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/pod_x509setflags.misspell.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,11 +0,0 @@
---- a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
-+++ b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
-@@ -113,7 +113,7 @@
- to examine the valid policy tree and perform additional checks or simply
- log it for debugging purposes.
- 
--By default some addtional features such as indirect CRLs and CRLs signed by
-+By default some additional features such as indirect CRLs and CRLs signed by
- different keys are disabled. If B<X509_V_FLAG_EXTENDED_CRL_SUPPORT> is set
- they are enabled.
- 

Deleted: openssl/trunk/debian/patches/req_bits.patch
===================================================================
--- openssl/trunk/debian/patches/req_bits.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/req_bits.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,43 +0,0 @@
-From: Kurt Roeckx <kurt at roeckx.be>
-Date: Sun, 22 Dec 2013 19:10:21 +0100
-Subject: Use defaults bits in req when not given
-Bug: http://rt.openssl.org/Ticket/Display.html?id=2592&user=guest&pass=guest
-
-Index: openssl-1.0.1e/apps/req.c
-===================================================================
---- openssl-1.0.1e.orig/apps/req.c	2013-12-22 19:47:42.355657810 +0100
-+++ openssl-1.0.1e/apps/req.c	2013-12-22 19:57:12.287547599 +0100
-@@ -644,6 +644,11 @@
- 		if (inrand)
- 			app_RAND_load_files(inrand);
- 
-+		if (!NCONF_get_number(req_conf,SECTION,BITS, &newkey))
-+			{
-+			newkey=DEFAULT_KEY_LENGTH;
-+			}
-+
- 		if (keyalg)
- 			{
- 			genctx = set_keygen_ctx(bio_err, keyalg, &pkey_type, &newkey,
-@@ -652,12 +657,6 @@
- 				goto end;
- 			}
- 	
--		if (newkey <= 0)
--			{
--			if (!NCONF_get_number(req_conf,SECTION,BITS, &newkey))
--				newkey=DEFAULT_KEY_LENGTH;
--			}
--
- 		if (newkey < MIN_KEY_LENGTH && (pkey_type == EVP_PKEY_RSA || pkey_type == EVP_PKEY_DSA))
- 			{
- 			BIO_printf(bio_err,"private key length is too short,\n");
-@@ -1649,6 +1648,8 @@
- 				keylen = atol(p + 1);
- 				*pkeylen = keylen;
- 				}
-+			else
-+				keylen = *pkeylen;
- 			}
- 		else if (p)
- 			paramfile = p + 1;

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/series	2014-02-24 23:34:27 UTC (rev 653)
@@ -16,19 +16,10 @@
 gnu_source.patch
 c_rehash-compat.patch
 libdoc-manpgs-pod-spell.patch
-libssl-misspell.patch
 openssl-pod-misspell.patch
-pod_req_misspell2.patch
-pod_pksc12.misspell.patch
-pod_s_server.misspell.patch
-pod_x509setflags.misspell.patch
-pod_ec.misspell.patch
-pkcs12-doc.patch
 dgst_hmac.patch
 block_diginotar.patch
 block_digicert_malaysia.patch
 #padlock_conf.patch
 defaults.patch
-openssl_fix_for_x32.patch
 fix-pod-errors.patch
-req_bits.patch

Modified: openssl/trunk/debian/patches/version-script.patch
===================================================================
--- openssl/trunk/debian/patches/version-script.patch	2014-02-01 20:41:52 UTC (rev 652)
+++ openssl/trunk/debian/patches/version-script.patch	2014-02-24 23:34:27 UTC (rev 653)
@@ -1,8 +1,8 @@
-Index: openssl-1.0.1d/Configure
+Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
 ===================================================================
---- openssl-1.0.1d.orig/Configure	2013-02-06 19:41:43.000000000 +0100
-+++ openssl-1.0.1d/Configure	2013-02-06 19:41:43.000000000 +0100
-@@ -1621,6 +1621,8 @@
+--- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure	2014-02-24 21:02:30.000000000 +0100
++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure	2014-02-24 21:02:30.000000000 +0100
+@@ -1651,6 +1651,8 @@
  		}
  	}
  
@@ -11,11 +11,11 @@
  open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
  unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
  open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-1.0.1d/openssl.ld
+Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.1d/openssl.ld	2013-02-06 19:44:25.000000000 +0100
-@@ -0,0 +1,4620 @@
++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld	2014-02-24 22:19:08.601827266 +0100
+@@ -0,0 +1,4601 @@
 +OPENSSL_1.0.0 {
 +	global:
 +		BIO_f_ssl;
@@ -2227,20 +2227,16 @@
 +		ERR_load_COMP_strings;
 +		PKCS12_item_decrypt_d2i;
 +		ASN1_UTF8STRING_it;
-+		ASN1_UTF8STRING_it;
 +		ENGINE_unregister_ciphers;
 +		ENGINE_get_ciphers;
 +		d2i_OCSP_BASICRESP;
 +		KRB5_CHECKSUM_it;
-+		KRB5_CHECKSUM_it;
 +		EC_POINT_add;
 +		ASN1_item_ex_i2d;
 +		OCSP_CERTID_it;
-+		OCSP_CERTID_it;
 +		d2i_OCSP_RESPBYTES;
 +		X509V3_add1_i2d;
 +		PKCS7_ENVELOPE_it;
-+		PKCS7_ENVELOPE_it;
 +		UI_add_input_boolean;
 +		ENGINE_unregister_RSA;
 +		X509V3_EXT_nconf;
@@ -2252,19 +2248,15 @@
 +		ENGINE_register_all_RAND;
 +		ENGINE_load_dynamic;
 +		PBKDF2PARAM_it;
-+		PBKDF2PARAM_it;
 +		EXTENDED_KEY_USAGE_new;
 +		EC_GROUP_clear_free;
 +		OCSP_sendreq_bio;
 +		ASN1_item_digest;
 +		OCSP_BASICRESP_delete_ext;
 +		OCSP_SIGNATURE_it;
-+		OCSP_SIGNATURE_it;
 +		X509_CRL_it;
-+		X509_CRL_it;
 +		OCSP_BASICRESP_add_ext;
 +		KRB5_ENCKEY_it;
-+		KRB5_ENCKEY_it;
 +		UI_method_set_closer;
 +		X509_STORE_set_purpose;
 +		i2d_ASN1_GENERALSTRING;
@@ -2275,7 +2267,6 @@
 +		OCSP_REQUEST_get_ext_by_OBJ;
 +		_ossl_old_des_random_key;
 +		ASN1_T61STRING_it;
-+		ASN1_T61STRING_it;
 +		EC_GROUP_method_of;
 +		i2d_KRB5_APREQ;
 +		_ossl_old_des_encrypt;
@@ -2291,7 +2282,6 @@
 +		OCSP_SINGLERESP_get_ext_count;
 +		UI_ctrl;
 +		_shadow_DES_rw_mode;
-+		_shadow_DES_rw_mode;
 +		asn1_do_adb;
 +		ASN1_template_i2d;
 +		ENGINE_register_DH;
@@ -2305,9 +2295,7 @@
 +		KRB5_ENCKEY_free;
 +		OCSP_resp_get0;
 +		GENERAL_NAME_it;
-+		GENERAL_NAME_it;
 +		ASN1_GENERALIZEDTIME_it;
-+		ASN1_GENERALIZEDTIME_it;
 +		X509_STORE_set_flags;
 +		EC_POINT_set_compressed_coordinates_GFp;
 +		EC_POINT_set_compr_coords_GFp;
@@ -2328,21 +2316,18 @@
 +		EC_POINT_set_affine_coords_GFp;
 +		_ossl_old_des_options;
 +		SXNET_it;
-+		SXNET_it;
 +		UI_dup_input_boolean;
 +		PKCS12_add_CSPName_asc;
 +		EC_POINT_is_at_infinity;
 +		ENGINE_load_cryptodev;
 +		DSO_convert_filename;
 +		POLICYQUALINFO_it;
-+		POLICYQUALINFO_it;
 +		ENGINE_register_ciphers;
 +		BN_mod_lshift_quick;
 +		DSO_set_filename;
 +		ASN1_item_free;
 +		KRB5_TKTBODY_free;
 +		AUTHORITY_KEYID_it;
-+		AUTHORITY_KEYID_it;
 +		KRB5_APREQBODY_new;
 +		X509V3_EXT_REQ_add_nconf;
 +		ENGINE_ctrl_cmd_string;
@@ -2350,20 +2335,16 @@
 +		EVP_MD_CTX_init;
 +		EXTENDED_KEY_USAGE_free;
 +		PKCS7_ATTR_SIGN_it;
-+		PKCS7_ATTR_SIGN_it;
 +		UI_add_error_string;
 +		KRB5_CHECKSUM_free;
 +		OCSP_REQUEST_get_ext;
 +		ENGINE_load_ubsec;
 +		ENGINE_register_all_digests;
 +		PKEY_USAGE_PERIOD_it;
-+		PKEY_USAGE_PERIOD_it;
 +		PKCS12_unpack_authsafes;
 +		ASN1_item_unpack;
 +		NETSCAPE_SPKAC_it;
-+		NETSCAPE_SPKAC_it;
 +		X509_REVOKED_it;
-+		X509_REVOKED_it;
 +		ASN1_STRING_encode;
 +		EVP_aes_128_ecb;
 +		KRB5_AUTHENT_free;
@@ -2374,7 +2355,6 @@
 +		UI_dup_info_string;
 +		_ossl_old_des_xwhite_in2out;
 +		PKCS12_it;
-+		PKCS12_it;
 +		OCSP_SINGLERESP_get_ext_by_critical;
 +		OCSP_SINGLERESP_get_ext_by_crit;
 +		OCSP_CERTSTATUS_free;
@@ -2393,10 +2373,8 @@
 +		ENGINE_unregister_DSA;
 +		_ossl_old_des_key_sched;
 +		X509_EXTENSION_it;
-+		X509_EXTENSION_it;
 +		i2d_KRB5_AUTHENT;
 +		SXNETID_it;
-+		SXNETID_it;
 +		d2i_OCSP_SINGLERESP;
 +		EDIPARTYNAME_new;
 +		PKCS12_certbag2x509;
@@ -2407,10 +2385,8 @@
 +		d2i_KRB5_APREQBODY;
 +		UI_method_get_flusher;
 +		X509_PUBKEY_it;
-+		X509_PUBKEY_it;
 +		_ossl_old_des_enc_read;
 +		PKCS7_ENCRYPT_it;
-+		PKCS7_ENCRYPT_it;
 +		i2d_OCSP_RESPONSE;
 +		EC_GROUP_get_cofactor;
 +		PKCS12_unpack_p7data;
@@ -2428,10 +2404,8 @@
 +		PKCS12_item_i2d_encrypt;
 +		X509_add1_ext_i2d;
 +		PKCS7_SIGNER_INFO_it;
-+		PKCS7_SIGNER_INFO_it;
 +		KRB5_PRINCNAME_new;
 +		PKCS12_SAFEBAG_it;
-+		PKCS12_SAFEBAG_it;
 +		EC_GROUP_get_order;
 +		d2i_OCSP_RESPID;
 +		OCSP_request_verify;
@@ -2446,42 +2420,32 @@
 +		EVP_MD_CTX_create;
 +		OCSP_resp_find_status;
 +		X509_ALGOR_it;
-+		X509_ALGOR_it;
 +		ASN1_TIME_it;
-+		ASN1_TIME_it;
 +		OCSP_request_set1_name;
 +		OCSP_ONEREQ_get_ext_count;
 +		UI_get0_result;
 +		PKCS12_AUTHSAFES_it;
-+		PKCS12_AUTHSAFES_it;
 +		EVP_aes_256_ecb;
 +		PKCS12_pack_authsafes;
 +		ASN1_IA5STRING_it;
-+		ASN1_IA5STRING_it;
 +		UI_get_input_flags;
 +		EC_GROUP_set_generator;
 +		_ossl_old_des_string_to_2keys;
 +		OCSP_CERTID_free;
 +		X509_CERT_AUX_it;
-+		X509_CERT_AUX_it;
 +		CERTIFICATEPOLICIES_it;
-+		CERTIFICATEPOLICIES_it;
 +		_ossl_old_des_ede3_cbc_encrypt;
 +		RAND_set_rand_engine;
 +		DSO_get_loaded_filename;
 +		X509_ATTRIBUTE_it;
-+		X509_ATTRIBUTE_it;
 +		OCSP_ONEREQ_get_ext_by_NID;
 +		PKCS12_decrypt_skey;
 +		KRB5_AUTHENT_it;
-+		KRB5_AUTHENT_it;
 +		UI_dup_error_string;
 +		RSAPublicKey_it;
-+		RSAPublicKey_it;
 +		i2d_OCSP_REQUEST;
 +		PKCS12_x509crl2certbag;
 +		OCSP_SERVICELOC_it;
-+		OCSP_SERVICELOC_it;
 +		ASN1_item_sign;
 +		X509_CRL_set_issuer_name;
 +		OBJ_NAME_do_all_sorted;
@@ -2492,30 +2456,23 @@
 +		ENGINE_get_digest;
 +		OCSP_RESPONSE_print;
 +		KRB5_TKTBODY_it;
-+		KRB5_TKTBODY_it;
 +		ACCESS_DESCRIPTION_it;
-+		ACCESS_DESCRIPTION_it;
 +		PKCS7_ISSUER_AND_SERIAL_it;
-+		PKCS7_ISSUER_AND_SERIAL_it;
 +		PBE2PARAM_it;
-+		PBE2PARAM_it;
 +		PKCS12_certbag2x509crl;
 +		PKCS7_SIGNED_it;
-+		PKCS7_SIGNED_it;
 +		ENGINE_get_cipher;
 +		i2d_OCSP_CRLID;
 +		OCSP_SINGLERESP_new;
 +		ENGINE_cmd_is_executable;
 +		RSA_up_ref;
 +		ASN1_GENERALSTRING_it;
-+		ASN1_GENERALSTRING_it;
 +		ENGINE_register_DSA;
 +		X509V3_EXT_add_nconf_sk;
 +		ENGINE_set_load_pubkey_function;
 +		PKCS8_decrypt;
 +		PEM_bytes_read_bio;
 +		DIRECTORYSTRING_it;
-+		DIRECTORYSTRING_it;
 +		d2i_OCSP_CRLID;
 +		EC_POINT_is_on_curve;
 +		CRYPTO_set_locked_mem_ex_functions;
@@ -2523,7 +2480,6 @@
 +		d2i_KRB5_CHECKSUM;
 +		ASN1_item_dup;
 +		X509_it;
-+		X509_it;
 +		BN_mod_add;
 +		KRB5_AUTHDATA_free;
 +		_ossl_old_des_cbc_cksum;
@@ -2532,7 +2488,6 @@
 +		EC_POINT_get_Jprojective_coordinates_GFp;
 +		EC_POINT_get_Jproj_coords_GFp;
 +		ZLONG_it;
-+		ZLONG_it;
 +		CRYPTO_get_locked_mem_ex_functions;
 +		CRYPTO_get_locked_mem_ex_funcs;
 +		ASN1_TIME_check;
@@ -2542,42 +2497,31 @@
 +		_ossl_old_des_ede3_cfb64_encrypt;
 +		_ossl_odes_ede3_cfb64_encrypt;
 +		ASN1_BMPSTRING_it;
-+		ASN1_BMPSTRING_it;
 +		ASN1_tag2bit;
 +		UI_method_set_flusher;
 +		X509_ocspid_print;
 +		KRB5_ENCDATA_it;
-+		KRB5_ENCDATA_it;
 +		ENGINE_get_load_pubkey_function;
 +		UI_add_user_data;
 +		OCSP_REQUEST_delete_ext;
 +		UI_get_method;
 +		OCSP_ONEREQ_free;
 +		ASN1_PRINTABLESTRING_it;
-+		ASN1_PRINTABLESTRING_it;
 +		X509_CRL_set_nextUpdate;
 +		OCSP_REQUEST_it;
-+		OCSP_REQUEST_it;
 +		OCSP_BASICRESP_it;
-+		OCSP_BASICRESP_it;
 +		AES_ecb_encrypt;
 +		BN_mod_sqr;
 +		NETSCAPE_CERT_SEQUENCE_it;
-+		NETSCAPE_CERT_SEQUENCE_it;
 +		GENERAL_NAMES_it;
-+		GENERAL_NAMES_it;
 +		AUTHORITY_INFO_ACCESS_it;
-+		AUTHORITY_INFO_ACCESS_it;
 +		ASN1_FBOOLEAN_it;
-+		ASN1_FBOOLEAN_it;
 +		UI_set_ex_data;
 +		_ossl_old_des_string_to_key;
 +		ENGINE_register_all_RSA;
 +		d2i_KRB5_PRINCNAME;
 +		OCSP_RESPBYTES_it;
-+		OCSP_RESPBYTES_it;
 +		X509_CINF_it;
-+		X509_CINF_it;
 +		ENGINE_unregister_digests;
 +		d2i_EDIPARTYNAME;
 +		d2i_OCSP_SERVICELOC;
@@ -2586,7 +2530,6 @@
 +		OCSP_RESPDATA_free;
 +		d2i_KRB5_TICKET;
 +		OTHERNAME_it;
-+		OTHERNAME_it;
 +		EVP_MD_CTX_cleanup;
 +		d2i_ASN1_GENERALSTRING;
 +		X509_CRL_set_version;
@@ -2596,7 +2539,6 @@
 +		OCSP_REQUEST_free;
 +		OCSP_REQUEST_add1_ext_i2d;
 +		X509_VAL_it;
-+		X509_VAL_it;
 +		EC_POINTs_make_affine;
 +		EC_POINT_mul;
 +		X509V3_EXT_add_nconf;
@@ -2604,7 +2546,6 @@
 +		X509_CRL_add1_ext_i2d;
 +		_ossl_old_des_fcrypt;
 +		DISPLAYTEXT_it;
-+		DISPLAYTEXT_it;
 +		X509_CRL_set_lastUpdate;
 +		OCSP_BASICRESP_free;
 +		OCSP_BASICRESP_add1_ext_i2d;
@@ -2617,7 +2558,6 @@
 +		UI_get0_result_string;
 +		ASN1_GENERALSTRING_new;
 +		X509_SIG_it;
-+		X509_SIG_it;
 +		ERR_set_implementation;
 +		ERR_load_EC_strings;
 +		UI_get0_action_string;
@@ -2632,35 +2572,27 @@
 +		OCSP_ONEREQ_get_ext_by_OBJ;
 +		ASN1_primitive_new;
 +		ASN1_PRINTABLE_it;
-+		ASN1_PRINTABLE_it;
 +		EVP_aes_192_ecb;
 +		OCSP_SIGNATURE_new;
 +		LONG_it;
-+		LONG_it;
 +		ASN1_VISIBLESTRING_it;
-+		ASN1_VISIBLESTRING_it;
 +		OCSP_SINGLERESP_add1_ext_i2d;
 +		d2i_OCSP_CERTID;
 +		ASN1_item_d2i_fp;
 +		CRL_DIST_POINTS_it;
-+		CRL_DIST_POINTS_it;
 +		GENERAL_NAME_print;
 +		OCSP_SINGLERESP_delete_ext;
 +		PKCS12_SAFEBAGS_it;
-+		PKCS12_SAFEBAGS_it;
 +		d2i_OCSP_SIGNATURE;
 +		OCSP_request_add1_nonce;
 +		ENGINE_set_cmd_defns;
 +		OCSP_SERVICELOC_free;
 +		EC_GROUP_free;
 +		ASN1_BIT_STRING_it;
-+		ASN1_BIT_STRING_it;
 +		X509_REQ_it;
-+		X509_REQ_it;
 +		_ossl_old_des_cbc_encrypt;
 +		ERR_unload_strings;
 +		PKCS7_SIGN_ENVELOPE_it;
-+		PKCS7_SIGN_ENVELOPE_it;
 +		EDIPARTYNAME_free;
 +		OCSP_REQINFO_free;
 +		EC_GROUP_new_curve_GFp;
@@ -2685,7 +2617,6 @@
 +		OCSP_CRLID_free;
 +		OCSP_BASICRESP_get1_ext_d2i;
 +		RSAPrivateKey_it;
-+		RSAPrivateKey_it;
 +		ENGINE_register_all_DH;
 +		i2d_EDIPARTYNAME;
 +		EC_POINT_get_affine_coordinates_GFp;
@@ -2693,10 +2624,8 @@
 +		OCSP_CRLID_new;
 +		ENGINE_get_flags;
 +		OCSP_ONEREQ_it;
-+		OCSP_ONEREQ_it;
 +		UI_process;
 +		ASN1_INTEGER_it;
-+		ASN1_INTEGER_it;
 +		EVP_CipherInit_ex;
 +		UI_get_string_type;
 +		ENGINE_unregister_DH;
@@ -2705,7 +2634,6 @@
 +		bn_dup_expand;
 +		OCSP_cert_id_new;
 +		BASIC_CONSTRAINTS_it;
-+		BASIC_CONSTRAINTS_it;
 +		BN_mod_add_quick;
 +		EC_POINT_new;
 +		EVP_MD_CTX_destroy;
@@ -2715,7 +2643,6 @@
 +		EC_POINT_free;
 +		DH_up_ref;
 +		X509_NAME_ENTRY_it;
-+		X509_NAME_ENTRY_it;
 +		UI_get_ex_new_index;
 +		BN_mod_sub_quick;
 +		OCSP_ONEREQ_add_ext;
@@ -2728,7 +2655,6 @@
 +		ENGINE_register_complete;
 +		X509V3_EXT_nconf_nid;
 +		ASN1_SEQUENCE_it;
-+		ASN1_SEQUENCE_it;
 +		UI_set_default_method;
 +		RAND_query_egd_bytes;
 +		UI_method_get_writer;
@@ -2736,9 +2662,7 @@
 +		PEM_def_callback;
 +		ENGINE_cleanup;
 +		DIST_POINT_it;
-+		DIST_POINT_it;
 +		OCSP_SINGLERESP_it;
-+		OCSP_SINGLERESP_it;
 +		d2i_KRB5_TKTBODY;
 +		EC_POINT_cmp;
 +		OCSP_REVOKEDINFO_new;
@@ -2756,24 +2680,20 @@
 +		OCSP_cert_to_id;
 +		OCSP_RESPID_new;
 +		OCSP_RESPDATA_it;
-+		OCSP_RESPDATA_it;
 +		d2i_OCSP_RESPDATA;
 +		ENGINE_register_all_complete;
 +		OCSP_check_validity;
 +		PKCS12_BAGS_it;
-+		PKCS12_BAGS_it;
 +		OCSP_url_svcloc_new;
 +		ASN1_template_free;
 +		OCSP_SINGLERESP_add_ext;
 +		KRB5_AUTHENTBODY_it;
-+		KRB5_AUTHENTBODY_it;
 +		X509_supported_extension;
 +		i2d_KRB5_AUTHDATA;
 +		UI_method_get_opener;
 +		ENGINE_set_ex_data;
 +		OCSP_REQUEST_print;
 +		CBIGNUM_it;
-+		CBIGNUM_it;
 +		KRB5_TICKET_new;
 +		KRB5_APREQ_new;
 +		EC_GROUP_get_curve_GFp;
@@ -2783,28 +2703,21 @@
 +		OCSP_single_get0_status;
 +		BN_swap;
 +		POLICYINFO_it;
-+		POLICYINFO_it;
 +		ENGINE_set_destroy_function;
 +		asn1_enc_free;
 +		OCSP_RESPID_it;
-+		OCSP_RESPID_it;
 +		EC_GROUP_new;
 +		EVP_aes_256_cbc;
 +		i2d_KRB5_PRINCNAME;
 +		_ossl_old_des_encrypt2;
 +		_ossl_old_des_encrypt3;
 +		PKCS8_PRIV_KEY_INFO_it;
-+		PKCS8_PRIV_KEY_INFO_it;
 +		OCSP_REQINFO_it;
-+		OCSP_REQINFO_it;
 +		PBEPARAM_it;
-+		PBEPARAM_it;
 +		KRB5_AUTHENTBODY_new;
 +		X509_CRL_add0_revoked;
 +		EDIPARTYNAME_it;
-+		EDIPARTYNAME_it;
 +		NETSCAPE_SPKI_it;
-+		NETSCAPE_SPKI_it;
 +		UI_get0_test_string;
 +		ENGINE_get_cipher_engine;
 +		ENGINE_register_all_ciphers;
@@ -2815,14 +2728,12 @@
 +		UI_method_get_reader;
 +		OCSP_BASICRESP_get_ext_count;
 +		ASN1_ENUMERATED_it;
-+		ASN1_ENUMERATED_it;
 +		UI_set_result;
 +		i2d_KRB5_TICKET;
 +		X509_print_ex_fp;
 +		EVP_CIPHER_CTX_set_padding;
 +		d2i_OCSP_RESPONSE;
 +		ASN1_UTCTIME_it;
-+		ASN1_UTCTIME_it;
 +		_ossl_old_des_enc_write;
 +		OCSP_RESPONSE_new;
 +		AES_set_encrypt_key;
@@ -2832,14 +2743,11 @@
 +		OCSP_onereq_get0_id;
 +		ENGINE_set_default_ciphers;
 +		NOTICEREF_it;
-+		NOTICEREF_it;
 +		X509V3_EXT_CRL_add_nconf;
 +		OCSP_REVOKEDINFO_it;
-+		OCSP_REVOKEDINFO_it;
 +		AES_encrypt;
 +		OCSP_REQUEST_new;
 +		ASN1_ANY_it;
-+		ASN1_ANY_it;
 +		CRYPTO_ex_data_new_class;
 +		_ossl_old_des_ncbc_encrypt;
 +		i2d_KRB5_TKTBODY;
@@ -2862,19 +2770,15 @@
 +		ENGINE_load_nuron;
 +		_ossl_old_des_pcbc_encrypt;
 +		PKCS12_MAC_DATA_it;
-+		PKCS12_MAC_DATA_it;
 +		OCSP_accept_responses_new;
 +		asn1_do_lock;
 +		PKCS7_ATTR_VERIFY_it;
-+		PKCS7_ATTR_VERIFY_it;
 +		KRB5_APREQBODY_it;
-+		KRB5_APREQBODY_it;
 +		i2d_OCSP_SINGLERESP;
 +		ASN1_item_ex_new;
 +		UI_add_verify_string;
 +		_ossl_old_des_set_key;
 +		KRB5_PRINCNAME_it;
-+		KRB5_PRINCNAME_it;
 +		EVP_DecryptInit_ex;
 +		i2d_OCSP_CERTID;
 +		ASN1_item_d2i_bio;
@@ -2888,20 +2792,17 @@
 +		OCSP_BASICRESP_new;
 +		OCSP_REQUEST_get_ext_by_NID;
 +		KRB5_APREQ_it;
-+		KRB5_APREQ_it;
 +		ENGINE_get_destroy_function;
 +		CONF_set_nconf;
 +		ASN1_PRINTABLE_free;
 +		OCSP_BASICRESP_get_ext_by_NID;
 +		DIST_POINT_NAME_it;
-+		DIST_POINT_NAME_it;
 +		X509V3_extensions_print;
 +		_ossl_old_des_cfb64_encrypt;
 +		X509_REVOKED_add1_ext_i2d;
 +		_ossl_old_des_ofb_encrypt;
 +		KRB5_TKTBODY_new;
 +		ASN1_OCTET_STRING_it;
-+		ASN1_OCTET_STRING_it;
 +		ERR_load_UI_strings;
 +		i2d_KRB5_ENCKEY;
 +		ASN1_template_new;
@@ -2909,52 +2810,41 @@
 +		ASN1_item_i2d_fp;
 +		KRB5_PRINCNAME_free;
 +		PKCS7_RECIP_INFO_it;
-+		PKCS7_RECIP_INFO_it;
 +		EXTENDED_KEY_USAGE_it;
-+		EXTENDED_KEY_USAGE_it;
 +		EC_GFp_simple_method;
 +		EC_GROUP_precompute_mult;
 +		OCSP_request_onereq_get0;
 +		UI_method_set_writer;
 +		KRB5_AUTHENT_new;
 +		X509_CRL_INFO_it;
-+		X509_CRL_INFO_it;
 +		DSO_set_name_converter;
 +		AES_set_decrypt_key;
 +		PKCS7_DIGEST_it;
-+		PKCS7_DIGEST_it;
 +		PKCS12_x5092certbag;
 +		EVP_DigestInit_ex;
 +		i2a_ACCESS_DESCRIPTION;
 +		OCSP_RESPONSE_it;
-+		OCSP_RESPONSE_it;
 +		PKCS7_ENC_CONTENT_it;
-+		PKCS7_ENC_CONTENT_it;
 +		OCSP_request_add0_id;
 +		EC_POINT_make_affine;
 +		DSO_get_filename;
 +		OCSP_CERTSTATUS_it;
-+		OCSP_CERTSTATUS_it;
 +		OCSP_request_add1_cert;
 +		UI_get0_output_string;
 +		UI_dup_verify_string;
 +		BN_mod_lshift;
 +		KRB5_AUTHDATA_it;
-+		KRB5_AUTHDATA_it;
 +		asn1_set_choice_selector;
 +		OCSP_basic_add1_status;
 +		OCSP_RESPID_free;
 +		asn1_get_field_ptr;
 +		UI_add_input_string;
 +		OCSP_CRLID_it;
-+		OCSP_CRLID_it;
 +		i2d_KRB5_AUTHENTBODY;
 +		OCSP_REQUEST_get_ext_count;
 +		ENGINE_load_atalla;
 +		X509_NAME_it;
-+		X509_NAME_it;
 +		USERNOTICE_it;
-+		USERNOTICE_it;
 +		OCSP_REQINFO_new;
 +		OCSP_BASICRESP_get_ext;
 +		CRYPTO_get_ex_data_implementation;
@@ -2963,33 +2853,27 @@
 +		i2d_KRB5_ENCDATA;
 +		X509_PURPOSE_set;
 +		X509_REQ_INFO_it;
-+		X509_REQ_INFO_it;
 +		UI_method_set_opener;
 +		ASN1_item_ex_free;
 +		ASN1_BOOLEAN_it;
-+		ASN1_BOOLEAN_it;
 +		ENGINE_get_table_flags;
 +		UI_create_method;
 +		OCSP_ONEREQ_add1_ext_i2d;
 +		_shadow_DES_check_key;
-+		_shadow_DES_check_key;
 +		d2i_OCSP_REQINFO;
 +		UI_add_info_string;
 +		UI_get_result_minsize;
 +		ASN1_NULL_it;
-+		ASN1_NULL_it;
 +		BN_mod_lshift1;
 +		d2i_OCSP_ONEREQ;
 +		OCSP_ONEREQ_new;
 +		KRB5_TICKET_it;
-+		KRB5_TICKET_it;
 +		EVP_aes_192_cbc;
 +		KRB5_TICKET_free;
 +		UI_new;
 +		OCSP_response_create;
 +		_ossl_old_des_xcbc_encrypt;
 +		PKCS7_it;
-+		PKCS7_it;
 +		OCSP_REQUEST_get_ext_by_critical;
 +		OCSP_REQUEST_get_ext_by_crit;
 +		ENGINE_set_flags;
@@ -2998,11 +2882,9 @@
 +		EVP_Digest;
 +		OCSP_ONEREQ_delete_ext;
 +		ASN1_TBOOLEAN_it;
-+		ASN1_TBOOLEAN_it;
 +		ASN1_item_new;
 +		ASN1_TIME_to_generalizedtime;
 +		BIGNUM_it;
-+		BIGNUM_it;
 +		AES_cbc_encrypt;
 +		ENGINE_get_load_privkey_function;
 +		ENGINE_get_load_privkey_fn;
@@ -3014,7 +2896,6 @@
 +		EC_POINT_point2oct;
 +		KRB5_APREQ_free;
 +		ASN1_OBJECT_it;
-+		ASN1_OBJECT_it;
 +		OCSP_crlID_new;
 +		OCSP_crlID2_new;
 +		CONF_modules_load_file;
@@ -3072,7 +2953,6 @@
 +		i2d_ASN1_UNIVERSALSTRING;
 +		ASN1_UNIVERSALSTRING_free;
 +		ASN1_UNIVERSALSTRING_it;
-+		ASN1_UNIVERSALSTRING_it;
 +		d2i_ASN1_UNIVERSALSTRING;
 +		EVP_des_ede3_ecb;
 +		X509_REQ_print_ex;
@@ -3128,14 +3008,12 @@
 +		HMAC_CTX_set_flags;
 +		d2i_PROXY_CERT_INFO_EXTENSION;
 +		PROXY_POLICY_it;
-+		PROXY_POLICY_it;
 +		i2d_PROXY_POLICY;
 +		i2d_PROXY_CERT_INFO_EXTENSION;
 +		d2i_PROXY_POLICY;
 +		PROXY_CERT_INFO_EXTENSION_new;
 +		PROXY_CERT_INFO_EXTENSION_free;
 +		PROXY_CERT_INFO_EXTENSION_it;
-+		PROXY_CERT_INFO_EXTENSION_it;
 +		PROXY_POLICY_free;
 +		PROXY_POLICY_new;
 +		BN_MONT_CTX_set_locked;
@@ -3172,7 +3050,6 @@
 +		BN_BLINDING_get_thread_id;
 +		X509_STORE_CTX_set0_param;
 +		POLICY_MAPPING_it;
-+		POLICY_MAPPING_it;
 +		STORE_parse_attrs_start;
 +		POLICY_CONSTRAINTS_free;
 +		EVP_PKEY_add1_attr_by_NID;
@@ -3181,7 +3058,6 @@
 +		STORE_set_method;
 +		GENERAL_SUBTREE_free;
 +		NAME_CONSTRAINTS_it;
-+		NAME_CONSTRAINTS_it;
 +		ECDH_get_default_method;
 +		PKCS12_add_safe;
 +		EC_KEY_new_by_curve_name;
@@ -3224,7 +3100,6 @@
 +		ENGINE_get_default_ECDH;
 +		EC_KEY_get_conv_form;
 +		ASN1_OCTET_STRING_NDEF_it;
-+		ASN1_OCTET_STRING_NDEF_it;
 +		STORE_delete_public_key;
 +		STORE_get_public_key;
 +		STORE_modify_arbitrary;
@@ -3381,7 +3256,6 @@
 +		ENGINE_load_padlock;
 +		EC_GROUP_set_curve_name;
 +		X509_CERT_PAIR_it;
-+		X509_CERT_PAIR_it;
 +		STORE_meth_get_revoke_fn;
 +		STORE_method_get_revoke_function;
 +		STORE_method_set_get_function;
@@ -3508,7 +3382,6 @@
 +		pqueue_pop;
 +		STORE_ATTR_INFO_get0_cstr;
 +		POLICY_CONSTRAINTS_it;
-+		POLICY_CONSTRAINTS_it;
 +		STORE_get_ex_new_index;
 +		EVP_PKEY_get_attr_by_OBJ;
 +		X509_VERIFY_PARAM_add0_policy;
@@ -3556,9 +3429,7 @@
 +		STORE_modify_crl;
 +		STORE_list_private_key_start;
 +		POLICY_MAPPINGS_it;
-+		POLICY_MAPPINGS_it;
 +		GENERAL_SUBTREE_it;
-+		GENERAL_SUBTREE_it;
 +		EC_GROUP_get_curve_name;
 +		PEM_write_X509_CERT_PAIR;
 +		BIO_dump_indent_cb;
@@ -3690,15 +3561,12 @@
 +		BIO_set_callback_arg;
 +		v3_addr_add_prefix;
 +		IPAddressOrRange_it;
-+		IPAddressOrRange_it;
 +		BIO_set_flags;
 +		ASIdentifiers_it;
-+		ASIdentifiers_it;
 +		v3_addr_get_range;
 +		BIO_method_type;
 +		v3_addr_inherits;
 +		IPAddressChoice_it;
-+		IPAddressChoice_it;
 +		AES_ige_encrypt;
 +		v3_addr_add_range;
 +		EVP_CIPHER_CTX_nid;
@@ -3719,7 +3587,6 @@
 +		BIO_clear_flags;
 +		i2d_ASRange;
 +		IPAddressRange_it;
-+		IPAddressRange_it;
 +		IPAddressChoice_new;
 +		ASIdentifierChoice_new;
 +		ASRange_free;
@@ -3740,7 +3607,6 @@
 +		BIO_test_flags;
 +		i2d_ASIdentifierChoice;
 +		ASRange_it;
-+		ASRange_it;
 +		d2i_ASIdentifiers;
 +		ASRange_new;
 +		d2i_IPAddressChoice;
@@ -3749,7 +3615,6 @@
 +		EVP_Cipher;
 +		i2d_IPAddressOrRange;
 +		ASIdOrRange_it;
-+		ASIdOrRange_it;
 +		EVP_CIPHER_nid;
 +		i2d_IPAddressChoice;
 +		EVP_CIPHER_CTX_block_size;
@@ -3760,7 +3625,6 @@
 +		v3_addr_is_canonical;
 +		i2d_IPAddressRange;
 +		IPAddressFamily_it;
-+		IPAddressFamily_it;
 +		v3_asid_inherits;
 +		EVP_CIPHER_CTX_cipher;
 +		EVP_CIPHER_CTX_get_app_data;
@@ -3770,7 +3634,6 @@
 +		d2i_IPAddressOrRange;
 +		v3_addr_canonize;
 +		ASIdentifierChoice_it;
-+		ASIdentifierChoice_it;
 +		EVP_MD_CTX_md;
 +		d2i_ASIdentifierChoice;
 +		BIO_method_name;
@@ -3793,7 +3656,6 @@
 +		SEED_set_key;
 +		EVP_seed_cfb128;
 +		X509_EXTENSIONS_it;
-+		X509_EXTENSIONS_it;
 +		X509_get1_ocsp;
 +		OCSP_REQ_CTX_free;
 +		i2d_X509_EXTENSIONS;
@@ -3801,7 +3663,6 @@
 +		OCSP_sendreq_new;
 +		d2i_X509_EXTENSIONS;
 +		X509_ALGORS_it;
-+		X509_ALGORS_it;
 +		X509_ALGOR_get0;
 +		X509_ALGOR_set0;
 +		AES_unwrap_key;
@@ -3846,7 +3707,6 @@
 +		CMS_SignerInfo_verify;
 +		CMS_data;
 +		CMS_ContentInfo_it;
-+		CMS_ContentInfo_it;
 +		d2i_CMS_ReceiptRequest;
 +		CMS_compress;
 +		CMS_digest_create;
@@ -3891,7 +3751,6 @@
 +		CMS_RecipientInfo_kekri_get0_id;
 +		CMS_verify_receipt;
 +		CMS_ReceiptRequest_it;
-+		CMS_ReceiptRequest_it;
 +		PEM_read_bio_CMS;
 +		CMS_get1_crls;
 +		CMS_add0_recipient_key;
@@ -4030,7 +3889,6 @@
 +		TS_REQ_dup;
 +		GENERAL_NAME_dup;
 +		ASN1_SEQUENCE_ANY_it;
-+		ASN1_SEQUENCE_ANY_it;
 +		WHIRLPOOL;
 +		X509_STORE_get1_crls;
 +		ENGINE_get_pkey_asn1_meth;
@@ -4101,7 +3959,6 @@
 +		DIST_POINT_set_dpname;
 +		i2d_ISSUING_DIST_POINT;
 +		ASN1_SET_ANY_it;
-+		ASN1_SET_ANY_it;
 +		EVP_PKEY_CTX_get_data;
 +		TS_STATUS_INFO_print_bio;
 +		EVP_PKEY_derive_init;
@@ -4261,7 +4118,6 @@
 +		EVP_DigestSignFinal;
 +		TS_RESP_CTX_set_def_policy;
 +		NETSCAPE_X509_it;
-+		NETSCAPE_X509_it;
 +		TS_RESP_create_response;
 +		PKCS7_SIGNER_INFO_get0_algs;
 +		TS_TST_INFO_get_nonce;
@@ -4320,7 +4176,6 @@
 +		EVP_CIPHER_do_all_sorted;
 +		EVP_PKEY_CTX_free;
 +		ISSUING_DIST_POINT_it;
-+		ISSUING_DIST_POINT_it;
 +		d2i_TS_MSG_IMPRINT_fp;
 +		X509_STORE_get1_certs;
 +		EVP_PKEY_CTX_get_operation;
@@ -4613,7 +4468,6 @@
 +		X509_signature_dump;
 +		d2i_RSA_PSS_PARAMS;
 +		RSA_PSS_PARAMS_it;
-+		RSA_PSS_PARAMS_it;
 +		RSA_PSS_PARAMS_free;
 +		X509_sign_ctx;
 +		i2d_RSA_PSS_PARAMS;
@@ -4636,10 +4490,137 @@
 +		CRYPTO_memcmp;
 +} OPENSSL_1.0.1;
 +
-Index: openssl-1.0.1d/engines/openssl.ld
++OPENSSL_1.0.2 {
++	global:
++		SSL_CTX_set_alpn_protos;
++		SSL_set_alpn_protos;
++		SSL_CTX_set_alpn_select_cb;
++		SSL_get0_alpn_selected;
++		SSL_CTX_set_custom_cli_ext;
++		SSL_CTX_set_custom_srv_ext;
++		SSL_CTX_set_srv_supp_data;
++		SSL_CTX_set_cli_supp_data;
++		SSL_set_cert_cb;
++		SSL_CTX_use_serverinfo;
++		SSL_CTX_use_serverinfo_file;
++		SSL_CTX_set_cert_cb;
++		SSL_CTX_get0_param;
++		SSL_get0_param;
++		SSL_certs_clear;
++		DTLSv1_2_method;
++		DTLSv1_2_server_method;
++		DTLSv1_2_client_method;
++		DTLS_method;
++		DTLS_server_method;
++		DTLS_client_method;
++		SSL_CTX_get_ssl_method;
++		SSL_CTX_get0_certificate;
++		SSL_CTX_get0_privatekey;
++		SSL_COMP_set0_compression_methods;
++		SSL_CIPHER_find;
++		SSL_is_server;
++		SSL_CONF_CTX_new;
++		SSL_CONF_CTX_finish;
++		SSL_CONF_CTX_free;
++		SSL_CONF_CTX_set_flags;
++		SSL_CONF_CTX_clear_flags;
++		SSL_CONF_CTX_set1_prefix;
++		SSL_CONF_CTX_set_ssl;
++		SSL_CONF_CTX_set_ssl_ctx;
++		SSL_CONF_cmd;
++		SSL_CONF_cmd_argv;
++		SSL_CONF_cmd_value_type;
++		SSL_trace;
++		SSL_CIPHER_standard_name;
++		SSL_get_tlsa_record_byname;
++		ASN1_TIME_diff;
++		BIO_hex_string;
++		CMS_RecipientInfo_get0_pkey_ctx;
++		CMS_RecipientInfo_encrypt;
++		CMS_SignerInfo_get0_pkey_ctx;
++		CMS_SignerInfo_get0_md_ctx;
++		CMS_SignerInfo_get0_signature;
++		CMS_RecipientInfo_kari_get0_alg;
++		CMS_RecipientInfo_kari_get0_reks;
++		CMS_RecipientInfo_kari_get0_orig_id;
++		CMS_RecipientInfo_kari_orig_id_cmp;
++		CMS_RecipientEncryptedKey_get0_id;
++		CMS_RecipientEncryptedKey_cert_cmp;
++		CMS_RecipientInfo_kari_set0_pkey;
++		CMS_RecipientInfo_kari_get0_ctx;
++		CMS_RecipientInfo_kari_decrypt;
++		CMS_SharedInfo_encode;
++		DH_compute_key_padded;
++		d2i_DHxparams;
++		i2d_DHxparams;
++		DH_get_1024_160;
++		DH_get_2048_224;
++		DH_get_2048_256;
++		DH_KDF_X9_42;
++		ECDH_KDF_X9_62;
++		ECDSA_METHOD_new;
++		ECDSA_METHOD_free;
++		ECDSA_METHOD_set_sign;
++		ECDSA_METHOD_set_sign_setup;
++		ECDSA_METHOD_set_verify;
++		ECDSA_METHOD_set_flags;
++		ECDSA_METHOD_set_name;
++		EVP_des_ede3_wrap;
++		EVP_aes_128_wrap;
++		EVP_aes_192_wrap;
++		EVP_aes_256_wrap;
++		EVP_aes_128_cbc_hmac_sha256;
++		EVP_aes_256_cbc_hmac_sha256;
++		CRYPTO_128_wrap;
++		CRYPTO_128_unwrap;
++		OCSP_REQ_CTX_nbio;
++		OCSP_REQ_CTX_new;
++		OCSP_set_max_response_length;
++		OCSP_REQ_CTX_i2d;
++		OCSP_REQ_CTX_nbio_d2i;
++		OCSP_REQ_CTX_get0_mem_bio;
++		OCSP_REQ_CTX_http;
++		RSA_padding_add_PKCS1_OAEP_mgf1;
++		RSA_padding_check_PKCS1_OAEP_mgf1;
++		RSA_OAEP_PARAMS_free;
++		RSA_OAEP_PARAMS_it;
++		RSA_OAEP_PARAMS_new;
++		SSL_get_sigalgs;
++		SSL_get_shared_sigalgs;
++		SSL_check_chain;
++		X509_chain_up_ref;
++		X509_http_nbio;
++		X509_CRL_http_nbio;
++		X509_REVOKED_dup;
++		X509_get0_signature;
++		X509_get_signature_nid;
++		X509_CRL_diff;
++		X509_chain_check_suiteb;
++		X509_CRL_check_suiteb;
++		X509_check_host;
++		X509_check_email;
++		X509_check_ip;
++		X509_check_ip_asc;
++		X509_STORE_set_lookup_crls_cb;
++		X509_STORE_CTX_get0_store;
++		X509_VERIFY_PARAM_set1_host;
++		X509_VERIFY_PARAM_set1_email;
++		X509_VERIFY_PARAM_set1_ip;
++		X509_VERIFY_PARAM_set1_ip_asc;
++		X509_VERIFY_PARAM_get0_name;
++		X509_VERIFY_PARAM_get_count;
++		X509_VERIFY_PARAM_get0;
++		X509V3_EXT_free;
++		EC_curve_nid2nist;
++		EC_curve_nist2nid;
++		PEM_write_bio_DHxparams;
++		PEM_write_DHxparams;
++} OPENSSL_1.0.1d;
++
+Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.1d/engines/openssl.ld	2013-02-06 19:41:43.000000000 +0100
++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld	2014-02-24 21:02:30.000000000 +0100
 @@ -0,0 +1,10 @@
 +OPENSSL_1.0.0 {
 +	global:
@@ -4651,10 +4632,10 @@
 +		*;
 +};
 +
-Index: openssl-1.0.1d/engines/ccgost/openssl.ld
+Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.1d/engines/ccgost/openssl.ld	2013-02-06 19:41:43.000000000 +0100
++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld	2014-02-24 21:02:30.000000000 +0100
 @@ -0,0 +1,10 @@
 +OPENSSL_1.0.0 {
 +	global:




More information about the Pkg-openssl-changes mailing list