Fix compile errors

Author: Hackerpilot

deimos/openssl/engine.d

@@ -94,6 +94,7 @@ public import deimos.openssl.err;
 }
 
 public import deimos.openssl.ossl_typ;
+import deimos.openssl.ssl : SSL;
 public import deimos.openssl.symhacks;
 
 public import deimos.openssl.x509;
@@ -141,7 +142,7 @@ enum ENGINE_FLAGS_MANUAL_CMD_CTRL = 0x0002;
  * the existing ENGINE's structural reference count. */
 enum ENGINE_FLAGS_BY_ID_COPY = 0x0004;
 
-/* This flag if for an ENGINE that does not want its methods registered as 
+/* This flag if for an ENGINE that does not want its methods registered as
  * part of ENGINE_register_all_complete() for example if the methods are
  * not usable as default methods.
  */

deimos/openssl/kssl.d

@@ -186,7 +186,7 @@ krb5_error_code  kssl_check_authent(KSSL_CTX* kssl_ctx, krb5_data* authentp,
 			            krb5_timestamp* atimep, KSSL_ERR* kssl_err);
 ubyte* kssl_skip_confound(krb5_enctype enctype, ubyte* authn);+/
 
-import deimos.openssl.ossl_typ : SSL;
+import deimos.openssl.ssl : SSL;
 void SSL_set0_kssl_ctx(SSL* s, KSSL_CTX* kctx);
 KSSL_CTX* SSL_get0_kssl_ctx(SSL* s);
 char* kssl_ctx_get0_client_princ(KSSL_CTX* kctx);

deimos/openssl/ossl_typ.d

@@ -204,9 +204,6 @@ alias st_ERR_FNS ERR_FNS;
 
 struct engine_st;
 alias engine_st ENGINE;
-import deimos.openssl.ssl : ssl_st, ssl_ctx_st;
-alias ssl_st SSL;
-alias ssl_ctx_st SSL_CTX;
 
 struct X509_POLICY_NODE_st;
 alias X509_POLICY_NODE_st X509_POLICY_NODE;

deimos/openssl/srtp.d

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young ([email protected]).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson ([email protected]).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young ([email protected])"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson ([email protected])"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -117,8 +117,7 @@
 module deimos.openssl.srtp;
 
 import deimos.openssl._d_util;
-import deimos.openssl.ossl_typ : SSL, SSL_CTX;
-import deimos.openssl.ssl : SRTP_PROTECTION_PROFILE;
+import deimos.openssl.ssl : SSL, SSL_CTX, SRTP_PROTECTION_PROFILE;
 import deimos.openssl.safestack : STACK_OF;
 
 extern(C):

deimos/openssl/ssl.d

@@ -461,7 +461,7 @@ struct ssl_method_st {
  *	Peer [ 3 ] EXPLICIT	X509,		-- optional Peer Certificate
  *	Session_ID_context [ 4 ] EXPLICIT OCTET STRING,   -- the Session ID context
  *	Verify_result [ 5 ] EXPLICIT INTEGER,   -- X509_V_... code for `Peer'
- *	HostName [ 6 ] EXPLICIT OCTET STRING,   -- optional HostName from servername TLS extension 
+ *	HostName [ 6 ] EXPLICIT OCTET STRING,   -- optional HostName from servername TLS extension
  *	PSK_identity_hint [ 7 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
  *	PSK_identity [ 8 ] EXPLICIT OCTET STRING,  -- optional PSK identity
  *	Ticket_lifetime_hint [9] EXPLICIT INTEGER, -- server's lifetime hint for session ticket
@@ -1014,10 +1014,10 @@ version(OPENSSL_NO_NEXTPROTONEG) {} else {
 	void *next_proto_select_cb_arg;
 }
         /* SRTP profiles we are willing to do from RFC 5764 */
-        STACK_OF!(SRTP_PROTECTION_PROFILE) *srtp_profiles;  
+        STACK_OF!(SRTP_PROTECTION_PROFILE) *srtp_profiles;
 }
 	}
-
+alias SSL_CTX = ssl_ctx_st;
 }
 
 enum SSL_SESS_CACHE_OFF = 0x0000;
@@ -1402,8 +1402,8 @@ alias initial_ctx session_ctx;
 version(OPENSSL_NO_SRP) {} else {
 	SRP_CTX srp_ctx; /* ctx for SRP authentication */
 }
-	};
-
+	}
+alias SSL = ssl_st;
 }
 
 public import deimos.openssl.ssl2;