[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Fri Dec 18 19:55:44 UTC 2015
The branch master has been updated
via 7795475f535e5368c20333903c1d2836f536115f (commit)
via f4d654d2f25694b4c0d7251521a0ec32d984394c (commit)
from 31384753c770b2d77dd9d54a19145d25498cf859 (commit)
- Log -----------------------------------------------------------------
commit 7795475f535e5368c20333903c1d2836f536115f
Author: Rich Salz <rsalz at akamai.com>
Date: Fri Dec 18 13:18:31 2015 -0500
Remove some L<asdf|asdf> which crept back in.
Reviewed-by: Tim Hudson <tjh at openssl.org>
commit f4d654d2f25694b4c0d7251521a0ec32d984394c
Author: Rich Salz <rsalz at akamai.com>
Date: Fri Dec 18 13:26:17 2015 -0500
Remove err and prime demo's
ERR is not really a public facility; remove the demo.
prime shows how to generate a prime. See apps.
Reviewed-by: Tim Hudson <tjh at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
demos/err/Makefile | 17 -------
demos/err/README | 12 -----
demos/err/main.c | 19 --------
demos/err/test_err.ec | 3 --
demos/err/test_err.h | 25 -----------
demos/prime/Makefile | 20 ---------
demos/prime/prime.c | 102 ------------------------------------------
doc/crypto/X509V3_get_d2i.pod | 2 +-
doc/ssl/DTLSv1_listen.pod | 4 +-
doc/ssl/ssl.pod | 2 +-
10 files changed, 4 insertions(+), 202 deletions(-)
delete mode 100644 demos/err/Makefile
delete mode 100644 demos/err/README
delete mode 100644 demos/err/main.c
delete mode 100644 demos/err/test_err.ec
delete mode 100644 demos/err/test_err.h
delete mode 100644 demos/prime/Makefile
delete mode 100644 demos/prime/prime.c
diff --git a/demos/err/Makefile b/demos/err/Makefile
deleted file mode 100644
index 81503c8..0000000
--- a/demos/err/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Minimal makefile to generate error codes and link a test app
-SRC= main.c
-OBJ= main.o
-HEADER=test_err.h
-ERROBJ= test_err.o
-CC=gcc
-CFLAGS=-I../../include
-LDFLAGS=-L../.. -lcrypto
-
-PERL=perl
-
-testapp: $(OBJ) $(ERROBJ) $(HEADER)
- $(CC) -o testapp $(OBJ) $(ERROBJ) $(LDFLAGS)
-
-errors:
- $(PERL) ../../util/mkerr.pl -conf test_err.ec \
- -nostatic -write $(SRC)
diff --git a/demos/err/README b/demos/err/README
deleted file mode 100644
index 79c392f..0000000
--- a/demos/err/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-This directory contains a simple example of how to use the ERR functions of
-OpenSSL to add error codes to an external application.
-
-To test it first do "make errors". This will build error codes and add them
-to the header files. It will also create some functions to load error codes.
-Notice how "test_err.h" is updated after this call and the C source file
-"test_err.c" is created. These names are in the test_err.ec file passed to the
-mkerr.pl script.
-
-Then do "make" which will build the test application.
-
diff --git a/demos/err/main.c b/demos/err/main.c
deleted file mode 100644
index a9a6a57..0000000
--- a/demos/err/main.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <openssl/err.h>
-
-#include "test_err.h"
-
-/* Simple error test routine */
-
-void a_test_function(void)
-{
- TESTerr(TEST_F_A_TEST_FUNCTION, TEST_R_TEST_REASON_CODE);
- TESTerr(TEST_F_A_TEST_FUNCTION, TEST_R_ANOTHER_TEST_REASON_CODE);
- ERR_add_error_data(1, "some additional error data");
-}
-
-int main(int argc, char **argv)
-{
- ERR_load_TEST_strings();
- a_test_function();
- ERR_print_errors_fp(stderr);
-}
diff --git a/demos/err/test_err.ec b/demos/err/test_err.ec
deleted file mode 100644
index 46e95bb..0000000
--- a/demos/err/test_err.ec
+++ /dev/null
@@ -1,3 +0,0 @@
-# Details: name of library, header file to use and
-# file to output error codes to.
-L TEST test_err.h test_err.c
diff --git a/demos/err/test_err.h b/demos/err/test_err.h
deleted file mode 100644
index a056815..0000000
--- a/demos/err/test_err.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Demo of use of error library */
-
-#ifndef TEST_ERR_H
-# define TEST_ERR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Test library name */
-
-# define TEST_LIB_NAME "demo test library routines"
-
-/* Normal header details go here */
-
-/*
- * Prototypes are picked up by the error script to generate strings for
- * function names.
- */
-
-void a_test_function(void);
-
-/*
- * Everything after this point is auto generated when you do "make errors"
- */
diff --git a/demos/prime/Makefile b/demos/prime/Makefile
deleted file mode 100644
index 0166cd4..0000000
--- a/demos/prime/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-CC=cc
-CFLAGS= -g -I../../include -Wall
-LIBS= -L../.. -lcrypto
-EXAMPLES=prime
-
-all: $(EXAMPLES)
-
-prime: prime.o
- $(CC) -o prime prime.o $(LIBS)
-
-clean:
- rm -f $(EXAMPLES) *.o
-
-test: all
- @echo Test creating a 128-bit prime
- ./prime 128
- @echo Test creating a 256-bit prime
- ./prime 256
- @echo Test creating a 512-bit prime
- ./prime 512
diff --git a/demos/prime/prime.c b/demos/prime/prime.c
deleted file mode 100644
index 6dd0228..0000000
--- a/demos/prime/prime.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* demos/prime/prime.c */
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay at cryptsoft.com).
- * 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 (tjh at cryptsoft.com).
- *
- * 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:
- * 1. Redistributions of source code must retain the copyright
- * 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 the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay at cryptsoft.com)"
- * 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
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
- *
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/bn.h>
-
-void callback(type, num)
-int type, num;
-{
- if (type == 0)
- fprintf(stderr, ".");
- else if (type == 1)
- fprintf(stderr, "+");
- else if (type == 2)
- fprintf(stderr, "*");
- fflush(stderr);
-}
-
-int main(argc, argv)
-int argc;
-char *argv[];
-{
- BIGNUM *rand;
- int num = 256;
-
- /*
- * we should really call RAND_seed(char *bytes,int num); to fully
- * initalise the random number generator
- */
- if (argc >= 2) {
- num = atoi(argv[1]);
- if (num == 0)
- num = 256;
- }
-
- fprintf(stderr, "generate a strong prime\n");
- rand = BN_generate_prime(NULL, num, 1, NULL, NULL, callback, NULL);
- /* change the third parameter to 1 for a strong prime */
- fprintf(stderr, "\n");
-
- BN_print_fp(stdout, rand);
- fprintf(stdout, "\n");
- BN_free(rand);
- exit(0);
- return (0);
-}
diff --git a/doc/crypto/X509V3_get_d2i.pod b/doc/crypto/X509V3_get_d2i.pod
index 4b50a10..8ae1708 100644
--- a/doc/crypto/X509V3_get_d2i.pod
+++ b/doc/crypto/X509V3_get_d2i.pod
@@ -212,7 +212,7 @@ NULL if no extensions are present.
=head1 SEE ALSO
L<d2i_X509(3)>,
-L<ERR_get_error(3)|ERR_get_error(3)>,
+L<ERR_get_error(3)>,
L<X509_CRL_get0_by_serial(3)>,
L<X509_get0_signature(3)>,
L<X509_get_ext_d2i(3)>,
diff --git a/doc/ssl/DTLSv1_listen.pod b/doc/ssl/DTLSv1_listen.pod
index 1977916..b3dd1ae 100644
--- a/doc/ssl/DTLSv1_listen.pod
+++ b/doc/ssl/DTLSv1_listen.pod
@@ -84,8 +84,8 @@ whilst return codes >0 indicate success.
=head1 SEE ALSO
-L<SSL_get_error(3)|SSL_get_error(3)>, L<SSL_accept(3)|SSL_accept(3)>,
-L<ssl(3)|ssl(3)>, L<bio(3)|bio(3)>
+L<SSL_get_error(3)>, L<SSL_accept(3)>,
+L<ssl(3)>, L<bio(3)>
=head1 HISTORY
diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod
index 19819f1..adcec5f 100644
--- a/doc/ssl/ssl.pod
+++ b/doc/ssl/ssl.pod
@@ -735,7 +735,7 @@ L<d2i_SSL_SESSION(3)>,
L<SSL_CTX_set_psk_client_callback(3)>,
L<SSL_CTX_use_psk_identity_hint(3)>,
L<SSL_get_psk_identity(3)>,
-L<DTLSv1_listen(3)|DTLSv1_listen(3)>
+L<DTLSv1_listen(3)>
=head1 HISTORY
More information about the openssl-commits
mailing list