Skip to content

Commit

Permalink
Merge branch 'ia/ssl/remove-old-ssl/OTP-7048'
Browse files Browse the repository at this point in the history
* ia/ssl/remove-old-ssl/OTP-7048:
  Remove old ssl implementation and deprecated function ssl:peercert/1

Conflicts:
	lib/ssl/test/Makefile
  • Loading branch information
IngelaAndin committed Oct 6, 2011
2 parents 811e0de + 64a3651 commit 0020233
Show file tree
Hide file tree
Showing 53 changed files with 80 additions and 13,987 deletions.
2 changes: 1 addition & 1 deletion erts/configure.in
Expand Up @@ -4325,7 +4325,7 @@ dnl The ones below should be moved to their respective lib
dnl
../lib/ic/c_src/$host/Makefile:../lib/ic/c_src/Makefile.in
../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in
../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
dnl ../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
../lib/crypto/c_src/$host/Makefile:../lib/crypto/c_src/Makefile.in
../lib/orber/c_src/$host/Makefile:../lib/orber/c_src/Makefile.in
../lib/runtime_tools/c_src/$host/Makefile:../lib/runtime_tools/c_src/Makefile.in
Expand Down
4 changes: 2 additions & 2 deletions lib/ssl/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
# Copyright Ericsson AB 1999-2010. All Rights Reserved.
# Copyright Ericsson AB 1999-2011. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
Expand All @@ -25,7 +25,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
# Macros
#

SUB_DIRECTORIES = src c_src doc/src examples/certs examples/src
SUB_DIRECTORIES = src doc/src examples/certs examples/src

include vsn.mk
VSN = $(SSL_VSN)
Expand Down
26 changes: 0 additions & 26 deletions lib/ssl/c_src/Makefile

This file was deleted.

33 changes: 0 additions & 33 deletions lib/ssl/c_src/Makefile.dist

This file was deleted.

211 changes: 0 additions & 211 deletions lib/ssl/c_src/Makefile.in

This file was deleted.

0 comments on commit 0020233

Please sign in to comment.