Module Name: src
Committed By: christos
Date: Tue Jul 10 19:35:58 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: i_cbc_dummy.c
i_skey_dummy.c mdc2dgst_dummy.c rc5_enc_dummy.c rc5_skey_dummy.c
Log Message:
reflect reality. We don't need .a libraries to link against anymore, and
we are not aboting, but exiting.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c \
src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c \
src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c \
src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c \
src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c:1.1 Sun Jul 19 19:30:43 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c Tue Jul 10 15:35:58 2012
@@ -72,17 +72,17 @@ __weak_alias(idea_encrypt,_idea_encrypt)
#endif
__warn_references(idea_cbc_encrypt,
- "IDEA is a patented algorithm; link against libcrypto_idea.a")
+ "IDEA is a patented algorithm; link against libcrypto_idea")
__warn_references(idea_encrypt,
- "IDEA is a patented algorithm; link against libcrypto_idea.a")
+ "IDEA is a patented algorithm; link against libcrypto_idea")
void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt)
{
fprintf(stderr,
- "IDEA is a patented algorithm; link against libcrypto_idea.a. "
- "Aborting...\n");
+ "IDEA is a patented algorithm; link against libcrypto_idea. "
+ "Exiting...\n");
exit(1);
}
@@ -90,7 +90,7 @@ void idea_encrypt(IDEA_INT *d, IDEA_KEY_
{
fprintf(stderr,
- "IDEA is a patented algorithm; link against libcrypto_idea.a. "
- "Aborting...\n");
+ "IDEA is a patented algorithm; link against libcrypto_idea. "
+ "Exiting...\n");
exit(1);
}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c:1.1 Sun Jul 19 19:30:43 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c Tue Jul 10 15:35:58 2012
@@ -72,16 +72,16 @@ __weak_alias(idea_set_decrypt_key,_idea_
#endif
__warn_references(idea_set_encrypt_key,
- "IDEA is a patented algorithm; link against libcrypto_idea.a")
+ "IDEA is a patented algorithm; link against libcrypto_idea")
__warn_references(idea_set_decrypt_key,
- "IDEA is a patented algorithm; link against libcrypto_idea.a")
+ "IDEA is a patented algorithm; link against libcrypto_idea")
void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
{
fprintf(stderr,
- "IDEA is a patented algorithm; link against libcrypto_idea.a. "
- "Aborting...\n");
+ "IDEA is a patented algorithm; link against libcrypto_idea. "
+ "Exiting...\n");
exit(1);
}
@@ -89,7 +89,7 @@ void idea_set_decrypt_key(IDEA_KEY_SCHED
{
fprintf(stderr,
- "IDEA is a patented algorithm; link against libcrypto_idea.a. "
- "Aborting...\n");
+ "IDEA is a patented algorithm; link against libcrypto_idea. "
+ "Exiting...\n");
exit(1);
}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c:1.1 Sun Jul 19 19:30:44 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c Tue Jul 10 15:35:58 2012
@@ -75,18 +75,18 @@ __weak_alias(MDC2_Final,_MDC2_Final)
#endif
__warn_references(MDC2_Init,
- "MDC2 is a patented algorithm; link against libcrypto_mdc2.a")
+ "MDC2 is a patented algorithm; link against libcrypto_mdc2")
__warn_references(MDC2_Update,
- "MDC2 is a patented algorithm; link against libcrypto_mdc2.a")
+ "MDC2 is a patented algorithm; link against libcrypto_mdc2")
__warn_references(MDC2_Final,
- "MDC2 is a patented algorithm; link against libcrypto_mdc2.a")
+ "MDC2 is a patented algorithm; link against libcrypto_mdc2")
void MDC2_Init(MDC2_CTX *c)
{
fprintf(stderr,
- "MDC2 is a patented algorithm; link against libcrypto_mdc2.a. "
- "Aborting...\n");
+ "MDC2 is a patented algorithm; link against libcrypto_mdc2. "
+ "Exiting...\n");
exit(1);
}
@@ -94,8 +94,8 @@ void MDC2_Update(MDC2_CTX *c, const unsi
{
fprintf(stderr,
- "MDC2 is a patented algorithm; link against libcrypto_mdc2.a. "
- "Aborting...\n");
+ "MDC2 is a patented algorithm; link against libcrypto_mdc2. "
+ "Exiting...\n");
exit(1);
}
@@ -103,7 +103,7 @@ void MDC2_Final(unsigned char *md, MDC2_
{
fprintf(stderr,
- "MDC2 is a patented algorithm; link against libcrypto_mdc2.a. "
- "Aborting...\n");
+ "MDC2 is a patented algorithm; link against libcrypto_mdc2. "
+ "Exiting...\n");
exit(1);
}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c:1.1 Sun Jul 19 19:30:44 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c Tue Jul 10 15:35:58 2012
@@ -74,19 +74,19 @@ __weak_alias(RC5_32_decrypt,_RC5_32_decr
#endif
__warn_references(RC5_32_cbc_encrypt,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a")
+ "RC5 is a patented algorithm; link against libcrypto_rc5")
__warn_references(RC5_32_encrypt,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a")
+ "RC5 is a patented algorithm; link against libcrypto_rc5")
__warn_references(RC5_32_decrypt,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a")
+ "RC5 is a patented algorithm; link against libcrypto_rc5")
void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
long length, RC5_32_KEY *ks, unsigned char *iv, int encrypt)
{
fprintf(stderr,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a. "
- "Aborting...\n");
+ "RC5 is a patented algorithm; link against libcrypto_rc5. "
+ "Exiting...\n");
exit(1);
}
@@ -94,8 +94,8 @@ void RC5_32_encrypt(RC5_32_INT *d, RC5_3
{
fprintf(stderr,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a. "
- "Aborting...\n");
+ "RC5 is a patented algorithm; link against libcrypto_rc5. "
+ "Exiting...\n");
exit(1);
}
@@ -103,7 +103,7 @@ void RC5_32_decrypt(RC5_32_INT *d, RC5_3
{
fprintf(stderr,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a. "
- "Aborting...\n");
+ "RC5 is a patented algorithm; link against libcrypto_rc5. "
+ "Exiting...\n");
exit(1);
}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c:1.1 Sun Jul 19 19:30:44 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c Tue Jul 10 15:35:58 2012
@@ -70,14 +70,14 @@ __weak_alias(RC5_32_set_key,_RC5_32_set_
#endif
__warn_references(RC5_32_set_key,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a")
+ "RC5 is a patented algorithm; link against libcrypto_rc5")
void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
int rounds)
{
fprintf(stderr,
- "RC5 is a patented algorithm; link against libcrypto_rc5.a. "
- "Aborting...\n");
+ "RC5 is a patented algorithm; link against libcrypto_rc5. "
+ "Exiting...\n");
exit(1);
}
