Switched to AmiSSL v5

src/YAM_global.c

@@ -2,7 +2,7 @@
 
  YAM - Yet Another Mailer
  Copyright (C) 1995-2000 Marcel Beck
- Copyright (C) 2000-2019 YAM Open Source Team
+ Copyright (C) 2000-2022 YAM Open Source Team
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -167,6 +167,9 @@ struct Library* xadMasterBase     = NULL;
 struct Library* XpkBase           = NULL;
 struct Library* AmiSSLMasterBase  = NULL;
 struct Library* AmiSSLBase        = NULL;
+#if !defined(__amigaos4__)
+struct Library* AmiSSLExtBase     = NULL;
+#endif
 struct Device*  TimerBase         = NULL;
 struct Library* GfxBase           = NULL;
 struct Library* LayersBase        = NULL;
@@ -207,9 +210,6 @@ struct GraphicsIFace*     IGraphics     = NULL;
 struct LayersIFace*       ILayers       = NULL;
 struct DiskfontIFace*     IDiskfont     = NULL;
 struct CodesetsIFace*     ICodesets     = NULL;
-#if !defined(__amigaos4__)
-struct CyberGfxIFace*     ICyberGfx     = NULL;
-#endif
 struct ExpatIFace*        IExpat        = NULL;
 struct ApplicationIFace*  IApplication  = NULL;
 struct TimezoneIFace*     ITimezone     = NULL;

src/extrasrc/vastubs.c

@@ -2,7 +2,7 @@
 
  YAM - Yet Another Mailer
  Copyright (C) 1995-2000 Marcel Beck
- Copyright (C) 2000-2019 YAM Open Source Team
+ Copyright (C) 2000-2022 YAM Open Source Team
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -88,6 +88,10 @@ LONG XpkPackTags(Tag tag, ...)
 LONG XpkUnpackTags(Tag tag, ...)
 { return XpkUnpack((struct TagItem *)&tag); }
 
+#include <proto/amisslmaster.h>
+LONG (OpenAmiSSLTags)(LONG APIVersion, Tag tag1, ...)
+{ return OpenAmiSSLTagList(APIVersion, (struct TagItem *)&tag1); }
+
 #include <proto/amissl.h>
 LONG InitAmiSSL(Tag tag, ...)
 { return InitAmiSSLA((struct TagItem *)&tag); }
@@ -160,6 +164,14 @@ LONG XpkUnpackTags(Tag tag1, ...)
   AROS_SLOWSTACKTAGS_POST
 }
 
+#include <proto/amisslmaster.h>
+long OpenAmiSSLTags(LONG APIVersion, Tag tag1, ...)
+{
+  AROS_SLOWSTACKTAGS_PRE(tag1)
+  retval = (IPTR)OpenAmiSSLTagList(APIVersion, (struct TagItem *)AROS_SLOWSTACKTAGS_ARG(tag1));
+  AROS_SLOWSTACKTAGS_POST
+}
+
 #include <proto/amissl.h>
 long InitAmiSSL(Tag tag1, ...)
 {

src/include/amissl/amissl.h

@@ -1,3 +1,27 @@
+/***************************************************************************
+
+ AmiSSL - OpenSSL wrapper for AmigaOS-based systems
+ Copyright (c) 1999-2006 Andrija Antonijevic, Stefan Burstroem.
+ Copyright (c) 2006-2022 AmiSSL Open Source Team.
+ All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License in the file LICENSE in the
+ source distribution or at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ AmiSSL Official Support Site: https://github.com/jens-maus/amissl
+
+***************************************************************************/
+
 /* 
  * Make sure that this file is included from proto/amissl.h
  * so that the dependancies don't cause errors
@@ -9,10 +33,6 @@
 #ifndef AMISSL_AMISSL_H
 #define AMISSL_AMISSL_H
 
-#ifdef __SASC
-#define ssize_t int
-#endif
-
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_NO_AES
@@ -33,14 +53,24 @@
 #ifndef OPENSSL_NO_CAST
 #include <openssl/cast.h>
 #endif
+#ifndef OPENSSL_NO_CMAC
 #include <openssl/cmac.h>
+#endif
+#ifndef OPENSSL_NO_CMP
+#include <openssl/cmp.h>
+#endif
 #include <openssl/comp.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
+#include <openssl/core.h>
+#ifndef OPENSSL_NO_CRMF
+#include <openssl/crmf.h>
+#endif
 #include <openssl/crypto.h>
 #ifndef OPENSSL_NO_CT
 #include <openssl/ct.h>
 #endif
+#include <openssl/decoder.h>
 #ifndef OPENSSL_NO_DES
 #include <openssl/des.h>
 #endif
@@ -55,20 +85,17 @@
 #ifndef OPENSSL_NO_EC
 #include <openssl/ec.h>
 #endif
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
+#include <openssl/encoder.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
 #include <openssl/err.h>
+#include <openssl/ess.h>
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_HMAC
 #include <openssl/hmac.h>
 #endif
+#include <openssl/http.h>
 #ifndef OPENSSL_NO_IDEA
 #include <openssl/idea.h>
 #endif
@@ -91,13 +118,14 @@
 #include <openssl/objects.h>
 #include <openssl/ocsp.h>
 #include <openssl/opensslv.h>
-#include <openssl/ossl_typ.h>
 #include <openssl/pem.h>
 #include <openssl/pem2.h>
 #include <openssl/pkcs12.h>
 #include <openssl/pkcs7.h>
+#include <openssl/params.h>
+#include <openssl/param_build.h>
+#include <openssl/provider.h>
 #include <openssl/rand.h>
-#include <openssl/rand_drbg.h>
 #ifndef OPENSSL_NO_RC2
 #include <openssl/rc2.h>
 #endif
@@ -117,6 +145,7 @@
 #ifndef OPENSSL_NO_SEED
 #include <openssl/seed.h>
 #endif
+#include <openssl/self_test.h>
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif
@@ -131,8 +160,12 @@
 #include <openssl/store.h>
 #include <openssl/symhacks.h>
 #include <openssl/tls1.h>
+#include <openssl/trace.h>
+#ifndef OPENSSL_NO_TS
 #include <openssl/ts.h>
+#endif
 #include <openssl/txt_db.h>
+#include <openssl/types.h>
 #include <openssl/ui.h>
 #ifndef OPENSSL_NO_WHIRLPOOL
 #include <openssl/whrlpool.h>